Merge pull request #356 from MetaMask/networkDropdownFix

Network dropdown fix

1 files changed, 21 insertions, 0 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 8aab63a6a..8297ed796 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -46,6 +46,7 @@ function mapStateToProps (state) {
     unconfMsgs: state.metamask.unconfMsgs,
     menuOpen: state.appState.menuOpen,
     network: state.metamask.network,
+    provider: state.metamask.provider,
   }
 }
 
@@ -228,6 +229,7 @@ App.prototype.renderNetworkDropdown = function () {
       action: () => props.dispatch(actions.setRpcTarget('http://localhost:8545')),
       icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
     }),
+    this.renderCustomOption(props.provider.rpcTarget),
   ])
 }
 
@@ -355,3 +357,22 @@ App.prototype.toggleMetamaskActive = function () {
     this.props.dispatch(actions.lockMetamask(false))
   }
 }
+
+App.prototype.renderCustomOption = function (rpcTarget) {
+  switch (rpcTarget) {
+    case undefined:
+      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', { ariaHidden: true }),
+      })
+
+    default:
+      return h(DropMenuItem, {
+        label: `${rpcTarget}`,
+        closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
+        icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
+      })
+  }
+}