Merge branch 'master' into UpdateWeb3

1 files changed, 7 insertions, 8 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, {