Merge pull request #512 from Synthetixio/dev

promote dev to master
Synthetixio · Sep 20, 2022 · 9955ada · 9955ada
2 parents 67228d4 + dacce32
commit 9955ada
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml
@@ -76,7 +76,7 @@ jobs:
         if:
           always() && (github.ref == 'refs/heads/master' || github.ref ==
           'refs/heads/dev' || github.event_name == 'pull_request')
-        uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # pin@codeql-bundle-20210517
+        uses: github/codeql-action/upload-sarif@904260d7d935dff982205cbdb42025ce30b7a34f # pin@codeql-bundle-20210517
         with:
           sarif_file: lint-results.sarif
         continue-on-error: true

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b398f525a5587552e573b247ac661067fafa920b
+        uses: github/codeql-action/init@904260d7d935dff982205cbdb42025ce30b7a34f
         with:
           queries: security-and-quality
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b398f525a5587552e573b247ac661067fafa920b
+        uses: github/codeql-action/analyze@904260d7d935dff982205cbdb42025ce30b7a34f
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -452,6 +452,17 @@ module.exports = {
       );
     }
 
+    // close popup if present
+    if (
+      (await playwright
+        .metamaskWindow()
+        .$(mainPageElements.connectedSites.modal)) !== null
+    ) {
+      await playwright.waitAndClick(
+        mainPageElements.connectedSites.closeButton,
+      );
+    }
+
     await switchToCypressIfNotActive();
     return true;
   },