m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fixes regression in confirm-send-token

Browse Source
This commit is contained in:
Dan 2017-10-20 18:13:55 -02:30
parent 344b467d03
commit 80025e278b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/components/pending-tx/confirm-send-token.js
View File

@ -36,6 +36,7 @@ function mapStateToProps (state, ownProps) {
const { const {
conversionRate, conversionRate,
identities, identities,
currentCurrency,
} = state.metamask } = state.metamask
const accounts = state.metamask.accounts const accounts = state.metamask.accounts
const selectedAddress = getSelectedAddress(state) const selectedAddress = getSelectedAddress(state)
@ -47,6 +48,7 @@ function mapStateToProps (state, ownProps) {
selectedAddress, selectedAddress,
tokenExchangeRate, tokenExchangeRate,
tokenData: tokenData || {}, tokenData: tokenData || {},
currentCurrency: currentCurrency.toUpperCase(),
} }
} }
@ -101,7 +103,7 @@ ConfirmSendToken.prototype.getGasFee = function () {
multiplierBase: 16, multiplierBase: 16,
}) })
const FIAT = conversionUtil(txFeeBn, { const FIAT = conversionUtil(gasTotal, {
fromNumericBase: 'BN', fromNumericBase: 'BN',
toNumericBase: 'dec', toNumericBase: 'dec',
fromDenomination: 'WEI', fromDenomination: 'WEI',
@ -223,7 +225,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
h('div.confirm-screen-section-column', [ h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', `${fiatAmount + fiatGas} ${currentCurrency}`), 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}`),
]), ]),
]) ])
) )