Merge remote-tracking branch 'origin/release-8.1' into release-8.6

lib/new-admin/config/accounts.js

@@ -3,7 +3,7 @@ const _ = require('lodash/fp')
 
 const { ALL } = require('../../plugins/common/ccxt')
 
-const { BTC, BCH, DASH, ETH, LTC, USDT, ZEC, XMR } = COINS
+const { BTC, BCH, DASH, ETH, LTC, USDT, ZEC, XMR, TRX, USDT_TRON } = COINS
 const { bitpay, coinbase, itbit, bitstamp, kraken, binanceus, cex, binance } = ALL
 
 const TICKER = 'ticker'
@@ -29,6 +29,7 @@ const ALL_ACCOUNTS = [
   { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] },
   { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS },
   { code: 'infura', display: 'Infura', class: WALLET, cryptos: [ETH, USDT] },
+  { code: 'trongrid', display: 'Trongrid', class: WALLET, cryptos: [TRX, USDT_TRON] },
   { code: 'geth', display: 'geth (deprecated)', class: WALLET, cryptos: [ETH, USDT] },
   { code: 'zcashd', display: 'zcashd', class: WALLET, cryptos: [ZEC] },
   { code: 'litecoind', display: 'litecoind', class: WALLET, cryptos: [LTC] },

lib/new-admin/config/index.js

@@ -34,7 +34,8 @@ const mapLanguage = lang => {
 const massageCryptos = cryptos => {
   const convert = crypto => ({
     code: crypto['cryptoCode'],
-    display: crypto['display']
+    display: crypto['display'],
+    codeDisplay: crypto['cryptoCodeDisplay'] ?? crypto['cryptoCode']
   })
 
   return _.map(convert, cryptos)

lib/new-admin/graphql/types/currency.type.js

@@ -9,6 +9,7 @@ const typeDef = gql`
   type CryptoCurrency {
     code: String!
     display: String!
+    codeDisplay: String!
   }
 
   type Query {