diff options
| author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2018-10-02 00:34:50 +0800 |
|---|---|---|
| committer | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2018-10-02 04:02:01 +0800 |
| commit | 65ba018aad5c09cf5f5b96df559cb543e4a9e980 (patch) | |
| tree | fec8bb9ea69bf8391468c609f6c70e7ebc7dc387 | |
| parent | e351a7dd7439d65b47321c9ce18e661da67929ee (diff) | |
| download | tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar.gz tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar.bz2 tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar.lz tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar.xz tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.tar.zst tangerine-wallet-browser-65ba018aad5c09cf5f5b96df559cb543e4a9e980.zip | |
Only use current network txs when calculating "Reject All"
| -rw-r--r-- | ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js index 2e7677a45..b34067686 100644 --- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js @@ -53,6 +53,7 @@ const mapStateToProps = (state, props) => { selectedAddress, selectedAddressTxList, assetImages, + network, unapprovedTxs, } = metamask const assetImage = assetImages[txParamsToAddress] @@ -68,7 +69,11 @@ const mapStateToProps = (state, props) => { const transaction = R.find(({ id }) => id === transactionId)(selectedAddressTxList) const transactionStatus = transaction ? transaction.status : '' - const unapprovedTxCount = valuesFor(unapprovedTxs).length + const currentNetworkUnapprovedTxs = R.filter( + ({ metamaskNetworkId }) => metamaskNetworkId === network, + valuesFor(unapprovedTxs), + ) + const unapprovedTxCount = currentNetworkUnapprovedTxs.length return { balance, |