@metamask-previews/network-controller 22.1.1-preview-111ffee8 → 22.1.1-preview-c96fc296

package/CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix `selectAvailableNetworkClientIds` so that it is properly memoized ([#5193](https://github.com/MetaMask/core/pull/5193))
+- Fix `lookupNetwork` so that it will no longer throw an error if `networkDidChange` subscriptions have been removed before it returns ([#5116](https://github.com/MetaMask/core/pull/5116))
+  - This error could occur if the NetworkController's messenger is cleared of subscriptions, as in a "destroy" step.
 
 ## [22.1.1]
 

package/dist/NetworkController.cjs

@@ -550,7 +550,26 @@ class NetworkController extends base_controller_1.BaseController {
         let networkChanged = false;
         const listener = () => {
             networkChanged = true;
-            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+            try {
+                this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+            }
+            catch (error) {
+                // In theory, this `catch` should not be necessary given that this error
+                // would occur "inside" of the call to `#determineEIP1559Compatibility`
+                // below and so it should be caught by the `try`/`catch` below (it is
+                // impossible to reproduce in tests for that reason). However, somehow
+                // it occurs within Mobile and so we have to add our own `try`/`catch`
+                // here.
+                /* istanbul ignore next */
+                if (!(error instanceof Error) ||
+                    error.message !==
+                        'Subscription not found for event: NetworkController:networkDidChange') {
+                    // Again, this error should not happen and is impossible to reproduce
+                    // in tests.
+                    /* istanbul ignore next */
+                    throw error;
+                }
+            }
         };
         this.messagingSystem.subscribe('NetworkController:networkDidChange', listener);
         let updatedNetworkStatus;
@@ -600,7 +619,16 @@ class NetworkController extends base_controller_1.BaseController {
             // in the process of being called, so we don't need to go further.
             return;
         }
-        this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+        try {
+            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+        }
+        catch (error) {
+            if (!(error instanceof Error) ||
+                error.message !==
+                    'Subscription not found for event: NetworkController:networkDidChange') {
+                throw error;
+            }
+        }
         this.update((state) => {
             const meta = state.networksMetadata[state.selectedNetworkClientId];
             meta.status = updatedNetworkStatus;