diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-09-14 06:02:05 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-09-14 06:06:04 +0800 |
commit | a01921758b25d151cfb1c47d7235f59291c29945 (patch) | |
tree | f9453bd23f37c14267a6497befb9f6c15cb70da2 /ui | |
parent | 0ba649317592efced339980a729213876bc25a81 (diff) | |
download | tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar.gz tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar.bz2 tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar.lz tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar.xz tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.tar.zst tangerine-wallet-browser-a01921758b25d151cfb1c47d7235f59291c29945.zip |
Add computed balance to account detail view
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/account-detail.js | 5 | ||||
-rw-r--r-- | ui/app/conf-tx.js | 1 |
2 files changed, 3 insertions, 3 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: { diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 8b93305eb..15fb9a59f 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -49,7 +49,6 @@ ConfirmTxScreen.prototype.render = function () { var txParams = txData.params || {} var isNotification = isPopupOrNotification() === 'notification' - log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`) if (unconfTxList.length === 0) return h(Loading, { isLoading: true }) |