Introduce detected tokens and update other relevant controllers.

src/assets/TokenBalancesController.test.ts

@@ -121,7 +121,10 @@ describe('TokenBalancesController', () => {
         getSelectedAddress: () => preferences.state.selectedAddress,
         getERC20BalanceOf: sinon.stub().returns(new BN(1)),
       },
-      { interval: 1337, tokens: [{ address, decimals: 18, symbol: 'EOS' }] },
+      {
+        interval: 1337,
+        tokens: [{ address, decimals: 18, symbol: 'EOS', aggregators: [] }],
+      },
     );
     expect(tokenBalances.state.contractBalances).toStrictEqual({});
 
@@ -155,7 +158,10 @@ describe('TokenBalancesController', () => {
         getSelectedAddress: () => preferences.state.selectedAddress,
         getERC20BalanceOf: getERC20BalanceOfStub,
       },
-      { interval: 1337, tokens: [{ address, decimals: 18, symbol: 'EOS' }] },
+      {
+        interval: 1337,
+        tokens: [{ address, decimals: 18, symbol: 'EOS', aggregators: [] }],
+      },
     );
 
     expect(tokenBalances.state.contractBalances).toStrictEqual({});
@@ -180,11 +186,12 @@ describe('TokenBalancesController', () => {
   });
 
   it('should subscribe to new sibling assets controllers', async () => {
+    const network = new NetworkController();
     const preferences = new PreferencesController();
     const assetsContract = new AssetsContractController({
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
+      onNetworkStateChange: (listener) => network.subscribe(listener),
     });
-    const network = new NetworkController();
     const tokensController = new TokensController({
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) => network.subscribe(listener),

src/assets/TokenBalancesController.ts

@@ -82,8 +82,8 @@ export class TokenBalancesController extends BaseController<
     };
     this.defaultState = { contractBalances: {} };
     this.initialize();
-    onTokensStateChange(({ tokens }) => {
-      this.configure({ tokens });
+    onTokensStateChange(({ tokens, detectedTokens }) => {
+      this.configure({ tokens: [...tokens, ...detectedTokens] });
       this.updateBalances();
     });
     this.getSelectedAddress = getSelectedAddress;
@@ -122,7 +122,7 @@ export class TokenBalancesController extends BaseController<
           this.getSelectedAddress(),
         );
         tokens[i].balanceError = null;
-      } catch (error) {
+      } catch (error: any) {
         newContractBalances[address] = new BN(0);
         tokens[i].balanceError = error;
       }