diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-09-27 02:46:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 02:46:28 +0800 |
| commit | b1daa5ae260be0aa91516bde0cbdb8820099587b (patch) | |
| tree | 21814a5909ee4988178378d54501a4bc9a6081a7 /ui/app/account-detail.js | |
| parent | d135c3c9ca1dcbb25fae9ab39d92e923115ae2a1 (diff) | |
| parent | 9e3648c668aed1f3e632efe1693d6a2e0aa76617 (diff) | |
| download | tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar.gz tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar.bz2 tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar.lz tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar.xz tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.tar.zst tangerine-wallet-browser-b1daa5ae260be0aa91516bde0cbdb8820099587b.zip | |
Merge pull request #2094 from MetaMask/AddBalanceController
Calculate balance based on pending txs
Diffstat (limited to 'ui/app/account-detail.js')
| -rw-r--r-- | ui/app/account-detail.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 02089ecd0..90724dc3f 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -32,6 +32,7 @@ function mapStateToProps (state) { currentCurrency: state.metamask.currentCurrency, currentAccountTab: state.metamask.currentAccountTab, tokens: state.metamask.tokens, + computedBalances: state.metamask.computedBalances, } } @@ -45,7 +46,7 @@ AccountDetailScreen.prototype.render = function () { var selected = props.address || Object.keys(props.accounts)[0] var checksumAddress = selected && ethUtil.toChecksumAddress(selected) var identity = props.identities[selected] - var account = props.accounts[selected] + var account = props.computedBalances[selected] const { network, conversionRate, currentCurrency } = props return ( @@ -180,7 +181,7 @@ AccountDetailScreen.prototype.render = function () { }, [ h(EthBalance, { - value: account && account.balance, + value: account && account.ethBalance, conversionRate, currentCurrency, style: { |