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/transaction-list-item.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/transaction-list-item.js')
-rw-r--r-- | ui/app/components/transaction-list-item.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 3db4c016e..c2a585003 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -2,7 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits -const EtherBalance = require('./eth-balance') +const EthBalance = require('./eth-balance') const addressSummary = require('../util').addressSummary const explorerLink = require('../../lib/explorer-link') const CopyButton = require('./copyButton') @@ -19,7 +19,7 @@ function TransactionListItem () { } TransactionListItem.prototype.render = function () { - const { transaction, network, conversionRate } = this.props + const { transaction, network, conversionRate, currentCurrency } = this.props if (transaction.key === 'shapeshift') { if (network === '1') return h(ShiftListItem, transaction) } @@ -78,9 +78,10 @@ TransactionListItem.prototype.render = function () { // Places a copy button if tx is successful, else places a placeholder empty div. transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}), - isTx ? h(EtherBalance, { + isTx ? h(EthBalance, { value: txParams.value, conversionRate, + currentCurrency, width: '55px', shorten: true, showFiat: false, |