From 1579eae918bf2c5340efbd31074245502931bf8f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 15 Jul 2024 10:02:05 +0200
Subject: [PATCH] add more checks in metamask setup

---
 apps/remix-ide-e2e/src/commands/setupMetamask.ts     | 12 +++++++++++-
 .../src/tests/runAndDeploy_injected.test.ts          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/setupMetamask.ts b/apps/remix-ide-e2e/src/commands/setupMetamask.ts
index 768b9631bb..1e0e6991c9 100644
--- a/apps/remix-ide-e2e/src/commands/setupMetamask.ts
+++ b/apps/remix-ide-e2e/src/commands/setupMetamask.ts
@@ -16,6 +16,7 @@ class MetaMask extends EventEmitter {
 
 function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password: string, done: VoidFunction) {
   const words = passphrase.split(' ')
+  console.log('setup metamask')
   browser
     .switchBrowserTab(1)
     .waitForElementVisible('input[data-testid="onboarding-terms-checkbox"]')
@@ -49,6 +50,13 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
     .click('button[data-testid="pin-extension-next"]')
     .waitForElementVisible('button[data-testid="pin-extension-done"]')
     .click('button[data-testid="pin-extension-done"]')
+    .waitForElementVisible({
+      selector: 'button[data-testid="popover-close"]',
+      locateStrategy: 'css selector',
+      suppressNotFoundErrors: true,
+      abortOnFailure: false,
+      timeout: 10000
+    })
     .isVisible({
       selector: 'button[data-testid="popover-close"]',
       locateStrategy: 'css selector',
@@ -58,7 +66,8 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
       console.log('okVisible', okVisible)
       if (!okVisible.value) {
         console.log('popover not found')
-      }else{
+      } else {
+        console.log('popover found... closing')
         browser.click('button[data-testid="popover-close"]')
       }
     })
@@ -66,6 +75,7 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
     .click('.mm-modal-content label.toggle-button--off') // show test networks
     .click('div[data-testid="Sepolia"]') // switch to sepolia
     .perform(() => {
+      console.log('MetaMask setup complete')
       done()
     })
 }
diff --git a/apps/remix-ide-e2e/src/tests/runAndDeploy_injected.test.ts b/apps/remix-ide-e2e/src/tests/runAndDeploy_injected.test.ts
index 20a252a729..f28cc82f5e 100644
--- a/apps/remix-ide-e2e/src/tests/runAndDeploy_injected.test.ts
+++ b/apps/remix-ide-e2e/src/tests/runAndDeploy_injected.test.ts
@@ -236,7 +236,7 @@ const branch = process.env.CIRCLE_BRANCH;
 const isMasterBranch = branch === 'master';
 
 module.exports = {
-  ...(branch ? (isMasterBranch ? tests : {}) : tests),
+  ...tests//(branch ? (isMasterBranch ? tests : {}) : tests),
 };
 
 const localsCheck = {