Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker

1 files changed, 13 insertions, 1 deletions

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index bb35cf990..732fa6dea 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -28,6 +28,7 @@ function reduceMetamask (state, action) {
     contractExchangeRates: {},
     tokenExchangeRates: {},
     tokens: [],
+    pendingTokens: {},
     send: {
       gasLimit: null,
       gasPrice: null,
@@ -163,7 +164,7 @@ function reduceMetamask (state, action) {
         selectedTokenAddress: action.value,
       })
 
-    case actions.SAVE_ACCOUNT_LABEL:
+    case actions.SET_ACCOUNT_LABEL:
       const account = action.value.account
       const name = action.value.label
       const id = {}
@@ -356,6 +357,17 @@ function reduceMetamask (state, action) {
         currentLocale: action.value,
       })
 
+    case actions.SET_PENDING_TOKENS:
+      return extend(metamaskState, {
+        pendingTokens: { ...action.payload },
+      })
+
+    case actions.CLEAR_PENDING_TOKENS: {
+      return extend(metamaskState, {
+        pendingTokens: {},
+      })
+    }
+
     default:
       return metamaskState