diff options
| author | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
|---|---|---|
| committer | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
| commit | e743f44150d4c09908d24945de5a281e15e8469d (patch) | |
| tree | 76984504e65b06ae15633d721fedc7ddd5b0cca7 /old-ui | |
| parent | 3106374cc31b66e5a0faadd657b4430e21aa48b2 (diff) | |
| parent | 0259eb02140fec1db9861506a6ff7890911af652 (diff) | |
| download | tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.gz tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.zst tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.zip | |
fix conflicts
Diffstat (limited to 'old-ui')
| -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, ]) |