test: Refactor signature flow e2e test

test/e2e/flask/multichain-api/evm/wallet_createSession.spec.ts

@@ -7,7 +7,7 @@ import {
   ACCOUNT_2,
 } from '../../../helpers';
 import FixtureBuilder from '../../../fixtures/fixture-builder';
-import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/connect-account-confirmation';
 import EditConnectedAccountsModal from '../../../page-objects/pages/dialog/edit-connected-accounts-modal';
 import HomePage from '../../../page-objects/pages/home/homepage';
 import NetworkPermissionSelectModal from '../../../page-objects/pages/dialog/network-permission-select-modal';

test/e2e/flask/multichain-api/evm/wallet_invokeMethod.spec.ts

@@ -12,10 +12,10 @@ import { DEFAULT_LOCAL_NODE_ETH_BALANCE_DEC } from '../../../constants';
 import TestDappMultichain from '../../../page-objects/pages/test-dapp-multichain';
 import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
 import ActivityListPage from '../../../page-objects/pages/home/activity-list';
-import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/connect-account-confirmation';
 import HomePage from '../../../page-objects/pages/home/homepage';
-import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation';
-import Eip7702AndSendCalls from '../../../page-objects/pages/confirmations/redesign/batch-confirmation';
+import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation';
+import Eip7702AndSendCalls from '../../../page-objects/pages/confirmations/batch-confirmation';
 import { mockEip7702FeatureFlag } from '../../../tests/confirmations/helpers';
 import {
   DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,

test/e2e/flask/multichain-api/evm/wallet_revokeSession.spec.ts

@@ -8,7 +8,7 @@ import {
   withFixtures,
 } from '../../../helpers';
 import FixtureBuilder from '../../../fixtures/fixture-builder';
-import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/connect-account-confirmation';
 import EditConnectedAccountsModal from '../../../page-objects/pages/dialog/edit-connected-accounts-modal';
 import TestDappMultichain from '../../../page-objects/pages/test-dapp-multichain';
 import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';

test/e2e/flask/multichain-api/evm/wallet_sessionChanged.spec.ts

@@ -8,7 +8,7 @@ import {
 import { Driver } from '../../../webdriver/driver';
 import FixtureBuilder from '../../../fixtures/fixture-builder';
 import { DAPP_HOST_ADDRESS } from '../../../constants';
-import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/connect-account-confirmation';
 import EditConnectedAccountsModal from '../../../page-objects/pages/dialog/edit-connected-accounts-modal';
 import HomePage from '../../../page-objects/pages/home/homepage';
 import PermissionListPage from '../../../page-objects/pages/permission/permission-list-page';

test/e2e/flask/multichain-api/non-evm/wallet_invokeMethod.spec.ts

@@ -4,8 +4,8 @@ import { WINDOW_TITLES } from '../../../helpers';
 import TestDappMultichain from '../../../page-objects/pages/test-dapp-multichain';
 import { DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS } from '../testHelpers';
 import { withSolanaAccountSnap } from '../../../tests/solana/common-solana';
-import SnapTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/snap-transaction-confirmation';
-import SnapSignInConfirmation from '../../../page-objects/pages/confirmations/redesign/snap-sign-in-confirmation';
+import SnapTransactionConfirmation from '../../../page-objects/pages/confirmations/snap-transaction-confirmation';
+import SnapSignInConfirmation from '../../../page-objects/pages/confirmations/snap-sign-in-confirmation';
 
 describe('Multichain API - Non EVM', function () {
   const SOLANA_SCOPE = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';

test/e2e/flask/multichain-api/testHelpers.ts

@@ -11,7 +11,7 @@ import {
   METAMASK_CAIP_MULTICHAIN_PROVIDER,
   METAMASK_INPAGE,
 } from '../../../../app/scripts/constants/stream';
-import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation';
 import EditConnectedAccountsModal from '../../page-objects/pages/dialog/edit-connected-accounts-modal';
 
 export type FixtureCallbackArgs = { driver: Driver; extensionId: string };

test/e2e/flask/snaps/test-snap-protocol.spec.ts

@@ -2,7 +2,7 @@ import { openTestSnapClickButtonAndInstall } from '../../page-objects/flows/inst
 import { DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS } from '../multichain-api/testHelpers';
 import { DAPP_ONE_URL, WINDOW_TITLES } from '../../helpers';
 import { withSolanaAccountSnap } from '../../tests/solana/common-solana';
-import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation';
 import TestDappMultichain from '../../page-objects/pages/test-dapp-multichain';
 
 describe('Test Protocol Snaps', function () {

test/e2e/flask/solana-wallet-standard/connect.spec.ts

@@ -5,7 +5,7 @@ import {
 } from '../../tests/solana/common-solana';
 import { TestDappSolana } from '../../page-objects/pages/test-dapp-solana';
 import { regularDelayMs, WINDOW_TITLES } from '../../helpers';
-import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation';
 import NetworkPermissionSelectModal from '../../page-objects/pages/dialog/network-permission-select-modal';
 import {
   account1Short,

test/e2e/flask/solana-wallet-standard/testHelpers.ts

@@ -7,7 +7,7 @@ import { Driver } from '../../webdriver/driver';
 import { TestDappSolana } from '../../page-objects/pages/test-dapp-solana';
 import { SOLANA_DEVNET_URL } from '../../tests/solana/common-solana';
 import AccountListPage from '../../page-objects/pages/account-list-page';
-import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation';
 import NetworkPermissionSelectModal from '../../page-objects/pages/dialog/network-permission-select-modal';
 import NonEvmHomepage from '../../page-objects/pages/home/non-evm-homepage';
 

test/e2e/json-rpc/eth_requestAccounts.spec.ts

@@ -4,7 +4,7 @@ import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 import FixtureBuilder from '../fixtures/fixture-builder';
 import { Driver } from '../webdriver/driver';
 import LoginPage from '../page-objects/pages/login-page';
-import ConnectAccountConfirmation from '../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import ConnectAccountConfirmation from '../page-objects/pages/confirmations/connect-account-confirmation';
 import TestDapp from '../page-objects/pages/test-dapp';
 
 describe('eth_requestAccounts', function () {

test/e2e/json-rpc/eth_sendTransaction.spec.ts

@@ -1,7 +1,7 @@
 import { strict as assert } from 'assert';
 import { withFixtures, WINDOW_TITLES } from '../helpers';
 import FixtureBuilder from '../fixtures/fixture-builder';
-import Confirmation from '../page-objects/pages/confirmations/redesign/confirmation';
+import Confirmation from '../page-objects/pages/confirmations/confirmation';
 import TestDapp from '../page-objects/pages/test-dapp';
 import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 import LoginPage from '../page-objects/pages/login-page';

test/e2e/json-rpc/switchEthereumChain.spec.ts

@@ -7,12 +7,12 @@ import {
 } from '../helpers';
 import FixtureBuilder from '../fixtures/fixture-builder';
 import { DEFAULT_FIXTURE_ACCOUNT } from '../constants';
-import Confirmation from '../page-objects/pages/confirmations/redesign/confirmation';
-import ConnectAccountConfirmation from '../page-objects/pages/confirmations/redesign/connect-account-confirmation';
+import Confirmation from '../page-objects/pages/confirmations/confirmation';
+import ConnectAccountConfirmation from '../page-objects/pages/confirmations/connect-account-confirmation';
 import NetworkPermissionSelectModal from '../page-objects/pages/dialog/network-permission-select-modal';
-import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/redesign/review-permissions-confirmation';
+import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/review-permissions-confirmation';
 import TestDapp from '../page-objects/pages/test-dapp';
-import TransactionConfirmation from '../page-objects/pages/confirmations/redesign/transaction-confirmation';
+import TransactionConfirmation from '../page-objects/pages/confirmations/transaction-confirmation';
 import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 
 describe('Switch Ethereum Chain for two dapps', function () {

test/e2e/json-rpc/switchEthereumChain_pendingConfirmation.spec.ts

@@ -1,9 +1,9 @@
 import { withFixtures, WINDOW_TITLES } from '../helpers';
 import FixtureBuilder from '../fixtures/fixture-builder';
-import Confirmation from '../page-objects/pages/confirmations/redesign/confirmation';
+import Confirmation from '../page-objects/pages/confirmations/confirmation';
 import NetworkSwitchAlertModal from '../page-objects/pages/dialog/network-switch-alert-modal';
-import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/redesign/review-permissions-confirmation';
-import SwitchNetworkConfirmation from '../page-objects/pages/confirmations/redesign/switch-network-confirmation';
+import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/review-permissions-confirmation';
+import SwitchNetworkConfirmation from '../page-objects/pages/confirmations/switch-network-confirmation';
 import TestDapp from '../page-objects/pages/test-dapp';
 import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 

test/e2e/json-rpc/wallet_addEthereumChain.spec.ts

@@ -9,11 +9,11 @@ import { withFixtures, WINDOW_TITLES } from '../helpers';
 import { PermissionNames } from '../../../app/scripts/controllers/permissions';
 import { CaveatTypes } from '../../../shared/constants/permissions';
 import { switchToEditRPCViaGlobalMenuNetworks } from '../page-objects/flows/network.flow';
-import AddNetworkConfirmation from '../page-objects/pages/confirmations/redesign/add-network-confirmations';
-import Confirmation from '../page-objects/pages/confirmations/redesign/confirmation';
-import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/redesign/review-permissions-confirmation';
+import AddNetworkConfirmation from '../page-objects/pages/confirmations/add-network-confirmations';
+import Confirmation from '../page-objects/pages/confirmations/confirmation';
+import ReviewPermissionsConfirmation from '../page-objects/pages/confirmations/review-permissions-confirmation';
 import TestDapp from '../page-objects/pages/test-dapp';
-import UpdateNetworkConfirmation from '../page-objects/pages/confirmations/redesign/update-network-confirmation';
+import UpdateNetworkConfirmation from '../page-objects/pages/confirmations/update-network-confirmation';
 import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 
 const getPermittedChains = async (driver: Driver) => {

test/e2e/page-objects/flows/encrypt-decrypt.flow.ts

@@ -1,8 +1,8 @@
 import { Driver } from '../../webdriver/driver';
 import { WINDOW_TITLES } from '../../helpers';
 import { DEFAULT_LOCAL_NODE_ETH_BALANCE_DEC } from '../../constants';
-import DecryptMessageConfirmation from '../pages/confirmations/redesign/decrypt-message-confirmation';
-import GetEncryptionKeyConfirmation from '../pages/confirmations/redesign/get-encryption-key-confirmation';
+import DecryptMessageConfirmation from '../pages/confirmations/decrypt-message-confirmation';
+import GetEncryptionKeyConfirmation from '../pages/confirmations/get-encryption-key-confirmation';
 import TestDapp from '../pages/test-dapp';
 
 /**

test/e2e/page-objects/flows/send-transaction.flow.ts

@@ -2,7 +2,7 @@ import HomePage from '../pages/home/homepage';
 import SendTokenPage from '../pages/send/send-token-page';
 import { Driver } from '../../webdriver/driver';
 import SnapSimpleKeyringPage from '../pages/snap-simple-keyring-page';
-import TransactionConfirmation from '../pages/confirmations/redesign/transaction-confirmation';
+import TransactionConfirmation from '../pages/confirmations/transaction-confirmation';
 import ActivityListPage from '../pages/home/activity-list';
 
 /**

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

@@ -2,9 +2,9 @@ import { Driver } from '../../webdriver/driver';
 import { WINDOW_TITLES } from '../../helpers';
 import SnapSimpleKeyringPage from '../pages/snap-simple-keyring-page';
 import TestDapp from '../pages/test-dapp';
-import PersonalSignConfirmation from '../pages/confirmations/redesign/personal-sign-confirmation';
-import SignTypedDataConfirmation from '../pages/confirmations/redesign/sign-typed-data-confirmation';
-import PermitConfirmation from '../pages/confirmations/redesign/permit-confirmation';
+import PersonalSignConfirmation from '../pages/confirmations/personal-sign-confirmation';
+import SignTypedDataConfirmation from '../pages/confirmations/sign-typed-data-confirmation';
+import PermitConfirmation from '../pages/confirmations/permit-confirmation';
 
 /**
  * This function initiates the steps for a personal sign with snap account on test dapp.
@@ -110,6 +110,7 @@ export const signTypedDataV3WithSnapAccount = async (
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
   const confirmation = new SignTypedDataConfirmation(driver);
   await confirmation.verifyConfirmationHeadingTitle();
+  await confirmation.clickScrollToBottomButton();
   if (isSyncFlow) {
     await confirmation.clickFooterConfirmButtonAndAndWaitForWindowToClose();
   } else {
@@ -152,6 +153,7 @@ export const signTypedDataV4WithSnapAccount = async (
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
   const confirmation = new SignTypedDataConfirmation(driver);
   await confirmation.verifyConfirmationHeadingTitle();
+  await confirmation.clickScrollToBottomButton();
   if (isSyncFlow) {
     await confirmation.clickFooterConfirmButtonAndAndWaitForWindowToClose();
   } else {
@@ -215,3 +217,65 @@ export const signPermitWithSnapAccount = async (
     );
   }
 };
+
+/**
+ * Sign typed data (eth_signTypedData) flow (non-snap).
+ *
+ * @param driver - The webdriver instance.
+ * @param publicAddress - Address expected to appear in the dapp verification.
+ */
+export const signTypedData = async (
+  driver: Driver,
+  publicAddress: string,
+): Promise<void> => {
+  const testDapp = new TestDapp(driver);
+  await testDapp.checkPageIsLoaded();
+  await testDapp.clickSignTypedData();
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+  const confirmation = new SignTypedDataConfirmation(driver);
+  await confirmation.verifyConfirmationHeadingTitle();
+  await confirmation.clickFooterConfirmButtonAndAndWaitForWindowToClose();
+  await testDapp.checkSuccessSignTypedData(publicAddress);
+};
+
+/**
+ * Sign typed data V3 flow (non-snap).
+ *
+ * @param driver - The webdriver instance.
+ * @param publicAddress - Address expected to appear in the dapp verification.
+ */
+export const signTypedDataV3 = async (
+  driver: Driver,
+  publicAddress: string,
+): Promise<void> => {
+  const testDapp = new TestDapp(driver);
+  await testDapp.checkPageIsLoaded();
+  await testDapp.clickSignTypedDatav3();
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+  const confirmation = new SignTypedDataConfirmation(driver);
+  await confirmation.verifyConfirmationHeadingTitle();
+  await confirmation.clickScrollToBottomButton();
+  await confirmation.clickFooterConfirmButtonAndAndWaitForWindowToClose();
+  await testDapp.checkSuccessSignTypedDataV3(publicAddress);
+};
+
+/**
+ * Sign typed data V4 flow (non-snap).
+ *
+ * @param driver - The webdriver instance.
+ * @param publicAddress - Address expected to appear in the dapp verification.
+ */
+export const signTypedDataV4 = async (
+  driver: Driver,
+  publicAddress: string,
+): Promise<void> => {
+  const testDapp = new TestDapp(driver);
+  await testDapp.checkPageIsLoaded();
+  await testDapp.clickSignTypedDatav4();
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+  const confirmation = new SignTypedDataConfirmation(driver);
+  await confirmation.verifyConfirmationHeadingTitle();
+  await confirmation.clickScrollToBottomButton();
+  await confirmation.clickFooterConfirmButtonAndAndWaitForWindowToClose();
+  await testDapp.checkSuccessSignTypedDataV4(publicAddress);
+};

test/e2e/page-objects/pages/confirmations/redesign/accountDetailsModal.ts → test/e2e/page-objects/pages/confirmations/accountDetailsModal.ts

@@ -1,5 +1,5 @@
-import { Driver } from '../../../../webdriver/driver';
-import { RawLocator } from '../../../common';
+import { Driver } from '../../../webdriver/driver';
+import { RawLocator } from '../../common';
 import Confirmation from './confirmation';
 
 class AccountDetailsModal extends Confirmation {

test/e2e/page-objects/pages/confirmations/redesign/add-network-confirmations.ts → test/e2e/page-objects/pages/confirmations/add-network-confirmations.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class AddNetworkConfirmation {
   private readonly driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/add-token-confirmations.ts → test/e2e/page-objects/pages/confirmations/add-token-confirmations.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class AddTokenConfirmation {
   driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/alert-modal.ts → test/e2e/page-objects/pages/confirmations/alert-modal.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class AlertModal {
   private driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/batch-confirmation.ts → test/e2e/page-objects/pages/confirmations/batch-confirmation.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 import TransactionConfirmation from './transaction-confirmation';
 
 export default class Eip7702AndSendCalls extends TransactionConfirmation {

test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts → test/e2e/page-objects/pages/confirmations/confirmation.ts

@@ -1,6 +1,6 @@
 import { Key } from 'selenium-webdriver';
-import { Driver } from '../../../../webdriver/driver';
-import { RawLocator } from '../../../common';
+import { Driver } from '../../../webdriver/driver';
+import { RawLocator } from '../../common';
 
 class Confirmation {
   protected driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/connect-account-confirmation.ts → test/e2e/page-objects/pages/confirmations/connect-account-confirmation.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class ConnectAccountConfirmation {
   driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/decrypt-message-confirmation.ts → test/e2e/page-objects/pages/confirmations/decrypt-message-confirmation.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class DecryptMessageConfirmation {
   driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/deploy-confirmation.ts → test/e2e/page-objects/pages/confirmations/deploy-confirmation.ts

@@ -1,5 +1,5 @@
-import { Driver } from '../../../../webdriver/driver';
-import { RawLocator } from '../../../common';
+import { Driver } from '../../../webdriver/driver';
+import { RawLocator } from '../../common';
 import Confirmation from './confirmation';
 
 class ContractDeploymentConfirmation extends Confirmation {

test/e2e/page-objects/pages/confirmations/redesign/erc20-approve-transaction-confirmation.ts → test/e2e/page-objects/pages/confirmations/erc20-approve-transaction-confirmation.ts

@@ -1,4 +1,4 @@
-import { tEn } from '../../../../../lib/i18n-helpers';
+import { tEn } from '../../../../lib/i18n-helpers';
 import TransactionConfirmation from './transaction-confirmation';
 
 class ERC20ApproveTransactionConfirmation extends TransactionConfirmation {

test/e2e/page-objects/pages/confirmations/redesign/gas-fee-modal.ts → test/e2e/page-objects/pages/confirmations/gas-fee-modal.ts

@@ -1,5 +1,5 @@
-import { Driver } from '../../../../webdriver/driver';
-import { RawLocator } from '../../../common';
+import { Driver } from '../../../webdriver/driver';
+import { RawLocator } from '../../common';
 
 /**
  * Page object for the new redesigned gas fee modal.

test/e2e/page-objects/pages/confirmations/redesign/gas-fee-token-modal.ts → test/e2e/page-objects/pages/confirmations/gas-fee-token-modal.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 export default class GasFeeTokenModal {
   constructor(driver: Driver) {

test/e2e/page-objects/pages/confirmations/redesign/get-encryption-key-confirmation.ts → test/e2e/page-objects/pages/confirmations/get-encryption-key-confirmation.ts

@@ -1,4 +1,4 @@
-import { Driver } from '../../../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class GetEncryptionKeyConfirmation {
   driver: Driver;

test/e2e/page-objects/pages/confirmations/redesign/permit-confirmation.ts → test/e2e/page-objects/pages/confirmations/permit-confirmation.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
-import { Driver } from '../../../../webdriver/driver';
-import { DAPP_HOST_ADDRESS } from '../../../../constants';
+import { Driver } from '../../../webdriver/driver';
+import { DAPP_HOST_ADDRESS } from '../../../constants';
 import Confirmation from './confirmation';
 
 export default class PermitConfirmation extends Confirmation {