cleanup

MetaMask · Feb 16, 2024 · 6fdee42 · 6fdee42
1 parent 068a667
commit 6fdee42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/queued-request-controller/src/QueuedRequestMiddleware.ts b/packages/queued-request-controller/src/QueuedRequestMiddleware.ts
@@ -93,7 +93,6 @@ export const createQueuedRequestMiddleware = ({
         QueuedRequestControllerActionTypes.enqueueRequest,
         async () => {
           if (
-            // TODO should this list include wallet_requestPermissions/requestAccounts
             req.method === 'wallet_switchEthereumChain' ||
             req.method === 'wallet_addEthereumChain'
           ) {

diff --git a/packages/selected-network-controller/src/SelectedNetworkController.ts b/packages/selected-network-controller/src/SelectedNetworkController.ts
@@ -154,7 +154,9 @@ export class SelectedNetworkController extends BaseController<
     this.messagingSystem.subscribe(
       'NetworkController:stateChange',
       ({ selectedNetworkClientId }) => {
-        this.setNetworkClientIdForMetamask(selectedNetworkClientId);
+        if (this.getNetworkClientIdForMetamask() !== selectedNetworkClientId) {
+          this.setNetworkClientIdForMetamask(selectedNetworkClientId);
+        }
       },
     );
   }
@@ -204,7 +206,7 @@ export class SelectedNetworkController extends BaseController<
     });
   }
 
-  domainHasPermissions(domain: Domain): boolean {
+  #domainHasPermissions(domain: Domain): boolean {
     return this.messagingSystem.call(
       'PermissionController:hasPermissions',
       domain,
@@ -221,7 +223,7 @@ export class SelectedNetworkController extends BaseController<
     }
 
     // Check and, if not a metamask request, return early if the domain lacks permissions
-    if (domain !== METAMASK_DOMAIN && !this.domainHasPermissions(domain)) {
+    if (domain !== METAMASK_DOMAIN && !this.#domainHasPermissions(domain)) {
       return;
     }