aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/transaction-manager.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-15 13:29:46 +0800
committerkumavis <aaron@kumavis.me>2017-01-15 13:29:46 +0800
commitf49fb149ccae56f5522a892778d83360856fe880 (patch)
tree921290cf70852c5b85c4e9f7a1862f87bbd3aae6 /app/scripts/transaction-manager.js
parentc3d491a37cb4d704e405b1e19560c14dd2c401ae (diff)
downloadtangerine-wallet-browser-f49fb149ccae56f5522a892778d83360856fe880.tar.gz
tangerine-wallet-browser-f49fb149ccae56f5522a892778d83360856fe880.tar.zst
tangerine-wallet-browser-f49fb149ccae56f5522a892778d83360856fe880.zip
background - txManager - filter txs by network
Diffstat (limited to 'app/scripts/transaction-manager.js')
-rw-r--r--app/scripts/transaction-manager.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index 5a44705b7..87f99ce62 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -35,7 +35,8 @@ module.exports = class TransactionManager extends EventEmitter {
// Returns the tx list
getTxList () {
- return this.txList
+ let network = this.getNetwork()
+ return this.txList.filter(txMeta => txMeta.metamaskNetworkId === network)
}
// Adds a tx to the txlist
@@ -345,8 +346,8 @@ module.exports = class TransactionManager extends EventEmitter {
if (status === 'submitted' || status === 'rejected') {
this.emit(`${txMeta.id}:finished`, status)
}
- this.emit('updateBadge')
this.updateTx(txMeta)
+ this.emit('updateBadge')
}
// Saves the new/updated txList.