fix remove network

MetaMask · Jan 24, 2025 · d65cabf · d65cabf
1 parent 67dae48
commit d65cabf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -421,6 +421,7 @@ import { walletCreateSession } from './lib/rpc-method-middleware/handlers/wallet
 import BridgeStatusController from './controllers/bridge-status/bridge-status-controller';
 import { BRIDGE_STATUS_CONTROLLER_NAME } from './controllers/bridge-status/constants';
 import { rejectAllApprovals } from './lib/approval/utils';
+import { hexToBigInt, toCaipChainId } from '@metamask/utils';
 
 const { TRIGGER_TYPES } = NotificationServicesController.Constants;
 export const METAMASK_CONTROLLER_EVENTS = {
@@ -3308,7 +3309,8 @@ export default class MetamaskController extends EventEmitter {
     this.controllerMessenger.subscribe(
       'NetworkController:networkRemoved',
       ({ chainId }) => {
-        this.removeAllChainIdPermissions(chainId);
+        const scopeString = toCaipChainId('eip155', hexToBigInt(chainId).toString(10))
+        this.removeAllScopePermissions(scopeString);
       },
     );
 

diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
@@ -2099,19 +2099,19 @@ describe('MetaMaskController', () => {
     describe('NetworkConfiguration is removed', () => {
       it('should remove the permitted chain from all existing permissions', () => {
         jest
-          .spyOn(metamaskController, 'removeAllChainIdPermissions')
+          .spyOn(metamaskController, 'removeAllScopePermissions')
           .mockReturnValue();
 
         metamaskController.controllerMessenger.publish(
           'NetworkController:networkRemoved',
           {
-            chainId: '0xdeadbeef',
+            chainId: '0xa',
           },
         );
 
         expect(
-          metamaskController.removeAllChainIdPermissions,
-        ).toHaveBeenCalledWith('0xdeadbeef');
+          metamaskController.removeAllScopePermissions,
+        ).toHaveBeenCalledWith('eip155:10');
       });
     });