From 62854398f1d3c72a82ae9d4feb03d9a1a947534e Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 23 Feb 2017 13:56:58 -0800
Subject: Tested against code to play nice with unit tests.

---
 ui/app/reducers/metamask.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui/app/reducers/metamask.js')

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,
         },
       })
 
-- 
cgit v1.2.3


From 2a98beb87877619ad123281facab3e22dec64fab Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 7 Mar 2017 10:25:50 -0800
Subject: Break out rpc update and rpclist into two reducers.

---
 ui/app/reducers/metamask.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ui/app/reducers/metamask.js')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 7bf2969e7..c09556c91 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -53,12 +53,16 @@ function reduceMetamask (state, action) {
         isUnlocked: false,
       })
 
+    case actions.SET_RPC_LIST:
+      return extend(metamaskState, {
+        frequentRpcList: action.value,
+      })
+
     case actions.SET_RPC_TARGET:
       return extend(metamaskState, {
-        frequentRpcList: action.value.frequentRpcList,
         provider: {
           type: 'rpc',
-          rpcTarget: action.value.rpcTarget,
+          rpcTarget: action.value,
         },
       })
 
-- 
cgit v1.2.3


From e7e024bcdd2c93b34a0baf8bc27e6c571c098476 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 7 Mar 2017 16:01:51 -0800
Subject: Refactor of code into separate reducers and actions.

---
 ui/app/reducers/metamask.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/reducers/metamask.js')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index c09556c91..a3c07d977 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -18,6 +18,7 @@ function reduceMetamask (state, action) {
     conversionDate: 'N/A',
     noActiveNotices: true,
     lastUnreadNotice: undefined,
+    frequentRpcList: [],
   }, state.metamask)
 
   switch (action.type) {
-- 
cgit v1.2.3