diff options
author | Dan Finlay <somniac@me.com> | 2016-08-19 22:50:57 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-19 22:50:57 +0800 |
commit | 9cd85aea2f858cb79f82cde57e53096756092503 (patch) | |
tree | c2bb2a52f309be3b781ac0ba6ef8df0b287d991c /ui/app/components/account-eth-balance.js | |
parent | e3e5538ddcf79ce0db6e7469a1c0b6c4847de276 (diff) | |
parent | 9c29328085fbad82ce7bce4659ce6968405a7b3c (diff) | |
download | tangerine-wallet-browser-9cd85aea2f858cb79f82cde57e53096756092503.tar.gz tangerine-wallet-browser-9cd85aea2f858cb79f82cde57e53096756092503.tar.zst tangerine-wallet-browser-9cd85aea2f858cb79f82cde57e53096756092503.zip |
Merge branch 'master' into shapeshiftTx
Diffstat (limited to 'ui/app/components/account-eth-balance.js')
-rw-r--r-- | ui/app/components/account-eth-balance.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ui/app/components/account-eth-balance.js b/ui/app/components/account-eth-balance.js index 6cdb33b73..8d693685f 100644 --- a/ui/app/components/account-eth-balance.js +++ b/ui/app/components/account-eth-balance.js @@ -46,16 +46,17 @@ EthBalanceComponent.prototype.render = function () { EthBalanceComponent.prototype.renderBalance = function (value, state) { if (value === 'None') return value var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3) - var balance, fiatNumber + var balance, fiatDisplayNumber, fiatTooltipNumber var splitBalance = value.split(' ') var ethNumber = splitBalance[0] var ethSuffix = splitBalance[1] if (state.conversionRate !== 0) { - fiatNumber = (Number(splitBalance[0]) * state.conversionRate).toFixed(2) + fiatTooltipNumber = Number(splitBalance[0]) * state.conversionRate + fiatDisplayNumber = fiatTooltipNumber.toFixed(2) } else { - fiatNumber = 'N/A' + fiatDisplayNumber = 'N/A' } var fiatSuffix = state.currentFiat @@ -99,16 +100,16 @@ EthBalanceComponent.prototype.renderBalance = function (value, state) { ]), h(Tooltip, { position: 'bottom', - title: `${fiatNumber} ${fiatSuffix}`, + title: `${fiatTooltipNumber} ${fiatSuffix}`, }, [ - fiatDisplay(fiatNumber, fiatSuffix), + fiatDisplay(fiatDisplayNumber, fiatSuffix), ]), ]) ) } -function fiatDisplay (fiatNumber, fiatSuffix) { - if (fiatNumber !== 'N/A') { +function fiatDisplay (fiatDisplayNumber, fiatSuffix) { + if (fiatDisplayNumber !== 'N/A') { return h('.flex-row', { style: { alignItems: 'flex-end', @@ -124,7 +125,7 @@ function fiatDisplay (fiatNumber, fiatSuffix) { fontSize: '12px', color: '#333333', }, - }, fiatNumber), + }, fiatDisplayNumber), h('div', { style: { color: '#AEAEAE', |