Merge branch 'develop' into fix-experimental-toggle

MetaMask · Nov 22, 2023 · e223b71 · e223b71
2 parents ed1ff12 + a9398f3
commit e223b71
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -1561,9 +1561,12 @@ export default class MetamaskController extends EventEmitter {
             this.txController.txGasUtil,
           ),
         networkController: this.networkController,
+        // This handler is misnamed. We must listen to networkDidChange
+        // to ensure the network provider has been set by the time we
+        // try to use it in this controller
         onNetworkStateChange: networkControllerMessenger.subscribe.bind(
           networkControllerMessenger,
-          'NetworkController:stateChange',
+          'NetworkController:networkDidChange',
         ),
         provider: this.provider,
         getProviderConfig: () => this.networkController.state.providerConfig,