diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-20 03:35:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 03:35:49 +0800 |
| commit | d3f923efefef893db31c18aa4ff4e2488a5b6448 (patch) | |
| tree | 0e63ad5171608accdd2a0d669687a16cd8c17b95 /ui/app/send-v2.js | |
| parent | c2880c4b8fe56f3b175d75b6ae8a84271dde3e28 (diff) | |
| parent | f1c097ab5c833d0e4bab639d65e5641211cb9753 (diff) | |
| download | tangerine-wallet-browser-d3f923efefef893db31c18aa4ff4e2488a5b6448.tar.gz tangerine-wallet-browser-d3f923efefef893db31c18aa4ff4e2488a5b6448.tar.zst tangerine-wallet-browser-d3f923efefef893db31c18aa4ff4e2488a5b6448.zip | |
Merge pull request #2399 from danjm/MM-128-get-currentCurrency-from-state
[NewUI] Get currentCurrency from state, allows other fiats
Diffstat (limited to 'ui/app/send-v2.js')
| -rw-r--r-- | ui/app/send-v2.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index 8915350a3..effa68b4b 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -277,6 +277,7 @@ SendTransactionScreen.prototype.renderAmountRow = function () { const { selectedToken, primaryCurrency = 'ETH', + convertedCurrency, amountConversionRate, errors, } = this.props @@ -294,10 +295,9 @@ SendTransactionScreen.prototype.renderAmountRow = function () { h(CurrencyDisplay, { inError: Boolean(errors.amount), primaryCurrency, - convertedCurrency: 'USD', + convertedCurrency, value: amount, conversionRate: amountConversionRate, - convertedPrefix: '$', handleChange: this.handleAmountChange, validate: this.validateAmount, }), @@ -309,6 +309,7 @@ SendTransactionScreen.prototype.renderAmountRow = function () { SendTransactionScreen.prototype.renderGasRow = function () { const { conversionRate, + convertedCurrency, showCustomizeGasModal, gasTotal = MIN_GAS_TOTAL, } = this.props @@ -322,6 +323,7 @@ SendTransactionScreen.prototype.renderGasRow = function () { h(GasFeeDisplay, { gasTotal, conversionRate, + convertedCurrency, onClick: showCustomizeGasModal, }), |