diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-27 07:24:43 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-27 07:24:43 +0800 |
| commit | 8ab23c713db1f5d45abb0ba433450591b8759809 (patch) | |
| tree | c192fcf5eec3c7b422f3d0a91a4a96037c7f2fa6 /ui/app/account-detail.js | |
| parent | 77a48fb0b16d7415377b02a3b7d383c9ef86fcb6 (diff) | |
| parent | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff) | |
| download | tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.gz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.bz2 tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.lz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.xz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.zst tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.zip | |
Merge branch 'master' into transactionControllerRefractorPt3
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: { |