diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2018-10-15 08:32:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 08:32:29 +0800 |
| commit | 85884b21afe6e5e85b58123b24e72776d1437cc6 (patch) | |
| tree | 6dbec947089691c0dffd5febbe6e92c1f712e40f /old-ui/app/components/app-bar.js | |
| parent | db981b827b07c946e17d3a8aeaefd2143c236ef7 (diff) | |
| parent | 7f6b488c04e6ea12b2ef24ac936b6a236ad904c2 (diff) | |
| download | tangerine-wallet-browser-85884b21afe6e5e85b58123b24e72776d1437cc6.tar.gz tangerine-wallet-browser-85884b21afe6e5e85b58123b24e72776d1437cc6.tar.zst tangerine-wallet-browser-85884b21afe6e5e85b58123b24e72776d1437cc6.zip | |
Merge pull request #5512 from MetaMask/v4.14.0
Version 4.14.0
Diffstat (limited to 'old-ui/app/components/app-bar.js')
| -rw-r--r-- | old-ui/app/components/app-bar.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/old-ui/app/components/app-bar.js b/old-ui/app/components/app-bar.js index 8ab647efd..234c06a01 100644 --- a/old-ui/app/components/app-bar.js +++ b/old-ui/app/components/app-bar.js @@ -350,11 +350,14 @@ module.exports = class AppBar extends Component { } } - renderCommonRpc (rpcList, {rpcTarget}) { + renderCommonRpc (rpcList, provider) { const {dispatch} = this.props + const reversedRpcList = rpcList.slice().reverse() - return rpcList.map((rpc) => { - if ((rpc === LOCALHOST_RPC_URL) || (rpc === rpcTarget)) { + return reversedRpcList.map((rpc) => { + const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget + + if ((rpc === LOCALHOST_RPC_URL) || currentRpcTarget) { return null } else { return h(DropdownMenuItem, { @@ -364,7 +367,7 @@ module.exports = class AppBar extends Component { }, [ h('i.fa.fa-question-circle.fa-lg.menu-icon'), rpc, - rpcTarget === rpc + currentRpcTarget ? h('.check', '✓') : null, ]) |