chore: addressing PR comments

agoric-labs · Mar 4, 2024 · 9d8db98 · 9d8db98
1 parent 7c42815
commit 9d8db98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/commands/keplr.js b/commands/keplr.js
@@ -9,6 +9,7 @@ let extensionId;
 let extensionVersion;
 let registrationUrl;
 let permissionsUrl;
+let switchBackToCypressWindow;
 
 const keplr = {
   async resetState() {
@@ -71,12 +72,7 @@ const keplr = {
     return true;
   },
   async importWallet(secretWordsOrPrivateKey, password, newAccount) {
-    const keplrWindow = playwright.keplrWindow();
-    const currentUrl = await keplrWindow.url();
-    if (!currentUrl.includes('registr')) {
-      await module.exports.goToRegistration();
-    }
-
+    await module.exports.goToRegistration();
     await playwright.waitAndClickByText(
       newAccount
         ? onboardingElements.createWalletButton

diff --git a/commands/metamask.js b/commands/metamask.js
@@ -582,6 +582,7 @@ const metamask = {
     return true;
   },
   async disconnectWalletFromDapp() {
+    await playwright.switchToKeplrWindow();
     await switchToMetamaskIfNotActive();
     await playwright.waitAndClick(mainPageElements.optionsMenu.button);
     await playwright.waitAndClick(

diff --git a/tests/e2e/specs/keplr/keplr-spec.js b/tests/e2e/specs/keplr/keplr-spec.js
@@ -61,10 +61,8 @@ describe('Keplr', () => {
       });
     });
     it(`should disconnect the wallet from all the connected DAPPs`, () => {
-      cy.switchToExtensionWindow().then(() => {
-        cy.disconnectWalletFromDapp().then(taskCompleted => {
-          expect(taskCompleted).to.be.true;
-        });
+      cy.disconnectWalletFromDapp().then(taskCompleted => {
+        expect(taskCompleted).to.be.true;
       });
     });
   });