Merge pull request #5793 from MetaMask/develop

Bring master up to date with develop

1 files changed, 6 insertions, 2 deletions

diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index 70cac096b..4bf40b1db 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -1,4 +1,4 @@
-const EventEmitter = require('events')
+const EventEmitter = require('safe-event-emitter')
 const log = require('loglevel')
 const EthQuery = require('ethjs-query')
 
@@ -27,6 +27,7 @@ class PendingTransactionTracker extends EventEmitter {
     this.getPendingTransactions = config.getPendingTransactions
     this.getCompletedTransactions = config.getCompletedTransactions
     this.publishTransaction = config.publishTransaction
+    this.approveTransaction = config.approveTransaction
     this.confirmTransaction = config.confirmTransaction
   }
 
@@ -108,7 +109,7 @@ class PendingTransactionTracker extends EventEmitter {
     if (txBlockDistance <= Math.pow(2, retryCount) - 1) return
 
     // Only auto-submit already-signed txs:
-    if (!('rawTx' in txMeta)) return
+    if (!('rawTx' in txMeta)) return this.approveTransaction(txMeta.id)
 
     const rawTx = txMeta.rawTx
     const txHash = await this.publishTransaction(rawTx)
@@ -129,6 +130,9 @@ class PendingTransactionTracker extends EventEmitter {
     const txHash = txMeta.hash
     const txId = txMeta.id
 
+    // Only check submitted txs
+    if (txMeta.status !== 'submitted') return
+
     // extra check in case there was an uncaught error during the
     // signature and submission process
     if (!txHash) {