diff options
author | Dan J Miller <danjm.com@gmail.com> | 2018-06-30 03:33:09 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 03:33:09 +0800 |
commit | b2e64f24ecbc9e309869e678254cf755ffe11b40 (patch) | |
tree | a12ae5d2d2f40f720216f2b011c100d3014c06f8 /ui/app/components/send_/send-content/send-amount-row | |
parent | 22debbfec8b571241c874b0ee99d0d4c732076ea (diff) | |
parent | ad6c454fd5d59c7f47edf515f0eb8aec549a8683 (diff) | |
download | tangerine-wallet-browser-b2e64f24ecbc9e309869e678254cf755ffe11b40.tar.gz tangerine-wallet-browser-b2e64f24ecbc9e309869e678254cf755ffe11b40.tar.zst tangerine-wallet-browser-b2e64f24ecbc9e309869e678254cf755ffe11b40.zip |
Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency
fixes #4623
Diffstat (limited to 'ui/app/components/send_/send-content/send-amount-row')
-rw-r--r-- | ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js | 4 | ||||
-rw-r--r-- | ui/app/components/send_/send-content/send-amount-row/tests/send-amount-row-container.test.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js index bbbf56971..b816d948f 100644 --- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js +++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js @@ -2,7 +2,7 @@ import { connect } from 'react-redux' import { getAmountConversionRate, getConversionRate, - getConvertedCurrency, + getCurrentCurrency, getGasTotal, getPrimaryCurrency, getSelectedToken, @@ -31,7 +31,7 @@ function mapStateToProps (state) { amountConversionRate: getAmountConversionRate(state), balance: getSendFromBalance(state), conversionRate: getConversionRate(state), - convertedCurrency: getConvertedCurrency(state), + convertedCurrency: getCurrentCurrency(state), gasTotal: getGasTotal(state), inError: sendAmountIsInError(state), primaryCurrency: getPrimaryCurrency(state), diff --git a/ui/app/components/send_/send-content/send-amount-row/tests/send-amount-row-container.test.js b/ui/app/components/send_/send-content/send-amount-row/tests/send-amount-row-container.test.js index e4c913c69..94d9918a7 100644 --- a/ui/app/components/send_/send-content/send-amount-row/tests/send-amount-row-container.test.js +++ b/ui/app/components/send_/send-content/send-amount-row/tests/send-amount-row-container.test.js @@ -24,7 +24,7 @@ proxyquire('../send-amount-row.container.js', { '../../send.selectors': { getAmountConversionRate: (s) => `mockAmountConversionRate:${s}`, getConversionRate: (s) => `mockConversionRate:${s}`, - getConvertedCurrency: (s) => `mockConvertedCurrency:${s}`, + getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`, getGasTotal: (s) => `mockGasTotal:${s}`, getPrimaryCurrency: (s) => `mockPrimaryCurrency:${s}`, getSelectedToken: (s) => `mockSelectedToken:${s}`, |