Fix SelectedNetworkController default metamask networkClientId

packages/selected-network-controller/src/SelectedNetworkController.ts

@@ -120,15 +120,18 @@ export class SelectedNetworkController extends BaseControllerV2<
       this.setNetworkClientIdForDomain.bind(this),
     );
 
-    // subscribe to networkController statechange:: selectedNetworkClientId changed
-    // update the value for the domain 'metamask'
+    // subscribe to NetworkController state change events
+    // set the value for the domain 'metamask' if not already initialized
+    // or update it if the selectedNetworkClientId has changed
     this.messagingSystem.subscribe(
       'NetworkController:stateChange',
       (state: NetworkState, patch: Patch[]) => {
         const isChangingNetwork = patch.some(
           (p) => p.path[0] === 'selectedNetworkClientId',
         );
-        if (!isChangingNetwork) {
+        const hasMetamaskNetworkClientId =
+          this.getNetworkClientIdForDomain(METAMASK_DOMAIN);
+        if (!isChangingNetwork && hasMetamaskNetworkClientId) {
           return;
         }
 

packages/selected-network-controller/tests/SelectedNetworkController.test.ts

@@ -72,6 +72,30 @@ describe('SelectedNetworkController', () => {
     });
   });
 
+  it('updates the networkClientId for the metamask domain if not already set when the networkControllers state changes', () => {
+    const messenger = buildMessenger();
+    const options: SelectedNetworkControllerOptions = {
+      messenger: buildSelectedNetworkControllerMessenger(messenger),
+    };
+    const controller = new SelectedNetworkController(options);
+    expect(controller.state.domains.metamask).toBeUndefined();
+
+    const patch = [
+      {
+        path: ['anythingelse'],
+        op: 'replace' as const,
+        value: 'abc',
+      },
+    ];
+
+    const state = {
+      ...networkControllerDefaultState,
+      selectedNetworkClientId: 'currentNetwork',
+    };
+    messenger.publish('NetworkController:stateChange', state, patch);
+    expect(controller.state.domains.metamask).toBe('currentNetwork');
+  });
+
   it('updates the networkClientId for the metamask domain when the networkControllers selectedNetworkClientId changes', () => {
     const messenger = buildMessenger();
     const options: SelectedNetworkControllerOptions = {