diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-09-23 05:30:31 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-09-23 05:30:31 +0800 |
| commit | aa2abc00eb86c1cb746a59a6e307a6bc255e6466 (patch) | |
| tree | c6056fb31ac0c79bfebc5e36d7dd56e8cabfd543 /ui/app/components/pending-tx.js | |
| parent | 08b36b9b582853b411a19e48b407c70596381f61 (diff) | |
| parent | f128240e7f877280fa59bf22f2ea8285bb467022 (diff) | |
| download | tangerine-wallet-browser-aa2abc00eb86c1cb746a59a6e307a6bc255e6466.tar.gz tangerine-wallet-browser-aa2abc00eb86c1cb746a59a6e307a6bc255e6466.tar.zst tangerine-wallet-browser-aa2abc00eb86c1cb746a59a6e307a6bc255e6466.zip | |
Merge branch 'AddBalanceController' into BreakOutKeyringController
Diffstat (limited to 'ui/app/components/pending-tx.js')
| -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) |