aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorBruno Barbieri <brunobar79@gmail.com>2018-02-01 02:29:02 +0800
committerBruno Barbieri <brunobar79@gmail.com>2018-02-01 02:29:02 +0800
commitc1b7cfe91d803c0085afe59d058f2422a0e8dc30 (patch)
treee152803c2ec6b6edd3770bcd60169aa1fb93390d /app
parent7dc1b09f94003fdac4ed9ea36ecf1c1a14d972a1 (diff)
downloadtangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar.gz
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar.bz2
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar.lz
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar.xz
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.tar.zst
tangerine-wallet-browser-c1b7cfe91d803c0085afe59d058f2422a0e8dc30.zip
preserve other networks TXs
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/tx-state-manager.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index f488130a2..051efd247 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -223,10 +223,11 @@ module.exports = class TransactionStateManger extends EventEmitter {
wipeTransactions (address) {
// network only tx
- const txs = this.getTxList()
+ const txs = this.getFullTxList()
+ const network = this.getNetwork()
- // Filter out the ones from the current account
- const otherAccountTxs = txs.filter((txMeta) => txMeta.txParams.from !== address)
+ // Filter out the ones from the current account and network
+ const otherAccountTxs = txs.filter((txMeta) => !(txMeta.txParams.from === address && txMeta.metamaskNetworkId === network))
// Update state
this._saveTxList(otherAccountTxs)