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/shift-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/shift-list-item.js')
-rw-r--r-- | ui/app/components/shift-list-item.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index db5fda5cb..32bfbeda4 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -8,7 +8,7 @@ const actions = require('../actions') const addressSummary = require('../util').addressSummary const CopyButton = require('./copyButton') -const EtherBalance = require('./eth-balance') +const EthBalance = require('./eth-balance') const Tooltip = require('./tooltip') @@ -17,6 +17,7 @@ module.exports = connect(mapStateToProps)(ShiftListItem) function mapStateToProps (state) { return { conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, } } @@ -66,7 +67,7 @@ function formatDate (date) { ShiftListItem.prototype.renderUtilComponents = function () { var props = this.props - const { conversionRate } = props + const { conversionRate, currentCurrency } = props switch (props.response.status) { case 'no_deposits': @@ -97,9 +98,10 @@ ShiftListItem.prototype.renderUtilComponents = function () { h(CopyButton, { value: this.props.response.transaction, }), - h(EtherBalance, { + h(EthBalance, { value: `${props.response.outgoingCoin}`, conversionRate, + currentCurrency, width: '55px', shorten: true, needsParse: false, |