feat: Multichain: Migrate getCurrentChainId to use page context

shared/modules/selectors/networks.ts

@@ -3,9 +3,9 @@
   type NetworkConfiguration,
   type NetworkState as InternalNetworkState,
 } from '@metamask/network-controller';
-import { createSelector } from 'reselect';
 import { NetworkStatus } from '../../constants/network';
 import { createDeepEqualSelector } from './util';
+import { ORIGIN_METAMASK } from '../../constants/app';
 
 export type NetworkState = {
   metamask: InternalNetworkState;
@@ -30,7 +30,14 @@
 };
 
 export type ProviderConfigState = NetworkConfigurationsByChainIdState &
-  SelectedNetworkClientIdState;
+  SelectedNetworkClientIdState & {
+    activeTab?: {
+      origin: string;
+    };
+    metamask: {
+      domains: Record<string, string>;
+    }
+  };
 
 export const getNetworkConfigurationsByChainId = createDeepEqualSelector(
   (state: NetworkConfigurationsByChainIdState) =>
@@ -50,19 +57,26 @@
  * @param state - Redux state object.
  * @throws `new Error('Provider configuration not found')` If the provider configuration is not found.
  */
-export const getProviderConfig = createSelector(
-  (state: ProviderConfigState) => getNetworkConfigurationsByChainId(state),
-  getSelectedNetworkClientId,
-  (networkConfigurationsByChainId, selectedNetworkClientId) => {
+export const getProviderConfig = createDeepEqualSelector(
+  (state: ProviderConfigState) => ({
+    networkConfigurationsByChainId: getNetworkConfigurationsByChainId(state),
+    selectedNetworkClientId: getSelectedNetworkClientId(state),
+    metamask: state.metamask,
+    activeTabOrigin: state.activeTab?.origin || ORIGIN_METAMASK,
+  }),
+  ({
+    networkConfigurationsByChainId,
+    selectedNetworkClientId,
+    metamask,
+    activeTabOrigin,
+  }) => {
+    const networkClientId = metamask.domains[activeTabOrigin];
+    const networkClientIdToUse = networkClientId || selectedNetworkClientId;
     for (const network of Object.values(networkConfigurationsByChainId)) {
       for (const rpcEndpoint of network.rpcEndpoints) {
-        if (rpcEndpoint.networkClientId === selectedNetworkClientId) {
+        if (rpcEndpoint.networkClientId === networkClientIdToUse) {
           const blockExplorerUrl =
-            network.defaultBlockExplorerUrlIndex === undefined
-              ? undefined
-              : network.blockExplorerUrls?.[
-                  network.defaultBlockExplorerUrlIndex
-                ];
+            network.blockExplorerUrls?.[network.defaultBlockExplorerUrlIndex ?? 0];
 
           return {
             chainId: network.chainId,

ui/index.js

@@ -23,12 +23,12 @@
 import * as actions from './store/actions';
 import configureStore from './store/store';
 import {
   getOriginOfCurrentTab,
   getPermittedAccountsForCurrentTab,
   getSelectedInternalAccount,
   getUnapprovedTransactions,
   getNetworkToAutomaticallySwitchTo,
   getSwitchedNetworkDetails,
 } from './selectors';
 import { ALERT_STATE } from './ducks/alerts';
 import {
@@ -217,8 +217,9 @@
 }
 
 async function runInitialActions(store) {
   const state = store.getState();
 
+  /*
   // This block autoswitches chains based on the last chain used
   // for a given dapp, when there are no pending confimrations
   // This allows the user to be connected on one chain
@@ -239,6 +240,7 @@
     // if the user didn't just change the dapp network
     await store.dispatch(actions.clearSwitchedNetworkDetails());
   }
+    */
 
   // Register this window as the current popup
   // and set in background state

ui/pages/routes/routes.component.js

@@ -190,7 +190,7 @@
     hideDeprecatedNetworkModal: PropTypes.func.isRequired,
     clearSwitchedNetworkDetails: PropTypes.func.isRequired,
     networkToAutomaticallySwitchTo: PropTypes.object,
     automaticallySwitchNetwork: PropTypes.func.isRequired,
     totalUnapprovedConfirmationCount: PropTypes.number.isRequired,
     currentExtensionPopupId: PropTypes.number,
     clearEditedNetwork: PropTypes.func.isRequired,
@@ -212,8 +212,8 @@
   componentDidUpdate(prevProps) {
     const {
       theme,
       networkToAutomaticallySwitchTo,
       activeTabOrigin,
       totalUnapprovedConfirmationCount,
       isUnlocked,
       currentExtensionPopupId,
@@ -222,6 +222,7 @@
       setTheme(theme);
     }
 
+    /*
     // Automatically switch the network if the user
     // no longer has unapproved transactions and they
     // should be on a different network for the
@@ -237,6 +238,7 @@
         activeTabOrigin,
       );
     }
+      */
 
     // Terminate the popup when another popup is opened
     // if the user is using RPC queueing