diff --git a/test/e2e/flask/multichain-api/evm/wallet_createSession.spec.ts b/test/e2e/flask/multichain-api/evm/wallet_createSession.spec.ts index 7691e204972e..2ffb82e262f8 100644 --- a/test/e2e/flask/multichain-api/evm/wallet_createSession.spec.ts +++ b/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'; diff --git a/test/e2e/flask/multichain-api/evm/wallet_invokeMethod.spec.ts b/test/e2e/flask/multichain-api/evm/wallet_invokeMethod.spec.ts index fb7f18123e18..21f09821e864 100644 --- a/test/e2e/flask/multichain-api/evm/wallet_invokeMethod.spec.ts +++ b/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, diff --git a/test/e2e/flask/multichain-api/evm/wallet_revokeSession.spec.ts b/test/e2e/flask/multichain-api/evm/wallet_revokeSession.spec.ts index db359628d7e9..f2df018650f1 100644 --- a/test/e2e/flask/multichain-api/evm/wallet_revokeSession.spec.ts +++ b/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'; diff --git a/test/e2e/flask/multichain-api/evm/wallet_sessionChanged.spec.ts b/test/e2e/flask/multichain-api/evm/wallet_sessionChanged.spec.ts index 619c139c1af9..0caea4e23124 100644 --- a/test/e2e/flask/multichain-api/evm/wallet_sessionChanged.spec.ts +++ b/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'; diff --git a/test/e2e/flask/multichain-api/non-evm/wallet_invokeMethod.spec.ts b/test/e2e/flask/multichain-api/non-evm/wallet_invokeMethod.spec.ts index cdc8c7e9c1ca..3fcc0d4e9210 100644 --- a/test/e2e/flask/multichain-api/non-evm/wallet_invokeMethod.spec.ts +++ b/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'; diff --git a/test/e2e/flask/multichain-api/testHelpers.ts b/test/e2e/flask/multichain-api/testHelpers.ts index eacd2fa49f03..7005abc4096d 100644 --- a/test/e2e/flask/multichain-api/testHelpers.ts +++ b/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 }; diff --git a/test/e2e/flask/snaps/test-snap-protocol.spec.ts b/test/e2e/flask/snaps/test-snap-protocol.spec.ts index cfe76f412cc5..c70bea676f75 100644 --- a/test/e2e/flask/snaps/test-snap-protocol.spec.ts +++ b/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 () { diff --git a/test/e2e/flask/solana-wallet-standard/connect.spec.ts b/test/e2e/flask/solana-wallet-standard/connect.spec.ts index 3f042cbda1f9..76abdb376b45 100644 --- a/test/e2e/flask/solana-wallet-standard/connect.spec.ts +++ b/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, diff --git a/test/e2e/flask/solana-wallet-standard/testHelpers.ts b/test/e2e/flask/solana-wallet-standard/testHelpers.ts index 9c74541805f8..b18059105dea 100644 --- a/test/e2e/flask/solana-wallet-standard/testHelpers.ts +++ b/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'; diff --git a/test/e2e/json-rpc/eth_requestAccounts.spec.ts b/test/e2e/json-rpc/eth_requestAccounts.spec.ts index 50ce89f3734c..6e523c14dca3 100644 --- a/test/e2e/json-rpc/eth_requestAccounts.spec.ts +++ b/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 () { diff --git a/test/e2e/json-rpc/eth_sendTransaction.spec.ts b/test/e2e/json-rpc/eth_sendTransaction.spec.ts index 1a05fb3a5a89..269cf000ac1e 100644 --- a/test/e2e/json-rpc/eth_sendTransaction.spec.ts +++ b/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'; diff --git a/test/e2e/json-rpc/switchEthereumChain.spec.ts b/test/e2e/json-rpc/switchEthereumChain.spec.ts index acb249911330..87d70781424f 100644 --- a/test/e2e/json-rpc/switchEthereumChain.spec.ts +++ b/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 () { diff --git a/test/e2e/json-rpc/switchEthereumChain_pendingConfirmation.spec.ts b/test/e2e/json-rpc/switchEthereumChain_pendingConfirmation.spec.ts index 111e90ffa311..f5a09299a6c4 100644 --- a/test/e2e/json-rpc/switchEthereumChain_pendingConfirmation.spec.ts +++ b/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'; diff --git a/test/e2e/json-rpc/wallet_addEthereumChain.spec.ts b/test/e2e/json-rpc/wallet_addEthereumChain.spec.ts index c26b4127a163..ae4640e48a96 100644 --- a/test/e2e/json-rpc/wallet_addEthereumChain.spec.ts +++ b/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) => { diff --git a/test/e2e/page-objects/flows/encrypt-decrypt.flow.ts b/test/e2e/page-objects/flows/encrypt-decrypt.flow.ts index f22a23d94d19..917ec24ebc72 100644 --- a/test/e2e/page-objects/flows/encrypt-decrypt.flow.ts +++ b/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'; /** diff --git a/test/e2e/page-objects/flows/send-transaction.flow.ts b/test/e2e/page-objects/flows/send-transaction.flow.ts index 087b618ff529..c896c2d55759 100644 --- a/test/e2e/page-objects/flows/send-transaction.flow.ts +++ b/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'; /** diff --git a/test/e2e/page-objects/flows/sign.flow.ts b/test/e2e/page-objects/flows/sign.flow.ts index b733033f480e..715c6bedf190 100644 --- a/test/e2e/page-objects/flows/sign.flow.ts +++ b/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 => { + 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 => { + 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 => { + 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); +}; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/accountDetailsModal.ts b/test/e2e/page-objects/pages/confirmations/accountDetailsModal.ts similarity index 91% rename from test/e2e/page-objects/pages/confirmations/redesign/accountDetailsModal.ts rename to test/e2e/page-objects/pages/confirmations/accountDetailsModal.ts index 3c10307e8fb4..42ae0bc94056 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/accountDetailsModal.ts +++ b/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 { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/add-network-confirmations.ts b/test/e2e/page-objects/pages/confirmations/add-network-confirmations.ts similarity index 97% rename from test/e2e/page-objects/pages/confirmations/redesign/add-network-confirmations.ts rename to test/e2e/page-objects/pages/confirmations/add-network-confirmations.ts index 6239e0b7095b..645bd209c522 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/add-network-confirmations.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/add-token-confirmations.ts b/test/e2e/page-objects/pages/confirmations/add-token-confirmations.ts similarity index 95% rename from test/e2e/page-objects/pages/confirmations/redesign/add-token-confirmations.ts rename to test/e2e/page-objects/pages/confirmations/add-token-confirmations.ts index b6d4a73861c5..dc27c89cff0e 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/add-token-confirmations.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/alert-modal.ts b/test/e2e/page-objects/pages/confirmations/alert-modal.ts similarity index 93% rename from test/e2e/page-objects/pages/confirmations/redesign/alert-modal.ts rename to test/e2e/page-objects/pages/confirmations/alert-modal.ts index 09ffb0628a77..e946bbdffaf6 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/alert-modal.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/batch-confirmation.ts b/test/e2e/page-objects/pages/confirmations/batch-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/batch-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/batch-confirmation.ts index 4e0859745d51..8d045fddcc3c 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/batch-confirmation.ts +++ b/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 { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts b/test/e2e/page-objects/pages/confirmations/confirmation.ts similarity index 98% rename from test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts rename to test/e2e/page-objects/pages/confirmations/confirmation.ts index 0ff874223ef4..f2930913b526 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/connect-account-confirmation.ts b/test/e2e/page-objects/pages/confirmations/connect-account-confirmation.ts similarity index 98% rename from test/e2e/page-objects/pages/confirmations/redesign/connect-account-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/connect-account-confirmation.ts index 67f3106b2212..5043be3238e3 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/connect-account-confirmation.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/decrypt-message-confirmation.ts b/test/e2e/page-objects/pages/confirmations/decrypt-message-confirmation.ts similarity index 97% rename from test/e2e/page-objects/pages/confirmations/redesign/decrypt-message-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/decrypt-message-confirmation.ts index 37139ce41fab..1b416c727010 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/decrypt-message-confirmation.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/deploy-confirmation.ts b/test/e2e/page-objects/pages/confirmations/deploy-confirmation.ts similarity index 88% rename from test/e2e/page-objects/pages/confirmations/redesign/deploy-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/deploy-confirmation.ts index c68bbf6ad67f..6095a24de4bc 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/deploy-confirmation.ts +++ b/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 { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/erc20-approve-transaction-confirmation.ts b/test/e2e/page-objects/pages/confirmations/erc20-approve-transaction-confirmation.ts similarity index 98% rename from test/e2e/page-objects/pages/confirmations/redesign/erc20-approve-transaction-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/erc20-approve-transaction-confirmation.ts index f83ced1ca37b..2b43c4b313ef 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/erc20-approve-transaction-confirmation.ts +++ b/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 { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/gas-fee-modal.ts b/test/e2e/page-objects/pages/confirmations/gas-fee-modal.ts similarity index 98% rename from test/e2e/page-objects/pages/confirmations/redesign/gas-fee-modal.ts rename to test/e2e/page-objects/pages/confirmations/gas-fee-modal.ts index 62c2ab9bfe9a..f9b7a3bd63c2 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/gas-fee-modal.ts +++ b/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. diff --git a/test/e2e/page-objects/pages/confirmations/redesign/gas-fee-token-modal.ts b/test/e2e/page-objects/pages/confirmations/gas-fee-token-modal.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/gas-fee-token-modal.ts rename to test/e2e/page-objects/pages/confirmations/gas-fee-token-modal.ts index 0d416d4efc82..e7682e7f4861 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/gas-fee-token-modal.ts +++ b/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) { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/get-encryption-key-confirmation.ts b/test/e2e/page-objects/pages/confirmations/get-encryption-key-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/get-encryption-key-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/get-encryption-key-confirmation.ts index d9e67ca92a4b..0187e42979f0 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/get-encryption-key-confirmation.ts +++ b/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; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/permit-confirmation.ts b/test/e2e/page-objects/pages/confirmations/permit-confirmation.ts similarity index 97% rename from test/e2e/page-objects/pages/confirmations/redesign/permit-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/permit-confirmation.ts index 2fe7b50f2865..472ab887f37b 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/permit-confirmation.ts +++ b/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 { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/personal-sign-confirmation.ts b/test/e2e/page-objects/pages/confirmations/personal-sign-confirmation.ts similarity index 93% rename from test/e2e/page-objects/pages/confirmations/redesign/personal-sign-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/personal-sign-confirmation.ts index b5e88e963673..d7f25fe2bad4 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/personal-sign-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/personal-sign-confirmation.ts @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; -import { DAPP_HOST_ADDRESS } from '../../../../constants'; -import { Driver } from '../../../../webdriver/driver'; +import { DAPP_HOST_ADDRESS } from '../../../constants'; +import { Driver } from '../../../webdriver/driver'; import Confirmation from './confirmation'; export default class PersonalSignConfirmation extends Confirmation { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/review-permissions-confirmation.ts b/test/e2e/page-objects/pages/confirmations/review-permissions-confirmation.ts similarity index 98% rename from test/e2e/page-objects/pages/confirmations/redesign/review-permissions-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/review-permissions-confirmation.ts index d8d69e86d4a3..c64eb67750cf 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/review-permissions-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/review-permissions-confirmation.ts @@ -1,4 +1,4 @@ -import { Driver } from '../../../../webdriver/driver'; +import { Driver } from '../../../webdriver/driver'; class ReviewPermissionsConfirmation { driver: Driver; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation.ts b/test/e2e/page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation.ts similarity index 88% rename from test/e2e/page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation.ts index a04d5a7db2da..d310c13902c3 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation.ts @@ -1,6 +1,6 @@ -import { tEn } from '../../../../../lib/i18n-helpers'; -import { Driver } from '../../../../webdriver/driver'; -import { RawLocator } from '../../../common'; +import { tEn } from '../../../../lib/i18n-helpers'; +import { Driver } from '../../../webdriver/driver'; +import { RawLocator } from '../../common'; import TransactionConfirmation from './transaction-confirmation'; class SetApprovalForAllTransactionConfirmation extends TransactionConfirmation { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/sign-typed-data-confirmation.ts b/test/e2e/page-objects/pages/confirmations/sign-typed-data-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/sign-typed-data-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/sign-typed-data-confirmation.ts index 9f36c0d76b43..a1d58d76827b 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/sign-typed-data-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/sign-typed-data-confirmation.ts @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; -import { DAPP_HOST_ADDRESS } from '../../../../constants'; -import { Driver } from '../../../../webdriver/driver'; +import { DAPP_HOST_ADDRESS } from '../../../constants'; +import { Driver } from '../../../webdriver/driver'; import Confirmation from './confirmation'; export default class SignTypedData extends Confirmation { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/snap-sign-in-confirmation.ts b/test/e2e/page-objects/pages/confirmations/snap-sign-in-confirmation.ts similarity index 95% rename from test/e2e/page-objects/pages/confirmations/redesign/snap-sign-in-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/snap-sign-in-confirmation.ts index b2f3210b6932..4d40cebf6978 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/snap-sign-in-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/snap-sign-in-confirmation.ts @@ -1,4 +1,4 @@ -import { Driver } from '../../../../webdriver/driver'; +import { Driver } from '../../../webdriver/driver'; class SnapSignInConfirmation { protected driver: Driver; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/snap-transaction-confirmation.ts b/test/e2e/page-objects/pages/confirmations/snap-transaction-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/snap-transaction-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/snap-transaction-confirmation.ts index ca058ee81208..ff14bace044d 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/snap-transaction-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/snap-transaction-confirmation.ts @@ -1,4 +1,4 @@ -import { Driver } from '../../../../webdriver/driver'; +import { Driver } from '../../../webdriver/driver'; class SnapTransactionConfirmation { protected driver: Driver; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/switch-network-confirmation.ts b/test/e2e/page-objects/pages/confirmations/switch-network-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/switch-network-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/switch-network-confirmation.ts index c8a3a61b58b8..9df06404c3e9 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/switch-network-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/switch-network-confirmation.ts @@ -1,4 +1,4 @@ -import { Driver } from '../../../../webdriver/driver'; +import { Driver } from '../../../webdriver/driver'; class SwitchNetworkConfirmation { private readonly driver: Driver; diff --git a/test/e2e/page-objects/pages/confirmations/redesign/token-transfer-confirmation.ts b/test/e2e/page-objects/pages/confirmations/token-transfer-confirmation.ts similarity index 96% rename from test/e2e/page-objects/pages/confirmations/redesign/token-transfer-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/token-transfer-confirmation.ts index 45f44f7a419d..03ccc5742fc5 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/token-transfer-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/token-transfer-confirmation.ts @@ -1,5 +1,5 @@ -import { tEn } from '../../../../../lib/i18n-helpers'; -import { Driver } from '../../../../webdriver/driver'; +import { tEn } from '../../../../lib/i18n-helpers'; +import { Driver } from '../../../webdriver/driver'; import TransactionConfirmation from './transaction-confirmation'; class TokenTransferTransactionConfirmation extends TransactionConfirmation { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/transaction-confirmation.ts b/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts similarity index 99% rename from test/e2e/page-objects/pages/confirmations/redesign/transaction-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts index 5cba99b84ce0..9a04af38e6dd 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/transaction-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts @@ -1,8 +1,8 @@ import { strict as assert } from 'assert'; import { By, Key } from 'selenium-webdriver'; -import { tEn } from '../../../../../lib/i18n-helpers'; -import { Driver } from '../../../../webdriver/driver'; -import { RawLocator } from '../../../common'; +import { tEn } from '../../../../lib/i18n-helpers'; +import { Driver } from '../../../webdriver/driver'; +import { RawLocator } from '../../common'; import Confirmation from './confirmation'; class TransactionConfirmation extends Confirmation { diff --git a/test/e2e/page-objects/pages/confirmations/redesign/update-network-confirmation.ts b/test/e2e/page-objects/pages/confirmations/update-network-confirmation.ts similarity index 97% rename from test/e2e/page-objects/pages/confirmations/redesign/update-network-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/update-network-confirmation.ts index 715f03faa579..583914c2a1e7 100644 --- a/test/e2e/page-objects/pages/confirmations/redesign/update-network-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/update-network-confirmation.ts @@ -1,4 +1,4 @@ -import { Driver } from '../../../../webdriver/driver'; +import { Driver } from '../../../webdriver/driver'; class UpdateNetworkConfirmation { private readonly driver: Driver; diff --git a/test/e2e/page-objects/pages/confirmations/legacy/watch-asset-confirmation.ts b/test/e2e/page-objects/pages/confirmations/watch-asset-confirmation.ts similarity index 84% rename from test/e2e/page-objects/pages/confirmations/legacy/watch-asset-confirmation.ts rename to test/e2e/page-objects/pages/confirmations/watch-asset-confirmation.ts index 645559fcc816..503b746deacb 100644 --- a/test/e2e/page-objects/pages/confirmations/legacy/watch-asset-confirmation.ts +++ b/test/e2e/page-objects/pages/confirmations/watch-asset-confirmation.ts @@ -1,5 +1,5 @@ -import { Driver } from '../../../../webdriver/driver'; -import { RawLocator } from '../../../common'; +import { Driver } from '../../../webdriver/driver'; +import { RawLocator } from '../../common'; class WatchAssetConfirmation { private driver: Driver; diff --git a/test/e2e/page-objects/pages/settings/shield/shield-subscription-approve-page.ts b/test/e2e/page-objects/pages/settings/shield/shield-subscription-approve-page.ts index 35a639080d7e..1a79ffb916a5 100644 --- a/test/e2e/page-objects/pages/settings/shield/shield-subscription-approve-page.ts +++ b/test/e2e/page-objects/pages/settings/shield/shield-subscription-approve-page.ts @@ -1,4 +1,4 @@ -import TransactionConfirmation from '../../confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../confirmations/transaction-confirmation'; import { RawLocator } from '../../../common'; class ShieldSubscriptionApprovePage extends TransactionConfirmation { diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts index 7bdb0177423a..ae33bf077e80 100644 --- a/test/e2e/page-objects/pages/test-dapp.ts +++ b/test/e2e/page-objects/pages/test-dapp.ts @@ -1132,42 +1132,6 @@ class TestDapp { ); } - 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. - * - */ - async signTypedDataV4() { - console.log('Sign message with signTypedDataV4'); - await this.clickSignTypedDatav4(); - 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, - ); - } - /** * Check if the test dapp is connected to the specified network. * diff --git a/test/e2e/snaps/test-snap-txinsights.spec.ts b/test/e2e/snaps/test-snap-txinsights.spec.ts index 1032431b77d8..fbe192329c8e 100644 --- a/test/e2e/snaps/test-snap-txinsights.spec.ts +++ b/test/e2e/snaps/test-snap-txinsights.spec.ts @@ -12,7 +12,7 @@ import TestDapp from '../page-objects/pages/test-dapp'; import { SMART_CONTRACTS } from '../seeder/smart-contracts'; import ContractAddressRegistry from '../seeder/contract-address-registry'; import { TestSuiteArguments } from '../tests/confirmations/transactions/shared'; -import TransactionConfirmation from '../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../page-objects/pages/confirmations/transaction-confirmation'; import SnapTxInsights from '../page-objects/pages/dialog/snap-txinsight'; import { mockInsightsSnap } from '../mock-response-data/snaps/snap-binary-mocks'; import { DAPP_ONE_URL, DAPP_PATH } from '../constants'; diff --git a/test/e2e/tests/account/account-modal-account-type-change.spec.ts b/test/e2e/tests/account/account-modal-account-type-change.spec.ts index cefeb230fe0e..bfb58ec27f3f 100644 --- a/test/e2e/tests/account/account-modal-account-type-change.spec.ts +++ b/test/e2e/tests/account/account-modal-account-type-change.spec.ts @@ -3,7 +3,7 @@ import { Anvil } from '@viem/anvil'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; import AccountDetailsModal from '../../page-objects/pages/dialog/account-details-modal'; -import Eip7702AndSendCalls from '../../page-objects/pages/confirmations/redesign/batch-confirmation'; +import Eip7702AndSendCalls from '../../page-objects/pages/confirmations/batch-confirmation'; import FixtureBuilder from '../../fixtures/fixture-builder'; import HomePage from '../../page-objects/pages/home/homepage'; import HeaderNavbar from '../../page-objects/pages/header-navbar'; diff --git a/test/e2e/tests/account/snap-account-contract-interaction.spec.ts b/test/e2e/tests/account/snap-account-contract-interaction.spec.ts index b0d4370a23a2..9aacc8a8fc7b 100644 --- a/test/e2e/tests/account/snap-account-contract-interaction.spec.ts +++ b/test/e2e/tests/account/snap-account-contract-interaction.spec.ts @@ -13,7 +13,7 @@ import HeaderNavbar from '../../page-objects/pages/header-navbar'; import HomePage from '../../page-objects/pages/home/homepage'; import SnapSimpleKeyringPage from '../../page-objects/pages/snap-simple-keyring-page'; 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 { installSnapSimpleKeyring } from '../../page-objects/flows/snap-simple-keyring.flow'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import { mockSnapSimpleKeyringAndSite } from './snap-keyring-site-mocks'; diff --git a/test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts b/test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts index 5dd2747f2f84..56a039f1f00d 100644 --- a/test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts +++ b/test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts @@ -2,8 +2,8 @@ import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, WINDOW_TITLES } from '../../../helpers'; import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; import { TestSuiteArguments } from '../transactions/shared'; -import AlertModal from '../../../page-objects/pages/confirmations/redesign/alert-modal'; -import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; +import AlertModal from '../../../page-objects/pages/confirmations/alert-modal'; +import Confirmation from '../../../page-objects/pages/confirmations/confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { loginWithoutBalanceValidation } from '../../../page-objects/flows/login.flow'; diff --git a/test/e2e/tests/confirmations/helpers.ts b/test/e2e/tests/confirmations/helpers.ts index 51c0d90b954c..48348881a4f6 100644 --- a/test/e2e/tests/confirmations/helpers.ts +++ b/test/e2e/tests/confirmations/helpers.ts @@ -4,7 +4,7 @@ import { withFixtures } from '../../helpers'; import { MockedEndpoint, Mockttp } from '../../mock-e2e'; import { SMART_CONTRACTS } from '../../seeder/smart-contracts'; import { Driver } from '../../webdriver/driver'; -import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../page-objects/pages/confirmations/confirmation'; import { MOCK_META_METRICS_ID } from '../../constants'; import { mockDialogSnap } from '../../mock-response-data/snaps/snap-binary-mocks'; import { LEGACY_SEND_FEATURE_FLAG } from '../send/common'; diff --git a/test/e2e/tests/confirmations/navigation.spec.ts b/test/e2e/tests/confirmations/navigation.spec.ts index ba75241411c8..4c56ae5e0231 100644 --- a/test/e2e/tests/confirmations/navigation.spec.ts +++ b/test/e2e/tests/confirmations/navigation.spec.ts @@ -7,8 +7,8 @@ import TestDapp from '../../page-objects/pages/test-dapp'; import { createDappTransaction } from '../../page-objects/flows/transaction'; import { TestSnaps } from '../../page-objects/pages/test-snaps'; import { openTestSnapClickButtonAndInstall } from '../../page-objects/flows/install-test-snap.flow'; -import SignTypedData from '../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import SignTypedData from '../../page-objects/pages/confirmations/sign-typed-data-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import { DAPP_ONE_URL, DAPP_PATH, MOCK_META_METRICS_ID } from '../../constants'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { mockDialogSnap } from '../../mock-response-data/snaps/snap-binary-mocks'; diff --git a/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts b/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts index 5d85c18a4b66..b4a142d289f2 100644 --- a/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts +++ b/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts @@ -7,7 +7,7 @@ import { withSignatureFixtures, } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; -import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../../page-objects/pages/confirmations/confirmation'; import ConfirmAlertModal from '../../../page-objects/pages/dialog/confirm-alert'; import { BlockaidReason, diff --git a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts index 691f2768e02d..aedba1474dd3 100644 --- a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts +++ b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts @@ -9,7 +9,7 @@ import { withSignatureFixtures, } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; -import PermitConfirmation from '../../../page-objects/pages/confirmations/redesign/permit-confirmation'; +import PermitConfirmation from '../../../page-objects/pages/confirmations/permit-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; import { diff --git a/test/e2e/tests/confirmations/signatures/permit.spec.ts b/test/e2e/tests/confirmations/signatures/permit.spec.ts index 15692dbdf24b..4abf368d9f4d 100644 --- a/test/e2e/tests/confirmations/signatures/permit.spec.ts +++ b/test/e2e/tests/confirmations/signatures/permit.spec.ts @@ -12,8 +12,8 @@ import { } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; import TestDapp from '../../../page-objects/pages/test-dapp'; -import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; -import PermitConfirmation from '../../../page-objects/pages/confirmations/redesign/permit-confirmation'; +import Confirmation from '../../../page-objects/pages/confirmations/confirmation'; +import PermitConfirmation from '../../../page-objects/pages/confirmations/permit-confirmation'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; import { assertAccountDetailsMetrics, diff --git a/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts b/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts index d3a3a972cf43..305f21acb04e 100644 --- a/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts +++ b/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts @@ -10,7 +10,7 @@ import { } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; import TestDapp from '../../../page-objects/pages/test-dapp'; -import PersonalSignConfirmation from '../../../page-objects/pages/confirmations/redesign/personal-sign-confirmation'; +import PersonalSignConfirmation from '../../../page-objects/pages/confirmations/personal-sign-confirmation'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; import FixtureBuilder from '../../../fixtures/fixture-builder'; import { DEFAULT_FIXTURE_ACCOUNT_LOWERCASE } from '../../../constants'; diff --git a/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts b/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts index 1e275e84bafe..70b1e41515f7 100644 --- a/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts +++ b/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts @@ -9,7 +9,7 @@ import { withSignatureFixtures, } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; -import SignTypedData from '../../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; +import SignTypedData from '../../../page-objects/pages/confirmations/sign-typed-data-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; import { diff --git a/test/e2e/tests/confirmations/signatures/sign-typed-data-v4.spec.ts b/test/e2e/tests/confirmations/signatures/sign-typed-data-v4.spec.ts index 1e032da162c1..f91c610f870a 100644 --- a/test/e2e/tests/confirmations/signatures/sign-typed-data-v4.spec.ts +++ b/test/e2e/tests/confirmations/signatures/sign-typed-data-v4.spec.ts @@ -10,7 +10,7 @@ import { } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; import { DEFAULT_FIXTURE_ACCOUNT } from '../../../constants'; -import SignTypedData from '../../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; +import SignTypedData from '../../../page-objects/pages/confirmations/sign-typed-data-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import TestDappIndividualRequest from '../../../page-objects/pages/test-dapp-individual-request'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; diff --git a/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts b/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts index 703a2d6e4204..c52979898db2 100644 --- a/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts +++ b/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts @@ -8,7 +8,7 @@ import { withSignatureFixtures, } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; -import SignTypedData from '../../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; +import SignTypedData from '../../../page-objects/pages/confirmations/sign-typed-data-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { MetaMetricsRequestedThrough } from '../../../../../shared/constants/metametrics'; import { diff --git a/test/e2e/tests/confirmations/signatures/signature-helpers.ts b/test/e2e/tests/confirmations/signatures/signature-helpers.ts index 1b8f74f87935..f579e04ab5e8 100644 --- a/test/e2e/tests/confirmations/signatures/signature-helpers.ts +++ b/test/e2e/tests/confirmations/signatures/signature-helpers.ts @@ -8,8 +8,8 @@ import { import { Driver } from '../../../webdriver/driver'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { DAPP_URL } from '../../../constants'; -import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; -import AccountDetailsModal from '../../../page-objects/pages/confirmations/redesign/accountDetailsModal'; +import Confirmation from '../../../page-objects/pages/confirmations/confirmation'; +import AccountDetailsModal from '../../../page-objects/pages/confirmations/accountDetailsModal'; import { BlockaidReason, BlockaidResultType, diff --git a/test/e2e/tests/confirmations/signatures/signature-request.spec.ts b/test/e2e/tests/confirmations/signatures/signature-request.spec.ts index 223623596eab..414f8b6936d7 100644 --- a/test/e2e/tests/confirmations/signatures/signature-request.spec.ts +++ b/test/e2e/tests/confirmations/signatures/signature-request.spec.ts @@ -1,4 +1,4 @@ -import SignTypedData from '../../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; +import SignTypedData from '../../../page-objects/pages/confirmations/sign-typed-data-confirmation'; import { withFixtures, unlockWallet } from '../../../helpers'; import FixtureBuilder from '../../../fixtures/fixture-builder'; diff --git a/test/e2e/tests/confirmations/signatures/siwe.spec.ts b/test/e2e/tests/confirmations/signatures/siwe.spec.ts index 28b8c0d329e5..b7f784350d76 100644 --- a/test/e2e/tests/confirmations/signatures/siwe.spec.ts +++ b/test/e2e/tests/confirmations/signatures/siwe.spec.ts @@ -9,7 +9,7 @@ import { withSignatureFixtures, } from '../helpers'; import { TestSuiteArguments } from '../transactions/shared'; -import PersonalSignConfirmation from '../../../page-objects/pages/confirmations/redesign/personal-sign-confirmation'; +import PersonalSignConfirmation from '../../../page-objects/pages/confirmations/personal-sign-confirmation'; import { BlockaidReason, BlockaidResultType, diff --git a/test/e2e/tests/confirmations/transactions/contract-deployment-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/contract-deployment-redesign.spec.ts index 41a35dea9e86..31beb104c78e 100644 --- a/test/e2e/tests/confirmations/transactions/contract-deployment-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/contract-deployment-redesign.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */ import { WINDOW_TITLES } from '../../../constants'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import ContractDeploymentConfirmation from '../../../page-objects/pages/confirmations/redesign/deploy-confirmation'; +import ContractDeploymentConfirmation from '../../../page-objects/pages/confirmations/deploy-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import TestDapp from '../../../page-objects/pages/test-dapp'; diff --git a/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts index eeb7c47382c9..c7d5110d55b7 100644 --- a/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts @@ -9,7 +9,7 @@ import { loginWithBalanceValidation } from '../../../page-objects/flows/login.fl import TestDapp from '../../../page-objects/pages/test-dapp'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import AdvancedSettings from '../../../page-objects/pages/settings/advanced-settings'; import SettingsPage from '../../../page-objects/pages/settings/settings-page'; import { diff --git a/test/e2e/tests/confirmations/transactions/eip7702-eip5792-upgrade-account.spec.ts b/test/e2e/tests/confirmations/transactions/eip7702-eip5792-upgrade-account.spec.ts index c080f5bf43c5..01dc3c8cebb3 100644 --- a/test/e2e/tests/confirmations/transactions/eip7702-eip5792-upgrade-account.spec.ts +++ b/test/e2e/tests/confirmations/transactions/eip7702-eip5792-upgrade-account.spec.ts @@ -6,7 +6,7 @@ import { DEFAULT_FIXTURE_ACCOUNT } from '../../../constants'; import FixtureBuilder from '../../../fixtures/fixture-builder'; import { WINDOW_TITLES, withFixtures } from '../../../helpers'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import Eip7702AndSendCalls from '../../../page-objects/pages/confirmations/redesign/batch-confirmation'; +import Eip7702AndSendCalls from '../../../page-objects/pages/confirmations/batch-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import TestDapp from '../../../page-objects/pages/test-dapp'; diff --git a/test/e2e/tests/confirmations/transactions/erc1155-revoke-set-approval-for-all-redesign.ts b/test/e2e/tests/confirmations/transactions/erc1155-revoke-set-approval-for-all-redesign.ts index 914e301e9e31..fd7afc8f7b0b 100644 --- a/test/e2e/tests/confirmations/transactions/erc1155-revoke-set-approval-for-all-redesign.ts +++ b/test/e2e/tests/confirmations/transactions/erc1155-revoke-set-approval-for-all-redesign.ts @@ -3,7 +3,7 @@ import { TransactionEnvelopeType } from '@metamask/transaction-controller'; import { DAPP_URL } from '../../../constants'; import { unlockWallet, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; import { Driver } from '../../../webdriver/driver'; diff --git a/test/e2e/tests/confirmations/transactions/erc1155-set-approval-for-all-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc1155-set-approval-for-all-redesign.spec.ts index e75fd5c08cf9..95e1ab504c73 100644 --- a/test/e2e/tests/confirmations/transactions/erc1155-set-approval-for-all-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/erc1155-set-approval-for-all-redesign.spec.ts @@ -4,7 +4,7 @@ import { DAPP_URL, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; import { Anvil } from '../../../seeder/anvil'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; import { Driver } from '../../../webdriver/driver'; diff --git a/test/e2e/tests/confirmations/transactions/erc20-approve-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc20-approve-redesign.spec.ts index 9e135eabe11d..e4668b3a05e5 100644 --- a/test/e2e/tests/confirmations/transactions/erc20-approve-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/erc20-approve-redesign.spec.ts @@ -4,7 +4,7 @@ import { WINDOW_TITLES, withFixtures } from '../../../helpers'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import AssetListPage from '../../../page-objects/pages/home/asset-list'; -import ERC20ApproveTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/erc20-approve-transaction-confirmation'; +import ERC20ApproveTransactionConfirmation from '../../../page-objects/pages/confirmations/erc20-approve-transaction-confirmation'; import { scrollAndConfirmAndAssertConfirm } from '../helpers'; import HomePage from '../../../page-objects/pages/home/homepage'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; diff --git a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts index e334beb7edc9..b6cb92adb22b 100644 --- a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts @@ -4,9 +4,9 @@ import { DAPP_URL } from '../../../constants'; import { veryLargeDelayMs, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; import { Anvil } from '../../../seeder/anvil'; -import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation'; +import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/watch-asset-confirmation'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; +import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/token-transfer-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; import SendTokenPage from '../../../page-objects/pages/send/send-token-page'; import TestDapp from '../../../page-objects/pages/test-dapp'; diff --git a/test/e2e/tests/confirmations/transactions/erc721-revoke-set-approval-for-all-redesign.ts b/test/e2e/tests/confirmations/transactions/erc721-revoke-set-approval-for-all-redesign.ts index ca3044a6a555..1f165181ab64 100644 --- a/test/e2e/tests/confirmations/transactions/erc721-revoke-set-approval-for-all-redesign.ts +++ b/test/e2e/tests/confirmations/transactions/erc721-revoke-set-approval-for-all-redesign.ts @@ -3,7 +3,7 @@ import { TransactionEnvelopeType } from '@metamask/transaction-controller'; import { DAPP_URL } from '../../../constants'; import { unlockWallet, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import TestDapp from '../../../page-objects/pages/test-dapp'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; import { Driver } from '../../../webdriver/driver'; diff --git a/test/e2e/tests/confirmations/transactions/erc721-set-approval-for-all-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc721-set-approval-for-all-redesign.spec.ts index 931e82e0e2d0..80213ba2a51e 100644 --- a/test/e2e/tests/confirmations/transactions/erc721-set-approval-for-all-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/erc721-set-approval-for-all-redesign.spec.ts @@ -3,7 +3,7 @@ import { TransactionEnvelopeType } from '@metamask/transaction-controller'; import { DAPP_URL, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; import { Anvil } from '../../../seeder/anvil'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import TestDapp from '../../../page-objects/pages/test-dapp'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; diff --git a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts index 79962bd55111..5c531614f406 100644 --- a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts +++ b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts @@ -12,7 +12,7 @@ import { } from '../../../helpers'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import { createDappTransaction } from '../../../page-objects/flows/transaction'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import { mockEip7702FeatureFlag } from '../helpers'; diff --git a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts index 3dd2c12d0467..3c12b545f2b2 100644 --- a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts +++ b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts @@ -8,8 +8,8 @@ import { decimalToHex } from '../../../../../shared/modules/conversion.utils'; import FixtureBuilder from '../../../fixtures/fixture-builder'; import { WINDOW_TITLES, unlockWallet, withFixtures } from '../../../helpers'; import { createDappTransaction } from '../../../page-objects/flows/transaction'; -import GasFeeTokenModal from '../../../page-objects/pages/confirmations/redesign/gas-fee-token-modal'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import GasFeeTokenModal from '../../../page-objects/pages/confirmations/gas-fee-token-modal'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import { Driver } from '../../../webdriver/driver'; diff --git a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-smart-transactions.spec.ts b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-smart-transactions.spec.ts index d7756cb2882b..00123f710f36 100644 --- a/test/e2e/tests/confirmations/transactions/gas-fee-tokens-smart-transactions.spec.ts +++ b/test/e2e/tests/confirmations/transactions/gas-fee-tokens-smart-transactions.spec.ts @@ -8,8 +8,8 @@ import FixtureBuilder from '../../../fixtures/fixture-builder'; import { WINDOW_TITLES, unlockWallet, withFixtures } from '../../../helpers'; import { mockMultiNetworkBalancePolling } from '../../../mock-balance-polling/mock-balance-polling'; import { createDappTransaction } from '../../../page-objects/flows/transaction'; -import GasFeeTokenModal from '../../../page-objects/pages/confirmations/redesign/gas-fee-token-modal'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import GasFeeTokenModal from '../../../page-objects/pages/confirmations/gas-fee-token-modal'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import { Driver } from '../../../webdriver/driver'; diff --git a/test/e2e/tests/confirmations/transactions/metrics.spec.ts b/test/e2e/tests/confirmations/transactions/metrics.spec.ts index 08aa48c6dd1d..3ff8cc583802 100644 --- a/test/e2e/tests/confirmations/transactions/metrics.spec.ts +++ b/test/e2e/tests/confirmations/transactions/metrics.spec.ts @@ -8,9 +8,9 @@ import { import { Driver } from '../../../webdriver/driver'; import { MOCK_META_METRICS_ID, WINDOW_TITLES } from '../../../constants'; import TestDapp from '../../../page-objects/pages/test-dapp'; -import ContractDeploymentConfirmation from '../../../page-objects/pages/confirmations/redesign/deploy-confirmation'; +import ContractDeploymentConfirmation from '../../../page-objects/pages/confirmations/deploy-confirmation'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import { assertAdvancedGasDetails } from './shared'; diff --git a/test/e2e/tests/confirmations/transactions/multiple-dapp-network-confirmation-routing.spec.ts b/test/e2e/tests/confirmations/transactions/multiple-dapp-network-confirmation-routing.spec.ts index 59108da8b39c..23ac27dc1837 100644 --- a/test/e2e/tests/confirmations/transactions/multiple-dapp-network-confirmation-routing.spec.ts +++ b/test/e2e/tests/confirmations/transactions/multiple-dapp-network-confirmation-routing.spec.ts @@ -9,7 +9,7 @@ import { withFixtures, } from '../../../helpers'; import TestDapp from '../../../page-objects/pages/test-dapp'; -import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; +import ConnectAccountConfirmation from '../../../page-objects/pages/confirmations/connect-account-confirmation'; describe('Routing confirmstions from Multiple Dapps and different networks', function () { it('Confirmation requests from different DAPPS and networks should be in same queue, it is possible to navigate the queue.', async function () { diff --git a/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts index 5410c2777583..a1529af2dfd8 100644 --- a/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts @@ -3,7 +3,7 @@ import { TransactionEnvelopeType } from '@metamask/transaction-controller'; import { DAPP_URL } from '../../../constants'; import { veryLargeDelayMs, WINDOW_TITLES } from '../../../helpers'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; +import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/token-transfer-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; import SendTokenPage from '../../../page-objects/pages/send/send-token-page'; import TestDapp from '../../../page-objects/pages/test-dapp'; diff --git a/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts index 1d509cf9fa06..e77c8882a590 100644 --- a/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts @@ -4,10 +4,10 @@ import { DAPP_URL } from '../../../constants'; import { veryLargeDelayMs, WINDOW_TITLES } from '../../../helpers'; import { Mockttp } from '../../../mock-e2e'; import { Anvil } from '../../../seeder/anvil'; -import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation'; +import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/watch-asset-confirmation'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; -import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/token-transfer-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import NFTListPage from '../../../page-objects/pages/home/nft-list'; diff --git a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts index 903c6ec90591..e991f38ff665 100644 --- a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts +++ b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts @@ -4,7 +4,7 @@ import { decimalToPrefixedHex } from '../../../../../shared/modules/conversion.u import { DEFAULT_FIXTURE_ACCOUNT } from '../../../constants'; import { unlockWallet } from '../../../helpers'; import { createDappTransaction } from '../../../page-objects/flows/transaction'; -import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../../page-objects/pages/confirmations/confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; import { TestSuiteArguments } from './shared'; diff --git a/test/e2e/tests/confirmations/transactions/transaction-decoding-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/transaction-decoding-redesign.spec.ts index 8fd58440ac79..55c969177bb9 100644 --- a/test/e2e/tests/confirmations/transactions/transaction-decoding-redesign.spec.ts +++ b/test/e2e/tests/confirmations/transactions/transaction-decoding-redesign.spec.ts @@ -5,7 +5,7 @@ import { DAPP_URL, WINDOW_TITLES } from '../../../constants'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import TestDapp from '../../../page-objects/pages/test-dapp'; import { TRANSACTION_DATA_UNISWAP } from '../../../../data/confirmations/transaction-decode'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; import { TestSuiteArguments } from './shared'; diff --git a/test/e2e/tests/connections/multiple-provider-connections.spec.ts b/test/e2e/tests/connections/multiple-provider-connections.spec.ts index 51946433627d..75849519929e 100644 --- a/test/e2e/tests/connections/multiple-provider-connections.spec.ts +++ b/test/e2e/tests/connections/multiple-provider-connections.spec.ts @@ -21,7 +21,7 @@ import Homepage from '../../page-objects/pages/home/homepage'; import PermissionListPage from '../../page-objects/pages/permission/permission-list-page'; import SitePermissionPage from '../../page-objects/pages/permission/site-permission-page'; import TestDapp from '../../page-objects/pages/test-dapp'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow'; import { withSolanaAccountSnap } from '../solana/common-solana'; import FixtureBuilder from '../../fixtures/fixture-builder'; diff --git a/test/e2e/tests/connections/review-switch-permission-page.spec.ts b/test/e2e/tests/connections/review-switch-permission-page.spec.ts index d040c98dd2cd..ef597b3a1062 100644 --- a/test/e2e/tests/connections/review-switch-permission-page.spec.ts +++ b/test/e2e/tests/connections/review-switch-permission-page.spec.ts @@ -3,7 +3,7 @@ import FixtureBuilder from '../../fixtures/fixture-builder'; import { withFixtures, WINDOW_TITLES } from '../../helpers'; import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants'; import HomePage from '../../page-objects/pages/home/homepage'; -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 { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import { switchToNetworkFromSendFlow } from '../../page-objects/flows/network.flow'; diff --git a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.ts b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.ts index f855d5c782b9..17b2820620e3 100644 --- a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.ts +++ b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.ts @@ -6,8 +6,8 @@ import { DEFAULT_FIXTURE_ACCOUNT, } from '../../constants'; import FixtureBuilder from '../../fixtures/fixture-builder'; -import AddNetworkConfirmation from '../../page-objects/pages/confirmations/redesign/add-network-confirmations'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; +import AddNetworkConfirmation from '../../page-objects/pages/confirmations/add-network-confirmations'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; import Homepage from '../../page-objects/pages/home/homepage'; import LoginPage from '../../page-objects/pages/login-page'; import PermissionListPage from '../../page-objects/pages/permission/permission-list-page'; diff --git a/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.ts b/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.ts index f45305c26065..55f4887dd452 100644 --- a/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.ts +++ b/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.ts @@ -1,7 +1,7 @@ import { Suite } from 'mocha'; import { WINDOW_TITLES, withFixtures } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; -import DecryptMessageConfirmation from '../../page-objects/pages/confirmations/redesign/decrypt-message-confirmation'; +import DecryptMessageConfirmation from '../../page-objects/pages/confirmations/decrypt-message-confirmation'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import { diff --git a/test/e2e/tests/hardware-wallets/ledger/ledger-erc20.spec.ts b/test/e2e/tests/hardware-wallets/ledger/ledger-erc20.spec.ts index bc30e81fdc5d..dbc9acd30eb0 100644 --- a/test/e2e/tests/hardware-wallets/ledger/ledger-erc20.spec.ts +++ b/test/e2e/tests/hardware-wallets/ledger/ledger-erc20.spec.ts @@ -5,11 +5,11 @@ import { WINDOW_TITLES, withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import CreateContractModal from '../../../page-objects/pages/dialog/create-contract'; -import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation'; +import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/watch-asset-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; -import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; +import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/token-transfer-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; describe('Ledger Hardware', function (this: Suite) { diff --git a/test/e2e/tests/hardware-wallets/ledger/ledger-erc721.spec.ts b/test/e2e/tests/hardware-wallets/ledger/ledger-erc721.spec.ts index aa79bb512d94..49fb4fb24d85 100644 --- a/test/e2e/tests/hardware-wallets/ledger/ledger-erc721.spec.ts +++ b/test/e2e/tests/hardware-wallets/ledger/ledger-erc721.spec.ts @@ -5,10 +5,10 @@ import { WINDOW_TITLES, withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import CreateContractModal from '../../../page-objects/pages/dialog/create-contract'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; import NFTListPage from '../../../page-objects/pages/home/nft-list'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; diff --git a/test/e2e/tests/hardware-wallets/ledger/ledger-sign.spec.ts b/test/e2e/tests/hardware-wallets/ledger/ledger-sign.spec.ts index e0fef7c85123..caf0925c2b3c 100644 --- a/test/e2e/tests/hardware-wallets/ledger/ledger-sign.spec.ts +++ b/test/e2e/tests/hardware-wallets/ledger/ledger-sign.spec.ts @@ -5,6 +5,7 @@ import { withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import { loginWithoutBalanceValidation } from '../../../page-objects/flows/login.flow'; import TestDappPage from '../../../page-objects/pages/test-dapp'; +import { signTypedDataV4 } from '../../../page-objects/flows/sign.flow'; describe('Ledger Hardware Signatures', function (this: Suite) { it('sign typed v4', async function () { @@ -24,10 +25,7 @@ describe('Ledger Hardware Signatures', function (this: Suite) { const testDappPage = new TestDappPage(driver); await testDappPage.openTestDappPage(); await testDappPage.checkPageIsLoaded(); - await testDappPage.signTypedDataV4(); - await testDappPage.checkSuccessSignTypedDataV4( - KNOWN_PUBLIC_KEY_ADDRESSES[0].address, - ); + await signTypedDataV4(driver, KNOWN_PUBLIC_KEY_ADDRESSES[0].address); }, ); }); diff --git a/test/e2e/tests/hardware-wallets/trezor/trezor-erc20.spec.ts b/test/e2e/tests/hardware-wallets/trezor/trezor-erc20.spec.ts index 5bdb39fb07fd..7fc14198989e 100644 --- a/test/e2e/tests/hardware-wallets/trezor/trezor-erc20.spec.ts +++ b/test/e2e/tests/hardware-wallets/trezor/trezor-erc20.spec.ts @@ -5,11 +5,11 @@ import { WINDOW_TITLES, withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import CreateContractModal from '../../../page-objects/pages/dialog/create-contract'; -import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation'; +import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/watch-asset-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; -import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; +import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/token-transfer-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; describe('Trezor Hardware', function (this: Suite) { diff --git a/test/e2e/tests/hardware-wallets/trezor/trezor-erc721.spec.ts b/test/e2e/tests/hardware-wallets/trezor/trezor-erc721.spec.ts index 6d3265fadee6..aa11ae114de1 100644 --- a/test/e2e/tests/hardware-wallets/trezor/trezor-erc721.spec.ts +++ b/test/e2e/tests/hardware-wallets/trezor/trezor-erc721.spec.ts @@ -5,10 +5,10 @@ import { DAPP_URL, WINDOW_TITLES, withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow'; import CreateContractModal from '../../../page-objects/pages/dialog/create-contract'; -import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation'; import HomePage from '../../../page-objects/pages/home/homepage'; import NFTListPage from '../../../page-objects/pages/home/nft-list'; -import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/set-approval-for-all-transaction-confirmation'; +import SetApprovalForAllTransactionConfirmation from '../../../page-objects/pages/confirmations/set-approval-for-all-transaction-confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; import ContractAddressRegistry from '../../../seeder/contract-address-registry'; diff --git a/test/e2e/tests/hardware-wallets/trezor/trezor-sign.spec.ts b/test/e2e/tests/hardware-wallets/trezor/trezor-sign.spec.ts index 0196558cbb4f..1ade9631a2a6 100644 --- a/test/e2e/tests/hardware-wallets/trezor/trezor-sign.spec.ts +++ b/test/e2e/tests/hardware-wallets/trezor/trezor-sign.spec.ts @@ -5,6 +5,7 @@ import { withFixtures } from '../../../helpers'; import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../../stub/keyring-bridge'; import TestDappPage from '../../../page-objects/pages/test-dapp'; import { loginWithoutBalanceValidation } from '../../../page-objects/flows/login.flow'; +import { signTypedDataV4 } from '../../../page-objects/flows/sign.flow'; describe('Trezor Hardware Signatures', function (this: Suite) { it('personal sign', async function () { @@ -49,10 +50,7 @@ describe('Trezor Hardware Signatures', function (this: Suite) { const testDappPage = new TestDappPage(driver); await testDappPage.openTestDappPage(); await testDappPage.checkPageIsLoaded(); - await testDappPage.signTypedDataV4(); - await testDappPage.checkSuccessSignTypedDataV4( - KNOWN_PUBLIC_KEY_ADDRESSES[0].address, - ); + await signTypedDataV4(driver, KNOWN_PUBLIC_KEY_ADDRESSES[0].address); }, ); }); diff --git a/test/e2e/tests/metrics/signature-approved.spec.ts b/test/e2e/tests/metrics/signature-approved.spec.ts index f17936b54c75..aa4f42ba3697 100644 --- a/test/e2e/tests/metrics/signature-approved.spec.ts +++ b/test/e2e/tests/metrics/signature-approved.spec.ts @@ -2,10 +2,15 @@ import { strict as assert } from 'assert'; import { Mockttp } from 'mockttp'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { DEFAULT_FIXTURE_ACCOUNT, MOCK_META_METRICS_ID } from '../../constants'; import { MetaMetricsRequestedThrough } from '../../../../shared/constants/metametrics'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; +import { + signTypedDataV3, + signTypedDataV4, + signTypedData, +} from '../../page-objects/flows/sign.flow'; /** * mocks the segment api multiple times for specific payloads that we expect to @@ -88,8 +93,8 @@ describe('Signature Approved Event', function () { await testDapp.openTestDappPage(); await testDapp.checkPageIsLoaded(); - // creates a sign typed data V4 signature request - await testDapp.signTypedDataV4(); + // creates and approves a sign typed data V4 signature request + await signTypedDataV4(driver, DEFAULT_FIXTURE_ACCOUNT); const events = await getEventPayloads(driver, mockedEndpoints); assert.deepStrictEqual(events[0].properties, { @@ -147,8 +152,8 @@ describe('Signature Approved Event', function () { await testDapp.openTestDappPage(); await testDapp.checkPageIsLoaded(); - // creates a sign typed data V3 signature request - await testDapp.signTypedDataV3Redesign(); + // creates and approves a sign typed data V3 signature request + await signTypedDataV3(driver, DEFAULT_FIXTURE_ACCOUNT); const events = await getEventPayloads(driver, mockedEndpoints); assert.deepStrictEqual(events[0].properties, { @@ -200,8 +205,8 @@ describe('Signature Approved Event', function () { await testDapp.openTestDappPage(); await testDapp.checkPageIsLoaded(); - // creates a sign typed data signature request - await testDapp.signTypedData(); + // creates and approves a sign typed data signature request + await signTypedData(driver, DEFAULT_FIXTURE_ACCOUNT); const events = await getEventPayloads(driver, mockedEndpoints); assert.deepStrictEqual(events[0].properties, { diff --git a/test/e2e/tests/network/add-custom-rpc.spec.ts b/test/e2e/tests/network/add-custom-rpc.spec.ts index 83be46610957..2ddbe3ef45e0 100644 --- a/test/e2e/tests/network/add-custom-rpc.spec.ts +++ b/test/e2e/tests/network/add-custom-rpc.spec.ts @@ -3,8 +3,8 @@ import { MockttpServer } from 'mockttp'; import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import TestDapp from '../../page-objects/pages/test-dapp'; -import AddNetworkConfirmation from '../../page-objects/pages/confirmations/redesign/add-network-confirmations'; -import UpdateNetworkConfirmation from '../../page-objects/pages/confirmations/redesign/update-network-confirmation'; +import AddNetworkConfirmation from '../../page-objects/pages/confirmations/add-network-confirmations'; +import UpdateNetworkConfirmation from '../../page-objects/pages/confirmations/update-network-confirmation'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import { RowAlertKey } from '../../../../ui/components/app/confirm/info/row/constants'; diff --git a/test/e2e/tests/network/network-manager.spec.ts b/test/e2e/tests/network/network-manager.spec.ts index 9e9c5f856da9..fa04439d5af7 100644 --- a/test/e2e/tests/network/network-manager.spec.ts +++ b/test/e2e/tests/network/network-manager.spec.ts @@ -8,7 +8,7 @@ import NetworkManager, { } from '../../page-objects/pages/network-manager'; import AssetListPage from '../../page-objects/pages/home/asset-list'; import TestDapp from '../../page-objects/pages/test-dapp'; -import AddNetworkConfirmation from '../../page-objects/pages/confirmations/redesign/add-network-confirmations'; +import AddNetworkConfirmation from '../../page-objects/pages/confirmations/add-network-confirmations'; describe('Network Manager', function (this: Suite) { it('should reflect the enabled networks state in the network manager', async function () { diff --git a/test/e2e/tests/network/switch-custom-network.spec.ts b/test/e2e/tests/network/switch-custom-network.spec.ts index 3ca9e220e80b..3a7d422fab10 100644 --- a/test/e2e/tests/network/switch-custom-network.spec.ts +++ b/test/e2e/tests/network/switch-custom-network.spec.ts @@ -2,7 +2,7 @@ import { strict as assert } from 'assert'; import { Suite } from 'mocha'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { regularDelayMs, WINDOW_TITLES, withFixtures } from '../../helpers'; -import AddNetworkConfirmation from '../../page-objects/pages/confirmations/redesign/add-network-confirmations'; +import AddNetworkConfirmation from '../../page-objects/pages/confirmations/add-network-confirmations'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import AssetListPage from '../../page-objects/pages/home/asset-list'; diff --git a/test/e2e/tests/petnames/petnames-signatures.spec.ts b/test/e2e/tests/petnames/petnames-signatures.spec.ts index fc79086c4632..af130a3fd3f9 100644 --- a/test/e2e/tests/petnames/petnames-signatures.spec.ts +++ b/test/e2e/tests/petnames/petnames-signatures.spec.ts @@ -7,7 +7,7 @@ import { openTestSnapClickButtonAndInstall } from '../../page-objects/flows/inst import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { mockLookupSnap } from '../../mock-response-data/snaps/snap-binary-mocks'; -import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../page-objects/pages/confirmations/confirmation'; import { DAPP_ONE_URL, DAPP_PATH } from '../../constants'; describe('Petnames - Signatures', function (this: Suite) { diff --git a/test/e2e/tests/petnames/petnames-transactions.spec.ts b/test/e2e/tests/petnames/petnames-transactions.spec.ts index 76d6ed2865aa..ed0b48939c94 100644 --- a/test/e2e/tests/petnames/petnames-transactions.spec.ts +++ b/test/e2e/tests/petnames/petnames-transactions.spec.ts @@ -2,7 +2,7 @@ import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import TestDapp from '../../page-objects/pages/test-dapp'; -import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../page-objects/pages/confirmations/confirmation'; import HomePage from '../../page-objects/pages/home/homepage'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; import { Driver } from '../../webdriver/driver'; diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts index d9f7699295b0..8814f5cda7b8 100644 --- a/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts +++ b/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts @@ -3,7 +3,7 @@ import { MockttpServer, CompletedRequest } from 'mockttp'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { WINDOW_TITLES, withFixtures } from '../../helpers'; 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'; import { mockServerJsonRpc } from './mocks/mock-server-json-rpc'; import { SECURITY_ALERTS_PROD_API_BASE_URL } from './constants'; diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts index cfa25a29fba0..bd86326be80d 100644 --- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts +++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts @@ -3,7 +3,7 @@ import { MockttpServer } from 'mockttp'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { WINDOW_TITLES, withFixtures } from '../../helpers'; 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'; import { mockServerJsonRpc } from './mocks/mock-server-json-rpc'; import { SECURITY_ALERTS_PROD_API_BASE_URL } from './constants'; diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts index 02aef6c293fb..34bf40203aa7 100644 --- a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts +++ b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts @@ -6,7 +6,7 @@ import { mockMultiNetworkBalancePolling } from '../../mock-balance-polling/mock- import HomePage from '../../page-objects/pages/home/homepage'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; 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 { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow'; import { mockServerJsonRpc } from './mocks/mock-server-json-rpc'; import { SECURITY_ALERTS_PROD_API_BASE_URL } from './constants'; diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts index 377fb585c7cf..baabc94ee029 100644 --- a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts +++ b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts @@ -3,7 +3,7 @@ import { MockttpServer } from 'mockttp'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { WINDOW_TITLES, withFixtures } from '../../helpers'; 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'; import { SECURITY_ALERTS_PROD_API_BASE_URL } from './constants'; import { mockServerJsonRpc } from './mocks/mock-server-json-rpc'; diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.ts b/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.ts index 4c127c0328ba..ef740926ce22 100644 --- a/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.ts +++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.ts @@ -7,7 +7,7 @@ import { largeDelayMs, } from '../../helpers'; 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 { switchToNetworkFromSendFlow } from '../../page-objects/flows/network.flow'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.ts b/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.ts index 579bc4b55174..60e26ef808de 100644 --- a/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.ts +++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.ts @@ -10,8 +10,8 @@ import { import { Driver } from '../../webdriver/driver'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; describe('Request Queuing for Multiple Dapps and Txs on different networks', function (this: Suite) { it('should put txs from different dapps on different networks adds extra tx after in same queue.', async function () { diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.ts b/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.ts index d7caa8cdb79e..71fede369f36 100644 --- a/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.ts +++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.ts @@ -7,7 +7,7 @@ import { largeDelayMs, } from '../../helpers'; 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('Request Queuing for Multiple Dapps and Txs on same networks', function () { diff --git a/test/e2e/tests/request-queuing/chainid-check.spec.ts b/test/e2e/tests/request-queuing/chainid-check.spec.ts index 49b79614f4d6..b746e6bd895e 100644 --- a/test/e2e/tests/request-queuing/chainid-check.spec.ts +++ b/test/e2e/tests/request-queuing/chainid-check.spec.ts @@ -10,8 +10,8 @@ import { } from '../../helpers'; import { PAGES } from '../../webdriver/driver'; import TestDapp from '../../page-objects/pages/test-dapp'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; -import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/redesign/review-permissions-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; +import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/review-permissions-confirmation'; import type { Driver } from '../../webdriver/driver'; describe('Request Queueing chainId proxy sync', function () { diff --git a/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.ts b/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.ts index 4598e5000570..1cdc7016a765 100644 --- a/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.ts +++ b/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.ts @@ -7,8 +7,8 @@ import { } from '../../helpers'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import TestDapp from '../../page-objects/pages/test-dapp'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; -import SignTypedDataConfirmation from '../../page-objects/pages/confirmations/redesign/sign-typed-data-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; +import SignTypedDataConfirmation from '../../page-objects/pages/confirmations/sign-typed-data-confirmation'; import { Driver } from '../../webdriver/driver'; describe('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () { diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.ts b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.ts index 15b549d4f3b5..db54e9ed38a2 100644 --- a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.ts +++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.ts @@ -5,8 +5,8 @@ import { withFixtures, DAPP_ONE_URL, WINDOW_TITLES } from '../../helpers'; import { Driver } from '../../webdriver/driver'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; describe('Request Queuing Dapp 1 Send Tx -> Dapp 2 Request Accounts Tx', function (this: Suite) { it('should queue `eth_requestAccounts` requests when the requesting dapp does not already have connected accounts', async function () { diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.ts b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.ts index dc9578f564ac..6fc2357741ca 100644 --- a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.ts +++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.ts @@ -6,13 +6,13 @@ import { withFixtures, } from '../../helpers'; 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 NetworkManager from '../../page-objects/pages/network-manager'; 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('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () { diff --git a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.ts b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.ts index 140bd6c8f2d2..7a840cf0f17b 100644 --- a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.ts +++ b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.ts @@ -10,7 +10,7 @@ import { import ActivityListPage from '../../page-objects/pages/home/activity-list'; import HomePage from '../../page-objects/pages/home/homepage'; 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'; // BUG #38149 - Request Queuing multiple Dapps and txs on different networks fails with unapproved transaction diff --git a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts index 5927b65bd0f3..e20230881424 100644 --- a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts +++ b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts @@ -1,6 +1,6 @@ import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; 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 { Driver } from '../../webdriver/driver'; import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants'; import FixtureBuilder from '../../fixtures/fixture-builder'; diff --git a/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.ts b/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.ts index 2f48214d7b63..83aa3549d25b 100644 --- a/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.ts +++ b/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.ts @@ -4,9 +4,9 @@ import FixtureBuilder from '../../fixtures/fixture-builder'; import { Driver } from '../../webdriver/driver'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import TestDapp from '../../page-objects/pages/test-dapp'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; -import AlertModal from '../../page-objects/pages/confirmations/redesign/alert-modal'; -import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/redesign/review-permissions-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; +import AlertModal from '../../page-objects/pages/confirmations/alert-modal'; +import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/review-permissions-confirmation'; import HomePage from '../../page-objects/pages/home/homepage'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; diff --git a/test/e2e/tests/request-queuing/switch-network.spec.ts b/test/e2e/tests/request-queuing/switch-network.spec.ts index 74c9b91170e6..37149f78256b 100644 --- a/test/e2e/tests/request-queuing/switch-network.spec.ts +++ b/test/e2e/tests/request-queuing/switch-network.spec.ts @@ -1,6 +1,6 @@ import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; 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 HomePage from '../../page-objects/pages/home/homepage'; import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; diff --git a/test/e2e/tests/request-queuing/switchChain-sendTx.spec.ts b/test/e2e/tests/request-queuing/switchChain-sendTx.spec.ts index 98435d112263..3fdc6ebe8fa5 100644 --- a/test/e2e/tests/request-queuing/switchChain-sendTx.spec.ts +++ b/test/e2e/tests/request-queuing/switchChain-sendTx.spec.ts @@ -1,7 +1,7 @@ import FixtureBuilder from '../../fixtures/fixture-builder'; import { withFixtures, WINDOW_TITLES } from '../../helpers'; 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('Request Queuing SwitchChain -> SendTx', function () { diff --git a/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.ts b/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.ts index 2ba0aabd0e93..0eebcdb43033 100644 --- a/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.ts +++ b/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.ts @@ -4,8 +4,8 @@ import FixtureBuilder from '../../fixtures/fixture-builder'; import { SMART_CONTRACTS } from '../../seeder/smart-contracts'; import { DAPP_URL } from '../../constants'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; -import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/redesign/review-permissions-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; +import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/review-permissions-confirmation'; import TestDapp from '../../page-objects/pages/test-dapp'; describe('Request Queue SwitchChain -> WatchAsset', function (this: Suite) { diff --git a/test/e2e/tests/request-queuing/ui.spec.ts b/test/e2e/tests/request-queuing/ui.spec.ts index 7556648c7a5b..26a8bdadd264 100644 --- a/test/e2e/tests/request-queuing/ui.spec.ts +++ b/test/e2e/tests/request-queuing/ui.spec.ts @@ -25,11 +25,11 @@ import { Anvil } from '../../seeder/anvil'; import HomePage from '../../page-objects/pages/home/homepage'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; import { CHAIN_IDS } from '../../../../shared/constants/network'; -import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/redesign/connect-account-confirmation'; -import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation'; -import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; -import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/redesign/review-permissions-confirmation'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import ConnectAccountConfirmation from '../../page-objects/pages/confirmations/connect-account-confirmation'; +import Confirmation from '../../page-objects/pages/confirmations/confirmation'; +import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/token-transfer-confirmation'; +import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/review-permissions-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import HeaderNavbar from '../../page-objects/pages/header-navbar'; // Window handle adjustments will need to be made for Non-MV3 Firefox diff --git a/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.ts b/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.ts index dcbf44f1b6b0..6bd3a525148a 100644 --- a/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.ts +++ b/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.ts @@ -5,7 +5,7 @@ import { Driver } from '../../webdriver/driver'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import TestDapp from '../../page-objects/pages/test-dapp'; import AddTokensModal from '../../page-objects/pages/dialog/add-tokens'; -import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/redesign/review-permissions-confirmation'; +import ReviewPermissionsConfirmation from '../../page-objects/pages/confirmations/review-permissions-confirmation'; import { SMART_CONTRACTS } from '../../seeder/smart-contracts'; import { DAPP_URL } from '../../constants'; import ContractAddressRegistry from '../../seeder/contract-address-registry'; diff --git a/test/e2e/tests/send/send-erc20.spec.ts b/test/e2e/tests/send/send-erc20.spec.ts index eaea5f69f039..f931a3ea104b 100644 --- a/test/e2e/tests/send/send-erc20.spec.ts +++ b/test/e2e/tests/send/send-erc20.spec.ts @@ -1,5 +1,5 @@ import ActivityListPage from '../../page-objects/pages/home/activity-list'; -import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation'; +import Confirmation from '../../page-objects/pages/confirmations/confirmation'; import FixtureBuilder from '../../fixtures/fixture-builder'; import AssetListPage from '../../page-objects/pages/home/asset-list'; import HomePage from '../../page-objects/pages/home/homepage'; diff --git a/test/e2e/tests/send/send-solana.spec.ts b/test/e2e/tests/send/send-solana.spec.ts index 22e6ebee1440..60594fba041f 100644 --- a/test/e2e/tests/send/send-solana.spec.ts +++ b/test/e2e/tests/send/send-solana.spec.ts @@ -1,6 +1,6 @@ import NonEvmHomepage from '../../page-objects/pages/home/non-evm-homepage'; import SendPage from '../../page-objects/pages/send/send-page'; -import SnapTransactionConfirmation from '../../page-objects/pages/confirmations/redesign/snap-transaction-confirmation'; +import SnapTransactionConfirmation from '../../page-objects/pages/confirmations/snap-transaction-confirmation'; import { DEFAULT_SOLANA_TEST_DAPP_FIXTURE_OPTIONS } from '../../flask/solana-wallet-standard/testHelpers'; import { withSolanaAccountSnap } from '../solana/common-solana'; import { mockSendRedesignFeatureFlag } from './common'; diff --git a/test/e2e/tests/settings/address-book.spec.ts b/test/e2e/tests/settings/address-book.spec.ts index cafc87956d45..5af04da620f9 100644 --- a/test/e2e/tests/settings/address-book.spec.ts +++ b/test/e2e/tests/settings/address-book.spec.ts @@ -9,7 +9,7 @@ import HeaderNavbar from '../../page-objects/pages/header-navbar'; import HomePage from '../../page-objects/pages/home/homepage'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; import SettingsPage from '../../page-objects/pages/settings/settings-page'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import { loginWithBalanceValidation, loginWithoutBalanceValidation, diff --git a/test/e2e/tests/shield/shield-ruleset-engine.spec.ts b/test/e2e/tests/shield/shield-ruleset-engine.spec.ts index d00017b0566e..cca09f857d65 100644 --- a/test/e2e/tests/shield/shield-ruleset-engine.spec.ts +++ b/test/e2e/tests/shield/shield-ruleset-engine.spec.ts @@ -3,10 +3,10 @@ import { withFixtures } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import HomePage from '../../page-objects/pages/home/homepage'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import TestDapp from '../../page-objects/pages/test-dapp'; import { WINDOW_TITLES } from '../../constants'; -import PersonalSignConfirmation from '../../page-objects/pages/confirmations/redesign/personal-sign-confirmation'; +import PersonalSignConfirmation from '../../page-objects/pages/confirmations/personal-sign-confirmation'; import { ShieldMockttpService } from '../../helpers/shield/mocks'; function createShieldFixture() { diff --git a/test/e2e/tests/simulation-details/simulation-details.spec.ts b/test/e2e/tests/simulation-details/simulation-details.spec.ts index 520920f9892b..ae94de953d18 100644 --- a/test/e2e/tests/simulation-details/simulation-details.spec.ts +++ b/test/e2e/tests/simulation-details/simulation-details.spec.ts @@ -6,7 +6,7 @@ import FixtureBuilder from '../../fixtures/fixture-builder'; import { Fixtures, withFixtures } from '../../helpers'; import { DAPP_URL, WINDOW_TITLES } from '../../constants'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import { BUY_ERC1155_REQUEST_1_MOCK, BUY_ERC1155_REQUEST_2_MOCK, diff --git a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts index 2e8fabfd91ec..c35f64f6e429 100644 --- a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts +++ b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts @@ -5,7 +5,7 @@ import { unlockWallet, WINDOW_TITLES, withFixtures } from '../../helpers'; import { Driver } from '../../webdriver/driver'; import { createDappTransaction } from '../../page-objects/flows/transaction'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; -import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation'; +import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation'; import HomePage from '../../page-objects/pages/home/homepage'; import SwapPage from '../../page-objects/pages/swap/swap-page'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; diff --git a/test/e2e/tests/solana/send-flow.spec.ts b/test/e2e/tests/solana/send-flow.spec.ts index 30e41b4ea598..62c40732df7d 100644 --- a/test/e2e/tests/solana/send-flow.spec.ts +++ b/test/e2e/tests/solana/send-flow.spec.ts @@ -2,7 +2,7 @@ import { strict as assert } from 'assert'; import { Suite } from 'mocha'; import SendPage from '../../page-objects/pages/send/send-page'; -import SnapTransactionConfirmation from '../../page-objects/pages/confirmations/redesign/snap-transaction-confirmation'; +import SnapTransactionConfirmation from '../../page-objects/pages/confirmations/snap-transaction-confirmation'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; import NonEvmHomepage from '../../page-objects/pages/home/non-evm-homepage'; import { mockSendRedesignFeatureFlag } from '../send/common'; diff --git a/test/e2e/tests/tokens/custom-token-send-transfer.spec.ts b/test/e2e/tests/tokens/custom-token-send-transfer.spec.ts index 42441349ef3d..0291002c12b4 100644 --- a/test/e2e/tests/tokens/custom-token-send-transfer.spec.ts +++ b/test/e2e/tests/tokens/custom-token-send-transfer.spec.ts @@ -9,8 +9,8 @@ import AssetListPage from '../../page-objects/pages/home/asset-list'; import HomePage from '../../page-objects/pages/home/homepage'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; import TestDapp from '../../page-objects/pages/test-dapp'; -import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; -import GasFeeModal from '../../page-objects/pages/confirmations/redesign/gas-fee-modal'; +import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/token-transfer-confirmation'; +import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal'; const recipientAddress = '0x2f318C334780961FB129D2a6c30D0763d9a5C970'; diff --git a/test/e2e/tests/tokens/send-erc20-with-loaded-state.spec.ts b/test/e2e/tests/tokens/send-erc20-with-loaded-state.spec.ts index 015484d4e590..49203033bf24 100644 --- a/test/e2e/tests/tokens/send-erc20-with-loaded-state.spec.ts +++ b/test/e2e/tests/tokens/send-erc20-with-loaded-state.spec.ts @@ -5,7 +5,7 @@ import AssetListPage from '../../page-objects/pages/home/asset-list'; import HomePage from '../../page-objects/pages/home/homepage'; import SendTokenPage from '../../page-objects/pages/send/send-token-page'; import TokenOverviewPage from '../../page-objects/pages/token-overview-page'; -import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/redesign/token-transfer-confirmation'; +import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/token-transfer-confirmation'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; describe('Send ERC20', function () { diff --git a/test/e2e/tests/tokens/watch-asset-call-add-token.spec.ts b/test/e2e/tests/tokens/watch-asset-call-add-token.spec.ts index da882638b739..acc650aa4b37 100644 --- a/test/e2e/tests/tokens/watch-asset-call-add-token.spec.ts +++ b/test/e2e/tests/tokens/watch-asset-call-add-token.spec.ts @@ -1,7 +1,7 @@ import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { SMART_CONTRACTS } from '../../seeder/smart-contracts'; -import AddTokenConfirmation from '../../page-objects/pages/confirmations/redesign/add-token-confirmations'; +import AddTokenConfirmation from '../../page-objects/pages/confirmations/add-token-confirmations'; import AssetListPage from '../../page-objects/pages/home/asset-list'; import TestDapp from '../../page-objects/pages/test-dapp'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; diff --git a/test/e2e/tests/transaction/edit-gas-fee.spec.ts b/test/e2e/tests/transaction/edit-gas-fee.spec.ts index 1acc2fee0754..3368bac81479 100644 --- a/test/e2e/tests/transaction/edit-gas-fee.spec.ts +++ b/test/e2e/tests/transaction/edit-gas-fee.spec.ts @@ -8,7 +8,7 @@ import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; -import GasFeeModal from '../../page-objects/pages/confirmations/redesign/gas-fee-modal'; +import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal'; import { mockSpotPrices } from '../tokens/utils/mocks'; const PREFERENCES_STATE_MOCK = { diff --git a/test/e2e/tests/transaction/navigate-transactions.spec.js b/test/e2e/tests/transaction/navigate-transactions.spec.js index d82fb632b89d..c1760fc6cc58 100644 --- a/test/e2e/tests/transaction/navigate-transactions.spec.js +++ b/test/e2e/tests/transaction/navigate-transactions.spec.js @@ -1,6 +1,6 @@ const { default: Confirmation, -} = require('../../page-objects/pages/confirmations/redesign/confirmation'); +} = require('../../page-objects/pages/confirmations/confirmation'); const { createDappTransaction, } = require('../../page-objects/flows/transaction'); diff --git a/test/e2e/tests/transaction/send-edit.spec.ts b/test/e2e/tests/transaction/send-edit.spec.ts index 5b13c1eef638..32e74c429a37 100644 --- a/test/e2e/tests/transaction/send-edit.spec.ts +++ b/test/e2e/tests/transaction/send-edit.spec.ts @@ -3,7 +3,7 @@ import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow' import { createInternalTransaction } from '../../page-objects/flows/transaction'; import { withFixtures } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; -import GasFeeModal from '../../page-objects/pages/confirmations/redesign/gas-fee-modal'; +import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal'; import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; diff --git a/test/e2e/tests/transaction/send-eth.spec.ts b/test/e2e/tests/transaction/send-eth.spec.ts index 76d29d416bd5..8e60620d826a 100644 --- a/test/e2e/tests/transaction/send-eth.spec.ts +++ b/test/e2e/tests/transaction/send-eth.spec.ts @@ -6,7 +6,7 @@ import { withFixtures, WINDOW_TITLES } from '../../helpers'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { mockSpotPrices } from '../tokens/utils/mocks'; import { Driver } from '../../webdriver/driver'; -import GasFeeModal from '../../page-objects/pages/confirmations/redesign/gas-fee-modal'; +import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal'; import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; import HomePage from '../../page-objects/pages/home/homepage'; diff --git a/test/e2e/tests/transaction/send-max.spec.ts b/test/e2e/tests/transaction/send-max.spec.ts index 5cf4af4a6757..370922c63e74 100644 --- a/test/e2e/tests/transaction/send-max.spec.ts +++ b/test/e2e/tests/transaction/send-max.spec.ts @@ -9,7 +9,7 @@ import { GAS_API_BASE_URL } from '../../../../shared/constants/swaps'; import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'; import { validateTransaction } from '../../page-objects/flows/send-transaction.flow'; import { mockSpotPrices } from '../tokens/utils/mocks'; -import GasFeeModal from '../../page-objects/pages/confirmations/redesign/gas-fee-modal'; +import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal'; import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page'; const PREFERENCES_STATE_MOCK = {