Bug fixes for incoming transactions (#7043)

* Fix styling of `.transaction-list`
* Filter `incomingTxListSelector` by network as well
* Start and stop block tracker polling in incoming tx controller
* Add fetch with abort in bg for `IncomingTxController`

1 files changed, 27 insertions, 12 deletions

diff --git a/test/unit/app/controllers/incoming-transactions-test.js b/test/unit/app/controllers/incoming-transactions-test.js
index 923da7de9..e77c83a3d 100644
--- a/test/unit/app/controllers/incoming-transactions-test.js
+++ b/test/unit/app/controllers/incoming-transactions-test.js
@@ -49,7 +49,8 @@ describe('IncomingTransactionsController', () => {
   }
 
   const MOCK_BLOCKTRACKER = {
-    on: sinon.spy(),
+    addListener: sinon.spy(),
+    removeListener: sinon.spy(),
     testProperty: 'fakeBlockTracker',
     getCurrentBlock: () => '0xa',
   }
@@ -95,17 +96,6 @@ describe('IncomingTransactionsController', () => {
       })
 
       incomingTransactionsController._update.resetHistory()
-
-      assert(incomingTransactionsController.blockTracker.on.calledOnce)
-      assert.equal(incomingTransactionsController.blockTracker.on.getCall(0).args[0], 'latest')
-      const blockTrackerListenerCallback = incomingTransactionsController.blockTracker.on.getCall(0).args[1]
-      assert.equal(incomingTransactionsController._update.callCount, 0)
-      blockTrackerListenerCallback('0xabc')
-      assert.equal(incomingTransactionsController._update.callCount, 1)
-      assert.deepEqual(incomingTransactionsController._update.getCall(0).args[0], {
-        address: '0x0101',
-        newBlockNumberDec: 2748,
-      })
     })
 
     it('should set the store to a provided initial state', () => {
@@ -120,6 +110,31 @@ describe('IncomingTransactionsController', () => {
     })
   })
 
+  describe('#start', () => {
+    it('should set up a listener for the latest block', () => {
+      const incomingTransactionsController = new IncomingTransactionsController({
+        blockTracker: MOCK_BLOCKTRACKER,
+        networkController: MOCK_NETWORK_CONTROLLER,
+        preferencesController: MOCK_PREFERENCES_CONTROLLER,
+        initState: {},
+      })
+      sinon.spy(incomingTransactionsController, '_update')
+
+      incomingTransactionsController.start()
+
+      assert(incomingTransactionsController.blockTracker.addListener.calledOnce)
+      assert.equal(incomingTransactionsController.blockTracker.addListener.getCall(0).args[0], 'latest')
+      const blockTrackerListenerCallback = incomingTransactionsController.blockTracker.addListener.getCall(0).args[1]
+      assert.equal(incomingTransactionsController._update.callCount, 0)
+      blockTrackerListenerCallback('0xabc')
+      assert.equal(incomingTransactionsController._update.callCount, 1)
+      assert.deepEqual(incomingTransactionsController._update.getCall(0).args[0], {
+        address: '0x0101',
+        newBlockNumberDec: 2748,
+      })
+    })
+  })
+
   describe('_getDataForUpdate', () => {
     it('should call fetchAll with the correct params when passed a new block number and the current network has no stored block', async () => {
       const incomingTransactionsController = new IncomingTransactionsController({