Provide method for tx tracker to refer to all txs

3 files changed, 11 insertions, 3 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index a0f983deb..ef659a300 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -62,6 +62,7 @@ module.exports = class TransactionController extends EventEmitter {
       retryTimePeriod: 86400000, // Retry 3500 blocks, or about 1 day.
       publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx),
       getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager),
+      getCompletedTransactions: this.txStateManager.getConfirmedTransactions.bind(this.txStateManager),
     })
 
     this.txStateManager.store.subscribe(() => this.emit('update:badge'))
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index cf8117864..2250403f6 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -46,6 +46,12 @@ module.exports = class TransactionStateManger extends EventEmitter {
     return this.getFilteredTxList(opts)
   }
 
+  getConfirmedTransactions (address) {
+    const opts = { status: 'confirmed' }
+    if (address) opts.from = address
+    return this.getFilteredTxList(opts)
+  }
+
   addTx (txMeta) {
     this.once(`${txMeta.id}:signed`, function (txId) {
       this.removeAllListeners(`${txMeta.id}:rejected`)
@@ -242,4 +248,4 @@ module.exports = class TransactionStateManger extends EventEmitter {
   _saveTxList (transactions) {
     this.store.updateState({ transactions })
   }
-}
\ No newline at end of file
+}
diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js
index 554bd5591..32421a44f 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/pending-tx-test.js
@@ -48,6 +48,7 @@ describe('PendingTransactionTracker', function () {
         }
       },
       getPendingTransactions: () => {return []},
+      getCompletedTransactions: () => {return []},
       publishTransaction: () => {},
     })
   })
@@ -82,7 +83,7 @@ describe('PendingTransactionTracker', function () {
         nonce: '0x01',
       }, { count: 1 })[0]
 
-      stub = sinon.stub(pendingTxTracker, 'getPendingTransactions')
+      stub = sinon.stub(pendingTxTracker, 'getCompletedTransactions')
       .returns(txGen.txs)
 
       // THE EXPECTATION
@@ -97,7 +98,7 @@ describe('PendingTransactionTracker', function () {
       await pendingTxTracker._checkPendingTx(pending)
 
       // THE ASSERTION
-      return sinon.assert.calledWith(spy, pending.id, 'tx failed should be emitted')
+      assert.ok(spy.calledWith(pending.id), 'tx failed should be emitted')
     })
   })