Merge branch 'develop' into cryptodev2s/bump-user-operatin-controller…

…-19.0.0
MetaMask · Nov 29, 2024 · 9a9a2f8 · 9a9a2f8
2 parents d7024b6 + db4386f
commit 9a9a2f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2897,8 +2897,7 @@ export default class MetamaskController extends EventEmitter {
             );
           },
           isOnPhishingList: (url) => {
-            const { usePhishDetect } =
-              this.preferencesController.store.getState();
+            const { usePhishDetect } = this.preferencesController.state;
 
             if (!usePhishDetect) {
               return false;

diff --git a/test/e2e/tests/confirmations/signatures/siwe.spec.ts b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
@@ -31,6 +31,7 @@ import {
 } from './signature-helpers';
 
 describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
+  this.timeout(200000); // This test is very long, so we need an unusually high timeout
   it('initiates and confirms', async function () {
     await withTransactionEnvelopeTypeFixtures(
       this.test?.fullTitle(),