diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-05-17 02:54:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-17 02:54:23 +0800 |
commit | 44148d6135d17184194bbde2c074f07d90fa8179 (patch) | |
tree | a476d521bc8d17f9598b8e1fdc98e51dded88cbf /ui/app/components/pending-tx.js | |
parent | d165f3a2b6f55cd1f4d4809c61ab3a4af5f8b070 (diff) | |
parent | b4e6ea9db787cbf7839d9caad6e1ea0385cc588e (diff) | |
download | tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar.gz tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar.bz2 tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar.lz tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar.xz tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.tar.zst tangerine-wallet-browser-44148d6135d17184194bbde2c074f07d90fa8179.zip |
Merge pull request #1440 from MetaMask/i1439-FixFiatFormatting
Fix fiat rendering
Diffstat (limited to 'ui/app/components/pending-tx.js')
-rw-r--r-- | ui/app/components/pending-tx.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index b084a1d2a..0d1f06ba6 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -31,6 +31,8 @@ function PendingTx () { PendingTx.prototype.render = function () { const props = this.props + const { currentCurrency } = props + const conversionRate = props.conversionRate const txMeta = this.gatherTxMeta() const txParams = txMeta.txParams || {} @@ -104,6 +106,7 @@ PendingTx.prototype.render = function () { h(EthBalance, { value: balance, conversionRate, + currentCurrency, inline: true, labelColor: '#F7861C', }), @@ -141,7 +144,7 @@ PendingTx.prototype.render = function () { // in the way that gas and gasLimit currently are. h('.row', [ h('.cell.label', 'Amount'), - h(EthBalance, { value: txParams.value }), + h(EthBalance, { value: txParams.value, currentCurrency, conversionRate }), ]), // Gas Limit (customizable) @@ -189,7 +192,7 @@ PendingTx.prototype.render = function () { // Max Transaction Fee (calculated) h('.cell.row', [ h('.cell.label', 'Max Transaction Fee'), - h(EthBalance, { value: txFeeBn.toString(16) }), + h(EthBalance, { value: txFeeBn.toString(16), currentCurrency, conversionRate }), ]), h('.cell.row', { @@ -208,6 +211,8 @@ PendingTx.prototype.render = function () { }, [ h(EthBalance, { value: maxCost.toString(16), + currentCurrency, + conversionRate, inline: true, labelColor: 'black', fontSize: '16px', |