From a350e80feea6747a5e10088ac6ec15171a590a65 Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Sun, 15 Apr 2018 23:37:42 -0400
Subject: Fetch token prices based on contract address

---
 ui/app/reducers/metamask.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 6d0a5bb10..d6b6de3b0 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -24,6 +24,7 @@ function reduceMetamask (state, action) {
     frequentRpcList: [],
     addressBook: [],
     selectedTokenAddress: null,
+    contractExchangeRates: {},
     tokenExchangeRates: {},
     tokens: [],
     send: {
@@ -176,14 +177,22 @@ function reduceMetamask (state, action) {
         conversionDate: action.value.conversionDate,
       })
 
-    case actions.UPDATE_TOKEN_EXCHANGE_RATE:
-      const { payload: { pair, marketinfo } } = action
-      return extend(metamaskState, {
-        tokenExchangeRates: {
-          ...metamaskState.tokenExchangeRates,
-          [pair]: marketinfo,
+    case actions.UPDATE_CONTRACT_EXCHANGE_RATES:
+      const { payload: { newExchangeRates } } = action
+      return {
+        ...metamaskState,
+        contractExchangeRates: newExchangeRates,
+      }
+
+    case actions.UPDATE_CONTRACT_EXCHANGE_RATE:
+      const { payload: { address, rate } } = action
+      return {
+        ...metamaskState,
+        contractExchangeRates: {
+          ...metamaskState.contractExchangeRates,
+          [address]: rate,
         },
-      })
+      }
 
     case actions.UPDATE_TOKENS:
       return extend(metamaskState, {
-- 
cgit v1.2.3


From d0447f90583275868bb72aa7ae8f670bf3668173 Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Mon, 16 Apr 2018 11:21:06 -0400
Subject: Maintain token prices using a background service

---
 ui/app/reducers/metamask.js | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index d6b6de3b0..1ed049be2 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -177,23 +177,6 @@ function reduceMetamask (state, action) {
         conversionDate: action.value.conversionDate,
       })
 
-    case actions.UPDATE_CONTRACT_EXCHANGE_RATES:
-      const { payload: { newExchangeRates } } = action
-      return {
-        ...metamaskState,
-        contractExchangeRates: newExchangeRates,
-      }
-
-    case actions.UPDATE_CONTRACT_EXCHANGE_RATE:
-      const { payload: { address, rate } } = action
-      return {
-        ...metamaskState,
-        contractExchangeRates: {
-          ...metamaskState.contractExchangeRates,
-          [address]: rate,
-        },
-      }
-
     case actions.UPDATE_TOKENS:
       return extend(metamaskState, {
         tokens: action.newTokens,
-- 
cgit v1.2.3