diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-18 04:36:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 04:36:21 +0800 |
| commit | 6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8 (patch) | |
| tree | 096c6a8f7e12c5ece8bb64af1466bb2d94b6e5d3 /ui/app/selectors.js | |
| parent | f15b81089e86dc095983faeba4a97209ddd670ce (diff) | |
| parent | 7b70804aa0d74120098a4bcb2c375d29080e8368 (diff) | |
| download | tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.gz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.bz2 tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.lz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.xz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.zst tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.zip | |
Merge branch 'master' into i3580-InternationalizeCurrency
Diffstat (limited to 'ui/app/selectors.js')
| -rw-r--r-- | ui/app/selectors.js | 19 |
1 files changed, 6 insertions, 13 deletions
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) { |