fix e2e tests

Author: pedronfigueiredo

test/e2e/page-objects/flows/sign.flow.ts

@@ -85,7 +85,8 @@ export const signTypedDataV3WithSnapAccount = async (
 ): Promise<void> => {
   const testDapp = new TestDapp(driver);
   await testDapp.check_pageIsLoaded();
-  await testDapp.signTypedDataV3();
+  await testDapp.signTypedDataV3Redesign();
+
   if (!isSyncFlow) {
     await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
     await new SnapSimpleKeyringPage(driver).approveRejectSnapAccountTransaction(

test/e2e/page-objects/pages/settings/experimental-settings.ts

@@ -16,9 +16,6 @@ class ExperimentalSettings {
     tag: 'h4',
   };
 
-  private readonly redesignedSignatureToggle =
-    '[data-testid="toggle-redesigned-confirmations-container"]';
-
   private readonly watchAccountToggleState =
     '[data-testid="watch-account-toggle"]';
 
@@ -65,11 +62,6 @@ class ExperimentalSettings {
     await this.driver.clickElement(this.addAccountSnapToggle);
   }
 
-  async toggleRedesignedSignature(): Promise<void> {
-    console.log('Toggle Redesigned Signature on experimental setting page');
-    await this.driver.clickElement(this.redesignedSignatureToggle);
-  }
-
   async toggleWatchAccount(): Promise<void> {
     console.log('Toggle Watch Account on experimental setting page');
     await this.driver.clickElement(this.watchAccountToggle);

test/e2e/page-objects/pages/snap-simple-keyring-page.ts

@@ -1,5 +1,5 @@
 import { Driver } from '../../webdriver/driver';
-import { WINDOW_TITLES } from '../../helpers';
+import { regularDelayMs, WINDOW_TITLES } from '../../helpers';
 
 class SnapSimpleKeyringPage {
   private readonly driver: Driver;
@@ -170,6 +170,9 @@ class SnapSimpleKeyringPage {
     console.log(
       'Approve/Reject snap account transaction on Snap Simple Keyring page',
     );
+
+    await this.driver.delay(regularDelayMs);
+
     if (isSignatureRequest) {
       await this.driver.clickElementAndWaitForWindowToClose(
         this.confirmationSubmitButton,

test/e2e/page-objects/pages/test-dapp.ts

@@ -24,9 +24,6 @@ class TestDapp {
   private readonly confirmScrollToBottomButtonRedesign =
     '.confirm-scroll-to-bottom__button';
 
-  private readonly confirmSignatureButton =
-    '[data-testid="page-container-footer-next"]';
-
   private readonly confirmSignatureButtonRedesign =
     '[data-testid="confirm-footer-button"]';
 
@@ -80,11 +77,6 @@ class TestDapp {
 
   private readonly personalSignResult = '#personalSignVerifyECRecoverResult';
 
-  private readonly personalSignSignatureRequestMessage = {
-    text: 'personal_sign',
-    tag: 'div',
-  };
-
   private readonly personalSignVerifyButton = '#personalSignVerify';
 
   private personalSignSigUtilResultSelector =
@@ -96,11 +88,6 @@ class TestDapp {
 
   private readonly signPermitResult = '#signPermitResult';
 
-  private readonly signPermitSignatureRequestMessage = {
-    text: 'Permit',
-    tag: 'p',
-  };
-
   private readonly signPermitVerifyButton = '#signPermitVerify';
 
   private readonly signPermitVerifyResult = '#signPermitVerifyResult';
@@ -115,11 +102,6 @@ class TestDapp {
 
   private readonly signTypedDataResult = '#signTypedDataResult';
 
-  private readonly signTypedDataSignatureRequestMessage = {
-    text: 'Hi, Alice!',
-    tag: 'div',
-  };
-
   private readonly signTypedDataV3Button = '#signTypedDataV3';
 
   private readonly signTypedDataV3Result = '#signTypedDataV3Result';
@@ -704,9 +686,8 @@ class TestDapp {
     console.log('Sign message with personal sign');
     await this.clickPersonalSign();
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    await this.driver.waitForSelector(this.personalSignSignatureRequestMessage);
     await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmSignatureButton,
+      this.confirmSignatureButtonRedesign,
     );
   }
 
@@ -717,9 +698,8 @@ class TestDapp {
     console.log('Sign message with signPermit');
     await this.clickPermit();
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    await this.driver.waitForSelector(this.signPermitSignatureRequestMessage);
     await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmSignatureButton,
+      this.confirmSignatureButtonRedesign,
     );
   }
 
@@ -730,11 +710,8 @@ class TestDapp {
     console.log('Sign message with signTypedData');
     await this.clickSignTypedData();
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    await this.driver.waitForSelector(
-      this.signTypedDataSignatureRequestMessage,
-    );
     await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmSignatureButton,
+      this.confirmSignatureButtonRedesign,
     );
   }
 
@@ -750,39 +727,44 @@ class TestDapp {
     );
     await this.driver.clickElementSafe(this.confirmDialogScrollButton, 200);
     await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmSignatureButton,
+      this.confirmSignatureButtonRedesign,
+    );
+  }
+
+  async signTypedDataV3Redesign() {
+    await this.clickSignTypedDatav3();
+    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+    await this.driver.waitForSelector(
+      this.signTypedDataV3V4SignatureRequestMessageRedesign,
+    );
+    await this.driver.clickElementSafe(
+      this.confirmScrollToBottomButtonRedesign,
+      200,
+    );
+    await this.driver.clickElementAndWaitForWindowToClose(
+      this.confirmSignatureButtonRedesign,
     );
   }
 
   /**
    * Sign a message with the signTypedDataV4 method.
    *
-   * @param confirmationRedesign - Indicates whether the redesigned signature confirmation flow is used. Defaults to false.
    */
-  async signTypedDataV4(confirmationRedesign: boolean = false) {
+  async signTypedDataV4() {
     console.log('Sign message with signTypedDataV4');
     await this.clickSignTypedDatav4();
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    if (confirmationRedesign) {
-      await this.driver.waitForSelector(
-        this.signTypedDataV3V4SignatureRequestMessageRedesign,
-      );
-      await this.driver.clickElementSafe(
-        this.confirmScrollToBottomButtonRedesign,
-        200,
-      );
-      await this.driver.clickElementAndWaitForWindowToClose(
-        this.confirmSignatureButtonRedesign,
-      );
-    } else {
-      await this.driver.waitForSelector(
-        this.signTypedDataV3V4SignatureRequestMessage,
-      );
-      await this.driver.clickElementSafe(this.confirmDialogScrollButton, 200);
-      await this.driver.clickElementAndWaitForWindowToClose(
-        this.confirmSignatureButton,
-      );
-    }
+
+    await this.driver.waitForSelector(
+      this.signTypedDataV3V4SignatureRequestMessageRedesign,
+    );
+    await this.driver.clickElementSafe(
+      this.confirmScrollToBottomButtonRedesign,
+      200,
+    );
+    await this.driver.clickElementAndWaitForWindowToClose(
+      this.confirmSignatureButtonRedesign,
+    );
   }
 
   async pasteIntoEip747ContractAddressInput() {

test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts

@@ -35,16 +35,6 @@ describe('Snap Account Signatures and Disconnects @no-mmi', function (this: Suit
         const headerNavbar = new HeaderNavbar(driver);
         await headerNavbar.check_accountLabel('SSK Account');
 
-        // Navigate to experimental settings and disable redesigned signature.
-        await headerNavbar.openSettingsPage();
-        const settingsPage = new SettingsPage(driver);
-        await settingsPage.check_pageIsLoaded();
-        await settingsPage.goToExperimentalSettings();
-
-        const experimentalSettings = new ExperimentalSettings(driver);
-        await experimentalSettings.check_pageIsLoaded();
-        await experimentalSettings.toggleRedesignedSignature();
-
         // Open the Test Dapp and connect
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();

test/e2e/tests/account/snap-account-signatures.spec.ts

@@ -56,7 +56,6 @@ describe('Snap Account Signatures @no-mmi', function (this: Suite) {
 
           const experimentalSettings = new ExperimentalSettings(driver);
           await experimentalSettings.check_pageIsLoaded();
-          await experimentalSettings.toggleRedesignedSignature();
 
           // Connect the SSK account
           const testDapp = new TestDapp(driver);