revert

MetaMask · Mar 5, 2025 · 267c636 · 267c636
1 parent 8c17b13
commit 267c636
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts b/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts
@@ -45,9 +45,7 @@ class Confirmation {
   }
 
   async clickFooterConfirmButton() {
-    await this.driver.clickElementAndWaitForWindowToClose(
-      this.footerConfirmButton,
-    );
+    await this.driver.clickElement(this.footerConfirmButton);
   }
 
   async clickHeaderAccountDetailsButton() {

diff --git a/test/e2e/tests/confirmations/transactions/shared.ts b/test/e2e/tests/confirmations/transactions/shared.ts
@@ -40,6 +40,7 @@ export async function createContractDeploymentTransaction(driver: Driver) {
 }
 
 export async function confirmContractDeploymentTransaction(driver: Driver) {
+  await driver.waitUntilXWindowHandles(3);
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
   await driver.waitForSelector({
@@ -49,6 +50,9 @@ export async function confirmContractDeploymentTransaction(driver: Driver) {
 
   await scrollAndConfirmAndAssertConfirm(driver);
 
+  await driver.delay(2000);
+  await driver.waitUntilXWindowHandles(2);
+
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
   await driver.clickElement({ text: 'Activity', tag: 'button' });
   await driver.waitForSelector(
@@ -59,6 +63,7 @@ export async function confirmContractDeploymentTransaction(driver: Driver) {
 export async function confirmRedesignedContractDeploymentTransaction(
   driver: Driver,
 ) {
+  await driver.waitUntilXWindowHandles(3);
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
   await driver.waitForSelector({
@@ -73,6 +78,9 @@ export async function confirmRedesignedContractDeploymentTransaction(
 
   await scrollAndConfirmAndAssertConfirm(driver);
 
+  await driver.delay(2000);
+  await driver.waitUntilXWindowHandles(2);
+
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
   await driver.clickElement({ text: 'Activity', tag: 'button' });
   await driver.waitForSelector(
@@ -86,6 +94,8 @@ export async function createDepositTransaction(driver: Driver) {
 }
 
 export async function confirmDepositTransaction(driver: Driver) {
+  await driver.waitUntilXWindowHandles(3);
+
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
   await driver.waitForSelector({
@@ -109,6 +119,7 @@ export async function confirmDepositTransactionWithCustomNonce(
   driver: Driver,
   customNonce: string,
 ) {
+  await driver.waitUntilXWindowHandles(3);
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
   await driver.waitForSelector({