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/selectors.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'ui/app/selectors.js')

diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 2bdc39004..60cc264da 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -62,22 +62,15 @@ function getSelectedToken (state) {
 }
 
 function getSelectedTokenExchangeRate (state) {
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
+  const contractExchangeRates = state.metamask.contractExchangeRates
   const selectedToken = getSelectedToken(state) || {}
-  const { symbol = '' } = selectedToken
-
-  const pair = `${symbol.toLowerCase()}_eth`
-  const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {}
-
-  return tokenExchangeRate
+  const { address } = selectedToken
+  return contractExchangeRates[address] || 0
 }
 
-function getTokenExchangeRate (state, tokenSymbol) {
-  const pair = `${tokenSymbol.toLowerCase()}_eth`
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
-  const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {}
-
-  return tokenExchangeRate
+function getTokenExchangeRate (state, address) {
+  const contractExchangeRates = state.metamask.contractExchangeRates
+  return contractExchangeRates[address] || 0
 }
 
 function conversionRateSelector (state) {
-- 
cgit 


From 91c201aa72581a59a0d2ef73a225b1768584dea7 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 26 Apr 2018 22:08:14 -0230
Subject: Lint fixes and alphabetization for i3725-refactor-send-component

---
 ui/app/selectors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/selectors.js')

diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 60cc264da..a29294b86 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -185,4 +185,4 @@ function autoAddToBetaUI (state) {
 function getCurrentViewContext (state) {
   const { currentView = {} } = state.appState
   return currentView.context
-}
\ No newline at end of file
+}
-- 
cgit