Handle case when network was already added (copied from PR #536)

Synthetixio · Aug 17, 2023 · f5f0591 · f5f0591
1 parent 6a4979f
commit f5f0591
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -1217,7 +1217,7 @@ const metamask = {
   },
   async allowToAddAndSwitchNetwork() {
     await module.exports.allowToAddNetwork();
-    await module.exports.allowToSwitchNetwork();
+    await allowToSwitchNetworkIfNeeded();
     return true;
   },
   async getWalletAddress() {
@@ -1320,6 +1320,14 @@ async function switchToCypressIfNotActive() {
   return switchBackToCypressWindow;
 }
 
+async function allowToSwitchNetworkIfNeeded() {
+  await playwright.assignWindows().then(async () => {
+    if (await playwright.isNotificationOpen()) {
+      await module.exports.allowToSwitchNetwork();
+    }
+  });
+}
+
 async function activateAdvancedSetting(
   toggleOn,
   toggleOff,

diff --git a/commands/playwright.js b/commands/playwright.js
@@ -469,4 +469,14 @@ module.exports = {
 
     return extensionsData;
   },
+  async isNotificationOpen() {
+    await sleep(200);
+    let pages = browser.contexts()[0].pages();
+    for (const page of pages) {
+      if (page.url().includes('notification')) {
+        return true;
+      }
+    }
+    return false;
+  },
 };