diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-09-09 06:43:51 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-09-09 06:43:51 +0800 |
| commit | 4a7eab5b1aee8b122d06903bc032849d1c35a3a9 (patch) | |
| tree | 3911014fabd11677573538727edbb95068457338 /ui/app/reducers | |
| parent | 6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf (diff) | |
| parent | fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5 (diff) | |
| download | tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.gz tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.zst tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.zip | |
Merge branch 'master' into FixLogoLeak
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index bad11113a..a6cd9ca1b 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -258,8 +258,9 @@ function reduceApp (state, action) { case actions.COMPLETED_TX: var unconfTxs = state.metamask.unconfTxs var unconfMsgs = state.metamask.unconfMsgs + var network = state.metamask.network - var unconfTxList = txHelper(unconfTxs, unconfMsgs) + var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) .filter(tx => tx !== tx.id) if (unconfTxList && unconfTxList.length > 0) { @@ -523,14 +524,16 @@ function reduceApp (state, action) { function hasPendingTxs (state) { var unconfTxs = state.metamask.unconfTxs var unconfMsgs = state.metamask.unconfMsgs - var unconfTxList = txHelper(unconfTxs, unconfMsgs) + var network = state.metamask.network + var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) return unconfTxList.length > 0 } function indexForPending (state, txId) { var unconfTxs = state.metamask.unconfTxs var unconfMsgs = state.metamask.unconfMsgs - var unconfTxList = txHelper(unconfTxs, unconfMsgs) + var network = state.metamask.network + var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) let idx unconfTxList.forEach((tx, i) => { if (tx.id === txId) { |