chore: get assets list from MultichainAssetsController state

packages/assets-controllers/src/MultichainBalancesController/MultichainBalancesController.test.ts

@@ -140,11 +140,13 @@ const setupController = ({
       allowedActions: [
         'SnapController:handleRequest',
         'AccountsController:listMultichainAccounts',
+        'MultichainAssetsController:getState',
       ],
       allowedEvents: [
         'AccountsController:accountAdded',
         'AccountsController:accountRemoved',
         'AccountsController:accountBalancesUpdated',
+        'MultichainAssetsController:stateChange',
       ],
     });
 
@@ -164,6 +166,16 @@ const setupController = ({
     ),
   );
 
+  const mockGetAssetsState = jest.fn().mockReturnValue({
+    accountsAssets: {
+      [mockBtcAccount.id]: [mockBtcNativeAsset],
+    },
+  });
+  messenger.registerActionHandler(
+    'MultichainAssetsController:getState',
+    mockGetAssetsState,
+  );
+
   const controller = new MultichainBalancesController({
     messenger: multichainBalancesMessenger,
     state,
@@ -174,6 +186,7 @@ const setupController = ({
     messenger,
     mockSnapHandleRequest,
     mockListMultichainAccounts,
+    mockGetAssetsState,
   };
 };
 
@@ -392,4 +405,41 @@ describe('BalancesController', () => {
       mockBalanceResult,
     );
   });
+
+  it('handles an account with no assets in MultichainAssetsController state', async () => {
+    const { controller, mockGetAssetsState } = setupController({
+      mocks: {
+        handleRequestReturnValue: {},
+      },
+    });
+
+    mockGetAssetsState.mockReturnValue({
+      accountsAssets: {},
+    });
+
+    await controller.updateBalance(mockBtcAccount.id);
+
+    expect(controller.state.balances[mockBtcAccount.id]).toStrictEqual({});
+  });
+
+  it('updates balances when receiving "MultichainAssetsController:stateChange" event', async () => {
+    const { controller, messenger } = setupController();
+
+    messenger.publish(
+      'MultichainAssetsController:stateChange',
+      {
+        assetsMetadata: {},
+        accountsAssets: {
+          [mockBtcAccount.id]: [mockBtcNativeAsset],
+        },
+      },
+      [],
+    );
+
+    await waitForAllPromises();
+
+    expect(controller.state.balances[mockBtcAccount.id]).toStrictEqual(
+      mockBalanceResult,
+    );
+  });
 });

packages/assets-controllers/src/MultichainBalancesController/MultichainBalancesController.ts

@@ -24,8 +24,11 @@ import { HandlerType } from '@metamask/snaps-utils';
 import type { Json, JsonRpcRequest } from '@metamask/utils';
 import type { Draft } from 'immer';
 
-import { NETWORK_ASSETS_MAP } from '.';
-import { getScopeForAccount } from './utils';
+import type {
+  MultichainAssetsControllerGetStateAction,
+  MultichainAssetsControllerState,
+  MultichainAssetsControllerStateChangeEvent,
+} from '../MultichainAssetsController';
 
 const controllerName = 'MultichainBalancesController';
 
@@ -90,15 +93,18 @@ export type MultichainBalancesControllerEvents =
  */
 type AllowedActions =
   | HandleSnapRequest
-  | AccountsControllerListMultichainAccountsAction;
+  | AccountsControllerListMultichainAccountsAction
+  | MultichainAssetsControllerGetStateAction;
 
 /**
  * Events that this controller is allowed to subscribe.
  */
 type AllowedEvents =
   | AccountsControllerAccountAddedEvent
   | AccountsControllerAccountRemovedEvent
-  | AccountsControllerAccountBalancesUpdatesEvent;
+  | AccountsControllerAccountBalancesUpdatesEvent
+  | MultichainAssetsControllerStateChangeEvent;
+
 /**
  * Messenger type for the MultichainBalancesController.
  */
@@ -173,6 +179,21 @@ export class MultichainBalancesController extends BaseController<
       (balanceUpdate: AccountBalancesUpdatedEventPayload) =>
         this.#handleOnAccountBalancesUpdated(balanceUpdate),
     );
+    this.messagingSystem.subscribe(
+      'MultichainAssetsController:stateChange',
+      async (assetsState: MultichainAssetsControllerState) => {
+        for (const accountId in assetsState.accountsAssets) {
+          if (
+            Object.prototype.hasOwnProperty.call(
+              assetsState.accountsAssets,
+              accountId,
+            )
+          ) {
+            await this.updateBalance(accountId);
+          }
+        }
+      },
+    );
   }
 
   /**
@@ -186,8 +207,11 @@ export class MultichainBalancesController extends BaseController<
       const account = this.#getAccount(accountId);
 
       if (account.metadata.snap) {
-        const scope = getScopeForAccount(account);
-        const assetTypes = NETWORK_ASSETS_MAP[scope];
+        const assetsState = this.messagingSystem.call(
+          'MultichainAssetsController:getState',
+        );
+
+        const assetTypes = assetsState.accountsAssets[accountId] ?? [];
 
         const accountBalance = await this.#getBalances(
           account.id,