diff options
| author | Evgeniy Filatov <efilatov@geeksforless.net> | 2018-08-20 02:02:30 +0800 |
|---|---|---|
| committer | Evgeniy Filatov <efilatov@geeksforless.net> | 2018-08-23 06:18:13 +0800 |
| commit | c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919 (patch) | |
| tree | 44c36a715d69a60ecc237fafb4f011a197278edc | |
| parent | b23cca14699b6c6a8c843c9cc020ec96fe758822 (diff) | |
| download | tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar.gz tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar.bz2 tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar.lz tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar.xz tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.tar.zst tangerine-wallet-browser-c0b5e8a088b7ed2ac557ad2b6bc6b55d9bae1919.zip | |
backported RPC improvements to oldui
| -rw-r--r-- | old-ui/app/components/app-bar.js | 8 | ||||
| -rw-r--r-- | ui/app/components/dropdowns/network-dropdown.js | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/old-ui/app/components/app-bar.js b/old-ui/app/components/app-bar.js index 8ab647efd..684dfbe19 100644 --- a/old-ui/app/components/app-bar.js +++ b/old-ui/app/components/app-bar.js @@ -350,11 +350,13 @@ module.exports = class AppBar extends Component { } } - renderCommonRpc (rpcList, {rpcTarget}) { + renderCommonRpc (rpcList, provider) { const {dispatch} = this.props return rpcList.map((rpc) => { - if ((rpc === LOCALHOST_RPC_URL) || (rpc === rpcTarget)) { + const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget + + if ((rpc === LOCALHOST_RPC_URL) || currentRpcTarget) { return null } else { return h(DropdownMenuItem, { @@ -364,7 +366,7 @@ module.exports = class AppBar extends Component { }, [ h('i.fa.fa-question-circle.fa-lg.menu-icon'), rpc, - rpcTarget === rpc + currentRpcTarget ? h('.check', '✓') : null, ]) diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 003ec1b98..b1aeed376 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -272,10 +272,9 @@ NetworkDropdown.prototype.getNetworkName = function () { NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { const props = this.props - const rpcTarget = provider.rpcTarget return rpcList.map((rpc) => { - const currentRpcTarget = provider.type === 'rpc' && rpc === rpcTarget + const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget if ((rpc === 'http://localhost:8545') || currentRpcTarget) { return null |