aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-26 05:16:04 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-26 05:16:04 +0800
commitb1fb8da3b00b68060443066608dc511a4a836b86 (patch)
treeef23ffadf102a575305f7414b45092b851bd7870
parentf7688ac3cf8939057013667f544d57dcb73937a5 (diff)
downloadtangerine-wallet-browser-b1fb8da3b00b68060443066608dc511a4a836b86.tar.gz
tangerine-wallet-browser-b1fb8da3b00b68060443066608dc511a4a836b86.tar.zst
tangerine-wallet-browser-b1fb8da3b00b68060443066608dc511a4a836b86.zip
Fix provider menu selection indication
-rw-r--r--ui/app/app.js15
-rw-r--r--ui/app/components/drop-menu-item.js2
2 files changed, 8 insertions, 9 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 71e0637d0..ae6fe7071 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -240,6 +240,7 @@ App.prototype.renderNetworkDropdown = function () {
action: () => props.dispatch(actions.setProviderType('testnet')),
icon: h('.menu-icon.red-dot'),
activeNetworkRender: props.network,
+ provider: props.provider,
}),
h(DropMenuItem, {
@@ -250,13 +251,6 @@ App.prototype.renderNetworkDropdown = function () {
activeNetworkRender: props.provider.rpcTarget,
}),
- h(DropMenuItem, {
- label: 'Custom RPC',
- closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
- action: () => this.props.dispatch(actions.showConfigPage()),
- icon: h('i.fa.fa-question-circle.fa-lg'),
- }),
-
this.renderCustomOption(props.provider.rpcTarget),
])
}
@@ -508,7 +502,12 @@ App.prototype.toggleMetamaskActive = function () {
App.prototype.renderCustomOption = function (rpcTarget) {
switch (rpcTarget) {
case undefined:
- return null
+ return h(DropMenuItem, {
+ label: 'Custom RPC',
+ closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
+ action: () => this.props.dispatch(actions.showConfigPage()),
+ icon: h('i.fa.fa-question-circle.fa-lg'),
+ })
case 'http://localhost:8545':
return h(DropMenuItem, {
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index 0ca1988c6..8088680c0 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -42,7 +42,7 @@ DropMenuItem.prototype.activeNetworkRender = function () {
if (providerType === 'mainnet') return h('.check', '✓')
break
case 'Morden Test Network':
- if (activeNetwork === '2') return h('.check', '✓')
+ if (provider.type === 'testnet') return h('.check', '✓')
break
case 'Localhost 8545':
if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')