Merge branch 'develop' into eth_json_rpc_middleware_patch

MetaMask · Sep 11, 2024 · debeefb · debeefb
2 parents 8a17155 + 3797b2f
commit debeefb
Show file tree

Hide file tree

Showing 8 changed files with 964 additions and 195 deletions.
diff --git a/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts b/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts
@@ -10,7 +10,6 @@ describe('isBlockedUrl', () => {
     allowedEvents: [],
   });
   const phishingController = new PhishingController({
-    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: phishingControllerMessenger,
     state: {
       phishingLists: [

diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -107,6 +107,7 @@ function withRequest<ReturnValue>(
   });
 
   const smartTransactionsController = new SmartTransactionsController({
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger,
     getNonceLock: jest.fn(),
     confirmExternalTransaction: jest.fn(),
@@ -176,6 +177,7 @@ function withRequest<ReturnValue>(
 
   return fn({
     request,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger,
     startFlowSpy,
     addRequestSpy,