diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-09-28 14:45:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 14:45:16 +0800 |
| commit | 59ab595b5ea6a4e24f2048d2ed43c1181bb5aa3e (patch) | |
| tree | 36a9c0701cd80942c48e97cab0c4190d134980c8 /ui/app/components/dropdowns/network-dropdown.js | |
| parent | cb0af67f743d242afa3bdb518847f77d3c2cc260 (diff) | |
| parent | bd489d358383b7556af323db78f30013459febf6 (diff) | |
| download | tangerine-wallet-browser-59ab595b5ea6a4e24f2048d2ed43c1181bb5aa3e.tar.gz tangerine-wallet-browser-59ab595b5ea6a4e24f2048d2ed43c1181bb5aa3e.tar.zst tangerine-wallet-browser-59ab595b5ea6a4e24f2048d2ed43c1181bb5aa3e.zip | |
Merge branch 'develop' into account-tracker-network-change
Diffstat (limited to 'ui/app/components/dropdowns/network-dropdown.js')
| -rw-r--r-- | ui/app/components/dropdowns/network-dropdown.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index e5363ff56..63a30dd82 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -272,10 +272,12 @@ NetworkDropdown.prototype.getNetworkName = function () { NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { const props = this.props - const rpcTarget = provider.rpcTarget + const reversedRpcList = rpcList.slice().reverse() - return rpcList.map((rpc) => { - if ((rpc === 'http://localhost:8545') || (rpc === rpcTarget)) { + return reversedRpcList.map((rpc) => { + const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget + + if ((rpc === 'http://localhost:8545') || currentRpcTarget) { return null } else { return h( @@ -291,11 +293,11 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { }, }, [ - rpcTarget === rpc ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + currentRpcTarget ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h('i.fa.fa-question-circle.fa-med.menu-icon-circle'), h('span.network-name-item', { style: { - color: rpcTarget === rpc ? '#ffffff' : '#9b9b9b', + color: currentRpcTarget ? '#ffffff' : '#9b9b9b', }, }, rpc), ] |