diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-09-27 06:47:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 06:47:31 +0800 |
| commit | e998d528f0af71d1163bc89fe9e81195bb4f5dc3 (patch) | |
| tree | 5bb9bbcdb3db6f8c1e7a34492aad18efe28462ed /ui/app/components | |
| parent | 57b5f15265be2ae39ddf538915f8bd57538760b6 (diff) | |
| parent | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff) | |
| download | tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.tar.gz tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.tar.zst tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.zip | |
Merge branch 'master' into RemoveSlackLink
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/pending-tx.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index c3350fcc1..6f8c19a3c 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -33,7 +33,7 @@ function PendingTx () { PendingTx.prototype.render = function () { const props = this.props - const { currentCurrency, blockGasLimit } = props + const { currentCurrency, blockGasLimit, computedBalances } = props const conversionRate = props.conversionRate const txMeta = this.gatherTxMeta() @@ -42,8 +42,8 @@ PendingTx.prototype.render = function () { // Account Details const address = txParams.from || props.selectedAddress const identity = props.identities[address] || { address: address } - const account = props.accounts[address] - const balance = account ? account.balance : '0x0' + const account = computedBalances[address] + const balance = account ? account.ethBalance : '0x0' // recipient check const isValidAddress = !txParams.to || util.isValidAddress(txParams.to) |