diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-09-28 07:04:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 07:04:51 +0800 |
| commit | 15b2823e546cfefd7e867f078b4385ddc6be3a0f (patch) | |
| tree | 448a321264f3d648d6edee7e90c6f487bc31084b /ui/app/components | |
| parent | 734490c58c25587a247e48eea086880bcb6a14fe (diff) | |
| parent | ecf909e140b2fc99afbd15f6f0882dd17e3ecb88 (diff) | |
| download | tangerine-wallet-browser-15b2823e546cfefd7e867f078b4385ddc6be3a0f.tar.gz tangerine-wallet-browser-15b2823e546cfefd7e867f078b4385ddc6be3a0f.tar.zst tangerine-wallet-browser-15b2823e546cfefd7e867f078b4385ddc6be3a0f.zip | |
Merge branch 'master' into new-currency-test
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) |