background - txManager - filter txs by network

2 files changed, 6 insertions, 4 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 3f15488ee..f3837a028 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -22,7 +22,7 @@ const controller = new MetamaskController({
   setData,
   loadData,
 })
-const txManager = controller.txManager
+
 function triggerUi () {
   if (!popupIsOpen) notification.show()
 }
@@ -93,7 +93,8 @@ function setupControllerConnection (stream) {
 // plugin badge text
 //
 
-txManager.on('updateBadge', updateBadge)
+controller.txManager.on('updateBadge', updateBadge)
+updateBadge()
 
 function updateBadge () {
   var label = ''
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.