2 files changed, 21 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 4b05b608d..6f08c6dc4 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -494,7 +494,6 @@ function reduceApp (state, action) {
         },
       })
 
-
     case actions.ONBOARDING_BUY_ETH_VIEW:
       return extend(appState, {
         transForward: true,
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 323539eef..85ac3e201 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -19,6 +19,8 @@ function reduceMetamask (state, action) {
     lastUnreadNotice: undefined,
     frequentRpcList: [],
     addressBook: [],
+    tokenExchangeRates: {},
+    coinOptions: {},
   }, state.metamask)
 
   switch (action.type) {
@@ -132,6 +134,25 @@ function reduceMetamask (state, action) {
         conversionDate: action.value.conversionDate,
       })
 
+    case actions.PAIR_UPDATE:
+      const { value: { marketinfo: pairMarketInfo } } = action
+      return extend(metamaskState, {
+        tokenExchangeRates: {
+          ...metamaskState.tokenExchangeRates,
+          [pairMarketInfo.pair]: pairMarketInfo,
+        },
+      })
+
+    case actions.SHAPESHIFT_SUBVIEW:
+      const { value: { marketinfo, coinOptions } } = action
+      return extend(metamaskState, {
+        tokenExchangeRates: {
+          ...metamaskState.tokenExchangeRates,
+          [marketinfo.pair]: marketinfo,
+        },
+        coinOptions,
+      })
+
     default:
       return metamaskState