diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 09:55:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 09:55:22 +0800 |
commit | ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20 (patch) | |
tree | 5c2f426a63e22f4abc378a59bb86faba7e002877 /ui/app/app.js | |
parent | 427a10308309e7d4792878ce997728a9a25cb39b (diff) | |
parent | 05c8658ff343af61b1a40a5624ecba77adb2ef00 (diff) | |
download | tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.gz tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.bz2 tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.lz tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.xz tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.zst tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.zip |
Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor
Fix new encryptor implementation
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index f9694214a..94e8adc34 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -258,7 +258,7 @@ App.prototype.renderNetworkDropdown = function () { activeNetworkRender: props.provider.rpcTarget, }), - this.renderCustomOption(props.provider.rpcTarget), + this.renderCustomOption(props.provider), h(DropMenuItem, { label: 'Custom RPC', @@ -480,7 +480,10 @@ App.prototype.toggleMetamaskActive = function () { } } -App.prototype.renderCustomOption = function (rpcTarget) { +App.prototype.renderCustomOption = function (provider) { + const { rpcTarget, type } = provider + if (type !== 'rpc') return null + switch (rpcTarget) { case 'http://localhost:8545': |