From ad21415f3e66f26534b5c1e02404763cd57d8e4d Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Sun, 24 Nov 2019 00:31:30 +0800
Subject: [PATCH 01/39] fix can not send coin on test node when initializing
 the tronlink and upgrade sunweb

---
 .../services/NodeService/index.js             | 99 ++++++++++++++++---
 packages/pageHook/package.json                |  2 +-
 yarn.lock                                     | 28 +-----
 3 files changed, 93 insertions(+), 36 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index b0a456f..6719aad 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -27,7 +27,16 @@ const NodeService = {
             eventServer: 'https://api.trongrid.io',
             default: true, // false
             chain: '_',
-            connect: '9dd662e3-052c-584d-9a13-df395a0d68f6'
+            connect: '9dd662e3-052c-584d-9a13-df395a0d68f6',
+            chainType: 0,
+            connectChain: {
+                fullNode: 'https://api.trongrid.io',
+                solidityNode: 'https://api.trongrid.io',
+                eventServer: 'https://api.trongrid.io',
+                mainGateway: CONTRACT_ADDRESS.MAIN,
+                sideGateway: CONTRACT_ADDRESS.SIDE,
+                chainId: SIDE_CHAIN_ID,
+            }
         },
         'bb99520f-d86e-5722-92a3-e0bcbe409b3f': {
             name: 'Shasta Testnet',
@@ -36,6 +45,8 @@ const NodeService = {
             eventServer: 'https://api.shasta.trongrid.io',
             default: false,
             chain: '_',
+            chainType: 0,
+            connectChain: false,
         },
         '9670cbd2-5289-57df-82c2-1c80b6bd8511': {
             name: 'DappChain Testnet',
@@ -44,7 +55,16 @@ const NodeService = {
             eventServer: 'https://testapi.tronex.io',
             default: false,
             chain: '_',
-            connect: '89895c8f-d355-5533-b9b3-d63f2408af7e'
+            connect: '89895c8f-d355-5533-b9b3-d63f2408af7e',
+            chainType: 0,
+            connectChain: {
+                fullNode: 'https://suntest.tronex.io',
+                solidityNode: 'https://suntest.tronex.io',
+                eventServer: 'https://suntest.tronex.io',
+                mainGateway: CONTRACT_ADDRESS.MAIN_TEST,
+                sideGateway: CONTRACT_ADDRESS.SIDE_TEST,
+                chainId: SIDE_CHAIN_ID_TEST,
+            }
         },
         '9dd662e3-052c-584d-9a13-df395a0d68f6': {
             name: 'DappChain',
@@ -54,6 +74,15 @@ const NodeService = {
             default: true,
             chain: SIDE_CHAIN_ID,
             connect: '3672f655-68a1-5c62-8929-d151c90ac21d',
+            chainType: 1,
+            mainGateway: CONTRACT_ADDRESS.MAIN,
+            sideGateway: CONTRACT_ADDRESS.SIDE,
+            sideChainId: SIDE_CHAIN_ID,
+            connectChain: {
+                fullNode: 'https://api.trongrid.io',
+                solidityNode: 'https://api.trongrid.io',
+                eventServer: 'https://api.trongrid.io',
+            }
         },
         '89895c8f-d355-5533-b9b3-d63f2408af7e': {
             name: 'DappChain Testnet',
@@ -63,6 +92,15 @@ const NodeService = {
             default: false,
             chain: SIDE_CHAIN_ID,
             connect: '9670cbd2-5289-57df-82c2-1c80b6bd8511',
+            chainType: 1,
+            mainGateway: CONTRACT_ADDRESS.MAIN_TEST,
+            sideGateway: CONTRACT_ADDRESS.SIDE_TEST,
+            sideChainId: SIDE_CHAIN_ID_TEST,
+            connectChain: {
+                fullNode: 'https://testhttpapi.tronex.io',
+                solidityNode: 'https://testhttpapi.tronex.io',
+                eventServer: 'https://testapi.tronex.io',
+            }
         },
 
     },
@@ -132,18 +170,55 @@ const NodeService = {
             fullNode,
             solidityNode,
             eventServer,
+            connectNode,
+            chainType,
+            connectChain,
+            mainGateway,
+            sideGateway,
+            sideChainId,
         } = this.getCurrentNode();
         
-        this.sunWeb = new SunWeb(
-            //{fullNode:'https://api.trongrid.io',solidityNode:'https://api.trongrid.io',eventServer:'https://api.trongrid.io'},
-            //{fullNode:'https://sun.tronex.io',solidityNode:'https://sun.tronex.io',eventServer:'https://sun.tronex.io'},
-            NODE.MAIN,
-            NODE.SIDE,
-            CONTRACT_ADDRESS.MAIN,
-            CONTRACT_ADDRESS.SIDE,
-            SIDE_CHAIN_ID
-        );
-
+        // this.sunWeb = new SunWeb(
+        //     NODE.MAIN,
+        //     NODE.SIDE,
+        //     CONTRACT_ADDRESS.MAIN,
+        //     CONTRACT_ADDRESS.SIDE,
+        //     SIDE_CHAIN_ID
+        // );
+        { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
+        {
+            fullNode: connectNode.fullNode,
+            solidityNode: connectNode.solidityNode,
+            eventServer: connectNode.eventServer
+        },
+        CONTRACT_ADDRESS.MAIN,
+        CONTRACT_ADDRESS.SIDE,
+        SIDE_CHAIN_ID
+
+        if (Number(chainType) === 0) {
+            if (connectChain) {
+               this.sunWeb = new SunWeb(
+                new TronWeb(
+                    fullNode, 
+                    solidityNode, 
+                    eventServer, 
+               ), new TronWeb(
+                   connectChain.fullNode, 
+                   connectChain.solidityNode, 
+                   connectNode.eventServer, 
+               ), 
+               connectNode.mainGateway, 
+               connectNode.sidechain, 
+               connectNode.chainId);
+            } 
+        } else  {
+            this.sunWeb = new SunWeb(
+                new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer),
+                new TronWeb(fullNode, solidityNode, eventServer),
+                mainGateway, 
+                sideGateway, 
+                sideChainId);
+        }
         this.tronWeb = new TronWeb(
             fullNode,
             solidityNode,
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index cf68e6d..58a6ea5 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -12,6 +12,6 @@
   "dependencies": {
     "ethers": "^4.0.33",
     "tronweb": "^2.7.4",
-    "sunweb": "^1.0.7"
+    "sunweb": "^1.0.8"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 08b5114..9d12694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6496,7 +6496,7 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-ethers@^4.0.32, ethers@^4.0.33, ethers@^4.0.7:
+ethers@^4.0.33, ethers@^4.0.7:
   version "4.0.33"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.33.tgz#f7b88d2419d731a39aefc37843a3f293e396f918"
   integrity sha512-lAHkSPzBe0Vj+JrhmkEHLtUEKEheVktIjGDyE9gbzF4zf1vibjYgB57LraDHu4/ItqWVkztgsm8GWqcDMN+6vQ==
@@ -14042,15 +14042,13 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-sunweb@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/sunweb/-/sunweb-1.0.7.tgz#9a4d09e0b5848060c60b8e99740076132c91f49c"
-  integrity sha512-2Nr1haGdTjtylgE53y83aGy5Edx8SyUQMB/Fs/LEnTF5bZuMvPNFpljXUiae0xy5j/UMuEb0Q1a6ONKmSsQpCw==
+sunweb@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/sunweb/-/sunweb-1.0.8.tgz#f7adcd9b71e1a1f68020868792219d3c1e1a0054"
+  integrity sha512-4KyrxcnWIvozQ9ZrRdggDVl+pUrPDssI4T2ApVk105DkxKwosPAa5987LmpLV9tXykIg77ZNihy4dX2UGoawsA==
   dependencies:
     "@babel/runtime" "^7.4.5"
     babel-runtime "^6.26.0"
-    ethers "^4.0.32"
-    tronweb "^2.7.1"
 
 supports-color@5.4.0:
   version "5.4.0"
@@ -14434,22 +14432,6 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-tronweb@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/tronweb/-/tronweb-2.7.1.tgz#714547728a2e6e87e808da91b7a5b1e178179503"
-  integrity sha512-BSqEFeCX3nM4utzWKzo/nCVbtvZ6MMbFvPKVje1as/ZPqACTH0KxaJnOdsxs2KESuT/uuWKXYcqrUQie4KHN2A==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    axios "^0.19.0"
-    babel-runtime "^6.26.0"
-    bignumber.js "^7.2.1"
-    elliptic "^6.4.1"
-    ethers "^4.0.7"
-    eventemitter3 "^3.1.0"
-    lodash "^4.17.14"
-    semver "^5.6.0"
-    validator "^10.7.1"
-
 tronweb@^2.7.4:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/tronweb/-/tronweb-2.7.4.tgz#9fc81db59ee3dd8cb88ef12c92f6c6f554020022"

From db021a48c596fd74a8e486f2c8b8d8e71b69df7d Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Sun, 24 Nov 2019 00:34:18 +0800
Subject: [PATCH 02/39] change the way to new SunWeb

---
 .../services/WalletService/index.js           | 42 ++++---------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index a2902ca..60160c0 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -779,7 +779,7 @@ class Wallet extends EventEmitter {
 
         const node = NodeService.getCurrentNode();
         NodeService.selectChain(node.chain);
-        
+
         const nodes = NodeService.getNodes();
 
         const connectNode = nodes.nodes[nodes.nodes[nodeID].connect];
@@ -819,12 +819,8 @@ class Wallet extends EventEmitter {
 
             if (node.fullNode === 'https://api.trongrid.io' && connectNode.fullNode === 'https://sun.tronex.io') {
                 NodeService.sunWeb = new SunWeb(
-                    { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
-                    {
-                        fullNode: connectNode.fullNode,
-                        solidityNode: connectNode.solidityNode,
-                        eventServer: connectNode.eventServer
-                    },
+                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
+                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
                     CONTRACT_ADDRESS.MAIN,
                     CONTRACT_ADDRESS.SIDE,
                     SIDE_CHAIN_ID
@@ -833,16 +829,8 @@ class Wallet extends EventEmitter {
 
             if (connectNode.fullNode === 'https://api.trongrid.io' && node.fullNode === 'https://sun.tronex.io') {
                 NodeService.sunWeb = new SunWeb(
-                    {
-                        fullNode: connectNode.fullNode,
-                        solidityNode: connectNode.solidityNode,
-                        eventServer: connectNode.eventServer
-                    },
-                    {
-                        fullNode: node.fullNode,
-                        solidityNode: node.solidityNode,
-                        eventServer: node.eventServer
-                    },
+                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
+                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
                     CONTRACT_ADDRESS.MAIN,
                     CONTRACT_ADDRESS.SIDE,
                     SIDE_CHAIN_ID
@@ -851,12 +839,8 @@ class Wallet extends EventEmitter {
 
             if (node.fullNode === 'https://testhttpapi.tronex.io' && connectNode.fullNode === 'https://suntest.tronex.io') {
                 NodeService.sunWeb = new SunWeb(
-                    { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
-                    {
-                        fullNode: connectNode.fullNode,
-                        solidityNode: connectNode.solidityNode,
-                        eventServer: connectNode.eventServer
-                    },
+                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
+                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
                     'TFLtPoEtVJBMcj6kZPrQrwEdM3W3shxsBU',
                     'TRDepx5KoQ8oNbFVZ5sogwUxtdYmATDRgX',
                     '413AF23F37DA0D48234FDD43D89931E98E1144481B'
@@ -865,16 +849,8 @@ class Wallet extends EventEmitter {
 
             if (connectNode.fullNode === 'https://testhttpapi.tronex.io' && node.fullNode === 'https://suntest.tronex.io') {
                 NodeService.sunWeb = new SunWeb(
-                    {
-                        fullNode: connectNode.fullNode,
-                        solidityNode: connectNode.solidityNode,
-                        eventServer: connectNode.eventServer
-                    },
-                    {
-                        fullNode: node.fullNode,
-                        solidityNode: node.solidityNode,
-                        eventServer: node.eventServer
-                    },
+                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
+                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
                     'TFLtPoEtVJBMcj6kZPrQrwEdM3W3shxsBU',
                     'TRDepx5KoQ8oNbFVZ5sogwUxtdYmATDRgX',
                     '413AF23F37DA0D48234FDD43D89931E98E1144481B'

From 808192dbc32ccee7f610747c0d8d43549bb89062 Mon Sep 17 00:00:00 2001
From: llwslc <llwslc@gmail.com>
Date: Mon, 25 Nov 2019 11:47:45 +0800
Subject: [PATCH 03/39] Unexpected token

---
 .../services/NodeService/index.js             | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 6719aad..8cfe8d2 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -177,46 +177,41 @@ const NodeService = {
             sideGateway,
             sideChainId,
         } = this.getCurrentNode();
-        
-        // this.sunWeb = new SunWeb(
-        //     NODE.MAIN,
-        //     NODE.SIDE,
-        //     CONTRACT_ADDRESS.MAIN,
-        //     CONTRACT_ADDRESS.SIDE,
-        //     SIDE_CHAIN_ID
-        // );
-        { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
-        {
-            fullNode: connectNode.fullNode,
-            solidityNode: connectNode.solidityNode,
-            eventServer: connectNode.eventServer
-        },
-        CONTRACT_ADDRESS.MAIN,
-        CONTRACT_ADDRESS.SIDE,
-        SIDE_CHAIN_ID
+
+        this.sunWeb = new SunWeb(
+            { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
+            {
+                fullNode: connectNode.fullNode,
+                solidityNode: connectNode.solidityNode,
+                eventServer: connectNode.eventServer
+            },
+            CONTRACT_ADDRESS.MAIN,
+            CONTRACT_ADDRESS.SIDE,
+            SIDE_CHAIN_ID
+        );
 
         if (Number(chainType) === 0) {
             if (connectChain) {
                this.sunWeb = new SunWeb(
                 new TronWeb(
-                    fullNode, 
-                    solidityNode, 
-                    eventServer, 
+                    fullNode,
+                    solidityNode,
+                    eventServer,
                ), new TronWeb(
-                   connectChain.fullNode, 
-                   connectChain.solidityNode, 
-                   connectNode.eventServer, 
-               ), 
-               connectNode.mainGateway, 
-               connectNode.sidechain, 
+                   connectChain.fullNode,
+                   connectChain.solidityNode,
+                   connectNode.eventServer,
+               ),
+               connectNode.mainGateway,
+               connectNode.sidechain,
                connectNode.chainId);
-            } 
+            }
         } else  {
             this.sunWeb = new SunWeb(
                 new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer),
                 new TronWeb(fullNode, solidityNode, eventServer),
-                mainGateway, 
-                sideGateway, 
+                mainGateway,
+                sideGateway,
                 sideChainId);
         }
         this.tronWeb = new TronWeb(

From edd9caf823cd1a2e413e4e5afe844c2d414410f1 Mon Sep 17 00:00:00 2001
From: llwslc <llwslc@gmail.com>
Date: Mon, 25 Nov 2019 11:48:24 +0800
Subject: [PATCH 04/39] fix deposit button bug

---
 packages/popup/src/app/index.js                              | 2 +-
 .../popup/src/controllers/TransactionsController/index.js    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/popup/src/app/index.js b/packages/popup/src/app/index.js
index 9476297..94310ed 100644
--- a/packages/popup/src/app/index.js
+++ b/packages/popup/src/app/index.js
@@ -82,7 +82,7 @@ class App extends React.Component {
                 dom = <TransferController accounts={accounts} chains={chains} onCancel={ () => PopupAPI.changeState(APP_STATE.TRANSACTIONS) }  />;
                 break;
             case APP_STATE.TRANSACTIONS:
-                dom = <TransactionsController chains={chains} prices={prices} accounts={accounts} onCancel={ () => PopupAPI.changeState(APP_STATE.READY) } />;
+                dom = <TransactionsController chains={chains} prices={prices} accounts={accounts} nodes={nodes} onCancel={ () => PopupAPI.changeState(APP_STATE.READY) } />;
                 break;
             case APP_STATE.SETTING:
                 dom = <SettingController lock={lock} version={version} language={language} prices={prices} onCancel={ () => PopupAPI.changeState(APP_STATE.READY) } />
diff --git a/packages/popup/src/controllers/TransactionsController/index.js b/packages/popup/src/controllers/TransactionsController/index.js
index 54bbb39..67fe13e 100644
--- a/packages/popup/src/controllers/TransactionsController/index.js
+++ b/packages/popup/src/controllers/TransactionsController/index.js
@@ -23,8 +23,6 @@ class TransactionsController extends React.Component {
             isRequest: false,
             currentPage: 1
         };
-
-        this.nodes = '';
     }
 
     async componentDidMount() {
@@ -50,6 +48,7 @@ class TransactionsController extends React.Component {
             onCancel,
             prices,
             chains,
+            nodes,
         } = this.props;
 
 
@@ -284,7 +283,7 @@ class TransactionsController extends React.Component {
                             null
                     }
                     {
-                        accounts.selectedToken.isMapping && type !== ACCOUNT_TYPE.LEDGER ?
+                        accounts.selectedToken.isMapping && type !== ACCOUNT_TYPE.LEDGER && nodes.nodes[nodes.selected].connect ?
                             <button className='transfer' onClick={(e) => {
                                 PopupAPI.changeState(APP_STATE.TRANSFER);
                             }}>

From 0f6006ee0ed216e3e546b4db75eda31b7a3c58ca Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Mon, 25 Nov 2019 12:48:01 +0800
Subject: [PATCH 05/39] merge

---
 packages/backgroundScript/package.json               |  2 +-
 .../backgroundScript/services/NodeService/index.js   | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/backgroundScript/package.json b/packages/backgroundScript/package.json
index e77b324..e46296b 100644
--- a/packages/backgroundScript/package.json
+++ b/packages/backgroundScript/package.json
@@ -13,7 +13,7 @@
     "buffer": "^5.2.1",
     "eventemitter3": "^3.1.0",
     "tronweb": "^2.7.4",
-    "sunweb": "^1.0.7"
+    "sunweb": "^1.0.8"
   },
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/backgroundScript.js",
diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 8cfe8d2..7dee760 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -178,18 +178,6 @@ const NodeService = {
             sideChainId,
         } = this.getCurrentNode();
 
-        this.sunWeb = new SunWeb(
-            { fullNode: node.fullNode, solidityNode: node.solidityNode, eventServer: node.eventServer },
-            {
-                fullNode: connectNode.fullNode,
-                solidityNode: connectNode.solidityNode,
-                eventServer: connectNode.eventServer
-            },
-            CONTRACT_ADDRESS.MAIN,
-            CONTRACT_ADDRESS.SIDE,
-            SIDE_CHAIN_ID
-        );
-
         if (Number(chainType) === 0) {
             if (connectChain) {
                this.sunWeb = new SunWeb(

From 515e6bb8ad0226ac706948096bd881498931f2d6 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Mon, 25 Nov 2019 15:31:20 +0800
Subject: [PATCH 06/39] update

---
 .../backgroundScript/services/NodeService/index.js     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 7dee760..dd79bb6 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -177,7 +177,6 @@ const NodeService = {
             sideGateway,
             sideChainId,
         } = this.getCurrentNode();
-
         if (Number(chainType) === 0) {
             if (connectChain) {
                this.sunWeb = new SunWeb(
@@ -188,11 +187,11 @@ const NodeService = {
                ), new TronWeb(
                    connectChain.fullNode,
                    connectChain.solidityNode,
-                   connectNode.eventServer,
+                   connectChain.eventServer,
                ),
-               connectNode.mainGateway,
-               connectNode.sidechain,
-               connectNode.chainId);
+               connectChain.mainGateway,
+               connectChain.sideGateway,
+               connectChain.chainId);
             }
         } else  {
             this.sunWeb = new SunWeb(
@@ -207,7 +206,6 @@ const NodeService = {
             solidityNode,
             eventServer
         );
-
         if (!skipAddress) {
             this.setAddress();
         }

From 79c145e8ccf44b5f8053bcc16ae66f92bdedd821 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Mon, 25 Nov 2019 15:44:42 +0800
Subject: [PATCH 07/39] update

---
 .../services/NodeService/index.js             | 20 +++++++++----------
 .../services/WalletService/Account.js         |  6 +++---
 .../services/WalletService/index.js           |  2 +-
 .../popup/src/pages/AccountsPage/index.js     |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index dd79bb6..67e0458 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -20,14 +20,14 @@ const NodeService = {
         }
     },
     _nodes: {
-        '3672f655-68a1-5c62-8929-d151c90ac21d': {
+        '109c64ad-e59c-46fe-ba87-179587e6c772': {
             name: 'Mainnet',
             fullNode: 'https://api.trongrid.io',
             solidityNode: 'https://api.trongrid.io',
             eventServer: 'https://api.trongrid.io',
             default: true, // false
             chain: '_',
-            connect: '9dd662e3-052c-584d-9a13-df395a0d68f6',
+            connect: '51a36e5a-2480-4b57-989c-539345a13be2',
             chainType: 0,
             connectChain: {
                 fullNode: 'https://api.trongrid.io',
@@ -38,7 +38,7 @@ const NodeService = {
                 chainId: SIDE_CHAIN_ID,
             }
         },
-        'bb99520f-d86e-5722-92a3-e0bcbe409b3f': {
+        'b9424719-b45b-45aa-95d0-1b1b25fc75ae': {
             name: 'Shasta Testnet',
             fullNode: 'https://api.shasta.trongrid.io',
             solidityNode: 'https://api.shasta.trongrid.io',
@@ -48,14 +48,14 @@ const NodeService = {
             chainType: 0,
             connectChain: false,
         },
-        '9670cbd2-5289-57df-82c2-1c80b6bd8511': {
+        'f14212e2-a6a0-4391-9419-07b55f8be63e': {
             name: 'DappChain Testnet',
             fullNode: 'https://testhttpapi.tronex.io',
             solidityNode: 'https://testhttpapi.tronex.io',
             eventServer: 'https://testapi.tronex.io',
             default: false,
             chain: '_',
-            connect: '89895c8f-d355-5533-b9b3-d63f2408af7e',
+            connect: '01eda3a0-5a58-4e44-9f95-f7f1f59dd728',
             chainType: 0,
             connectChain: {
                 fullNode: 'https://suntest.tronex.io',
@@ -66,14 +66,14 @@ const NodeService = {
                 chainId: SIDE_CHAIN_ID_TEST,
             }
         },
-        '9dd662e3-052c-584d-9a13-df395a0d68f6': {
+        '51a36e5a-2480-4b57-989c-539345a13be2': {
             name: 'DappChain',
             fullNode: 'https://sun.tronex.io',
             solidityNode: 'https://sun.tronex.io',
             eventServer: 'https://sun.tronex.io',
             default: true,
             chain: SIDE_CHAIN_ID,
-            connect: '3672f655-68a1-5c62-8929-d151c90ac21d',
+            connect: '109c64ad-e59c-46fe-ba87-179587e6c772',
             chainType: 1,
             mainGateway: CONTRACT_ADDRESS.MAIN,
             sideGateway: CONTRACT_ADDRESS.SIDE,
@@ -84,14 +84,14 @@ const NodeService = {
                 eventServer: 'https://api.trongrid.io',
             }
         },
-        '89895c8f-d355-5533-b9b3-d63f2408af7e': {
+        '01eda3a0-5a58-4e44-9f95-f7f1f59dd728': {
             name: 'DappChain Testnet',
             fullNode: 'https://suntest.tronex.io',
             solidityNode: 'https://suntest.tronex.io',
             eventServer: 'https://suntest.tronex.io',
             default: false,
             chain: SIDE_CHAIN_ID,
-            connect: '9670cbd2-5289-57df-82c2-1c80b6bd8511',
+            connect: 'f14212e2-a6a0-4391-9419-07b55f8be63e',
             chainType: 1,
             mainGateway: CONTRACT_ADDRESS.MAIN_TEST,
             sideGateway: CONTRACT_ADDRESS.SIDE_TEST,
@@ -105,7 +105,7 @@ const NodeService = {
 
     },
     _selectedChain: '_',
-    _selectedNode: '3672f655-68a1-5c62-8929-d151c90ac21d',
+    _selectedNode: '109c64ad-e59c-46fe-ba87-179587e6c772',
     _read() {
         logger.info('Reading nodes and chains from storage');
 
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 49bdc01..044f790 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -226,13 +226,13 @@ class Account {
             return { data: { data: [] } };
         });
 
-        if (!(node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6')) {
+        if (!(node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2')) {
             smartTokens = [];
         }
 
         try {
 
-            //if (node === '3672f655-68a1-5c62-8929-d151c90ac21d') {
+            //if (node === '109c64ad-e59c-46fe-ba87-179587e6c772') {
             const account = await NodeService.tronWeb.trx.getUnconfirmedAccount(address);
 
             if (!account.address) {
@@ -278,7 +278,7 @@ class Account {
                     precision: trc20Filter[0].sPrecision
                 } : { price: 0, precision: 0 });
                 price = price / Math.pow(10, precision);
-                if (node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6') {
+                if (node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2') {
                     if (StorageService.allTokens[NodeService._selectedChain === '_' ? 'mainchain' : 'sidechain'].filter(({ tokenId }) => tokenId === key).length === 0) return;
                     const {
                         name = 'TRX',
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index 60160c0..57947bd 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -1257,7 +1257,7 @@ class Wallet extends EventEmitter {
 
         const nodes = NodeService.getNodes();
 
-        if (!(nodes.selected === '3672f655-68a1-5c62-8929-d151c90ac21d' || nodes.selected === '9dd662e3-052c-584d-9a13-df395a0d68f6')) {
+        if (!(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === '51a36e5a-2480-4b57-989c-539345a13be2')) {
             return { records: [], finger };
         }
 
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index b720c78..0721b85 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -251,14 +251,14 @@ class AccountsPage extends React.Component {
                         </div>
                         <ProcessBar percentage={(account.netLimit - account.netUsed) / account.netLimit} />
                     </div>
-                    <div className={'cell'+(nodes.selected === '3672f655-68a1-5c62-8929-d151c90ac21d' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682'?' bankSingle':'')} onClick={ () => {
+                    <div className={'cell'+(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682'?' bankSingle':'')} onClick={ () => {
                         //PopupAPI.changeState(APP_STATE.TRONBANK);
-                        if(nodes.selected === '3672f655-68a1-5c62-8929-d151c90ac21d' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682')
+                        if(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682')
                             window.open('http://www.tronlending.org');
                     }}>
                         <div className='title'>
                             {
-                                nodes.selected === '3672f655-68a1-5c62-8929-d151c90ac21d' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682' ?
+                                nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682' ?
                                     <span className='bankBox'>
                                         <FormattedMessage id='CONFIRMATIONS.RESOURCE.ENERGY' />
                                         {/*<img className='bankArrow' src={require('../../assets/images/new/tronBank/rightArrow.svg')} alt='arrow'/>*/}
@@ -527,7 +527,7 @@ class AccountsPage extends React.Component {
                 <Header showChainList={showChainList} developmentMode={setting.developmentMode} chains={chains} handleSelectChain={this.handleSelectChain.bind(this)} handleShowChainList={this.handleShowChainList.bind(this)} />
                 <div className='space-controller'>
                     {
-                        nodes.selected === '3672f655-68a1-5c62-8929-d151c90ac21d' && id !== 0 && (!setting.advertising[ id ] || (setting.advertising[ id ] && setting.advertising[ id ][ mode ])) ?
+                        nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' && id !== 0 && (!setting.advertising[ id ] || (setting.advertising[ id ] && setting.advertising[ id ][ mode ])) ?
                             <div className='advertisingWrap'>
                                 <div className='closed' onClick={async () => {
                                     const advertising = setting.advertising ? setting.advertising : {};

From c065d0f7201953cb2de0a6010be683bb3b8870f3 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Tue, 26 Nov 2019 09:33:16 +0800
Subject: [PATCH 08/39] set address when init tronweb and sunweb

---
 .../services/NodeService/index.js             | 25 ++++++++++++-------
 .../services/WalletService/Account.js         |  7 +++---
 .../services/WalletService/index.js           |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 67e0458..b4392d4 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -30,9 +30,9 @@ const NodeService = {
             connect: '51a36e5a-2480-4b57-989c-539345a13be2',
             chainType: 0,
             connectChain: {
-                fullNode: 'https://api.trongrid.io',
-                solidityNode: 'https://api.trongrid.io',
-                eventServer: 'https://api.trongrid.io',
+                fullNode: 'https://sun.tronex.io',
+                solidityNode: 'https://sun.tronex.io',
+                eventServer: 'https://sun.tronex.io',
                 mainGateway: CONTRACT_ADDRESS.MAIN,
                 sideGateway: CONTRACT_ADDRESS.SIDE,
                 chainId: SIDE_CHAIN_ID,
@@ -170,7 +170,6 @@ const NodeService = {
             fullNode,
             solidityNode,
             eventServer,
-            connectNode,
             chainType,
             connectChain,
             mainGateway,
@@ -178,6 +177,11 @@ const NodeService = {
             sideChainId,
         } = this.getCurrentNode();
         if (Number(chainType) === 0) {
+            this.tronWeb = new TronWeb(
+                fullNode,
+                solidityNode,
+                eventServer
+            );
             if (connectChain) {
                this.sunWeb = new SunWeb(
                 new TronWeb(
@@ -192,8 +196,14 @@ const NodeService = {
                connectChain.mainGateway,
                connectChain.sideGateway,
                connectChain.chainId);
+            } else {
+                this.sunWeb.mainchain = new TronWeb(fullNode,
+                    solidityNode,
+                    eventServer,)
             }
         } else  {
+            this.tronWeb = new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer);
+               
             this.sunWeb = new SunWeb(
                 new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer),
                 new TronWeb(fullNode, solidityNode, eventServer),
@@ -201,11 +211,6 @@ const NodeService = {
                 sideGateway,
                 sideChainId);
         }
-        this.tronWeb = new TronWeb(
-            fullNode,
-            solidityNode,
-            eventServer
-        );
         if (!skipAddress) {
             this.setAddress();
         }
@@ -223,6 +228,8 @@ const NodeService = {
         this.tronWeb.setAddress(
             StorageService.selectedAccount
         );
+        this.sunWeb.mainchain.setAddress(StorageService.selectedAccount);
+        this.sunWeb.sidechain.setAddress(StorageService.selectedAccount);
     },
 
     save() {
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 044f790..6d89645 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -226,14 +226,13 @@ class Account {
             return { data: { data: [] } };
         });
 
-        if (!(node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2')) {
+        if (!(node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6')) {
             smartTokens = [];
         }
 
         try {
 
-            //if (node === '109c64ad-e59c-46fe-ba87-179587e6c772') {
-            const account = await NodeService.tronWeb.trx.getUnconfirmedAccount(address);
+            const account = NodeService._selectedChain === '_' ? await NodeService.tronWeb.trx.getUnconfirmedAccount(address) : await NodeService.sunWeb.sidechain.trx.getUnconfirmedAccount(address);
 
             if (!account.address) {
                 logger.info(`Account ${address} does not exist on the network`);
@@ -278,7 +277,7 @@ class Account {
                     precision: trc20Filter[0].sPrecision
                 } : { price: 0, precision: 0 });
                 price = price / Math.pow(10, precision);
-                if (node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2') {
+                if (node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6') {
                     if (StorageService.allTokens[NodeService._selectedChain === '_' ? 'mainchain' : 'sidechain'].filter(({ tokenId }) => tokenId === key).length === 0) return;
                     const {
                         name = 'TRX',
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index 57947bd..9b594e0 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -859,6 +859,7 @@ class Wallet extends EventEmitter {
         }
         this.emit('setAccounts', this.getAccounts());
         this.emit('setAccount', this.selectedAccount);
+        NodeService.setAddress();
 
     }
 

From 94ac8d4de1aa097473778dfe58d5ea6455dece98 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Tue, 26 Nov 2019 23:54:18 +0800
Subject: [PATCH 09/39] update

---
 .../services/WalletService/Account.js         |  4 +-
 .../services/WalletService/index.js           | 47 -------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 6d89645..6e86cb1 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -226,7 +226,7 @@ class Account {
             return { data: { data: [] } };
         });
 
-        if (!(node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6')) {
+        if (!(node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2')) {
             smartTokens = [];
         }
 
@@ -277,7 +277,7 @@ class Account {
                     precision: trc20Filter[0].sPrecision
                 } : { price: 0, precision: 0 });
                 price = price / Math.pow(10, precision);
-                if (node === '3672f655-68a1-5c62-8929-d151c90ac21d' || node === '9dd662e3-052c-584d-9a13-df395a0d68f6') {
+                if (node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2') {
                     if (StorageService.allTokens[NodeService._selectedChain === '_' ? 'mainchain' : 'sidechain'].filter(({ tokenId }) => tokenId === key).length === 0) return;
                     const {
                         name = 'TRX',
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index 9b594e0..dab5306 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -793,12 +793,6 @@ class Wallet extends EventEmitter {
                     chain: node.chain
                 }
             });
-
-            NodeService.tronWeb = new TronWeb(
-                node.fullNode,
-                node.solidityNode,
-                node.eventServer
-            );
         } else {
 
             this.emit('setNode', {
@@ -816,50 +810,9 @@ class Wallet extends EventEmitter {
                     }
                 }
             );
-
-            if (node.fullNode === 'https://api.trongrid.io' && connectNode.fullNode === 'https://sun.tronex.io') {
-                NodeService.sunWeb = new SunWeb(
-                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
-                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
-                    CONTRACT_ADDRESS.MAIN,
-                    CONTRACT_ADDRESS.SIDE,
-                    SIDE_CHAIN_ID
-                );
-            }
-
-            if (connectNode.fullNode === 'https://api.trongrid.io' && node.fullNode === 'https://sun.tronex.io') {
-                NodeService.sunWeb = new SunWeb(
-                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
-                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
-                    CONTRACT_ADDRESS.MAIN,
-                    CONTRACT_ADDRESS.SIDE,
-                    SIDE_CHAIN_ID
-                );
-            }
-
-            if (node.fullNode === 'https://testhttpapi.tronex.io' && connectNode.fullNode === 'https://suntest.tronex.io') {
-                NodeService.sunWeb = new SunWeb(
-                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
-                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
-                    'TFLtPoEtVJBMcj6kZPrQrwEdM3W3shxsBU',
-                    'TRDepx5KoQ8oNbFVZ5sogwUxtdYmATDRgX',
-                    '413AF23F37DA0D48234FDD43D89931E98E1144481B'
-                );
-            }
-
-            if (connectNode.fullNode === 'https://testhttpapi.tronex.io' && node.fullNode === 'https://suntest.tronex.io') {
-                NodeService.sunWeb = new SunWeb(
-                    new TronWeb(connectNode.fullNode, connectNode.solidityNode, connectNode.eventServer),
-                    new TronWeb(node.fullNode, node.solidityNode, node.eventServer),
-                    'TFLtPoEtVJBMcj6kZPrQrwEdM3W3shxsBU',
-                    'TRDepx5KoQ8oNbFVZ5sogwUxtdYmATDRgX',
-                    '413AF23F37DA0D48234FDD43D89931E98E1144481B'
-                );
-            }
         }
         this.emit('setAccounts', this.getAccounts());
         this.emit('setAccount', this.selectedAccount);
-        NodeService.setAddress();
 
     }
 

From d8bcc3d2ffa971931d29c6e63622130e503817e5 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 27 Nov 2019 11:54:19 +0800
Subject: [PATCH 10/39] update version to 3.2.3

---
 manifest.json                                               | 4 ++--
 packages/backgroundScript/services/WalletService/Account.js | 2 +-
 packages/lib/package.json                                   | 2 +-
 packages/pageHook/package.json                              | 2 +-
 packages/popup/package.json                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 37146c1..4828c3d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink（波宝钱包）",
-    "version": "3.2.2",
-    "version_name": "3.2.2",
+    "version": "3.2.3",
+    "version_name": "3.2.3",
     "description": "The first and most popular TRON wallet. Recommended by TRON Foundation.",
     "author": "Kondax <kondaxsolutions@gmail.com>",
     "content_security_policy": "script-src 'self' 'unsafe-eval' 'sha256-LayQc1iWBC+6WbHHvHZj3uSx3CxrGBHUJBR7si4qf8w=' 'sha256-POEO+wER89cezFVZ27JoP523HJNPMQxmh5Rcz/OZpr4=' 'sha256-IThiKMnsg0UHaLmP7sJxZpd/ohvINImwjxFJyxGFSlk=' https://*.sentry.io https://www.google-analytics.com https://www.googletagmanager.com https://cdnjs.cloudflare.com; object-src 'self'",
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 6e86cb1..2e1329b 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -604,7 +604,7 @@ class Account {
                 return Promise.resolve(transactionId);
             } else {
                 const sidechain = NodeService.sunWeb.sidechain;
-                const { transaction } = await NodeService.tronWeb.transactionBuilder.triggerSmartContract(TronWeb.address.toHex(token), 'transfer(address,uint256)', { feeLimit: 1000000 }, [{
+                const { transaction } = await NodeService.sunWeb.sidechain.transactionBuilder.triggerSmartContract(TronWeb.address.toHex(token), 'transfer(address,uint256)', { feeLimit: 1000000 }, [{
                     'type': 'address',
                     'value': recipient
                 }, { 'type': 'uint256', 'value': amount }]);
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 106ae98..8975b52 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.2",
+  "version": "3.2.3",
   "dependencies": {
     "@tronscan/client": "^0.2.48",
     "@ledgerhq/hw-transport-u2f": "^4.31.0",
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index 58a6ea5..c13dd54 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.2",
+  "version": "3.2.3",
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/pageHook.js",
     "lint": "npx eslint . --fix"
diff --git a/packages/popup/package.json b/packages/popup/package.json
index 02ff379..8549bc5 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -3,7 +3,7 @@
   "main": "index.js",
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.8",

From 95d8506a7cf39bc6e04771825d1686cdd61d4afb Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 27 Nov 2019 12:12:51 +0800
Subject: [PATCH 11/39] get tokenID according to different chain

---
 packages/backgroundScript/services/StorageService/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backgroundScript/services/StorageService/index.js b/packages/backgroundScript/services/StorageService/index.js
index 6ed240c..15e3e06 100644
--- a/packages/backgroundScript/services/StorageService/index.js
+++ b/packages/backgroundScript/services/StorageService/index.js
@@ -395,7 +395,7 @@ const StorageService = {
             name,
             abbr,
             precision: decimals = 0
-        } = await NodeService.tronWeb.trx.getTokenFromID(tokenID);
+        } = NodeService._selectedChain === '_' ? await NodeService.tronWeb.trx.getTokenFromID(tokenID) : await NodeService.sunWeb.sidechain.trx.getTokenFromID(tokenID);
         this.tokenCache[ tokenID ] = {
             name,
             abbr,

From a7d516d40acf28cf61f86fe26177cebc8745b807 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 27 Nov 2019 15:44:19 +0800
Subject: [PATCH 12/39] modify json text trxmarket to Exchange

---
 packages/popup/src/translations/en.json | 2 +-
 packages/popup/src/translations/ja.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/popup/src/translations/en.json b/packages/popup/src/translations/en.json
index 7879e82..4905d4b 100644
--- a/packages/popup/src/translations/en.json
+++ b/packages/popup/src/translations/en.json
@@ -437,7 +437,7 @@
     "DAPP_WHITELIST.ADD_TIME":"Add time",
 
     "INDEX_ICON_TITLE.OFFICIAL_WEBSITE":"website",
-    "INDEX_ICON_TITLE.EXCHANGE":"trxmarket",
+    "INDEX_ICON_TITLE.EXCHANGE":"Exchange",
     "INDEX_ICON_TITLE.LOCK":"lock",
     "INDEX_ICON_TITLE.REFRESH":"refresh",
     "INDEX_ICON_TITLE.SETTING":"set up",
diff --git a/packages/popup/src/translations/ja.json b/packages/popup/src/translations/ja.json
index c33cb8b..846b6bc 100644
--- a/packages/popup/src/translations/ja.json
+++ b/packages/popup/src/translations/ja.json
@@ -432,7 +432,7 @@
   "DAPP_WHITELIST.ADD_TIME":"時間を追加",
 
   "INDEX_ICON_TITLE.OFFICIAL_WEBSITE":"ホームページ",
-  "INDEX_ICON_TITLE.EXCHANGE":"trxmarket",
+  "INDEX_ICON_TITLE.EXCHANGE":"Exchange",
   "INDEX_ICON_TITLE.LOCK":"アンカー",
   "INDEX_ICON_TITLE.REFRESH":"更新",
   "INDEX_ICON_TITLE.SETTING":"設定",

From d300eb85c4f73974110cb4d36779bc2ba112c061 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Tue, 3 Dec 2019 18:15:13 +0800
Subject: [PATCH 13/39] update tronweb

---
 packages/backgroundScript/package.json |  4 ++--
 packages/contentScript/package.json    |  2 +-
 packages/lib/package.json              |  2 +-
 packages/pageHook/index.js             |  4 +++-
 packages/pageHook/package.json         |  4 ++--
 packages/popup/package.json            |  2 +-
 yarn.lock                              | 23 +++++++++++++++--------
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/backgroundScript/package.json b/packages/backgroundScript/package.json
index e46296b..a350b92 100644
--- a/packages/backgroundScript/package.json
+++ b/packages/backgroundScript/package.json
@@ -12,8 +12,8 @@
     "bip39": "^2.5.0",
     "buffer": "^5.2.1",
     "eventemitter3": "^3.1.0",
-    "tronweb": "^2.7.4",
-    "sunweb": "^1.0.8"
+    "tronweb": "^2.8.1",
+    "sunweb": "^1.1.0"
   },
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/backgroundScript.js",
diff --git a/packages/contentScript/package.json b/packages/contentScript/package.json
index c191570..9317f38 100644
--- a/packages/contentScript/package.json
+++ b/packages/contentScript/package.json
@@ -11,6 +11,6 @@
   },
   "dependencies": {
     "extensionizer": "^1.0.1",
-    "tronweb": "^2.7.4"
+    "tronweb": "^2.8.1"
   }
 }
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 8975b52..fa2f090 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -16,7 +16,7 @@
     "eventemitter3": "^3.1.0",
     "extensionizer": "^1.0.1",
     "pbkdf2": "^3.0.17",
-    "tronweb": "^2.7.4",
+    "tronweb": "^2.8.1",
     "uuid": "^3.3.2",
     "ethers": "^4.0.7"
   },
diff --git a/packages/pageHook/index.js b/packages/pageHook/index.js
index e0da3b9..f221975 100644
--- a/packages/pageHook/index.js
+++ b/packages/pageHook/index.js
@@ -7,7 +7,9 @@ import Utils from '@tronlink/lib/utils';
 import { CONTRACT_ADDRESS, SIDE_CHAIN_ID, NODE, SIDE_CHAIN_ID_TEST } from '@tronlink/lib/constants';
 import RequestHandler from './handlers/RequestHandler';
 import ProxiedProvider from './handlers/ProxiedProvider';
-import SunWeb from './SunWeb';
+
+import SunWeb from 'sunweb';
+
 
 
 const logger = new Logger('pageHook');
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index c13dd54..712735d 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "ethers": "^4.0.33",
-    "tronweb": "^2.7.4",
-    "sunweb": "^1.0.8"
+    "tronweb": "^2.8.1",
+    "sunweb": "^1.1.0"
   }
 }
diff --git a/packages/popup/package.json b/packages/popup/package.json
index 8549bc5..59532ba 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -36,7 +36,7 @@
     "redux-starter-kit": "^0.2.0",
     "sweetalert2": "^7.29.2",
     "sweetalert2-react-content": "^1.0.1",
-    "tronweb": "^2.7.4",
+    "tronweb": "^2.8.1",
     "babel-core": "6.26.0",
     "babel-eslint": "7.2.3",
     "babel-jest": "20.0.3",
diff --git a/yarn.lock b/yarn.lock
index 9d12694..4e08b85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8153,6 +8153,11 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
+injectpromise@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/injectpromise/-/injectpromise-1.0.0.tgz#c621f7df2bbfc1164d714f1fb229adec2079da39"
+  integrity sha512-qNq5wy4qX4uWHcVFOEU+RqZkoVG65FhvGkyDWbuBxILMjK6A1LFf5A1mgXZkD4nRx5FCorD81X/XvPKp/zVfPA==
+
 inquirer@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
@@ -14042,13 +14047,14 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-sunweb@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/sunweb/-/sunweb-1.0.8.tgz#f7adcd9b71e1a1f68020868792219d3c1e1a0054"
-  integrity sha512-4KyrxcnWIvozQ9ZrRdggDVl+pUrPDssI4T2ApVk105DkxKwosPAa5987LmpLV9tXykIg77ZNihy4dX2UGoawsA==
+sunweb@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/sunweb/-/sunweb-1.1.0.tgz#7d00dbd610f9fd7d3380f71ae1fa03dabd882094"
+  integrity sha512-RoQHMAE3EMM04/y9XHDOhmnf4prhes2yYsRMi5mYANSHohpPvLl+v5I7xD0M5f5W6dMz2eSY7b0NsIyfH/1V/g==
   dependencies:
     "@babel/runtime" "^7.4.5"
     babel-runtime "^6.26.0"
+    injectpromise "^1.0.0"
 
 supports-color@5.4.0:
   version "5.4.0"
@@ -14432,10 +14438,10 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-tronweb@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/tronweb/-/tronweb-2.7.4.tgz#9fc81db59ee3dd8cb88ef12c92f6c6f554020022"
-  integrity sha512-dDwn12Chg4C6V0fZvE6lef8fqncOL1kvnGEuctCDI3QYYOB7CnAjxmeKyK8eey9eSQbtbzUhmCcSW9acN1IJHQ==
+tronweb@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tronweb/-/tronweb-2.8.1.tgz#b37bf830debff34ccc101da44f8d36775b654944"
+  integrity sha512-Wknx+XoqTK2cQ7eAMqFf04pJ5qGheRjMzP2BvTAvVCqivCCsiOWL0FtkBvD/g25pfOSd/Oryq7MVnI1gCPJrCA==
   dependencies:
     "@babel/runtime" "^7.0.0"
     axios "^0.19.0"
@@ -14444,6 +14450,7 @@ tronweb@^2.7.4:
     elliptic "^6.4.1"
     ethers "^4.0.7"
     eventemitter3 "^3.1.0"
+    injectpromise "^1.0.0"
     lodash "^4.17.14"
     semver "^5.6.0"
     validator "^10.7.1"

From 5484bc2057ac726a775b720e0c7f38297f47ec6e Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 4 Dec 2019 00:37:56 +0800
Subject: [PATCH 14/39] support multi sign confirmation

---
 packages/backgroundScript/index.js            | 17 ++++--
 .../services/WalletService/Account.js         | 13 +++++
 .../lib/transactionBuilder/contracts.json     |  3 +-
 packages/lib/utils.js                         | 11 +++-
 packages/pageHook/index.js                    | 58 +++++++++++++++++++
 5 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/packages/backgroundScript/index.js b/packages/backgroundScript/index.js
index e7cf873..f758c58 100644
--- a/packages/backgroundScript/index.js
+++ b/packages/backgroundScript/index.js
@@ -295,10 +295,19 @@ const backgroundScript = {
                                 uuid
                             });
                         }
-                        const signedTransaction = await account.sign(
-                            mapped.transaction || mapped,
-                            Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain
-                        );
+                        let signedTransaction = {};
+                        if (transaction.raw_data.contract[ 0 ].Permission_id != undefined) {
+                            signedTransaction = await account.multiSign(
+                                mapped.transaction || mapped,
+                                Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain
+                            )
+                        } else {
+                            signedTransaction = await account.sign(
+                                mapped.transaction || mapped,
+                                Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain
+                            );
+                        }
+                       
                         const whitelist = this.walletService.contractWhitelist[ input.contract_address ];
 
                         if(contractType === 'TriggerSmartContract') {
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 2e1329b..1021a61 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -541,6 +541,19 @@ class Account {
         return await signedTransaction;
     }
 
+    async multiSign(transaction, tronWeb = NodeService.tronWeb) {
+        if (!this.privateKey) {
+            return 'CREATION.LEDGER.ALERT.BODY';
+        }
+        const signedTransaction = tronWeb.trx.multiSign(
+            transaction,
+            this.privateKey,
+            transaction.raw_data.contract[ 0 ].Permission_id
+        );
+
+        return await signedTransaction;
+    }
+
     async sendTrx(recipient, amount) {
         const selectedChain = NodeService._selectedChain;
         try {
diff --git a/packages/lib/transactionBuilder/contracts.json b/packages/lib/transactionBuilder/contracts.json
index 3d991e2..de948da 100644
--- a/packages/lib/transactionBuilder/contracts.json
+++ b/packages/lib/transactionBuilder/contracts.json
@@ -21,5 +21,6 @@
     "ProposalDeleteContract": "wallet/proposaldelete",
     "UnfreezeAssetContract": "wallet/unfreezeasset",
     "AccountUpdateContract": "wallet/updateaccount",
-    "WitnessUpdateContract": "wallet/updatewitness"
+    "WitnessUpdateContract": "wallet/updatewitness",
+    "AccountPermissionUpdateContract": "wallet/accountpermissionupdate"
 }
\ No newline at end of file
diff --git a/packages/lib/utils.js b/packages/lib/utils.js
index d642d17..9b28fba 100644
--- a/packages/lib/utils.js
+++ b/packages/lib/utils.js
@@ -296,8 +296,17 @@ const Utils = {
         }
     },
 
+    isObject(obj) {
+        return obj === Object(obj) && Object.prototype.toString.call(obj) !== '[object Array]';
+    },
 
-
+    isInteger(number) {
+        if (number === null)
+            return false
+        return Number.isInteger(
+            Number(number)
+        );
+    },
 
 };
 
diff --git a/packages/pageHook/index.js b/packages/pageHook/index.js
index f221975..028ef2e 100644
--- a/packages/pageHook/index.js
+++ b/packages/pageHook/index.js
@@ -20,6 +20,7 @@ const pageHook = {
         sign: false,
         setMainGatewayAddress: false,
         setSideGatewayAddress: false,
+        multiSign: false,
     },
 
     init() {
@@ -93,6 +94,7 @@ const pageHook = {
             setMainGatewayAddress: sunWeb.setMainGatewayAddress.bind(sunWeb),
             setSideGatewayAddress: sunWeb.setSideGatewayAddress.bind(sunWeb),
             setChainId: sunWeb.setChainId.bind(sunWeb),
+            multiSign: tronWeb.trx.multiSign.bind(tronWeb),
         };
 
         ['setPrivateKey', 'setAddress', 'setFullNode', 'setSolidityNode', 'setEventServer'].forEach(method => {
@@ -116,6 +118,18 @@ const pageHook = {
             this.sign(...args)
         );
 
+        tronWeb.trx.multiSign = (...args) => (
+            this.multiSign(...args)
+        );
+
+        sunWeb.mainchain.trx.multiSign = (...args) => (
+            this.multiSign(...args)
+        );
+
+        sunWeb.sidechain.trx.multiSign = (...args) => (
+            this.multiSign(...args)
+        );
+
         window.sunWeb = sunWeb;
         window.tronWeb = tronWeb;
     },
@@ -268,6 +282,7 @@ const pageHook = {
         if (!tronWeb.ready) {
             return callback('User has not unlocked wallet');
         }
+
         this.request('sign', {
             transaction,
             useTronHeader,
@@ -283,7 +298,50 @@ const pageHook = {
             logger.error('Failed to sign transaction:', err);
             callback(err);
         });
+    },
+
+    multiSign(transaction = false, privateKey = false, permissionId = false, callback = false) {
+        if (Utils.isFunction(permissionId)) {
+            callback = permissionId;
+            permissionId = 0;
+        }
+
+        if (Utils.isFunction(privateKey)) {
+            callback = privateKey;
+            privateKey = false;
+            permissionId = 0;
+        }
+
+        if (!callback)
+            return Utils.injectPromise(this.multiSign.bind(this), transaction, privateKey, permissionId);
+
+        if (!tronWeb.ready) {
+            return callback('User has not unlocked wallet');
+        }
+
+        if (!Utils.isObject(transaction) || !transaction.raw_data || !transaction.raw_data.contract)
+            return callback('Invalid transaction provided');
+            
+        if (privateKey) {
+            return this.proxiedMethods.multiSign(transaction, privateKey, permissionId, callback);
+        }
+    
+        this.request('sign', {
+            transaction,
+            useTronHeader: true,
+            input: (
+                    transaction.__payload__ ||
+                    transaction.raw_data.contract[0].parameter.value
+            )
+        }).then(transaction => (
+            callback(null, transaction, permissionId)
+        )).catch(err => {
+            logger.error('Failed to sign transaction:', err);
+            callback(err);
+        });
+       
     }
+
 };
 
 pageHook.init();

From a79bd64577bf42ee64c6b2c4778dbd73d2996584 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 4 Dec 2019 00:48:18 +0800
Subject: [PATCH 15/39] change version to 3.2.4

---
 manifest.json                  | 4 ++--
 packages/lib/package.json      | 2 +-
 packages/pageHook/package.json | 2 +-
 packages/popup/package.json    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4828c3d..7e6e588 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink（波宝钱包）",
-    "version": "3.2.3",
-    "version_name": "3.2.3",
+    "version": "3.2.4",
+    "version_name": "3.2.4",
     "description": "The first and most popular TRON wallet. Recommended by TRON Foundation.",
     "author": "Kondax <kondaxsolutions@gmail.com>",
     "content_security_policy": "script-src 'self' 'unsafe-eval' 'sha256-LayQc1iWBC+6WbHHvHZj3uSx3CxrGBHUJBR7si4qf8w=' 'sha256-POEO+wER89cezFVZ27JoP523HJNPMQxmh5Rcz/OZpr4=' 'sha256-IThiKMnsg0UHaLmP7sJxZpd/ohvINImwjxFJyxGFSlk=' https://*.sentry.io https://www.google-analytics.com https://www.googletagmanager.com https://cdnjs.cloudflare.com; object-src 'self'",
diff --git a/packages/lib/package.json b/packages/lib/package.json
index fa2f090..534b779 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.3",
+  "version": "3.2.4",
   "dependencies": {
     "@tronscan/client": "^0.2.48",
     "@ledgerhq/hw-transport-u2f": "^4.31.0",
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index 712735d..2a57e35 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.3",
+  "version": "3.2.4",
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/pageHook.js",
     "lint": "npx eslint . --fix"
diff --git a/packages/popup/package.json b/packages/popup/package.json
index 59532ba..d00dfa0 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -3,7 +3,7 @@
   "main": "index.js",
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.8",

From 3d906cdb293abf6aef5261118b7360b06198400f Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 4 Dec 2019 13:30:32 +0800
Subject: [PATCH 16/39] support transfer trc20 token when multi sign

---
 packages/backgroundScript/index.js                     | 10 ++++------
 .../backgroundScript/services/WalletService/Account.js |  4 ++--
 packages/pageHook/index.js                             |  4 +++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backgroundScript/index.js b/packages/backgroundScript/index.js
index f758c58..286d80c 100644
--- a/packages/backgroundScript/index.js
+++ b/packages/backgroundScript/index.js
@@ -281,13 +281,12 @@ const backgroundScript = {
                                 input
                             }, uuid, resolve);
                         }
-
                         const contractType = transaction.raw_data.contract[ 0 ].type;
                         const contractAddress = TronWeb.address.fromHex(input.contract_address);
                         const {
                             mapped,
                             error
-                        } = await transactionBuilder(Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain, contractType, input); // NodeService.getCurrentNode()
+                        } = !!data.multiSign && data.permissionId != undefined ? {mapped: transaction, error: null} : await transactionBuilder(Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain, contractType, input); // NodeService.getCurrentNode()
                         if(error) {
                             return resolve({
                                 success: false,
@@ -296,10 +295,11 @@ const backgroundScript = {
                             });
                         }
                         let signedTransaction = {};
-                        if (transaction.raw_data.contract[ 0 ].Permission_id != undefined) {
+                        if (!!data.multiSign && data.permissionId != undefined) {
                             signedTransaction = await account.multiSign(
                                 mapped.transaction || mapped,
-                                Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain
+                                Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain,
+                                data.permissionId
                             )
                         } else {
                             signedTransaction = await account.sign(
@@ -309,11 +309,9 @@ const backgroundScript = {
                         }
                        
                         const whitelist = this.walletService.contractWhitelist[ input.contract_address ];
-
                         if(contractType === 'TriggerSmartContract') {
 
                             // code bury
-
                             const value = input.call_value || 0;
 
                             ga('send', 'event', {
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 1021a61..3e1cc4c 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -541,14 +541,14 @@ class Account {
         return await signedTransaction;
     }
 
-    async multiSign(transaction, tronWeb = NodeService.tronWeb) {
+    async multiSign(transaction, tronWeb = NodeService.tronWeb, permissionId) {
         if (!this.privateKey) {
             return 'CREATION.LEDGER.ALERT.BODY';
         }
         const signedTransaction = tronWeb.trx.multiSign(
             transaction,
             this.privateKey,
-            transaction.raw_data.contract[ 0 ].Permission_id
+            permissionId
         );
 
         return await signedTransaction;
diff --git a/packages/pageHook/index.js b/packages/pageHook/index.js
index 028ef2e..8863a9a 100644
--- a/packages/pageHook/index.js
+++ b/packages/pageHook/index.js
@@ -332,7 +332,9 @@ const pageHook = {
             input: (
                     transaction.__payload__ ||
                     transaction.raw_data.contract[0].parameter.value
-            )
+            ),
+            multiSign: true,
+            permissionId,
         }).then(transaction => (
             callback(null, transaction, permissionId)
         )).catch(err => {

From d8328c6f49b9fad4262fa66d08de8e04d395371f Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Wed, 4 Dec 2019 18:38:27 +0800
Subject: [PATCH 17/39] insert chainType into payload

---
 packages/backgroundScript/index.js            | 5 ++---
 packages/pageHook/handlers/ProxiedProvider.js | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/backgroundScript/index.js b/packages/backgroundScript/index.js
index 286d80c..59c15ac 100644
--- a/packages/backgroundScript/index.js
+++ b/packages/backgroundScript/index.js
@@ -249,15 +249,14 @@ const backgroundScript = {
                             transaction,
                             input
                         } = data;
-                        
                         const {
                             selectedAccount
                         } = this.walletService;
 
                         let tronWeb = NodeService.tronWeb;
                         let chainType = 0;
-                        if (!!transaction && transaction.chainType == 1) {
-                            chainType = transaction.chainType;
+                        if (!!transaction && data.input.chainType == 1) {
+                            chainType = data.input.chainType;
                             // tronWeb = NodeService.sunWeb.sidechain;
                         }
                         const account = this.walletService.getAccount(selectedAccount);
diff --git a/packages/pageHook/handlers/ProxiedProvider.js b/packages/pageHook/handlers/ProxiedProvider.js
index 09c625d..f3c8a4e 100644
--- a/packages/pageHook/handlers/ProxiedProvider.js
+++ b/packages/pageHook/handlers/ProxiedProvider.js
@@ -48,7 +48,6 @@ class ProxiedProvider extends HttpProvider {
             logger.info(`Request to ${ endpoint } has been queued`);
 
             return new Promise((resolve, reject) => {
-                payload.chainType = this.chainType;
                 this.queue.push({
                     args: [ endpoint, payload, method ],
                     resolve,
@@ -59,12 +58,11 @@ class ProxiedProvider extends HttpProvider {
 
         return super.request(endpoint, payload, method).then(res => {
             const response = res.transaction || res;
-            response.chainType = this.chainType;
             Object.defineProperty(response, '__payload__', {
                 writable: false,
                 enumerable: false,
                 configurable: false,
-                value: payload
+                value: { ...payload, chainType: this.chainType }
             });
             return res;
         });

From 6cf392072a7ce029a4d030524c12ddbbbda09464 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 11:09:48 +0800
Subject: [PATCH 18/39] add multi sign link to tronscan for mainnet

---
 .../src/assets/images/new/icon-multi-sign.svg  | 18 ++++++++++++++++++
 .../PageController/PageController.scss         |  3 +++
 packages/popup/src/pages/AccountsPage/index.js |  9 +++++++++
 packages/popup/src/translations/en.json        |  1 +
 packages/popup/src/translations/ja.json        |  1 +
 packages/popup/src/translations/zh.json        |  1 +
 6 files changed, 33 insertions(+)
 create mode 100644 packages/popup/src/assets/images/new/icon-multi-sign.svg

diff --git a/packages/popup/src/assets/images/new/icon-multi-sign.svg b/packages/popup/src/assets/images/new/icon-multi-sign.svg
new file mode 100644
index 0000000..0994eb9
--- /dev/null
+++ b/packages/popup/src/assets/images/new/icon-multi-sign.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>签名</title>
+    <desc>Created with Sketch.</desc>
+    <g id="多重签名" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页2" transform="translate(-232.000000, -156.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="更多" transform="translate(224.000000, 93.000000)">
+                <g id="备份" transform="translate(8.000000, 33.000000)">
+                    <g id="签名" transform="translate(0.000000, 30.000000)">
+                        <polygon id="路径" points="11.1642152 4.28355997 11.1642152 11.1364964 1 11.1364964 1 1.21807303 7.71602773 1.216358 7.71602773 0.011769962 0.00178535866 0.011769962 0.00178535866 12.0008482 11.9873924 12.0008482 11.9873924 4.28355997"></polygon>
+                        <path d="M1.95849316,10.0097162 L4.70223891,9.70767737 L11.9803539,2.43118138 L9.55491926,0.00566442905 L2.27801166,7.28187229 L1.95849316,10.0097162 Z M2.75097806,9.23594578 L2.88760488,7.88578529 L2.88778324,7.88560693 L4.10043882,9.0982625 L4.09722826,9.10147306 L2.75097806,9.23594578 Z M3.44073903,7.33262371 L8.47864352,2.29441736 L9.69151862,3.50727875 L4.65342205,8.54530673 L3.44073903,7.33262371 Z M10.7678218,2.4309893 L10.2444744,2.95432295 L9.0315856,1.74143413 L9.55491924,1.21807303 L10.7678218,2.4309893 Z" id="形状"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/popup/src/controllers/PageController/PageController.scss b/packages/popup/src/controllers/PageController/PageController.scss
index 3204090..ee8937e 100644
--- a/packages/popup/src/controllers/PageController/PageController.scss
+++ b/packages/popup/src/controllers/PageController/PageController.scss
@@ -328,6 +328,9 @@
                 &.asset{
                     background-image: url('../../assets/images/new/icon-asset.svg');
                 }
+                &.multi-sign{
+                    background-image: url('../../assets/images/new/icon-multi-sign.svg');
+                }
             }
 
             &:first-child{
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index 0721b85..ac4d1ff 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -186,6 +186,15 @@ class AccountsPage extends React.Component {
                                     :
                                     null
                             }
+                            {
+                                chains.selected === '_' ?
+                                    <div onClick={(e) => { e.stopPropagation();window.open(`${tronscanUrl}/account?from=tronlink&type=multiSign`); }} className='item'>
+                                        <span className='icon multi-sign'>&nbsp;</span>
+                                        <FormattedMessage id='MENU.MULTI_SIGN' />
+                                    </div>
+                                    :
+                                    null
+                            }
                             {
                                 accounts.selected.type !== ACCOUNT_TYPE.LEDGER && chains.selected === '_' ?
                                     <div onClick={ this.onExport } className='item'>
diff --git a/packages/popup/src/translations/en.json b/packages/popup/src/translations/en.json
index 4905d4b..25aacce 100644
--- a/packages/popup/src/translations/en.json
+++ b/packages/popup/src/translations/en.json
@@ -253,6 +253,7 @@
     "MENU.FROZEN_UNFROZEN":"Frozen/Unfrozen",
     "MENU.VOTE":"Vote",
     "MENU.ACCOUNTS.TOTAL_ASSET":"Asset{sign}",
+    "MENU.MULTI_SIGN": "Multi Sign",
 
     "TOAST.COPY":"Copied",
     "TOAST.ADDED":"added",
diff --git a/packages/popup/src/translations/ja.json b/packages/popup/src/translations/ja.json
index 846b6bc..5e50bd3 100644
--- a/packages/popup/src/translations/ja.json
+++ b/packages/popup/src/translations/ja.json
@@ -252,6 +252,7 @@
   "MENU.FROZEN_UNFROZEN":"凍結/解除",
   "MENU.VOTE":"投票",
   "MENU.ACCOUNTS.TOTAL_ASSET":"総資産{sign}",
+  "MENU.MULTI_SIGN": "マルチ署名",
 
   "TOAST.COPY":"コピー済み",
   "TOAST.ADDED":"追加しました",
diff --git a/packages/popup/src/translations/zh.json b/packages/popup/src/translations/zh.json
index 91d1430..14f216b 100644
--- a/packages/popup/src/translations/zh.json
+++ b/packages/popup/src/translations/zh.json
@@ -254,6 +254,7 @@
     "MENU.FROZEN_UNFROZEN":"冻结/解冻",
     "MENU.VOTE":"投票",
     "MENU.ACCOUNTS.TOTAL_ASSET":"总资产{sign}",
+    "MENU.MULTI_SIGN": "多重签名",
 
     "TOAST.COPY":"已复制",
     "TOAST.ADDED":"已添加",

From 05ef286f7f5b9fdb465e4b0398dae83a706db5e0 Mon Sep 17 00:00:00 2001
From: cathy-art <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 11:29:21 +0800
Subject: [PATCH 19/39] set droplist height auto

---
 packages/popup/src/pages/AccountsPage/AccountsPage.scss | 3 +++
 packages/popup/src/pages/AccountsPage/index.js          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/popup/src/pages/AccountsPage/AccountsPage.scss b/packages/popup/src/pages/AccountsPage/AccountsPage.scss
index 9b3ae3e..aa3f448 100644
--- a/packages/popup/src/pages/AccountsPage/AccountsPage.scss
+++ b/packages/popup/src/pages/AccountsPage/AccountsPage.scss
@@ -420,6 +420,9 @@
                 width: 23px;
                 height: 18px;
                 background-image: url('../../assets/images/new/icon-more.svg');
+                .item {
+                    height: 30px;
+                }
             }
             .accountWrap{
                 font-size: 16px;
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index ac4d1ff..19ba206 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -163,7 +163,7 @@ class AccountsPage extends React.Component {
                         }
                     </div>
                     <div className='menu' onClick={(e) => { e.stopPropagation();this.setState({ showMenuList: !showMenuList, showNodeList: false }); }}>
-                        <div className='dropList menuList' style={ showMenuList ? { width: '160px', height: 30 * (accounts.selected.type !== ACCOUNT_TYPE.LEDGER && chains.selected === '_'?6:2), opacity: 1 } : {}}>
+                        <div className='dropList menuList' style={ showMenuList ? { width: '160px', height: 'auto', opacity: 1 } : {}}>
                             <div onClick={ () => { PopupAPI.changeState(APP_STATE.ASSET_MANAGE); }} className='item'>
                                 <span className='icon asset'>&nbsp;</span>
                                 <FormattedMessage id='ASSET.ASSET_MANAGE' />

From f8e89b277a3307c971f5f88b3526e79f1c40b6a4 Mon Sep 17 00:00:00 2001
From: summertanh <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 11:56:59 +0800
Subject: [PATCH 20/39] fix cannot get account when add node

---
 packages/backgroundScript/services/NodeService/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index b4392d4..6eb7cfa 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -28,7 +28,7 @@ const NodeService = {
             default: true, // false
             chain: '_',
             connect: '51a36e5a-2480-4b57-989c-539345a13be2',
-            chainType: 0,
+            chainType: 0,  // 0: Tron, 1: DappChain
             connectChain: {
                 fullNode: 'https://sun.tronex.io',
                 solidityNode: 'https://sun.tronex.io',
@@ -292,9 +292,9 @@ const NodeService = {
 
     addNode(node) {
         const nodeID = randomUUID();
-
         this._nodes[nodeID] = {
             ...node,
+            chainType: 0,
             default: false
         };
         this.save();

From 6ae67d6bbba26ae6dcfc09bdb0a3b5bf54d4780d Mon Sep 17 00:00:00 2001
From: summertanh <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 15:29:11 +0800
Subject: [PATCH 21/39] get net and energy for Dappchain

---
 packages/backgroundScript/services/WalletService/Account.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 3e1cc4c..3ef1549 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -458,7 +458,7 @@ class Account {
 
     async updateBalance() {
         const { address } = this;
-        const { EnergyLimit = 0, EnergyUsed = 0, freeNetLimit, NetLimit = 0, freeNetUsed = 0, NetUsed = 0, TotalEnergyWeight, TotalEnergyLimit } = await NodeService.tronWeb.trx.getAccountResources(address);
+        const { EnergyLimit = 0, EnergyUsed = 0, freeNetLimit = 0, NetLimit = 0, freeNetUsed = 0, NetUsed = 0, TotalEnergyWeight, TotalEnergyLimit } = NodeService._selectedChain === '_' ? await NodeService.tronWeb.trx.getAccountResources(address) : await NodeService.sunWeb.sidechain.trx.getAccountResources(address);
         this.energy = EnergyLimit;
         this.energyUsed = EnergyUsed;
         this.netLimit = freeNetLimit + NetLimit;

From 28c202a9bc7c6d24f300e8daf63eeb407c60f407 Mon Sep 17 00:00:00 2001
From: summertanh <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 18:22:51 +0800
Subject: [PATCH 22/39] sign when input is string

---
 packages/backgroundScript/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backgroundScript/index.js b/packages/backgroundScript/index.js
index 59c15ac..90cbfa9 100644
--- a/packages/backgroundScript/index.js
+++ b/packages/backgroundScript/index.js
@@ -264,7 +264,7 @@ const backgroundScript = {
 
                         if(typeof input === 'string') {
                             const { duration = 0 } = appWhitelist;
-                            const signedTransaction = await account.sign(input);
+                            const signedTransaction = !!data.multiSign ? await account.multiSign(transaction,  Number(chainType) === 1 ? NodeService.sunWeb.sidechain : NodeService.sunWeb.mainchain, data.permissionId) : await account.sign(input);
                             if(appWhitelist && (duration === -1 || duration >= Date.now())){
                                 logger.info('Automatically signing transaction', signedTransaction);
                                 return resolve({

From 4f26907bd69b0dda8266610c57b918abcc6861c7 Mon Sep 17 00:00:00 2001
From: summertanh <cathy.tan@tron.network>
Date: Thu, 5 Dec 2019 19:23:02 +0800
Subject: [PATCH 23/39] modal body UI

---
 packages/popup/src/assets/styles/global.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/popup/src/assets/styles/global.scss b/packages/popup/src/assets/styles/global.scss
index 1b91a87..82e79fa 100644
--- a/packages/popup/src/assets/styles/global.scss
+++ b/packages/popup/src/assets/styles/global.scss
@@ -1839,6 +1839,9 @@ html, body {
         }
         .modalDesc {
             font-size: 13px;
+            span{
+                word-break: break-word;
+            }
         }
         &.loginModel,&.registrationModel{
             background: transparent;

From 8f82876cddc3883b8c2c60ffd565e0db5fc960f2 Mon Sep 17 00:00:00 2001
From: summertanh <macbookpro@MacBookdeMacBook-Pro.local>
Date: Thu, 12 Dec 2019 19:39:55 +0800
Subject: [PATCH 24/39] fix token precision

---
 packages/backgroundScript/services/WalletService/Account.js | 1 +
 packages/popup/src/pages/AccountsPage/index.js              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 3ef1549..29f1054 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -342,6 +342,7 @@ class Account {
                 token = {
                     price: 0,
                     balance: 0,
+                    balanceStr: '0',
                     name,
                     abbr: shortName,
                     decimals,
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index 19ba206..fda0ac9 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -343,7 +343,7 @@ class AccountsPage extends React.Component {
             <div className='tokens'>
                 {
                     tokens.filter(({tokenId, ...token})=>!token.hasOwnProperty('chain') || token.chain === chains.selected).map(({ tokenId, ...token }) => {
-                        const amount = new BigNumber(token.balance)
+                        const amount = new BigNumber(token.balanceStr)
                             .shiftedBy(-token.decimals)
                             .toString();
                         const price = token.price === undefined ? 0 : token.price;

From 0baeea698498251578755964e2011dac303e1a1a Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Fri, 13 Dec 2019 14:46:50 +0800
Subject: [PATCH 25/39] change version to v3.2.5

---
 manifest.json                                               | 4 ++--
 packages/backgroundScript/services/WalletService/Account.js | 3 ++-
 packages/lib/package.json                                   | 2 +-
 packages/pageHook/package.json                              | 2 +-
 packages/popup/package.json                                 | 2 +-
 packages/popup/src/pages/AccountsPage/index.js              | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7e6e588..297afc3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink（波宝钱包）",
-    "version": "3.2.4",
-    "version_name": "3.2.4",
+    "version": "3.2.5",
+    "version_name": "3.2.5",
     "description": "The first and most popular TRON wallet. Recommended by TRON Foundation.",
     "author": "Kondax <kondaxsolutions@gmail.com>",
     "content_security_policy": "script-src 'self' 'unsafe-eval' 'sha256-LayQc1iWBC+6WbHHvHZj3uSx3CxrGBHUJBR7si4qf8w=' 'sha256-POEO+wER89cezFVZ27JoP523HJNPMQxmh5Rcz/OZpr4=' 'sha256-IThiKMnsg0UHaLmP7sJxZpd/ohvINImwjxFJyxGFSlk=' https://*.sentry.io https://www.google-analytics.com https://www.googletagmanager.com https://cdnjs.cloudflare.com; object-src 'self'",
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 29f1054..323185d 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -334,7 +334,7 @@ class Account {
                     delete this.tokens.smart[tokenId];
                 }
             });
-            for (let { tokenAddress, logoUrl = false, decimals = 6, isMapping, name, shortName, balance } of smartTokens) {
+            for (let { tokenAddress, logoUrl = false, decimals = 6, isMapping, name, shortName, balance, balanceStr } of smartTokens) {
                 let token = this.tokens.smart[tokenAddress] || false;
                 const filter = smartTokenPriceList.filter(({ fTokenAddr, sTokenAddr }) => fTokenAddr === tokenAddress && sTokenAddr === this.trxAddress);
                 const price = filter.length ? new BigNumber(filter[0].price).shiftedBy(-decimals).toString() : 0;
@@ -355,6 +355,7 @@ class Account {
                     ...token,
                     price: tokenAddress === CONTRACT_ADDRESS.USDT ? usdtPrice : price,
                     balance,
+                    balanceStr,
                     chain: selectedChain
                 };
                 //this.tokens.smart[ tokenAddress ] = !TOP_TOKEN[selectedChain === '_' ? 'mainchain':'sidechain'].includes(tokenAddress) ? {...this.tokens.smart[ tokenAddress ],chain:selectedChain} : this.tokens.smart[ tokenAddress ];
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 534b779..90a8aa8 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.4",
+  "version": "3.2.5",
   "dependencies": {
     "@tronscan/client": "^0.2.48",
     "@ledgerhq/hw-transport-u2f": "^4.31.0",
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index 2a57e35..1c6b0f8 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.4",
+  "version": "3.2.5",
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/pageHook.js",
     "lint": "npx eslint . --fix"
diff --git a/packages/popup/package.json b/packages/popup/package.json
index d00dfa0..3dca06f 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -3,7 +3,7 @@
   "main": "index.js",
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.8",
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index fda0ac9..040f84b 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -343,7 +343,8 @@ class AccountsPage extends React.Component {
             <div className='tokens'>
                 {
                     tokens.filter(({tokenId, ...token})=>!token.hasOwnProperty('chain') || token.chain === chains.selected).map(({ tokenId, ...token }) => {
-                        const amount = new BigNumber(token.balanceStr)
+                        const balance = token.balanceStr != undefined ? token.balanceStr : token.balance;
+                        const amount = new BigNumber(Number(balance))
                             .shiftedBy(-token.decimals)
                             .toString();
                         const price = token.price === undefined ? 0 : token.price;

From c31b774d33173a0ddb04fee6ae216c28f0282956 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Sat, 14 Dec 2019 20:52:32 +0800
Subject: [PATCH 26/39] add 10 token

---
 packages/popup/src/tokensMap.js | 136 +++++++++++++++++++++++++++++++-
 1 file changed, 135 insertions(+), 1 deletion(-)

diff --git a/packages/popup/src/tokensMap.js b/packages/popup/src/tokensMap.js
index 7caebde..f849ecc 100644
--- a/packages/popup/src/tokensMap.js
+++ b/packages/popup/src/tokensMap.js
@@ -2675,5 +2675,139 @@ export const tokensMap = {
     "1002674": "TronShare_1002674_0_TSH",
     "1002675": "QueenMari_1002675_6_QM",
     "1002676": "Happiness_1002676_6_HPN",
-    "1002677": "ExitScamBet_1002677_1_ESB"
+    "1002677": "ExitScamBet_1002677_1_ESB",
+    "1002749": "TronChicken_1002749_6_TCK",
+    "1002728": "GreenCardLottery_1002728_0_GCL",
+    "1002779": "TronIOTOS_1002779_6_TIS",
+    "1002727": "Ovocoin_1002727_0_ovo",
+    "1002750": "listoken_1002750_0_LT",
+    "1002790": "APET_1002790_6_APET",
+    "1002791": "JLikecoin_1002791_3_JLike",
+    "1002769": "MasternodesCash_1002769_2_MNDxCASH",
+    "1002800": "GoGoMonster_1002800_6_GGM",
+    "1002743": "MasterNode_1002743_2_MNDx",
+    "1002761": "Butter_1002761_2_BTTR",
+    "1002745": "HawToken_1002745_6_HAW",
+    "1002763": "Ganja_1002763_2_GNJA",
+    "1002772": "TestMIL_1002772_0_TMIL",
+    "1002780": "TestMil3_1002780_0_TMIL3",
+    "1002686": "TEsportsnodropaftertransfer_1002686_0_TESDICORP",
+    "1002746": "QueenMahsa_1002746_6_QMT",
+    "1002683": "HappyEX_1002683_6_HappyEX",
+    "1002762": "Alphard_1002762_6_AHD",
+    "1002725": "TRONCORG_1002725_6_TCO",
+    "1002803": "ONENESS_1002803_0_ONS",
+    "1002753": "Zhong_1002753_6_ZNG",
+    "1002802": "ASBAZAR_1002802_6_ASB",
+    "1002806": "Evochain_1002806_0_Evochain",
+    "1002770": "VisionTrade_1002770_1_VST",
+    "1002714": "Present_1002714_1_PRT",
+    "1002680": "TRXGAMESC_1002680_6_TRGC",
+    "1002679": "TRXGAMES_1002679_6_TRG",
+    "1002687": "TEsportsnodropaftertransfer_1002687_0_TESDICORP",
+    "1002706": "RELIGION_1002706_1_RLG",
+    "1002710": "MAHMUTCAY_1002710_6_MC",
+    "1002678": "TRONPAGODA_1002678_6_TPGD",
+    "1002723": "BAUDC_1002723_6_BAUDC",
+    "1002730": "Kiwi_1002730_2_Kiwi",
+    "1002734": "TeQuiero_1002734_2_TQ3",
+    "1002733": "ILoveYou_1002733_2_i3U",
+    "1002735": "Jetaime_1002735_2_Jt3",
+    "1002731": "Bananas_1002731_2_Bananas",
+    "1002729": "Banana_1002729_2_Banana",
+    "1002738": "kiwi_1002738_2_Kiwi",
+    "1002695": "CocaCola_1002695_5_COKE",
+    "1002694": "TARGET_1002694_5_TGT",
+    "1002697": "Hilton_1002697_5_HLT",
+    "1002696": "GEICO_1002696_5_GEI",
+    "1002698": "COMCAST_1002698_4_COM",
+    "1002732": "Starbucks_1002732_5_SBUX",
+    "1002724": "LEGO_1002724_5_LEGO",
+    "1002720": "Apple_1002720_5_AAPL",
+    "1002717": "AmericanExpress_1002717_5_AMEX",
+    "1002709": "NationalFootballLeague_1002709_5_NFL",
+    "1002718": "Pepsi_1002718_5_PEP",
+    "1002715": "LOWES_1002715_5_LOW",
+    "1002712": "MajorLeagueBaseball_1002712_5_MLB",
+    "1002711": "NationalBasketballAssociation_1002711_5_NBA",
+    "1002716": "Hyatt_1002716_5_HY",
+    "1002707": "REMAX_1002707_5_RMAX",
+    "1002692": "COSTCO_1002692_5_COST",
+    "1002713": "UnitedParcelService_1002713_5_UPS",
+    "1002700": "Verizon_1002700_5_VZ",
+    "1002701": "airbnb_1002701_5_air",
+    "1002703": "Adobe_1002703_5_ADBE",
+    "1002693": "NIKE_1002693_6_NKE",
+    "1002708": "Budweiser_1002708_5_BUD",
+    "1002704": "HomeDepot_1002704_5_HD",
+    "1002699": "IKEA_1002699_5_IKEA",
+    "1002719": "Disney_1002719_5_DIS",
+    "1002689": "TASKCoins_1002689_6_TASK",
+    "1002705": "McDonalds_1002705_5_MCD",
+    "1002702": "FedEx_1002702_5_FDX",
+    "1002691": "IBM_1002691_6_IBM",
+    "1002739": "DARE_1002739_5_DC",
+    "1002741": "Kiwi_1002741_2_kiwi",
+    "1002744": "DECP_1002744_6_DECP",
+    "1002751": "FuelChainX_1002751_6_FCX",
+    "1002752": "MagicData_1002752_6_MDC",
+    "1002740": "MYTRON_1002740_0_MTRX",
+    "1002737": "WasteEnergy_1002737_6_WEC",
+    "1002754": "BinhCuToken_1002754_6_BINHC",
+    "1002758": "FUZE_1002758_0_FUZE",
+    "1002726": "Waxperience_1002726_2_WXP",
+    "1002722": "THECHOSENONECOIN_1002722_6_TCOC",
+    "1002760": "AussieOptions_1002760_1_AUS",
+    "1002776": "TRONSHOPVIETNAM_1002776_6_TRXPVN",
+    "1002771": "TRXFOREX_1002771_6_TRXFX",
+    "1002785": "TronManagementAssets_1002785_6_TMAX",
+    "1002778": "Whisper_1002778_2_WSPR",
+    "1002781": "liaoer_1002781_6_liaoer",
+    "1002786": "GVT_1002786_0_GVT",
+    "1002773": "TestMil2_1002773_0_TMil2",
+    "1002793": "Sportsai_1002793_4_SAI",
+    "1002796": "eCredit_1002796_6_ECTTX",
+    "1002792": "VoteForGeoTreasureSR_1002792_0_VoteGT",
+    "1002755": "Sezon_1002755_6_SZN",
+    "1002747": "49ers2020SuperBowlWinners_1002747_1_49ersLIV",
+    "1002688": "Anne_1002688_6_ANNE",
+    "1002759": "LUCKYPOINT_1002759_1_LKP",
+    "1002799": "Nerf_1002799_5_NERF",
+    "1002795": "LootUp_1002795_6_LOOT",
+    "1002777": "youForia_1002777_6_youForia",
+    "1002794": "TAOdice_1002794_6_TAOstake",
+    "1002783": "GlobalDollar_1002783_3_GLD",
+    "1002788": "TTRX_1002788_2_testTrx",
+    "1002801": "LotBall_1002801_0_Lot",
+    "1002767": "NovaRuby_1002767_1_NVR",
+    "1002766": "NovaSapphire_1002766_1_NVS",
+    "1002805": "NovaCoal_1002805_1_NVC",
+    "1002768": "NovaBlade_1002768_1_NVB",
+    "1002765": "NovaEmerald_1002765_1_NVE",
+    "1002764": "NovaDiamond_1002764_1_NVD",
+    "1002807": "TronLotBall_1002807_0_Lot",
+    "1002782": "ICS_1002782_6_CRED",
+    "1002789": "IKO_1002789_6_IKO",
+    "1002774": "GravelTRON_1002774_6_GRVL",
+    "1002809": "ZEEK_1002809_0_ZKT",
+    "1002808": "USDA_1002808_6_USDA",
+    "1002787": "SCFARM_1002787_6_SCDF",
+    "1002681": "TRG_1002681_6_TRG",
+    "1002748": "Bonus_1002748_6_Bonus",
+    "1002804": "UnityforBusiness_1002804_2_UFB",
+    "1002682": "TPORT_1002682_6_TPORT",
+    "1002811": "TheVatican_1002811_5_VAT",
+    "1002784": "BossToken_1002784_0_BOSS",
+    "1002756": "TRXTEST_1002756_6_TRXTEST",
+    "1002797": "eCredit_1002797_6_ECX",
+    "1002690": "HempysHub_1002690_5_2BITS",
+    "1002757": "SCCTEST_1002757_6_SCCTEST",
+    "1002775": "ALPHA_1002775_6_ALPHA",
+    "1002742": "PLANET_1002742_6_PLANET",
+    "1002798": "EPICAL_1002798_6_EPICAL",
+    "1002736": "SPACE_1002736_6_SPACE",
+    "1002721": "QDICE_1002721_6_QDICE",
+    "1002685": "AOCOINUSD_1002685_6_AOUSD",
+    "1002810": "MinistryCoin_1002810_6_USDMC",
+    "1002684": "AOCOINETH_1002684_6_AOETH",
 }
\ No newline at end of file

From c8cbf548d172f863ab633c8d5c853668529c9d36 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Sun, 15 Dec 2019 23:44:59 +0800
Subject: [PATCH 27/39] add  multi sign popup

---
 packages/backgroundScript/index.js            |  6 ++-
 .../services/NodeService/index.js             |  5 ++
 .../services/StorageService/index.js          |  8 +++
 .../services/WalletService/Account.js         | 42 ++++++++++++++-
 .../services/WalletService/index.js           | 14 +++++
 packages/lib/api/handlers/BackgroundAPI.js    |  4 ++
 packages/lib/api/handlers/PopupAPI.js         |  8 +++
 .../src/pages/AccountsPage/AccountsPage.scss  | 50 ++++++++++++++++--
 .../popup/src/pages/AccountsPage/index.js     | 52 ++++++++++++++++---
 .../popup/src/reducers/accountsReducer.js     |  3 +-
 packages/popup/src/translations/en.json       |  2 +
 packages/popup/src/translations/ja.json       |  2 +
 packages/popup/src/translations/zh.json       |  2 +
 13 files changed, 185 insertions(+), 13 deletions(-)

diff --git a/packages/backgroundScript/index.js b/packages/backgroundScript/index.js
index 90cbfa9..01d0e66 100644
--- a/packages/backgroundScript/index.js
+++ b/packages/backgroundScript/index.js
@@ -168,6 +168,7 @@ const backgroundScript = {
         duplex.on('getAllDapps', this.walletService.getAllDapps);
         duplex.on('updateTokens', this.walletService.updateTokens);
         duplex.on('getAllTokens', this.walletService.getAllTokens);
+        duplex.on('setMultiSignViewed', this.walletService.setMultiSignViewed);
         duplex.on('setTransactionDetail', this.walletService.setTransactionDetail);
         duplex.on('setAuthorizeDapps', this.walletService.setAuthorizeDapps);
         duplex.on('getAuthorizeDapps', this.walletService.getAuthorizeDapps);
@@ -442,7 +443,10 @@ const backgroundScript = {
         this.walletService.on('setNode', node => (
             BackgroundAPI.setNode(node)
         ));
-
+        
+        this.walletService.on('setMultiSignViewed', address => {
+            BackgroundAPI.setMultiSignViewed(address)
+        });
 
         this.walletService.on('setChain', chain => (
             BackgroundAPI.setChain(chain)
diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 6eb7cfa..1244c80 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -29,6 +29,7 @@ const NodeService = {
             chain: '_',
             connect: '51a36e5a-2480-4b57-989c-539345a13be2',
             chainType: 0,  // 0: Tron, 1: DappChain
+            netType: 0,
             connectChain: {
                 fullNode: 'https://sun.tronex.io',
                 solidityNode: 'https://sun.tronex.io',
@@ -46,6 +47,7 @@ const NodeService = {
             default: false,
             chain: '_',
             chainType: 0,
+            netType: 1,
             connectChain: false,
         },
         'f14212e2-a6a0-4391-9419-07b55f8be63e': {
@@ -57,6 +59,7 @@ const NodeService = {
             chain: '_',
             connect: '01eda3a0-5a58-4e44-9f95-f7f1f59dd728',
             chainType: 0,
+            netType: 1,
             connectChain: {
                 fullNode: 'https://suntest.tronex.io',
                 solidityNode: 'https://suntest.tronex.io',
@@ -75,6 +78,7 @@ const NodeService = {
             chain: SIDE_CHAIN_ID,
             connect: '109c64ad-e59c-46fe-ba87-179587e6c772',
             chainType: 1,
+            netType: 0,
             mainGateway: CONTRACT_ADDRESS.MAIN,
             sideGateway: CONTRACT_ADDRESS.SIDE,
             sideChainId: SIDE_CHAIN_ID,
@@ -93,6 +97,7 @@ const NodeService = {
             chain: SIDE_CHAIN_ID,
             connect: 'f14212e2-a6a0-4391-9419-07b55f8be63e',
             chainType: 1,
+            netType: 1,
             mainGateway: CONTRACT_ADDRESS.MAIN_TEST,
             sideGateway: CONTRACT_ADDRESS.SIDE_TEST,
             sideChainId: SIDE_CHAIN_ID_TEST,
diff --git a/packages/backgroundScript/services/StorageService/index.js b/packages/backgroundScript/services/StorageService/index.js
index 15e3e06..008de24 100644
--- a/packages/backgroundScript/services/StorageService/index.js
+++ b/packages/backgroundScript/services/StorageService/index.js
@@ -23,6 +23,7 @@ const StorageService = {
         'authorizeDapps',
         'vTokenList',
         'chains',
+        'multiSignRecords'
     ],
 
     storage: extensionizer.storage.local,
@@ -85,6 +86,7 @@ const StorageService = {
     allSideTokens : [],
     authorizeDapps: {},
     vTokenList: [],
+    multiSignRecords: {},
     get needsMigrating() {
         return localStorage.hasOwnProperty('TronLink_WALLET');
     },
@@ -212,6 +214,12 @@ const StorageService = {
         this.save('chains');
     },
 
+    saveMultiSignRecords(multiSignRecords, address) {
+        logger.info('Saving multiSignRecords', multiSignRecords);
+        this.multiSignRecords[address] = multiSignRecords;
+        this.save('multiSignRecords');
+    },
+
     selectNode(nodeID) {
         logger.info('Saving selected node', nodeID);
 
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 323185d..e8ec8a3 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -45,6 +45,7 @@ class Account {
             basic: {},
             smart: {}
         };
+        this.multiSignRecords = {};
         this.trxAddress = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
         // this.tokens.smart[ CONTRACT_ADDRESS.USDT ] = {
         //     abbr: 'USDT',
@@ -131,7 +132,8 @@ class Account {
             energy,
             energyUsed,
             lastUpdated,
-            asset
+            asset,
+            multiSignRecords,
         } = StorageService.getAccount(this.address);
 
         // Old TRC10 structure are no longer compatible
@@ -167,6 +169,7 @@ class Account {
         this.lastUpdated = lastUpdated;
         this.asset = asset;
         this.hash = '';
+        this.multiSignRecords = multiSignRecords;
     }
 
     matches(accountType, importData) {
@@ -203,6 +206,7 @@ class Account {
          */
         this.tokens.smart = {};
         this.tokens.basic = {};
+        this.multiSignRecords = {};
     }
 
     /** update data of an account
@@ -449,6 +453,7 @@ class Account {
             this.lastUpdated = Date.now();
             await Promise.all([
                 this.updateBalance(),
+                this.fetchMultiSignRecords(address),
             ]);
             logger.info(`Account ${address} successfully updated`);
             Object.keys(StorageService.getAccounts()).includes(this.address) && this.save();
@@ -469,6 +474,38 @@ class Account {
         this.TotalEnergyLimit = TotalEnergyLimit;
     }
 
+    async fetchMultiSignRecords(address) {
+        let { chainType, netType, } = NodeService.getCurrentNode();
+        chainType = Number(chainType === 1) ? 'DAppChain' : 'MainChain';
+        netType = Number(netType === 1) ? 'shasta' : 'main_net';
+        let data = [];
+        const url = `${API_URL}/api/wallet/multi/trx_record`;
+        let res = await axios.get(url, 
+            { headers: { chain: NodeService._selectedChain === '_' ? 'MainChain' : 'DAppChain' },
+              params: {
+                  start: 0,
+                  limit: 1000,
+                  state: 0,
+                  netType,
+                  address,
+              }
+            }).catch(e => {
+                data = [];
+            });
+        data = res.data.data.data || [];
+        let multiSignRecords = StorageService.multiSignRecords[address] || {};
+        data.map((item) => {
+            if (Number(item.isSign) === 0) {
+                if (multiSignRecords[item.hash] === undefined) {
+                    multiSignRecords[item.hash] = { status: true };
+                } 
+            };
+        });
+        StorageService.saveMultiSignRecords(multiSignRecords, address);
+        this.multiSignRecords = multiSignRecords;
+        return multiSignRecords;
+    }
+
     async addSmartToken({ address, name, decimals, symbol }) {
         logger.info(`Adding TRC20 token '${ address }' ${ name } (${ symbol }) to account '${ this.address }'`);
 
@@ -518,7 +555,8 @@ class Account {
             selectedBankRecordId: this.selectedBankRecordId,
             dealCurrencyPage: this.dealCurrencyPage,
             airdropInfo: this.airdropInfo,
-            transactionDetail: this.transactionDetail
+            transactionDetail: this.transactionDetail,
+            multiSignRecords: this.multiSignRecords,
         };
     }
 
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index dab5306..2bf1c7f 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -164,6 +164,7 @@ class Wallet extends EventEmitter {
                             this.emit('setAccount', this.selectedAccount);
                         }
                     }).catch(e => {
+                        logger.error('error2222')
                         logger.error(`update account ${account.address} fail`, e);
                     });
                 } else {
@@ -1355,6 +1356,19 @@ class Wallet extends EventEmitter {
         return StorageService.hasOwnProperty('allTokens') ? (selectedChain === '_' ? StorageService.allTokens.mainchain : StorageService.allTokens.sidechain) : {};
     }
 
+    setMultiSignViewed(address) {
+        console.log(this.accounts[this.selectedAccount], this.selectedAccount);
+        Object.keys(this.accounts[this.selectedAccount]['multiSignRecords']).forEach(item => {
+            this.accounts[this.selectedAccount]['multiSignRecords'][item].status = false;
+        })
+        StorageService.saveMultiSignRecords(this.accounts[this.selectedAccount]['multiSignRecords'], this.selectedAccount);
+        this.emit('setAccount', this.selectedAccount);
+    }
+
+    getMultiSignRecords(address) {
+        return StorageService.multiSignRecords && StorageService.multiSignRecords[address] ? StorageService.multiSignRecords[address] : false;
+    }
+
     async setTransactionDetail(hash) {
         const selectedChain = NodeService._selectedChain;
         const requestUrl = selectedChain === '_' ? 'https://apilist.tronscan.org' : 'https://dappchainapi.tronscan.org';
diff --git a/packages/lib/api/handlers/BackgroundAPI.js b/packages/lib/api/handlers/BackgroundAPI.js
index ca631e3..88e750a 100644
--- a/packages/lib/api/handlers/BackgroundAPI.js
+++ b/packages/lib/api/handlers/BackgroundAPI.js
@@ -73,6 +73,10 @@ export default {
         this.duplex.send('popup', 'setAirdropInfo', airdropInfo, false);
     },
 
+    setMultiSignViewed(address) {
+        this.duplex.send('popup', 'setMultiSignViewed', address, false);
+    },
+
     setDappList(dappList) {
         this.duplex.send('popup', 'setDappList',dappList ,false);
     },
diff --git a/packages/lib/api/handlers/PopupAPI.js b/packages/lib/api/handlers/PopupAPI.js
index 6de0ac6..a21dce0 100644
--- a/packages/lib/api/handlers/PopupAPI.js
+++ b/packages/lib/api/handlers/PopupAPI.js
@@ -278,6 +278,14 @@ export default {
         return this.duplex.send('getAllTokens',selectedChain);
     },
 
+    getMultiSignRecords(address) {
+        return this.duplex.send('getMultiSignRecords', address);
+    },
+
+    setMultiSignViewed(address) {
+        return this.duplex.send('setMultiSignViewed', address);
+    },
+
     setTransactionDetail(hash) {
        return this.duplex.send('setTransactionDetail', hash);
     },
diff --git a/packages/popup/src/pages/AccountsPage/AccountsPage.scss b/packages/popup/src/pages/AccountsPage/AccountsPage.scss
index aa3f448..0b55cc7 100644
--- a/packages/popup/src/pages/AccountsPage/AccountsPage.scss
+++ b/packages/popup/src/pages/AccountsPage/AccountsPage.scss
@@ -290,6 +290,53 @@
     overflow: hidden;
     display: flex;
     background-color: #F7F8FA;
+    .multi-sign-count {
+        background: #DB705C;
+        border-radius: 50%;
+        font-size: 10px;
+        color: #F7F8FA; 
+        text-align: center;
+        min-width: 14px;
+    }
+    .multi-sign-count-hide {
+        display: none;
+    }
+    .multi-sign-dg {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        height: 80px;
+        color: #FFFFFF;
+        text-align: center;
+        background: rgba(0,0,0,0.70);
+        padding: 20px;
+        .click-view-btn {
+            border: 0 solid #E2BD53;
+            border-radius: 12.5px;
+            height: 21px;
+            line-height: 21px;
+            padding: 0 15px;
+            margin-top: 5px;
+            span {
+                cursor: pointer;
+                display: inline-block;
+                padding: 0 15px;
+                border: 1px solid #E2BD53;
+                border-radius: 12.5px;
+                color: #E2BD53;   
+            }
+        }
+        .multi-sign-close {
+            cursor: pointer;
+            position: absolute;
+            right:8px;
+            top:12px;
+            width: 16px;
+            height: 16px;
+            opacity:.7;
+            background-image: url('../../assets/images/new/icon-close2.svg');
+        }
+    }
     .popUp{
         background: #505160;
         width: 100%;
@@ -420,9 +467,6 @@
                 width: 23px;
                 height: 18px;
                 background-image: url('../../assets/images/new/icon-more.svg');
-                .item {
-                    height: 30px;
-                }
             }
             .accountWrap{
                 font-size: 16px;
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index 040f84b..dcd7a54 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -24,6 +24,7 @@ class AccountsPage extends React.Component {
         this.onClick = this.onClick.bind(this);
         this.onDelete = this.onDelete.bind(this);
         this.onExport = this.onExport.bind(this);
+        this.setMultiSignViewed = this.setMultiSignViewed.bind(this);
         this.state = {
             mnemonic: false,
             privateKey: false,
@@ -33,7 +34,9 @@ class AccountsPage extends React.Component {
             showDelete: false,
             news: [],
             ieos: [],
-            allTokens: []
+            allTokens: [],
+            multiSignCount: 1,
+            multiSignDgVisible: true,
         };
     }
 
@@ -46,7 +49,6 @@ class AccountsPage extends React.Component {
                 this.setState({allTokens});
             }
         },100);
-
         const { prices, accounts } = this.props;
         const t = { name: 'TRX', abbr:'trx', id: '_', amount: 0, decimals: 6, price: prices.priceList[ prices.selected ], imgUrl: trxImg };
         PopupAPI.setSelectedToken(t);
@@ -63,6 +65,7 @@ class AccountsPage extends React.Component {
         const dappList = await PopupAPI.getDappList(false);
         PopupAPI.setDappList(dappList);
         app.getChains();
+        this.setState({multiSignDgVisible: true});
     }
 
     runTime(ieos) {
@@ -116,6 +119,16 @@ class AccountsPage extends React.Component {
         });
     }
 
+    async setMultiSignViewed(e, isOpen = true) {
+        e.stopPropagation();
+        const { selected } = this.props.accounts;
+        await PopupAPI.setMultiSignViewed(selected.address);
+        if (isOpen) {
+            window.open(`${tronscanUrl}/account?from=tronlink&type=multiSign`); 
+        }
+       
+    }
+
     handleShowChainList() {
         this.setState({
             showMenuList: false,
@@ -144,7 +157,7 @@ class AccountsPage extends React.Component {
         app.getNodes();
     }
 
-    renderAccountInfo(accounts, prices, totalMoney) {
+    renderAccountInfo(accounts, prices, totalMoney, multiSignCount) {
         const { formatMessage } = this.props.intl;
         const { showMenuList } = this.state;
         const { chains } = this.props;
@@ -188,9 +201,10 @@ class AccountsPage extends React.Component {
                             }
                             {
                                 chains.selected === '_' ?
-                                    <div onClick={(e) => { e.stopPropagation();window.open(`${tronscanUrl}/account?from=tronlink&type=multiSign`); }} className='item'>
+                                    <div onClick={(e) => { this.setMultiSignViewed(e); }} className='item'>
                                         <span className='icon multi-sign'>&nbsp;</span>
                                         <FormattedMessage id='MENU.MULTI_SIGN' />
+                                        <span className={Number(multiSignCount) > 0 ? 'multi-sign-count' : 'multi-sign-count-hide'}>{Number(multiSignCount) > 0 ? multiSignCount : ''}</span>
                                     </div>
                                     :
                                     null
@@ -487,7 +501,7 @@ class AccountsPage extends React.Component {
         const id = news.length > 0 ? news[0].id : 0;
         const { accounts,prices,nodes,setting,language:lng,vTokenList,chains } = this.props;
 
-        const { selected: { airdropInfo } } = accounts;
+        const { selected: { airdropInfo, multiSignRecords } } = accounts;
         const mode = 'productionMode';
         const { formatMessage } = this.props.intl;
         const trx_price = prices.priceList[prices.selected];
@@ -522,6 +536,10 @@ class AccountsPage extends React.Component {
         });
         const asset = accounts.accounts[ accounts.selected.address ] && accounts.accounts[ accounts.selected.address ].asset ? accounts.accounts[accounts.selected.address].asset : 0;
         const totalMoney = new BigNumber(asset).multipliedBy(prices.priceList[ prices.selected ]).toFixed(2);
+
+        let multiSignCount = Object.keys(multiSignRecords).filter(item => multiSignRecords[item].status).length;
+        
+
         return (
             <div className='accountsPage' onClick={() => {
                 this.setState({
@@ -649,7 +667,7 @@ class AccountsPage extends React.Component {
                         }}>
                         </div>
                     </div>
-                    { accounts.selected.address ? this.renderAccountInfo(accounts, prices, totalMoney) : null }
+                    { accounts.selected.address ? this.renderAccountInfo(accounts, prices, totalMoney, multiSignCount) : null }
                     <div className="listWrap">
                         { this.renderResource(accounts.accounts[accounts.selected.address]) }
                         { this.renderIeos(ieos) }
@@ -673,6 +691,28 @@ class AccountsPage extends React.Component {
                     :
                     null
                 }
+                {
+                    accounts.selected.address && Number(multiSignCount) > 0 && this.state.multiSignDgVisible
+                        ? 
+                    <div className='multi-sign-dg'>
+                        <div className="multi-sign-close" onClick={
+                            (e) => {
+                                this.setState({multiSignDgVisible: false});
+                                this.setMultiSignViewed(e, false);
+                            }
+                        }></div>
+                        <FormattedMessage id='NOTIFICATIONS.MULTI_SIGN_WAITTING' 
+                         values={{
+                            count: multiSignCount
+                         }}
+                        />
+                        <div className='click-view-btn' onClick={(e) => { this.setMultiSignViewed(e);}}> 
+                            <FormattedMessage id='NOTIFICATIONS.MULTI_SIGN_BTN_TEXT' />
+                        </div>
+                     </div>
+                        :
+                    null
+                }
             </div>
         );
     }
diff --git a/packages/popup/src/reducers/accountsReducer.js b/packages/popup/src/reducers/accountsReducer.js
index 9a81043..28d966c 100644
--- a/packages/popup/src/reducers/accountsReducer.js
+++ b/packages/popup/src/reducers/accountsReducer.js
@@ -28,7 +28,8 @@ export const accountsReducer = createReducer({
         selectedBankRecordId: 0,
         dealCurrencyPage: 0,
         airdropInfo: {},
-        hash: ''
+        hash: '',
+        multiSignRecords: {}
     },
     accounts: { },
     selectedToken: { id: '_', name: 'TRX', decimals: 6, amount: 0 }
diff --git a/packages/popup/src/translations/en.json b/packages/popup/src/translations/en.json
index 25aacce..f1559af 100644
--- a/packages/popup/src/translations/en.json
+++ b/packages/popup/src/translations/en.json
@@ -445,6 +445,8 @@
 
     "NOTIFICATIONS.TITLE":"transaction finished",
     "NOTIFICATIONS.MESSAGE":"go to Tronscan to check details",
+    "NOTIFICATIONS.MULTI_SIGN_WAITTING": "You have {count} transaction(s) waiting to be signed",
+    "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "click to View >",
 
     "ALERT.UPDATE_DESCRIPTION.TITLE":"Update Description",
     "ALERT.UPDATE_DESCRIPTION.BODY":"The update mainly supports TRON's official SUN Network. A side chain feature has been added. Now you can transfer your assets between the main chain and the side chain, and use Dapps that have already supported side chain by TronLink. Please note that the side chain does not support ledger yet.",
diff --git a/packages/popup/src/translations/ja.json b/packages/popup/src/translations/ja.json
index 5e50bd3..40d0445 100644
--- a/packages/popup/src/translations/ja.json
+++ b/packages/popup/src/translations/ja.json
@@ -440,6 +440,8 @@
 
   "NOTIFICATIONS.TITLE":"取引完了",
   "NOTIFICATIONS.MESSAGE":"クリックして、tronscanにジャンプし取引詳細をご覧ください。",
+  "NOTIFICATIONS.MULTI_SIGN_WAITTING": "サイン待ちのトランザクションがあります。",
+  "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "クリックしてご確認ください >",
 
   "ALERT.UPDATE_DESCRIPTION.TITLE":"アップデートについての説明",
   "ALERT.UPDATE_DESCRIPTION.BODY":"今回のアップデートでTRON公式のSUN NETWORKをサポートして、サイドチェーン機能を添加しました。現在から、資産をメインチェーンとサイドチェーンの間で移動することができ、およびTronLinkを通じて、先にサイドチェーンをサポートするDAppをご利用になります。しかし、現時点にサイドチェーンがledgerをサポートしていません、ご了承ください。",
diff --git a/packages/popup/src/translations/zh.json b/packages/popup/src/translations/zh.json
index 14f216b..e52bcfa 100644
--- a/packages/popup/src/translations/zh.json
+++ b/packages/popup/src/translations/zh.json
@@ -444,6 +444,8 @@
 
     "NOTIFICATIONS.TITLE":"交易完成",
     "NOTIFICATIONS.MESSAGE":"点击跳转tronscan查看交易详情",
+    "NOTIFICATIONS.MULTI_SIGN_WAITTING": "您有 {count} 笔待签名交易",
+    "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "点击查看 >",
 
     "ALERT.UPDATE_DESCRIPTION.TITLE":"更新说明",
     "ALERT.UPDATE_DESCRIPTION.BODY":"本次更新主要支持了Tron官方的sunnetwork，即添加了侧链功能。现在您可以将资产在主链与侧链之间转移，并可以通过TronLink使用优先支持了侧链的Dapp。请注意，目前侧链上暂不支持ledger",

From 3ab7c61987ffd44312000ab19315f872381348fe Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Mon, 16 Dec 2019 12:13:18 +0800
Subject: [PATCH 28/39] add nile testnet

---
 .../backgroundScript/services/NodeService/index.js    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 1244c80..e60115d 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -69,6 +69,17 @@ const NodeService = {
                 chainId: SIDE_CHAIN_ID_TEST,
             }
         },
+        '910d7fa5-da35-419d-b454-fd4ee22087cd': {
+            name: 'Nile Testnet',
+            fullNode: 'https://httpapi.nileex.io',
+            solidityNode: 'https://httpapi.nileex.io',
+            eventServer: 'https://api.nileex.io',
+            default: false,
+            chain: '_',
+            chainType: 0,
+            netType: 1,
+            connectChain: false,
+        },
         '51a36e5a-2480-4b57-989c-539345a13be2': {
             name: 'DappChain',
             fullNode: 'https://sun.tronex.io',

From b77bc19e083f9bef45c5049d63818b254c4d6d1a Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Tue, 17 Dec 2019 20:12:56 +0800
Subject: [PATCH 29/39] add mainnet tronex node

---
 .../services/NodeService/index.js             | 33 +++++++++++++++----
 .../services/WalletService/Account.js         |  3 +-
 .../services/WalletService/index.js           |  1 -
 .../popup/src/pages/AccountsPage/index.js     |  2 +-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index e60115d..e599c4b 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -21,7 +21,7 @@ const NodeService = {
     },
     _nodes: {
         '109c64ad-e59c-46fe-ba87-179587e6c772': {
-            name: 'Mainnet',
+            name: 'Mainnet (trongrid)',
             fullNode: 'https://api.trongrid.io',
             solidityNode: 'https://api.trongrid.io',
             eventServer: 'https://api.trongrid.io',
@@ -39,6 +39,25 @@ const NodeService = {
                 chainId: SIDE_CHAIN_ID,
             }
         },
+        '8eeb5be6-5e10-4283-ae61-03c0e4726fe0': {
+            name: 'Mainnet (tronex)',
+            fullNode: 'https://httpapi.tronex.io',
+            solidityNode: 'https://httpapi.tronex.io',
+            eventServer: 'https://api.trongrid.io',
+            default: false, 
+            chain: '_',
+            connect: '51a36e5a-2480-4b57-989c-539345a13be2',
+            chainType: 0,  // 0: Tron, 1: DappChain
+            netType: 0,   // 0: mainnet, 1: testnet
+            connectChain: {
+                fullNode: 'https://sun.tronex.io',
+                solidityNode: 'https://sun.tronex.io',
+                eventServer: 'https://sun.tronex.io',
+                mainGateway: CONTRACT_ADDRESS.MAIN,
+                sideGateway: CONTRACT_ADDRESS.SIDE,
+                chainId: SIDE_CHAIN_ID,
+            }
+        },
         'b9424719-b45b-45aa-95d0-1b1b25fc75ae': {
             name: 'Shasta Testnet',
             fullNode: 'https://api.shasta.trongrid.io',
@@ -51,7 +70,7 @@ const NodeService = {
             connectChain: false,
         },
         'f14212e2-a6a0-4391-9419-07b55f8be63e': {
-            name: 'DappChain Testnet',
+            name: 'Tronex Testnet',
             fullNode: 'https://testhttpapi.tronex.io',
             solidityNode: 'https://testhttpapi.tronex.io',
             eventServer: 'https://testapi.tronex.io',
@@ -71,9 +90,9 @@ const NodeService = {
         },
         '910d7fa5-da35-419d-b454-fd4ee22087cd': {
             name: 'Nile Testnet',
-            fullNode: 'https://httpapi.nileex.io',
-            solidityNode: 'https://httpapi.nileex.io',
-            eventServer: 'https://api.nileex.io',
+            fullNode: 'https://api.nileex.io',
+            solidityNode: 'https://api.nileex.io',
+            eventServer: 'https://event.nileex.io',
             default: false,
             chain: '_',
             chainType: 0,
@@ -81,7 +100,7 @@ const NodeService = {
             connectChain: false,
         },
         '51a36e5a-2480-4b57-989c-539345a13be2': {
-            name: 'DappChain',
+            name: 'DappChain Mainnet',
             fullNode: 'https://sun.tronex.io',
             solidityNode: 'https://sun.tronex.io',
             eventServer: 'https://sun.tronex.io',
@@ -100,7 +119,7 @@ const NodeService = {
             }
         },
         '01eda3a0-5a58-4e44-9f95-f7f1f59dd728': {
-            name: 'DappChain Testnet',
+            name: 'DappChain Tronex Testnet',
             fullNode: 'https://suntest.tronex.io',
             solidityNode: 'https://suntest.tronex.io',
             eventServer: 'https://suntest.tronex.io',
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index e8ec8a3..4aa512b 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -230,7 +230,7 @@ class Account {
             return { data: { data: [] } };
         });
 
-        if (!(node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2')) {
+        if (Number(NodeService.getNodes().nodes[node].netType) !== 0) { // filter testnet and custom node
             smartTokens = [];
         }
 
@@ -338,6 +338,7 @@ class Account {
                     delete this.tokens.smart[tokenId];
                 }
             });
+            
             for (let { tokenAddress, logoUrl = false, decimals = 6, isMapping, name, shortName, balance, balanceStr } of smartTokens) {
                 let token = this.tokens.smart[tokenAddress] || false;
                 const filter = smartTokenPriceList.filter(({ fTokenAddr, sTokenAddr }) => fTokenAddr === tokenAddress && sTokenAddr === this.trxAddress);
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index 2bf1c7f..b526ba7 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -1357,7 +1357,6 @@ class Wallet extends EventEmitter {
     }
 
     setMultiSignViewed(address) {
-        console.log(this.accounts[this.selectedAccount], this.selectedAccount);
         Object.keys(this.accounts[this.selectedAccount]['multiSignRecords']).forEach(item => {
             this.accounts[this.selectedAccount]['multiSignRecords'][item].status = false;
         })
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index dcd7a54..4f28203 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -537,7 +537,7 @@ class AccountsPage extends React.Component {
         const asset = accounts.accounts[ accounts.selected.address ] && accounts.accounts[ accounts.selected.address ].asset ? accounts.accounts[accounts.selected.address].asset : 0;
         const totalMoney = new BigNumber(asset).multipliedBy(prices.priceList[ prices.selected ]).toFixed(2);
 
-        let multiSignCount = Object.keys(multiSignRecords).filter(item => multiSignRecords[item].status).length;
+        let multiSignCount = multiSignRecords ? Object.keys(multiSignRecords).filter(item => multiSignRecords[item].status).length : 0;
         
 
         return (

From ffe5d3375b98c2a7b5288f4eb62d8e3365288faa Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Wed, 18 Dec 2019 18:58:43 +0800
Subject: [PATCH 30/39] delete tronex sidechain

---
 .../services/NodeService/index.js                | 16 +++++-----------
 .../services/WalletService/Account.js            |  2 +-
 .../services/WalletService/index.js              |  2 +-
 packages/lib/constants.js                        |  3 +++
 packages/popup/src/pages/AccountsPage/index.js   |  9 ++++-----
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index e599c4b..b6c948d 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -3,7 +3,7 @@ import randomUUID from 'uuid/v4';
 import TronWeb from 'tronweb';
 import SunWeb from 'sunweb';
 import Logger from '@tronlink/lib/logger';
-import { CONTRACT_ADDRESS, SIDE_CHAIN_ID, NODE, SIDE_CHAIN_ID_TEST } from '@tronlink/lib/constants';
+import { CONTRACT_ADDRESS, SIDE_CHAIN_ID, NODE, SIDE_CHAIN_ID_TEST,  SIDE_CHAIN_ID_TEST_NILE} from '@tronlink/lib/constants';
 import { BigNumber } from 'bignumber.js';
 
 const logger = new Logger('NodeService');
@@ -46,17 +46,10 @@ const NodeService = {
             eventServer: 'https://api.trongrid.io',
             default: false, 
             chain: '_',
-            connect: '51a36e5a-2480-4b57-989c-539345a13be2',
+            // connect: '51a36e5a-2480-4b57-989c-539345a13be2',
             chainType: 0,  // 0: Tron, 1: DappChain
             netType: 0,   // 0: mainnet, 1: testnet
-            connectChain: {
-                fullNode: 'https://sun.tronex.io',
-                solidityNode: 'https://sun.tronex.io',
-                eventServer: 'https://sun.tronex.io',
-                mainGateway: CONTRACT_ADDRESS.MAIN,
-                sideGateway: CONTRACT_ADDRESS.SIDE,
-                chainId: SIDE_CHAIN_ID,
-            }
+            connectChain: false
         },
         'b9424719-b45b-45aa-95d0-1b1b25fc75ae': {
             name: 'Shasta Testnet',
@@ -97,7 +90,7 @@ const NodeService = {
             chain: '_',
             chainType: 0,
             netType: 1,
-            connectChain: false,
+            connectChain: false
         },
         '51a36e5a-2480-4b57-989c-539345a13be2': {
             name: 'DappChain Mainnet',
@@ -340,6 +333,7 @@ const NodeService = {
         try {
             let balance;
             const contract = await this.tronWeb.contract().at(address);
+            const contract = await this._selectedChain === '_' ? await this.tronWeb.contract().at(address) : await this.sunWeb.sidechain.contract().at(address);
             if (!contract.name && !contract.symbol && !contract.decimals) {
                 return false;
             }
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 4aa512b..1279375 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -281,7 +281,7 @@ class Account {
                     precision: trc20Filter[0].sPrecision
                 } : { price: 0, precision: 0 });
                 price = price / Math.pow(10, precision);
-                if (node === '109c64ad-e59c-46fe-ba87-179587e6c772' || node === '51a36e5a-2480-4b57-989c-539345a13be2') {
+                if (Number(NodeService.getNodes().nodes[node].netType) === 0) {
                     if (StorageService.allTokens[NodeService._selectedChain === '_' ? 'mainchain' : 'sidechain'].filter(({ tokenId }) => tokenId === key).length === 0) return;
                     const {
                         name = 'TRX',
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index b526ba7..4253072 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -1212,7 +1212,7 @@ class Wallet extends EventEmitter {
 
         const nodes = NodeService.getNodes();
 
-        if (!(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === '51a36e5a-2480-4b57-989c-539345a13be2')) {
+        if (Number(NodeService.getNodes().nodes[nodes.selected].netType) !== 0) {
             return { records: [], finger };
         }
 
diff --git a/packages/lib/constants.js b/packages/lib/constants.js
index e6f3e3e..d8e1243 100644
--- a/packages/lib/constants.js
+++ b/packages/lib/constants.js
@@ -102,6 +102,8 @@ export const CONTRACT_ADDRESS = {
     SIDE:"TGKotco6YoULzbYisTBuP6DWXDjEgJSpYz",
     MAIN_TEST:"TFLtPoEtVJBMcj6kZPrQrwEdM3W3shxsBU", //testnet mainchain
     SIDE_TEST:"TRDepx5KoQ8oNbFVZ5sogwUxtdYmATDRgX", //testnet sidechain
+    MAIN_TEST_NILE: "TTYtjySdWFkZeUnQEB7cfwyxj3PD2ZsEmd",
+    SIDE_TEST_NILE: "TWLoD341FRJ43JfwTPADRqGnUT4zEU3UxG",
 };
 
 export const USDT_ACTIVITY_STAGE = {
@@ -168,6 +170,7 @@ export const TOP_TOKEN = {
 
 export const SIDE_CHAIN_ID = '41E209E4DE650F0150788E8EC5CAFA240A23EB8EB7';
 export const SIDE_CHAIN_ID_TEST = '413AF23F37DA0D48234FDD43D89931E98E1144481B';
+export const SIDE_CHAIN_ID_TEST_NILE = '41C0D909CC323543142E77AAD3786389364B981EEC';
 
 export const NODE = {
     //MAIN: {fullNode:'http://47.252.84.158:8070',solidityNode:'http://47.252.84.158:8071',eventServer:'http://47.252.81.14:8070'},
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index 4f28203..f43b611 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -274,14 +274,14 @@ class AccountsPage extends React.Component {
                         </div>
                         <ProcessBar percentage={(account.netLimit - account.netUsed) / account.netLimit} />
                     </div>
-                    <div className={'cell'+(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682'?' bankSingle':'')} onClick={ () => {
+                    <div className={'cell'+(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' ||  nodes.selected === '8eeb5be6-5e10-4283-ae61-03c0e4726fe0' ? ' bankSingle':'')} onClick={ () => {
                         //PopupAPI.changeState(APP_STATE.TRONBANK);
-                        if(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682')
+                        if(nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' ||  nodes.selected === '8eeb5be6-5e10-4283-ae61-03c0e4726fe0')
                             window.open('http://www.tronlending.org');
                     }}>
                         <div className='title'>
                             {
-                                nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' || nodes.selected === 'f0b1e38e-7bee-485e-9d3f-69410bf30682' ?
+                                nodes.selected === '109c64ad-e59c-46fe-ba87-179587e6c772' ||  nodes.selected === '8eeb5be6-5e10-4283-ae61-03c0e4726fe0' ?
                                     <span className='bankBox'>
                                         <FormattedMessage id='CONFIRMATIONS.RESOURCE.ENERGY' />
                                         {/*<img className='bankArrow' src={require('../../assets/images/new/tronBank/rightArrow.svg')} alt='arrow'/>*/}
@@ -351,14 +351,13 @@ class AccountsPage extends React.Component {
     }
 
     renderTokens(tokens) {
-
         const { prices, accounts,chains, language } = this.props;
         return (
             <div className='tokens'>
                 {
                     tokens.filter(({tokenId, ...token})=>!token.hasOwnProperty('chain') || token.chain === chains.selected).map(({ tokenId, ...token }) => {
                         const balance = token.balanceStr != undefined ? token.balanceStr : token.balance;
-                        const amount = new BigNumber(Number(balance))
+                        const amount = new BigNumber(balance)
                             .shiftedBy(-token.decimals)
                             .toString();
                         const price = token.price === undefined ? 0 : token.price;

From 7564612969677d038589535681c18cac68b0f9c6 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Wed, 18 Dec 2019 19:01:15 +0800
Subject: [PATCH 31/39] delete contract variables

---
 packages/backgroundScript/services/NodeService/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index b6c948d..77f9e77 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -332,7 +332,6 @@ const NodeService = {
     async getSmartToken(address) {
         try {
             let balance;
-            const contract = await this.tronWeb.contract().at(address);
             const contract = await this._selectedChain === '_' ? await this.tronWeb.contract().at(address) : await this.sunWeb.sidechain.contract().at(address);
             if (!contract.name && !contract.symbol && !contract.decimals) {
                 return false;

From 8424cead7214ab538593cd02e4cfa771c832b6f0 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Thu, 19 Dec 2019 17:06:19 +0800
Subject: [PATCH 32/39] change tronnex domain

---
 packages/backgroundScript/services/NodeService/index.js     | 6 +++---
 packages/backgroundScript/services/StorageService/index.js  | 2 +-
 packages/backgroundScript/services/WalletService/Account.js | 1 -
 packages/popup/src/controllers/AssetManageController.js     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 77f9e77..50b5318 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -40,9 +40,9 @@ const NodeService = {
             }
         },
         '8eeb5be6-5e10-4283-ae61-03c0e4726fe0': {
-            name: 'Mainnet (tronex)',
-            fullNode: 'https://httpapi.tronex.io',
-            solidityNode: 'https://httpapi.tronex.io',
+            name: 'Mainnet (tronstack)',
+            fullNode: 'https://api.tronstack.io',
+            solidityNode: 'https://api.tronstack.io',
             eventServer: 'https://api.trongrid.io',
             default: false, 
             chain: '_',
diff --git a/packages/backgroundScript/services/StorageService/index.js b/packages/backgroundScript/services/StorageService/index.js
index 008de24..3f06920 100644
--- a/packages/backgroundScript/services/StorageService/index.js
+++ b/packages/backgroundScript/services/StorageService/index.js
@@ -397,7 +397,7 @@ const StorageService = {
      */
 
     async cacheToken(tokenID) {
-
+        
 
         const {
             name,
diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 1279375..40e0091 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -306,7 +306,6 @@ class Account {
                     if ((!token && !StorageService.tokenCache.hasOwnProperty(key))) {
                         await StorageService.cacheToken(key);
                     }
-
                     if (StorageService.tokenCache.hasOwnProperty(key)) {
                         const {
                             name,
diff --git a/packages/popup/src/controllers/AssetManageController.js b/packages/popup/src/controllers/AssetManageController.js
index a55634e..72a0414 100644
--- a/packages/popup/src/controllers/AssetManageController.js
+++ b/packages/popup/src/controllers/AssetManageController.js
@@ -182,7 +182,7 @@ class AssetManageController extends React.Component {
                     <div className='leftSpace scroll'>
                         <div className='cellWrap'>
                             {
-                                filterTokens.map(({ tokenId, symbol = false, abbr = false, imgUrl, name, isList = false, html = `${name}(${abbr})`, decimals, balance = 0, isVerify = false ,isTop = false}) => {
+                                filterTokens.map(({ tokenId, symbol = false, abbr = '', imgUrl, name, isList = false, html = `${name}(${abbr})`, decimals, balance = 0, isVerify = false ,isTop = false}) => {
                                     return (
                                         <div className='cell'>
                                             <img src={imgUrl ? imgUrl : token10DefaultImg} onError={(e) => { e.target.src = token10DefaultImg; }} />

From 4ceba7f3b54ca109bea083954d1212419425d70a Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Fri, 20 Dec 2019 12:17:32 +0800
Subject: [PATCH 33/39] format decimals as 6

---
 .../backgroundScript/services/WalletService/Account.js |  5 +++--
 packages/popup/src/controllers/SendController.js       |  7 ++++---
 packages/popup/src/pages/AccountsPage/index.js         | 10 +++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/backgroundScript/services/WalletService/Account.js b/packages/backgroundScript/services/WalletService/Account.js
index 40e0091..fdc0569 100644
--- a/packages/backgroundScript/services/WalletService/Account.js
+++ b/packages/backgroundScript/services/WalletService/Account.js
@@ -237,7 +237,7 @@ class Account {
         try {
 
             const account = NodeService._selectedChain === '_' ? await NodeService.tronWeb.trx.getUnconfirmedAccount(address) : await NodeService.sunWeb.sidechain.trx.getUnconfirmedAccount(address);
-
+            let tronWeb = NodeService._selectedChain === '_' ? NodeService.tronWeb : NodeService.sunWeb.sidechain;
             if (!account.address) {
                 logger.info(`Account ${address} does not exist on the network`);
                 this.reset();
@@ -245,7 +245,7 @@ class Account {
             }
             const addSmartTokens = Object.entries(this.tokens.smart).filter(([tokenId, token]) => !token.hasOwnProperty('abbr'));
             for (const [tokenId, token] of addSmartTokens) {
-                const contract = await NodeService.tronWeb.contract().at(tokenId).catch(e => false);
+                const contract = await tronWeb.contract().at(tokenId).catch(e => false);
                 if (contract) {
                     let balance;
                     const number = await contract.balanceOf(address).call();
@@ -272,6 +272,7 @@ class Account {
             this.frozenBalance = (account.frozen && account.frozen[0]['frozen_balance'] || 0) + (account['account_resource']['frozen_balance_for_energy'] && account['account_resource']['frozen_balance_for_energy']['frozen_balance'] || 0) + (account['delegated_frozen_balance_for_bandwidth'] || 0) + (account['account_resource']['delegated_frozen_balance_for_energy'] || 0);
             this.balance = account.balance || 0;
             const filteredTokens = (account.assetV2 || []).filter(({ value }) => value >= 0);
+            this.tokens.basic = {};
             for (const { key, value } of filteredTokens) {
                 let token = this.tokens.basic[key] || false;
                 const filter = basicTokenPriceList.length ? basicTokenPriceList.filter(({ first_token_id }) => first_token_id === key) : [];
diff --git a/packages/popup/src/controllers/SendController.js b/packages/popup/src/controllers/SendController.js
index bda68cc..f0b9851 100644
--- a/packages/popup/src/controllers/SendController.js
+++ b/packages/popup/src/controllers/SendController.js
@@ -92,7 +92,7 @@ class SendController extends React.Component {
         const { selected } = nextProps.accounts;
         const { selectedToken } = this.state;
         const field = selectedToken.id.match(/^T/) ? 'smart':'basic';
-        const balance = selected.tokens[field].hasOwnProperty(selectedToken.id) ? selected.tokens[field][ selectedToken.id ].balance : 0;
+        const balance = selected.tokens[field].hasOwnProperty(selectedToken.id) ? (selected.tokens[field][ selectedToken.id ].balanceStr != undefined ? selected.tokens[field][ selectedToken.id ].balanceStr : selected.tokens[field][ selectedToken.id ].balance ): 0;
         const decimals = selected.tokens[field].hasOwnProperty(selectedToken.id) ? selected.tokens[field][ selectedToken.id ].decimals : 6;
         if(selectedToken.id === '_') {
             selectedToken.amount = selected.balance / Math.pow(10, 6);
@@ -487,13 +487,14 @@ class SendController extends React.Component {
                                 <span title={`${selectedToken.name}(${selectedToken.amount})`}>{`${selectedToken.name}(${selectedToken.amount})`}</span>{selectedToken.id !== '_' ? (<span>id:{selectedToken.id.length === 7 ? selectedToken.id : selectedToken.id.substr(0, 6) + '...' + selectedToken.id.substr(-6)}</span>) : ''}</div>
                             <div className='dropWrap' style={isOpen.token ? (tokens.length <= 5 ? { height: 36 * tokens.length } : { height: 180, overflow: 'scroll' }) : {}}>
                                 {
-                                    tokens.filter(({ isLocked = false }) => !isLocked ).map(({ tokenId: id, balance, name, decimals, decimal = false, abbr = false, symbol = false, imgUrl = false,frozenBalance = 0 }) => {
+                                    tokens.filter(({ isLocked = false }) => !isLocked ).map(({ tokenId: id, balance, balanceStr, name, decimals, decimal = false, abbr = false, symbol = false, imgUrl = false,frozenBalance = 0 }) => {
                                         const d =  decimal || decimals;
+                                        balance = balanceStr != undefined ? balanceStr : balance;
                                         const BN = BigNumber.clone({
                                             DECIMAL_PLACES: d,
                                             ROUNDING_MODE: Math.min(8, d)
                                         });
-                                        const amount = new BN(balance)
+                                        let amount = new BN(balance)
                                             .shiftedBy(-d)
                                             .toString();
                                         const frozenAmount = new BN(frozenBalance)
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index f43b611..55fd212 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -357,11 +357,19 @@ class AccountsPage extends React.Component {
                 {
                     tokens.filter(({tokenId, ...token})=>!token.hasOwnProperty('chain') || token.chain === chains.selected).map(({ tokenId, ...token }) => {
                         const balance = token.balanceStr != undefined ? token.balanceStr : token.balance;
-                        const amount = new BigNumber(balance)
+                        let amount = new BigNumber(balance)
                             .shiftedBy(-token.decimals)
                             .toString();
                         const price = token.price === undefined ? 0 : token.price;
                         const money = (tokenId === '_' || tokenId === CONTRACT_ADDRESS.USDT) ? (price * amount).toFixed(2) : (price * amount * prices.priceList[ prices.selected ]).toFixed(2);
+                        if (amount) {
+                            let amountArr = amount.split('.');
+                            let fractional = amountArr[1];
+                            if (fractional) {
+                                fractional = fractional.length > 6 ? fractional.substr(0, 6) + '...' : fractional;
+                                amount = String(amountArr[0]) + '.' + fractional;
+                            }
+                        }
                         return (
                             <div className='tokenItem' onClick={ () => {
                                 let o = { id: tokenId, name: token.name, abbr: token.abbr || token.symbol, decimals: token.decimals, amount, price: token.price, imgUrl: token.imgUrl ? token.imgUrl : token10DefaultImg,isMapping:token.isMapping};

From bfa0453cb0fc26f13e476e07866a8f67be5c5a35 Mon Sep 17 00:00:00 2001
From: llwslc <llwslc@gmail.com>
Date: Fri, 20 Dec 2019 15:03:09 +0800
Subject: [PATCH 34/39] fix getSmartToken default balance error

---
 packages/backgroundScript/services/NodeService/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backgroundScript/services/NodeService/index.js b/packages/backgroundScript/services/NodeService/index.js
index 50b5318..d5675e8 100644
--- a/packages/backgroundScript/services/NodeService/index.js
+++ b/packages/backgroundScript/services/NodeService/index.js
@@ -44,7 +44,7 @@ const NodeService = {
             fullNode: 'https://api.tronstack.io',
             solidityNode: 'https://api.tronstack.io',
             eventServer: 'https://api.trongrid.io',
-            default: false, 
+            default: false,
             chain: '_',
             // connect: '51a36e5a-2480-4b57-989c-539345a13be2',
             chainType: 0,  // 0: Tron, 1: DappChain
@@ -231,7 +231,7 @@ const NodeService = {
             }
         } else  {
             this.tronWeb = new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer);
-               
+
             this.sunWeb = new SunWeb(
                 new TronWeb(connectChain.fullNode, connectChain.solidityNode, connectChain.eventServer),
                 new TronWeb(fullNode, solidityNode, eventServer),
@@ -340,7 +340,7 @@ const NodeService = {
             const name = await contract.name().call();
             const symbol = await contract.symbol().call();
             const decimals = typeof d === 'object' && d._decimals ? d : new BigNumber(d).toNumber();
-            const number = await contract.balanceOf(address).call();
+            const number = await contract.balanceOf(this.tronWeb.defaultAddress.base58).call();
             if (number.balance) {
                 balance = new BigNumber(number.balance).toString();
             } else {

From 6108819e41053f945905e3e6db8a4bb83dc73683 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Thu, 26 Dec 2019 15:31:45 +0800
Subject: [PATCH 35/39] support updateBrokerage type

---
 packages/lib/transactionBuilder/contracts.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/lib/transactionBuilder/contracts.json b/packages/lib/transactionBuilder/contracts.json
index de948da..c7b851e 100644
--- a/packages/lib/transactionBuilder/contracts.json
+++ b/packages/lib/transactionBuilder/contracts.json
@@ -22,5 +22,6 @@
     "UnfreezeAssetContract": "wallet/unfreezeasset",
     "AccountUpdateContract": "wallet/updateaccount",
     "WitnessUpdateContract": "wallet/updatewitness",
-    "AccountPermissionUpdateContract": "wallet/accountpermissionupdate"
+    "AccountPermissionUpdateContract": "wallet/accountpermissionupdate",
+    "UpdateBrokerageContract": "wallet/updateBrokerage"
 }
\ No newline at end of file

From 109ae72b469d33efa3f64ef41d0e8381c358c6a2 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Mon, 30 Dec 2019 14:26:21 +0800
Subject: [PATCH 36/39] change tronscan.org to tronscan.io

---
 manifest.json                                                 | 4 ++--
 packages/backgroundScript/services/WalletService/index.js     | 2 +-
 packages/lib/package.json                                     | 2 +-
 packages/pageHook/package.json                                | 2 +-
 packages/popup/package.json                                   | 2 +-
 packages/popup/src/controllers/TransactionDetailController.js | 2 +-
 .../popup/src/controllers/TransactionsController/index.js     | 2 +-
 packages/popup/src/pages/AccountsPage/index.js                | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 297afc3..27f5648 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink（波宝钱包）",
-    "version": "3.2.5",
-    "version_name": "3.2.5",
+    "version": "3.2.6",
+    "version_name": "3.2.6",
     "description": "The first and most popular TRON wallet. Recommended by TRON Foundation.",
     "author": "Kondax <kondaxsolutions@gmail.com>",
     "content_security_policy": "script-src 'self' 'unsafe-eval' 'sha256-LayQc1iWBC+6WbHHvHZj3uSx3CxrGBHUJBR7si4qf8w=' 'sha256-POEO+wER89cezFVZ27JoP523HJNPMQxmh5Rcz/OZpr4=' 'sha256-IThiKMnsg0UHaLmP7sJxZpd/ohvINImwjxFJyxGFSlk=' https://*.sentry.io https://www.google-analytics.com https://www.googletagmanager.com https://cdnjs.cloudflare.com; object-src 'self'",
diff --git a/packages/backgroundScript/services/WalletService/index.js b/packages/backgroundScript/services/WalletService/index.js
index 4253072..941d68a 100644
--- a/packages/backgroundScript/services/WalletService/index.js
+++ b/packages/backgroundScript/services/WalletService/index.js
@@ -1444,7 +1444,7 @@ class Wallet extends EventEmitter {
                             }
                         );
                         extensionizer.notifications.onClicked.addListener(notifyId => {
-                            window.open('https://tronscan.org/#/transaction/' + notifyId);
+                            window.open('https://tronscan.io/#/transaction/' + notifyId);
                         });
                     } else {
                     }
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 90a8aa8..0f5cd19 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.5",
+  "version": "3.2.6",
   "dependencies": {
     "@tronscan/client": "^0.2.48",
     "@ledgerhq/hw-transport-u2f": "^4.31.0",
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index 1c6b0f8..662ee2d 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.5",
+  "version": "3.2.6",
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/pageHook.js",
     "lint": "npx eslint . --fix"
diff --git a/packages/popup/package.json b/packages/popup/package.json
index 3dca06f..6f152fb 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -3,7 +3,7 @@
   "main": "index.js",
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.8",
diff --git a/packages/popup/src/controllers/TransactionDetailController.js b/packages/popup/src/controllers/TransactionDetailController.js
index c385d85..792b3b4 100644
--- a/packages/popup/src/controllers/TransactionDetailController.js
+++ b/packages/popup/src/controllers/TransactionDetailController.js
@@ -136,7 +136,7 @@ class TransactionDetailController extends React.Component {
                                 null
                         }
                     </div>
-                    <div className='part3' onClick={() => window.open(`https://tronscan.org/#/transaction/${t.hash}`)}>
+                    <div className='part3' onClick={() => window.open(`https://tronscan.io/#/transaction/${t.hash}`)}>
                         <FormattedMessage id='TRANSACTION_DETAIL.GO_TRONSCAN' />
                     </div>
                 </div>
diff --git a/packages/popup/src/controllers/TransactionsController/index.js b/packages/popup/src/controllers/TransactionsController/index.js
index 67fe13e..bc99596 100644
--- a/packages/popup/src/controllers/TransactionsController/index.js
+++ b/packages/popup/src/controllers/TransactionsController/index.js
@@ -67,7 +67,7 @@ class TransactionsController extends React.Component {
                     {
                         id !== '_' ?
                             <span className='detail' onClick={() => {
-                                let url = 'https://tronscan.org/#/';
+                                let url = 'https://tronscan.io/#/';
                                 url += (id.match(/^T/) ? 'token20/' + id : 'token/' + id);
                                 window.open(url);
                             }
diff --git a/packages/popup/src/pages/AccountsPage/index.js b/packages/popup/src/pages/AccountsPage/index.js
index 55fd212..fdd2718 100644
--- a/packages/popup/src/pages/AccountsPage/index.js
+++ b/packages/popup/src/pages/AccountsPage/index.js
@@ -52,7 +52,7 @@ class AccountsPage extends React.Component {
         const { prices, accounts } = this.props;
         const t = { name: 'TRX', abbr:'trx', id: '_', amount: 0, decimals: 6, price: prices.priceList[ prices.selected ], imgUrl: trxImg };
         PopupAPI.setSelectedToken(t);
-        tronscanUrl = 'https://tronscan.org/#';
+        tronscanUrl = 'https://tronscan.io/#';
         const news = await PopupAPI.getNews();
         const ieos = await PopupAPI.getIeos();
         if(news.length > 0) {

From 1b39ca3565e8ba34ca3d886072da68035c84169f Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Tue, 31 Dec 2019 15:02:57 +0800
Subject: [PATCH 37/39] change detail link according to mainchain and dappchain

---
 packages/popup/src/app/index.js                              | 2 +-
 .../popup/src/controllers/TransactionDetailController.js     | 5 +++--
 .../popup/src/controllers/TransactionsController/index.js    | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/popup/src/app/index.js b/packages/popup/src/app/index.js
index 94310ed..8c8fa80 100644
--- a/packages/popup/src/app/index.js
+++ b/packages/popup/src/app/index.js
@@ -115,7 +115,7 @@ class App extends React.Component {
                 dom = <AssetManageController chains={chains} prices={prices} vTokenList={vTokenList} selected={accounts.selected} onCancel={ () => PopupAPI.changeState(APP_STATE.READY) } />;
                 break;
             case APP_STATE.TRANSACTION_DETAIL:
-                dom = <TransactionDetailController selectedToken={accounts.selectedToken} selected={accounts.selected} onCancel={ () => PopupAPI.changeState(APP_STATE.TRANSACTIONS) } />;
+                dom = <TransactionDetailController selectedToken={accounts.selectedToken} selected={accounts.selected} chains={chains} onCancel={ () => PopupAPI.changeState(APP_STATE.TRANSACTIONS) } />;
                 break;
             case APP_STATE.DAPP_WHITELIST:
                 dom = <DappWhitelistController authorizeDapps={authorizeDapps} onCancel={ () => PopupAPI.changeState(APP_STATE.SETTING) } />;
diff --git a/packages/popup/src/controllers/TransactionDetailController.js b/packages/popup/src/controllers/TransactionDetailController.js
index 792b3b4..87d7af3 100644
--- a/packages/popup/src/controllers/TransactionDetailController.js
+++ b/packages/popup/src/controllers/TransactionDetailController.js
@@ -25,11 +25,12 @@ class TransactionDetailController extends React.Component {
     }
     render() {
         const { help } = this.state;
-        const { selectedToken, selected, onCancel } = this.props;
+        const { selectedToken, selected, onCancel, chains } = this.props;
         const { formatMessage } = this.props.intl;
         const { transactionDetail: t, address, } = selected;
         let amount = t.contractType === 31 ? ( t.tokenTransferInfo ? t.tokenTransferInfo.amount_str : t.trigger_info.call_value ) : t.contractData.amount;
         amount = new BigNumber(amount).shiftedBy(-selectedToken.decimals).toString();
+        const tronScanUrl = chains.selected === '_' ? 'https://tronscan.io/#/transaction/' : 'https://dappchain.tronscan.io/#/transaction/'
         return (
             <div className='insetContainer transactions' onClick={ () => { this.setState({ isOpen: { account: false, token: false } }); } }>
                 <div className='pageHeader'>
@@ -136,7 +137,7 @@ class TransactionDetailController extends React.Component {
                                 null
                         }
                     </div>
-                    <div className='part3' onClick={() => window.open(`https://tronscan.io/#/transaction/${t.hash}`)}>
+                    <div className='part3' onClick={() => window.open(`${tronScanUrl}${t.hash}`)}>
                         <FormattedMessage id='TRANSACTION_DETAIL.GO_TRONSCAN' />
                     </div>
                 </div>
diff --git a/packages/popup/src/controllers/TransactionsController/index.js b/packages/popup/src/controllers/TransactionsController/index.js
index bc99596..e9ad9b3 100644
--- a/packages/popup/src/controllers/TransactionsController/index.js
+++ b/packages/popup/src/controllers/TransactionsController/index.js
@@ -51,7 +51,6 @@ class TransactionsController extends React.Component {
             nodes,
         } = this.props;
 
-
         const { formatMessage } = this.props.intl;
         const { address, airdropInfo, type } = accounts.selected;
         const { id = '_', name = 'TRX', decimals = 6, imgUrl, price = 0, amount, balance = 0, frozenBalance = 0 } = accounts.selectedToken;
@@ -67,7 +66,7 @@ class TransactionsController extends React.Component {
                     {
                         id !== '_' ?
                             <span className='detail' onClick={() => {
-                                let url = 'https://tronscan.io/#/';
+                                let url = chains.selected === '_' ? 'https://tronscan.io/#/' : 'https://dappchain.tronscan.io/#/';
                                 url += (id.match(/^T/) ? 'token20/' + id : 'token/' + id);
                                 window.open(url);
                             }

From b9b4c3901535e14557610d11de58016badd415a7 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Tue, 14 Jan 2020 20:24:37 +0800
Subject: [PATCH 38/39] modify copywriter

---
 manifest.json                           |   4 +-
 packages/lib/package.json               |   2 +-
 packages/pageHook/package.json          |   2 +-
 packages/popup/package.json             |   2 +-
 packages/popup/src/translations/en.json | 158 ++++++++++++------------
 packages/popup/src/translations/zh.json |  78 ++++++------
 6 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/manifest.json b/manifest.json
index 27f5648..df52893 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink（波宝钱包）",
-    "version": "3.2.6",
-    "version_name": "3.2.6",
+    "version": "3.2.7",
+    "version_name": "3.2.7",
     "description": "The first and most popular TRON wallet. Recommended by TRON Foundation.",
     "author": "Kondax <kondaxsolutions@gmail.com>",
     "content_security_policy": "script-src 'self' 'unsafe-eval' 'sha256-LayQc1iWBC+6WbHHvHZj3uSx3CxrGBHUJBR7si4qf8w=' 'sha256-POEO+wER89cezFVZ27JoP523HJNPMQxmh5Rcz/OZpr4=' 'sha256-IThiKMnsg0UHaLmP7sJxZpd/ohvINImwjxFJyxGFSlk=' https://*.sentry.io https://www.google-analytics.com https://www.googletagmanager.com https://cdnjs.cloudflare.com; object-src 'self'",
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 0f5cd19..dbd3133 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.6",
+  "version": "3.2.7",
   "dependencies": {
     "@tronscan/client": "^0.2.48",
     "@ledgerhq/hw-transport-u2f": "^4.31.0",
diff --git a/packages/pageHook/package.json b/packages/pageHook/package.json
index 662ee2d..0a17b58 100644
--- a/packages/pageHook/package.json
+++ b/packages/pageHook/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
   "private": true,
-  "version": "3.2.6",
+  "version": "3.2.7",
   "scripts": {
     "build": "webpack --config ../../webpack.config.js --progress --colors -o ../../dist/pageHook.js",
     "lint": "npx eslint . --fix"
diff --git a/packages/popup/package.json b/packages/popup/package.json
index 6f152fb..fe08150 100644
--- a/packages/popup/package.json
+++ b/packages/popup/package.json
@@ -3,7 +3,7 @@
   "main": "index.js",
   "repository": "https://github.com/TronLink/TronLink",
   "author": "Kondax <kondaxsolutions@gmail.com>",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.8",
diff --git a/packages/popup/src/translations/en.json b/packages/popup/src/translations/en.json
index f1559af..d4ec38a 100644
--- a/packages/popup/src/translations/en.json
+++ b/packages/popup/src/translations/en.json
@@ -1,4 +1,5 @@
 {
+
     "ERRORS.UNSUPPORTED_STATE": "State {appState} not yet implemented. Click to force a state refresh",
     "ERRORS.ALREADY_INITIALISED": "TronLink has already been initialised",
     "ERRORS.ACCOUNT_CREATION_FAILED": "Account creation failed",
@@ -6,14 +7,14 @@
     "ERRORS.NOT_LOCKED": "TronLink is not locked",
     "ERRORS.ALREADY_UNLOCKED": "TronLink is already unlocked",
     "ERRORS.NOT_SETUP": "TronLink has not been initialised",
-    "ERRORS.INVALID_PASSWORD": "Invalid password supplied",
+    "ERRORS.INVALID_PASSWORD": "Wrong password",
     "ERRORS.INVALID_TOKEN": "Not a valid TRC20 token",
     "ERRORS.TOKEN_ADDED": "Token already added exists in wallet",
-    "ERRORS.SEND": "Error Occurred",
+    "ERRORS.SEND": "Error occurred",
 
     "BUTTON.UNKNOWN": "Unknown button type",
     "BUTTON.CONTINUE": "Continue",
-    "BUTTON.CREATE_WALLET": "Create Account",
+    "BUTTON.CREATE_WALLET": "Create account",
     "BUTTON.CANCEL": "Cancel",
     "BUTTON.GO_BACK": "Go back",
     "BUTTON.CONFIRM": "Confirm",
@@ -30,9 +31,9 @@
     "BUTTON.GOT_IT": "Got it",
 
     "TITLES.ACCOUNTS": "Accounts",
-    "TITLES.TRANSACTIONS": "Transaction History",
-    "TITLES.TOKENS": "Token Overview",
-    "TITLES.SEND": "Send Assets",
+    "TITLES.TRANSACTIONS": "Create account",
+    "TITLES.TOKENS": "Create account",
+    "TITLES.SEND": "Send assets",
     "TITLES.SETTINGS": "Settings",
 
     "PAGES.ACCOUNTS": "Accounts",
@@ -72,16 +73,16 @@
     "CREATION.LEDGER.PROCESS_3":"connection completed. You can use it now.",
     "CREATION.LEDGER.LOADING":"open TRON APP in Ledger",
     "CREATION.LEDGER.CHOOSE_ADDRESS":"check the account address",
-    "CREATION.LEDGER.CONNECT":"connect",
-    "CREATION.LEDGER.KNOW_MORE":"learn more",
-    "CREATION.LEDGER.CONNECT_TIMEOUT":"connection timed out; please connect Ledger and open TRON APP",
-    "CREATION.LEDGER.AUTHORIZE_TIMEOUT":"authorization timed out; please try again",
-    "CREATION.LEDGER.REPEAT_IMPORT":"the current account already exists",
-    "CREATION.LEDGER.REJECT":"rejected ",
-    "CREATION.LEDGER.NO_TOKEN":"the current Ledger does not support transfers with this token",
-    "CREATION.LEDGER.ALERT.TIP":"prompt",
-    "CREATION.LEDGER.ALERT.BODY":"only basic transfer features are available for hardware wallet accounts at the moment; you cannot authorize DApps yet",
-    "CREATION.LEDGER.NOT_MATCH":"account address does not match Ledger",
+    "CREATION.LEDGER.CONNECT":"Connect",
+    "CREATION.LEDGER.KNOW_MORE":"Learn more",
+    "CREATION.LEDGER.CONNECT_TIMEOUT":"Connection timed out; please connect Ledger and open TRON APP",
+    "CREATION.LEDGER.AUTHORIZE_TIMEOUT":"Authorization timed out; please try again",
+    "CREATION.LEDGER.REPEAT_IMPORT":"The current account already exists",
+    "CREATION.LEDGER.REJECT":"Rejected ",
+    "CREATION.LEDGER.NO_TOKEN":"The current Ledger does not support transfers with this token",
+    "CREATION.LEDGER.ALERT.TIP":"Prompt",
+    "CREATION.LEDGER.ALERT.BODY":"Only basic transfer features are available for hardware wallet accounts at the moment; you cannot authorize DApps yet",
+    "CREATION.LEDGER.NOT_MATCH":"Account address does not match Ledger",
     "CREATION.LEDGER.TIP_CANCEL_TRANSACTION":"Canceled, please choose to refuse in ledger",
 
     "CHOOSING_TYPE.TITLE":"Choosing type",
@@ -105,24 +106,24 @@
     "PRIVATE_KEY_IMPORT.DESC": "Please enter your private key below. This can only contain hexadecimal characters",
 
     "ACCOUNT.BALANCE": "{amount, number} TRX",
-    "ACCOUNT.NO_BALANCE": "No Balance",
+    "ACCOUNT.NO_BALANCE": "No balance",
     "ACCOUNT.TOKENS": "{amount, number} Tokens",
-    "ACCOUNT.NO_TOKENS": "No Tokens",
+    "ACCOUNT.NO_TOKENS": "No tokens",
     "ACCOUNT.BANDWIDTH": "{amount, number} Bandwidth",
-    "ACCOUNT.NO_BANDWIDTH": "No Bandwidth",
+    "ACCOUNT.NO_BANDWIDTH": "No bandwidth",
     "ACCOUNT.ENERGY": "{amount, number} energy",
-    "ACCOUNT.NO_ENERGY": "No Energy",
+    "ACCOUNT.NO_ENERGY": "No energy",
     "ACCOUNT.RECEIVE":"Receive",
     "ACCOUNT.RECEIVE.DESC":"This address supports transferring to TRX and its token",
     "ACCOUNT.RECEIVE.BUTTON":"Copy address",
     "ACCOUNT.SEND":"Send",
     "ACCOUNT.ALL":"All",
-    "ACCOUNT.SEND.PAY_ACCOUNT":"Payment Account",
-    "ACCOUNT.SEND.RECEIVE_ADDRESS":"Receive Address",
-    "ACCOUNT.SEND.CHOOSE_TOKEN":"Choose Token",
-    "ACCOUNT.SEND.TRANSFER_AMOUNT":"Transfer Amount",
-    "ACCOUNT.TRANSFER":"deposit",
-    "ACCOUNT.TRANSFER2":"withdraw",
+    "ACCOUNT.SEND.PAY_ACCOUNT":"Payment account",
+    "ACCOUNT.SEND.RECEIVE_ADDRESS":"Receive address",
+    "ACCOUNT.SEND.CHOOSE_TOKEN":"Choose token",
+    "ACCOUNT.SEND.TRANSFER_AMOUNT":"Transfer amount",
+    "ACCOUNT.TRANSFER":"Deposit",
+    "ACCOUNT.TRANSFER2":"Withdraw",
     "ACCOUNT.TRANSFER.DESC":"\"Deposit\" means to transfer tokens from the main chain to the side chain. TRX and TRC10 can be deposited by default; while TRC20 tokens can only be deposited after the requester has completed the contract deployment. No extra service fee will be charged for deposit.",
     "ACCOUNT.TRANSFER.DESC2":"Withdraw means to transfer tokens from the side chain to the main chain. Withdrawal consumes 10 TRX each time as a service fee.",
     "ACCOUNT.TRANSFER.SELECT_CHAIN":"Choose the recipient chain",
@@ -166,7 +167,7 @@
     "CONFIRMATIONS.WHITELIST.TITLE": "Enable automatic signing",
     "CONFIRMATIONS.WHITELIST.BODY": "This allows TronLink to automatically sign similar transactions on your behalf",
     "CONFIRMATIONS.AUTO_AUTHORIZE.DESC": "Add the app to the white list so it will be authenticated automatically. The pop-up window will also stop showing.",
-    "CONFIRMATIONS.CLICK_SHOW_PARAMS":"click to display parameters",
+    "CONFIRMATIONS.CLICK_SHOW_PARAMS":"Click to display parameters",
 
     "CONFIRMATIONS.OPTIONS.NO": "Don't automatically sign",
     "CONFIRMATIONS.OPTIONS.FIFTEEN_MINUTES": "For fifteen minutes",
@@ -176,29 +177,29 @@
     "CONFIRMATIONS.OPTIONS.NEXT_LOGIN": "Until the next login",
 
 
-    "CONTRACTS.SignMessage": "sign a message",
-    "CONTRACTS.AccountCreateContract": "create an account",
-    "CONTRACTS.TransferContract": "send TRX to an address",
-    "CONTRACTS.TransferAssetContract": "send tokens to an address",
-    "CONTRACTS.VoteWitnessContract": "vote for a super representative",
-    "CONTRACTS.WitnessCreateContract": "create a super representative",
-    "CONTRACTS.AssetIssueContract": "create a token",
-    "CONTRACTS.WitnessUpdateContract": "update your super representative",
-    "CONTRACTS.ParticipateAssetIssueContract": "purchase a token",
-    "CONTRACTS.AccountUpdateContract": "update your account",
-    "CONTRACTS.FreezeBalanceContract": "freeze some of your balance",
-    "CONTRACTS.UnfreezeBalanceContract": "unfreeze your TRX",
-    "CONTRACTS.UpdateAssetContract": "update your token",
-    "CONTRACTS.ProposalCreateContract": "propose network changes",
-    "CONTRACTS.ProposalApproveContract": "approve a network proposal",
-    "CONTRACTS.ProposalDeleteContract": "reject a network proposal",
-    "CONTRACTS.CreateSmartContract": "create a smart contract",
-    "CONTRACTS.TriggerSmartContract": "use a smart contract",
-    "CONTRACTS.GetContract": "get details about a smart contract",
-    "CONTRACTS.ExchangeCreateContract": "create an exchange",
-    "CONTRACTS.ExchangeInjectContract": "add tokens to your exchange",
-    "CONTRACTS.ExchangeWithdrawContract": "withdraw tokens from your exchange",
-    "CONTRACTS.ExchangeTransactionContract": "use an exchange",
+    "CONTRACTS.SignMessage": "Sign a message",
+    "CONTRACTS.AccountCreateContract": "Create an account",
+    "CONTRACTS.TransferContract": "Send TRX to an address",
+    "CONTRACTS.TransferAssetContract": "Send tokens to an address",
+    "CONTRACTS.VoteWitnessContract": "Vote for a super representative",
+    "CONTRACTS.WitnessCreateContract": "Create a super representative",
+    "CONTRACTS.AssetIssueContract": "Create a token",
+    "CONTRACTS.WitnessUpdateContract": "Update your super representative",
+    "CONTRACTS.ParticipateAssetIssueContract": "Purchase a token",
+    "CONTRACTS.AccountUpdateContract": "Update your account",
+    "CONTRACTS.FreezeBalanceContract": "Freeze some of your balance",
+    "CONTRACTS.UnfreezeBalanceContract": "Unfreeze your TRX",
+    "CONTRACTS.UpdateAssetContract": "Update your token",
+    "CONTRACTS.ProposalCreateContract": "Propose network changes",
+    "CONTRACTS.ProposalApproveContract": "Approve a network proposal",
+    "CONTRACTS.ProposalDeleteContract": "Reject a network proposal",
+    "CONTRACTS.CreateSmartContract": "Create a smart contract",
+    "CONTRACTS.TriggerSmartContract": "Use a smart contract",
+    "CONTRACTS.GetContract": "Get details about a smart contract",
+    "CONTRACTS.ExchangeCreateContract": "Create an exchange",
+    "CONTRACTS.ExchangeInjectContract": "Add tokens to your exchange",
+    "CONTRACTS.ExchangeWithdrawContract": "Withdraw tokens from your exchange",
+    "CONTRACTS.ExchangeTransactionContract": "Use an exchange",
 
     "SETTINGS.PRICES": "Currency selection",
     "SETTINGS.NODES": "Node selection",
@@ -224,7 +225,7 @@
     "SETTING.TITLE.LANGUAGE":"Language",
     "SETTING.TITLE.AUTO_LOCK":"Auto lock",
     "SETTING.TITLE.LOCK":"Log out",
-    "SETTING.SUCCESS.ADD_NODE":"Add Node Success!",
+    "SETTING.SUCCESS.ADD_NODE":"Add node success!",
     "SETTING.TITLE.AUTO_LOCK.1_MIN":"1min",
     "SETTING.TITLE.AUTO_LOCK.5_MIN":"5min",
     "SETTING.TITLE.AUTO_LOCK.10_MIN":"10min",
@@ -233,12 +234,12 @@
 
     "SEND.SUCCESS": "Successfully broadcasted transaction",
 
-    "ACCOUNTS.CONFIRM_DELETE": "Delete Account",
+    "ACCOUNTS.CONFIRM_DELETE": "Delete account",
     "ACCOUNTS.CONFIRM_DELETE.BODY": "Are you sure you want to delete this account?",
 
-    "ACCOUNTS.EXPORT": "Export Account",
-    "ACCOUNTS.EXPORT.MNEMONIC": "Mnemonic Phrase",
-    "ACCOUNTS.EXPORT.PRIVATE_KEY": "Private Key",
+    "ACCOUNTS.EXPORT": "Export account",
+    "ACCOUNTS.EXPORT.MNEMONIC": "Mnemonic phrase",
+    "ACCOUNTS.EXPORT.PRIVATE_KEY": "Private key",
 
     "LOGIN.PASSWORD.BACK":"Welcome back",
 
@@ -246,17 +247,17 @@
     "COMMON.CURRENT_VERSION":"Current Version V{version}",
 
     "MENU.ADD_TRC20_TOKEN":"Add TRC20token",
-    "MENU.ACCOUNT_DETAIL":"Account Detail",
+    "MENU.ACCOUNT_DETAIL":"Account detail",
     "MENU.WHITE_LIST":"White list manage",
-    "MENU.DELETE_WALLET":"Delete Account",
+    "MENU.DELETE_WALLET":"Delete account",
     "MENU.ADD_TRC20_TOKEN.INPUT_PLACE_HOLDER":"Please enter the contract address of TRC20token",
     "MENU.FROZEN_UNFROZEN":"Frozen/Unfrozen",
     "MENU.VOTE":"Vote",
     "MENU.ACCOUNTS.TOTAL_ASSET":"Asset{sign}",
-    "MENU.MULTI_SIGN": "Multi Sign",
+    "MENU.MULTI_SIGN": "Multi sign",
 
     "TOAST.COPY":"Copied",
-    "TOAST.ADDED":"added",
+    "TOAST.ADDED":"Added",
 
     "ALERT.DELETE_ACCOUNT.ONLY_ONE":"At least one account is required",
 
@@ -407,25 +408,25 @@
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT7": "6月15日-8月7日(共计54天)  1.00%",
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT8": "共计100天",
 
-    "DAPP.NAV.RECOMMEND": "Recommend",
+    "DAPP.NAV.RECOMMEND": "Popular",
     "DAPP.NAV.USED": "Recents",
 
-    "ASSET.ASSET_MANAGE": "Asset Management",
-    "ASSET.ADD_TOKEN": "Add Tokens",
+    "ASSET.ASSET_MANAGE": "Asset management",
+    "ASSET.ADD_TOKEN": "Add tokens",
     "ASSET.ADD_TOKEN.PLACEHOLDER": "Token name or full contract address",
-    "ASSET.MY_ASSET": "My Asset",
-    "ASSET.CONFIRM.HIDE_TOKEN": "Hide Tokens",
+    "ASSET.MY_ASSET": "My asset",
+    "ASSET.CONFIRM.HIDE_TOKEN": "Hide tokens",
     "ASSET.CONFIRM.CANCEL": "Cancel",
     "ASSET.CONFIRM.HIDE": "Hide",
     "ASSET.CONFIRM.CONTENT": "The token balance is 0. When hidden, the token will not be displayed in the list.",
 
-    "TRANSACTION_DETAIL": "Transaction Detail",
-    "TRANSACTION_DETAIL.TRANSFER_SUCCESS": "Successful Transfer",
-    "TRANSACTION_DETAIL.SEND_ADDRESS": "Sending Address",
-    "TRANSACTION_DETAIL.RECEIVE_ADDRESS": "Receiving Address",
+    "TRANSACTION_DETAIL": "Transaction detail",
+    "TRANSACTION_DETAIL.TRANSFER_SUCCESS": "Successful transfer",
+    "TRANSACTION_DETAIL.SEND_ADDRESS": "Sending address",
+    "TRANSACTION_DETAIL.RECEIVE_ADDRESS": "Receiving address",
     "TRANSACTION_DETAIL.ID": "Transaction ID",
     "TRANSACTION_DETAIL.TIME": "Transaction time",
-    "TRANSACTION_DETAIL.BLOCK_HEIGHT": "Block Height",
+    "TRANSACTION_DETAIL.BLOCK_HEIGHT": "Block height",
     "TRANSACTION_DETAIL.FEE": "Fee",
     "TRANSACTION_DETAIL.GO_TRONSCAN": "Go to Tronscan for detailed data",
     "TRANSACTION_DETAIL.COPYED": "The screenshot is copied to the clipboard",
@@ -437,20 +438,19 @@
     "DAPP_WHITELIST.CONTRACT_ADDRESS":"Contract",
     "DAPP_WHITELIST.ADD_TIME":"Add time",
 
-    "INDEX_ICON_TITLE.OFFICIAL_WEBSITE":"website",
+    "INDEX_ICON_TITLE.OFFICIAL_WEBSITE":"Website",
     "INDEX_ICON_TITLE.EXCHANGE":"Exchange",
-    "INDEX_ICON_TITLE.LOCK":"lock",
-    "INDEX_ICON_TITLE.REFRESH":"refresh",
-    "INDEX_ICON_TITLE.SETTING":"set up",
+    "INDEX_ICON_TITLE.LOCK":"Lock",
+    "INDEX_ICON_TITLE.REFRESH":"Refresh",
+    "INDEX_ICON_TITLE.SETTING":"Set up",
 
-    "NOTIFICATIONS.TITLE":"transaction finished",
-    "NOTIFICATIONS.MESSAGE":"go to Tronscan to check details",
+    "NOTIFICATIONS.TITLE":"Transaction finished",
+    "NOTIFICATIONS.MESSAGE":"Go to Tronscan to check details",
     "NOTIFICATIONS.MULTI_SIGN_WAITTING": "You have {count} transaction(s) waiting to be signed",
-    "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "click to View >",
+    "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "Click to View >",
 
-    "ALERT.UPDATE_DESCRIPTION.TITLE":"Update Description",
+    "ALERT.UPDATE_DESCRIPTION.TITLE":"Update description",
     "ALERT.UPDATE_DESCRIPTION.BODY":"The update mainly supports TRON's official SUN Network. A side chain feature has been added. Now you can transfer your assets between the main chain and the side chain, and use Dapps that have already supported side chain by TronLink. Please note that the side chain does not support ledger yet.",
 
     "TIP.GET_USDT":"How to get"
-
-}
+}
\ No newline at end of file
diff --git a/packages/popup/src/translations/zh.json b/packages/popup/src/translations/zh.json
index e52bcfa..9798529 100644
--- a/packages/popup/src/translations/zh.json
+++ b/packages/popup/src/translations/zh.json
@@ -6,9 +6,9 @@
     "ERRORS.NOT_LOCKED": "TronLink插件钱包没有被锁定",
     "ERRORS.ALREADY_UNLOCKED": "TronLink插件钱包已经被锁定",
     "ERRORS.NOT_SETUP": "TronLink没有初始化",
-    "ERRORS.INVALID_PASSWORD": "密码无效",
+    "ERRORS.INVALID_PASSWORD": "密码错误",
     "ERRORS.INVALID_TOKEN": "不是一个有效的TRC20 token",
-    "ERRORS.TOKEN_ADDED": "即将添加的Token已经存在",
+    "ERRORS.TOKEN_ADDED": "即将添加的token已经存在",
     "ERRORS.SEND": "未知错误",
 
     "BUTTON.UNKNOWN": "未知按钮类型",
@@ -50,31 +50,31 @@
     "INPUT.REPEAT_PASSWORD": "重复密码",
     "INPUT.ACCOUNT_NAME": "账户名",
 
-    "CREATION.CREATE.TITLE": "创建账号",
+    "CREATION.CREATE.TITLE": "创建账户",
     "CREATION.CREATE.CONFIRM.MNEMONIC.TITLE": "确认助记词",
     "CREATION.CREATE.CONFIRM.MNEMONIC.DIALOG": "助记词顺序错误",
     "CREATION.CREATE.TIP":"推荐给新用户使用",
-    "CREATION.RESTORE.TITLE": "导入账号",
-    "CREATION.RESTORE.TIP":"推荐给已有tron账户使用",
+    "CREATION.RESTORE.TITLE": "导入账户",
+    "CREATION.RESTORE.TIP":"推荐给已有TRON账户使用",
     "CREATION.RESTORE.PRIVATE_KEY.TITLE": "通过私钥导入",
     "CREATION.RESTORE.MNEMONIC.TITLE": "通过助记词导入",
     "CREATION.RESTORE.MNEMONIC.RELATED_TO.ACCOUNT.TITLE": "选择账户",
     "CREATION.RESTORE.KEY_STORE.TITLE": "密钥库文件导入",
-    "CREATION.RESTORE.KEY_STORE.UPLOAD_DESC": "暂只支持tronscan导出的.txt文件",
+    "CREATION.RESTORE.KEY_STORE.UPLOAD_DESC": "暂只支持TRONSCAN导出的.txt文件",
     "CREATION.RESTORE.KEY_STORE.SELECT_FILE": "选择文件",
     "CREATION.RESTORE.KEY_STORE.INPUT_PASSWORD": "输入密码",
     "CREATION.RESTORE.KEY_STORE.EXCEPTION": "导入失败，请检查文件及密码是否匹配",
     "CREATION.LEDGER.TITLE": "硬件钱包",
     "CREATION.LEDGER.TIP": "Ledger用户使用",
     "CREATION.LEDGER.CONNECT_TITLE": "连接硬件钱包",
-    "CREATION.LEDGER.PROCESS_1":"将Ledger与电脑连接，<br />并在Ledger中打开Tron APP",
+    "CREATION.LEDGER.PROCESS_1":"将Ledger与电脑连接，<br />并在Ledger中打开TRON App",
     "CREATION.LEDGER.PROCESS_2":"核对即将导入的账户地址",
     "CREATION.LEDGER.PROCESS_3":"连接完成，请开始使用",
-    "CREATION.LEDGER.LOADING":"在Ledger上打开TRON APP",
+    "CREATION.LEDGER.LOADING":"在Ledger上打开TRON App",
     "CREATION.LEDGER.CHOOSE_ADDRESS":"核对即将导入的账户地址",
     "CREATION.LEDGER.CONNECT":"连接",
     "CREATION.LEDGER.KNOW_MORE":"了解更多",
-    "CREATION.LEDGER.CONNECT_TIMEOUT":"连接超时，请接入ledger并打开tronapp",
+    "CREATION.LEDGER.CONNECT_TIMEOUT":"连接超时，请接入Ledger并打开TRON App",
     "CREATION.LEDGER.AUTHORIZE_TIMEOUT":"授权超时，请重试",
     "CREATION.LEDGER.REPEAT_IMPORT":"当前账户已存在",
     "CREATION.LEDGER.REJECT":"已拒绝",
@@ -82,7 +82,7 @@
     "CREATION.LEDGER.ALERT.TIP":"提示",
     "CREATION.LEDGER.ALERT.BODY":"目前对于硬件钱包账户只支持基础的转账功能，暂不支持授权DAPP等操作。",
     "CREATION.LEDGER.NOT_MATCH":"账户地址与Ledger不匹配",
-    "CREATION.LEDGER.TIP_CANCEL_TRANSACTION":"已取消，请在ledger上选择拒绝",
+    "CREATION.LEDGER.TIP_CANCEL_TRANSACTION":"已取消，请在Ledger上选择拒绝",
 
     "CHOOSING_TYPE.TITLE":"导入方式",
     "CHOOSING_TYPE.MNEMONIC.TITLE": "助记词",
@@ -99,7 +99,7 @@
 
     "ACCOUNT_NAME.DESC": "请为您的新账号选择一个好记的名字",
 
-    "MNEMONIC_IMPORT.DESC": "请在下方输入你的助记词.长度为12，或者24个词（需用空格隔开）",
+    "MNEMONIC_IMPORT.DESC": "请在下方输入你的助记词，长度为12，或者24个词（需用空格隔开）",
     "MNEMONIC_IMPORT.SELECTION": "选择下面你想导入的账户",
 
     "PRIVATE_KEY_IMPORT.DESC": "请在下方输入你的私钥，只能包含16进制字符",
@@ -113,19 +113,19 @@
     "ACCOUNT.ENERGY": "{amount, number} Energy",
     "ACCOUNT.NO_ENERGY": "无能量",
     "ACCOUNT.RECEIVE":"接收",
-    "ACCOUNT.RECEIVE.DESC":"该地址支持trx以及token的交易",
+    "ACCOUNT.RECEIVE.DESC":"该地址支持TRX以及token的交易",
     "ACCOUNT.RECEIVE.BUTTON":"复制地址",
     "ACCOUNT.SEND":"发送",
     "ACCOUNT.ALL":"全部",
     "ACCOUNT.SEND.PAY_ACCOUNT":"支付地址",
     "ACCOUNT.SEND.RECEIVE_ADDRESS":"接收地址",
-    "ACCOUNT.SEND.CHOOSE_TOKEN":"选择Token",
+    "ACCOUNT.SEND.CHOOSE_TOKEN":"选择token",
     "ACCOUNT.SEND.TRANSFER_AMOUNT":"发送数量",
     "ACCOUNT.TRANSFER":"转入",
     "ACCOUNT.TRANSFER2":"转出",
-    "ACCOUNT.TRANSFER.DESC":"转入指的是将token从主链转移至侧链，trx与trc10token默认都可转入，trc20token需要项目方在侧链上完成合约部署才可转入，转入不需额外手续费",
-    "ACCOUNT.TRANSFER.DESC2":"转出指的是将token从侧链转移至主链，每次提取需额外消耗10trx的手续费",
-    "ACCOUNT.TRANSFER.SELECT_CHAIN":"选择到帐链",
+    "ACCOUNT.TRANSFER.DESC":"转入指的是将token从主链转移至侧链，TRX与TRC10 token默认都可转入，TRC20 token需要项目方在侧链上完成合约部署才可转入，转入不需额外手续费",
+    "ACCOUNT.TRANSFER.DESC2":"转出指的是将token从侧链转移至主链，每次提取需额外消耗10TRX的手续费",
+    "ACCOUNT.TRANSFER.SELECT_CHAIN":"选择到账链",
     "ACCOUNT.TRANSFER.WARNING.WITHDRAW_FEE":"（需额外消耗10TRX）",
     "ACCOUNT.TRANSFER.WARNING.TRX_NOT_ENOUGH":"TRX余额不足",
     "ACCOUNT.TRANSFER.WARNING.TRX_LIMIT":"最小数量为10",
@@ -165,7 +165,7 @@
     "CONFIRMATIONS.QUANTITY": "数量",
     "CONFIRMATIONS.WHITELIST.TITLE": "激活自动签名",
     "CONFIRMATIONS.WHITELIST.BODY": "允许TronLink代表您自动签署交易",
-    "CONFIRMATIONS.AUTO_AUTHORIZE.DESC": "将该应用加入白名单，此弹窗将不再弹出，自动授权。",
+    "CONFIRMATIONS.AUTO_AUTHORIZE.DESC": "将该应用加入免授权名单，此弹窗将不再弹出，自动授权。",
     "CONFIRMATIONS.CLICK_SHOW_PARAMS":"展示参数",
 
     "CONFIRMATIONS.OPTIONS.NO": "不自动签名",
@@ -173,18 +173,18 @@
     "CONFIRMATIONS.OPTIONS.THIRTY_MINUTES": "三十分钟之内自动签名",
     "CONFIRMATIONS.OPTIONS.ONE_HOUR": "一小时之内自动签名",
     "CONFIRMATIONS.OPTIONS.ONE_DAY": "一天之内自动签名",
-    "CONFIRMATIONS.OPTIONS.NEXT_LOGIN": "自动签名直到再次登陆",
+    "CONFIRMATIONS.OPTIONS.NEXT_LOGIN": "自动签名直到再次登录",
     "CONFIRMATIONS.DELETE_NODE.BODY": "确定删除当前节点吗？",
 
     "CONTRACTS.SignMessage": "签名",
     "CONTRACTS.AccountCreateContract": "创建账户",
-    "CONTRACTS.TransferContract": "转trx到一个地址",
-    "CONTRACTS.TransferAssetContract": "转token到一个地址",
+    "CONTRACTS.TransferContract": "转移trx到一个地址",
+    "CONTRACTS.TransferAssetContract": "转移token到一个地址",
     "CONTRACTS.VoteWitnessContract": "为超级代表投票",
     "CONTRACTS.WitnessCreateContract": "创建一个超级代表",
     "CONTRACTS.AssetIssueContract": "创建一个token",
     "CONTRACTS.WitnessUpdateContract": "更新超级代表信息",
-    "CONTRACTS.ParticipateAssetIssueContract": "参与通证发型",
+    "CONTRACTS.ParticipateAssetIssueContract": "参与通证发行",
     "CONTRACTS.AccountUpdateContract": "更新你的账户",
     "CONTRACTS.FreezeBalanceContract": "冻结余额",
     "CONTRACTS.UnfreezeBalanceContract": "解冻TRX",
@@ -200,7 +200,7 @@
     "CONTRACTS.ExchangeWithdrawContract": "撤资交易对",
     "CONTRACTS.ExchangeTransactionContract": "交易交易对",
 
-    "SETTINGS.PRICES": "设置货币",
+    "SETTINGS.PRICES": "设置计价货币",
     "SETTINGS.NODES": "Node selection",
     "SETTINGS.NODES.FULL_NODE": "Full node",
     "SETTINGS.NODES.SOLIDITY_NODE": "Solidity node",
@@ -234,7 +234,7 @@
     "SEND.SUCCESS": "交易已被成功广播",
 
     "ACCOUNTS.CONFIRM_DELETE": "删除账户",
-    "ACCOUNTS.CONFIRM_DELETE.BODY": "您确定要删除当前账号么？",
+    "ACCOUNTS.CONFIRM_DELETE.BODY": "您确定要删除当前账户吗",
 
     "ACCOUNTS.EXPORT": "导出账户",
     "ACCOUNTS.EXPORT.MNEMONIC": "助记词",
@@ -250,7 +250,7 @@
     "MENU.ACCOUNT_DETAIL":"账户明细",
     "MENU.WHITE_LIST":"白名单管理",
     "MENU.DELETE_WALLET":"删除账户",
-    "MENU.ADD_TRC20_TOKEN.INPUT_PLACE_HOLDER":"请输入TRC20token的合约地址",
+    "MENU.ADD_TRC20_TOKEN.INPUT_PLACE_HOLDER":"请输入TRC20 token的合约地址",
     "MENU.FROZEN_UNFROZEN":"冻结/解冻",
     "MENU.VOTE":"投票",
     "MENU.ACCOUNTS.TOTAL_ASSET":"总资产{sign}",
@@ -366,18 +366,18 @@
     "EXCEPTION.ADD_NODE.NODE_URL":"格式错误，请以http://或https://开头",
     "EXCEPTION.SEND.ADDRESS_FORMAT_ERROR":"地址格式错误",
     "EXCEPTION.SEND.ADDRESS_SAME_ERROR":"支付地址与接收地址不能相同",
-    "EXCEPTION.SEND.ADDRESS_UNACTIVATED_ERROR":"该地址未激活，将额外消耗您0.1个trx用于激活该地址",
+    "EXCEPTION.SEND.ADDRESS_UNACTIVATED_ERROR":"该地址未激活，将额外消耗您0.1个TRX用于激活该地址",
     "EXCEPTION.SEND.AMOUNT_FORMAT_ERROR":"格式错误",
     "EXCEPTION.SEND.AMOUNT_NOT_ENOUGH_ERROR":"余额不足",
     "EXCEPTION.SEND.AMOUNT_DECIMALS_ERROR":"精确到{decimals}，请调整小数点后数字位数",
-    "EXCEPTION.SEND.BANDWIDTH_NOT_ENOUGH_ERROR":"带宽不足，将额外消耗少量trx（不超过1TRX）",
-    "EXCEPTION.SEND.ENERGY_NOT_ENOUGH_ERROR":"能量不足，将额外消耗少量trx（不超过1TRX）",
-    "EXCEPTION.SEND.BANDWIDTH_ENERGY_NOT_ENOUGH_ERROR":"带宽，能量不足，将额外消耗少量trx（不超过1TRX）",
-    "EXCEPTION.SEND.BANDWIDTH_NOT_ENOUGH_TRX_ERROR":"带宽不足，将额外消耗少量trx，trx余额不足",
-    "EXCEPTION.SEND.ENERGY_NOT_ENOUGH_TRX_ERROR":"能量不足，将额外消耗少量trx，trx余额不足",
-    "EXCEPTION.SEND.BANDWIDTH_ENERGY_NOT_ENOUGH_TRX_ERROR":"带宽，能量不足，将额外消耗少量trx，trx余额不足",
-    "EXCEPTION.SEND.ADDRESS_UNACTIVATED_TRC20_ERROR":"地址未激活，无法发送20token，请向其转入trx，以激活该地址",
-    "EXCEPTION.TRANSFER.MAIN_ADDRESS_NO_ACTIVATE":"该地址在Tron主链上未激活",
+    "EXCEPTION.SEND.BANDWIDTH_NOT_ENOUGH_ERROR":"带宽不足，将额外消耗少量TRX（不超过1TRX）",
+    "EXCEPTION.SEND.ENERGY_NOT_ENOUGH_ERROR":"能量不足，将额外消耗少量TRX（不超过1TRX）",
+    "EXCEPTION.SEND.BANDWIDTH_ENERGY_NOT_ENOUGH_ERROR":"带宽，能量不足，将额外消耗少量TRX（不超过1TRX）",
+    "EXCEPTION.SEND.BANDWIDTH_NOT_ENOUGH_TRX_ERROR":"带宽不足，将额外消耗少量TRX，TRX余额不足",
+    "EXCEPTION.SEND.ENERGY_NOT_ENOUGH_TRX_ERROR":"能量不足，将额外消耗少量TRX，TRX余额不足",
+    "EXCEPTION.SEND.BANDWIDTH_ENERGY_NOT_ENOUGH_TRX_ERROR":"带宽，能量不足，将额外消耗少量TRX，TRX余额不足",
+    "EXCEPTION.SEND.ADDRESS_UNACTIVATED_TRC20_ERROR":"地址未激活，无法发送TRC20 token，请向其转入TRX，以激活该地址",
+    "EXCEPTION.TRANSFER.MAIN_ADDRESS_NO_ACTIVATE":"该地址在TRON主链上未激活",
 
     "USDT.MAIN.INCOME_YESTERDAY":"昨日收益 {earning}",
     "USDT.TEXT.YESTERDAY_INCOME":"昨日收益",
@@ -396,7 +396,7 @@
     "USDT.MAIN_TITLE1.SUBTITLE3.CONTENT":"奖励无需用户任何花费和成本。",
     "USDT.MAIN_TITLE1.SUBTITLE4.CONTENT":"按照当前的USDT总额计算，整个奖励支出将达到1亿元人民币，且根据情况上不封顶。",
     "USDT.MAIN_TITLE2": "日期",
-    "USDT.MAIN_TITLE2.SUBTITLE1": "年华奖励",
+    "USDT.MAIN_TITLE2.SUBTITLE1": "年化奖励",
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT1": "4月30日-5月4日(共计5天)  20.00%",
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT2": "5月5日-5月9日(共计5天)  12.00%",
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT3": "5月10日-5月14日(共计5天)  10.00%",
@@ -406,12 +406,12 @@
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT7": "6月15日-8月7日(共计54天)  1.00%",
     "USDT.MAIN_TITLE2.SUBTITLE1.CONTENT8": "共计100天",
 
-    "DAPP.NAV.RECOMMEND": "推荐",
+    "DAPP.NAV.RECOMMEND": "热门",
     "DAPP.NAV.USED": "使用过",
 
     "ASSET.ASSET_MANAGE": "资产管理",
     "ASSET.ADD_TOKEN": "添加token",
-    "ASSET.ADD_TOKEN.PLACEHOLDER": "代币名称，或完整合约地址",
+    "ASSET.ADD_TOKEN.PLACEHOLDER": "Token名称，或完整合约地址",
     "ASSET.MY_ASSET": "我的资产",
     "ASSET.CONFIRM.HIDE_TOKEN": "隐藏代币",
     "ASSET.CONFIRM.CANCEL": "取消",
@@ -426,7 +426,7 @@
     "TRANSACTION_DETAIL.TIME": "交易时间",
     "TRANSACTION_DETAIL.BLOCK_HEIGHT": "区块高度",
     "TRANSACTION_DETAIL.FEE": "费用",
-    "TRANSACTION_DETAIL.GO_TRONSCAN": "去tronscan查看更详细数据",
+    "TRANSACTION_DETAIL.GO_TRONSCAN": "去TRONSCAN查看更详细数据",
     "TRANSACTION_DETAIL.COPIED": "截图已复制到粘贴板",
     "TRANSACTION_DETAIL.ENABLE_COPY": "可复制",
     "TRANSACTION_DETAIL.HAVE_COPIED": "已复制",
@@ -443,7 +443,7 @@
     "INDEX_ICON_TITLE.SETTING":"设置",
 
     "NOTIFICATIONS.TITLE":"交易完成",
-    "NOTIFICATIONS.MESSAGE":"点击跳转tronscan查看交易详情",
+    "NOTIFICATIONS.MESSAGE":"点击跳转TRONSCAN查看交易详情",
     "NOTIFICATIONS.MULTI_SIGN_WAITTING": "您有 {count} 笔待签名交易",
     "NOTIFICATIONS.MULTI_SIGN_BTN_TEXT": "点击查看 >",
 
@@ -451,4 +451,4 @@
     "ALERT.UPDATE_DESCRIPTION.BODY":"本次更新主要支持了Tron官方的sunnetwork，即添加了侧链功能。现在您可以将资产在主链与侧链之间转移，并可以通过TronLink使用优先支持了侧链的Dapp。请注意，目前侧链上暂不支持ledger",
 
     "TIP.GET_USDT":"如何获得"
-}
+}
\ No newline at end of file

From df4be2f021acf19ae898332bd7329973da1248e8 Mon Sep 17 00:00:00 2001
From: summertanh <huijuant58@163.com>
Date: Wed, 15 Jan 2020 15:50:31 +0800
Subject: [PATCH 39/39] SETTING.TITLE.CURRENCY changed

---
 packages/popup/src/translations/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/popup/src/translations/zh.json b/packages/popup/src/translations/zh.json
index 9798529..1e2451f 100644
--- a/packages/popup/src/translations/zh.json
+++ b/packages/popup/src/translations/zh.json
@@ -220,7 +220,7 @@
     "SETTING.TITLE.NODE_MANAGE":"节点管理",
     "SETTING.TITLE.NODE":"切换节点",
     "SETTING.TITLE.ADD_NODE":"添加节点",
-    "SETTING.TITLE.CURRENCY":"设置货币",
+    "SETTING.TITLE.CURRENCY":"设置计价货币",
     "SETTING.TITLE.LANGUAGE":"语言",
     "SETTING.TITLE.AUTO_LOCK":"自动锁定",
     "SETTING.TITLE.LOCK":"登出",