aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx/confirm-send-token.js
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-10-21 09:28:11 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-21 09:28:11 +0800
commit60f4e9c5f1085d91d14b732e382e63ca62e14b72 (patch)
tree780a9711c04bea4ad3202dc9c4925ab0f84fd848 /ui/app/components/pending-tx/confirm-send-token.js
parent48f348e7296dd323c1cfd6194a88a26b3339042b (diff)
parent8f3b762461ada222f82089e686a61183dd167428 (diff)
downloadtangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar.gz
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar.bz2
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar.lz
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar.xz
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.tar.zst
tangerine-wallet-browser-60f4e9c5f1085d91d14b732e382e63ca62e14b72.zip
Merge branch 'NewUI-flat' into uat
Diffstat (limited to 'ui/app/components/pending-tx/confirm-send-token.js')
-rw-r--r--ui/app/components/pending-tx/confirm-send-token.js14
1 files changed, 8 insertions, 6 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..a4c3d16e3 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(),
}
}
@@ -83,7 +85,9 @@ ConfirmSendToken.prototype.getAmount = function () {
fiat: tokenExchangeRate
? +(sendTokenAmount * tokenExchangeRate * conversionRate).toFixed(2)
: null,
- token: +sendTokenAmount.toFixed(decimals),
+ token: typeof value === 'undefined'
+ ? 'Unknown'
+ : +sendTokenAmount.toFixed(decimals),
}
}
@@ -101,7 +105,7 @@ ConfirmSendToken.prototype.getGasFee = function () {
multiplierBase: 16,
})
- const FIAT = conversionUtil(txFeeBn, {
+ const FIAT = conversionUtil(gasTotal, {
fromNumericBase: 'BN',
toNumericBase: 'dec',
fromDenomination: 'WEI',
@@ -211,8 +215,6 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
const { fiat: fiatAmount, token: tokenAmount } = this.getAmount()
const { fiat: fiatGas, token: tokenGas } = this.getGasFee()
- const tokenTotal = addCurrencies(tokenAmount, tokenGas || '0')
-
return fiatAmount && fiatGas
? (
h('section.flex-row.flex-center.confirm-screen-total-box ', [
@@ -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', `${addCurrencies(tokenAmount, tokenGas || '0')} ${symbol}`),
]),
])
)
@@ -319,7 +321,7 @@ ConfirmSendToken.prototype.render = function () {
]),
]),
- h('section.flex-row.flex-center.confirm-screen-row', [
+ toAddress && h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', toName),