aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-10-21 04:43:55 +0800
committerDan <danjm.com@gmail.com>2017-10-21 04:47:13 +0800
commit80025e278b6c02f87bcfce3b8d5443722f4f9e52 (patch)
treef5f68f5071269a980b049866621b624b7c231447
parent344b467d03efd3f6fb50f11f4a5b16673e0d8bfd (diff)
downloadtangerine-wallet-browser-80025e278b6c02f87bcfce3b8d5443722f4f9e52.tar.gz
tangerine-wallet-browser-80025e278b6c02f87bcfce3b8d5443722f4f9e52.tar.zst
tangerine-wallet-browser-80025e278b6c02f87bcfce3b8d5443722f4f9e52.zip
Fixes regression in confirm-send-token
-rw-r--r--ui/app/components/pending-tx/confirm-send-token.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 42b676954..6fb4ddf70 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -36,6 +36,7 @@ function mapStateToProps (state, ownProps) {
const {
conversionRate,
identities,
+ currentCurrency,
} = state.metamask
const accounts = state.metamask.accounts
const selectedAddress = getSelectedAddress(state)
@@ -47,6 +48,7 @@ function mapStateToProps (state, ownProps) {
selectedAddress,
tokenExchangeRate,
tokenData: tokenData || {},
+ currentCurrency: currentCurrency.toUpperCase(),
}
}
@@ -101,7 +103,7 @@ ConfirmSendToken.prototype.getGasFee = function () {
multiplierBase: 16,
})
- const FIAT = conversionUtil(txFeeBn, {
+ const FIAT = conversionUtil(gasTotal, {
fromNumericBase: 'BN',
toNumericBase: 'dec',
fromDenomination: 'WEI',
@@ -223,7 +225,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', `${fiatAmount + fiatGas} ${currentCurrency}`),
- h('div.confirm-screen-row-detail', `${tokenAmount + tokenGas} ${symbol}`),
+ h('div.confirm-screen-row-detail', `${tokenTotal} ${symbol}`),
]),
])
)