Merge branch 'main' into bug/10825-upgrading-appium-test-failing

MetaMask · Aug 26, 2024 · 0a99eff · 0a99eff
2 parents c18a25b + d921087
commit 0a99eff
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/app/core/Engine.ts b/app/core/Engine.ts
@@ -837,7 +837,6 @@ class Engine {
         networkController.getNetworkClientById.bind(networkController),
     });
     const permissionController = new PermissionController({
-      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messenger: this.controllerMessenger.getRestricted({
         name: 'PermissionController',
         allowedActions: [

diff --git a/app/core/RPCMethods/RPCMethodMiddleware.test.ts b/app/core/RPCMethods/RPCMethodMiddleware.test.ts
@@ -371,7 +371,6 @@ describe('getRpcMethodMiddleware', () => {
       },
     ]);
     const permissionController = new PermissionController({
-      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messenger: controllerMessenger.getRestricted({
         name: 'PermissionController',
         allowedActions: [],

diff --git a/package.json b/package.json
@@ -167,7 +167,7 @@
     "@metamask/message-signing-snap": "^0.3.3",
     "@metamask/network-controller": "^19.0.0",
     "@metamask/notification-services-controller": "^0.2.1",
-    "@metamask/permission-controller": "^9.0.0",
+    "@metamask/permission-controller": "^11.0.0",
     "@metamask/phishing-controller": "^9.0.0",
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "0.32.0",
@@ -193,7 +193,7 @@
     "@metamask/swappable-obj-proxy": "^2.1.0",
     "@metamask/swaps-controller": "^9.0.2",
     "@metamask/transaction-controller": "^35.0.0",
-    "@metamask/utils": "^8.1.0",
+    "@metamask/utils": "^9.1.0",
     "@ngraveio/bc-ur": "^1.1.6",
     "@notifee/react-native": "^7.8.2",
     "@react-native-async-storage/async-storage": "^1.23.1",

diff --git a/yarn.lock b/yarn.lock
@@ -4952,7 +4952,7 @@
     immer "^9.0.6"
     nanoid "^3.1.31"
 
-"@metamask/permission-controller@^9.0.0", "@metamask/permission-controller@^9.0.2":
+"@metamask/permission-controller@^9.0.2":
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-9.1.1.tgz#de8c15438afa4ef65e419c20f358799924fc3f2c"
   integrity sha512-h4EakReO5JFDZBIAjXXOiwaMGqrQvNp6/6kQfDYREvT+tIpjGD5JUaqgwBblLkPCLeip57hIqxeobPlgmCfATA==