Tested against code to play nice with unit tests.

3 files changed, 17 insertions, 8 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 86638fc91..7e5add1d0 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -626,13 +626,19 @@ function markAccountsFound() {
 //
 
 function setRpcTarget (newRpc) {
-  if (global.METAMASK_DEBUG) console.log(`background.setRpcTarget`)
-  background.addToFrequentRpcList(newRpc, () => {
+  return (dispatch) => {
+    if (global.METAMASK_DEBUG) console.log(`background.setRpcTarget`)
     background.setRpcTarget(newRpc)
-  })
-  return {
-    type: actions.SET_RPC_TARGET,
-    value: newRpc,
+    background.updateFrequentRpcList(newRpc, (frequentRpcList) => {
+      const value = {
+        rpcTarget: newRpc,
+        frequentRpcList,
+      }
+      dispatch({
+        type: actions.SET_RPC_TARGET,
+        value,
+      })
+    })
   }
 }
 
diff --git a/ui/app/app.js b/ui/app/app.js
index d61f93dd2..cf865f23f 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -257,7 +257,9 @@ App.prototype.renderNetworkDropdown = function () {
     h(DropMenuItem, {
       label: 'Localhost 8545',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-      action: () => props.dispatch(actions.setRpcTarget('http://localhost:8545')),
+      action: () => {
+        props.dispatch(actions.setRpcTarget('http://localhost:8545'))
+      },
       icon: h('i.fa.fa-question-circle.fa-lg'),
       activeNetworkRender: props.provider.rpcTarget,
     }),
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 3875cf6d1..7bf2969e7 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -55,9 +55,10 @@ function reduceMetamask (state, action) {
 
     case actions.SET_RPC_TARGET:
       return extend(metamaskState, {
+        frequentRpcList: action.value.frequentRpcList,
         provider: {
           type: 'rpc',
-          rpcTarget: action.value,
+          rpcTarget: action.value.rpcTarget,
         },
       })