Merge pull request #104 from lidofinance/wallets-fixes

Wallets update
lidofinance · Nov 2, 2023 · 8437e45 · 8437e45
2 parents 47dda82 + 6cbdd35
commit 8437e45
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 141 deletions.
diff --git a/packages/wallets/src/gamestop/gamestop.constants.ts b/packages/wallets/src/gamestop/gamestop.constants.ts
diff --git a/packages/wallets/src/gamestop/gamestop.page.ts b/packages/wallets/src/gamestop/gamestop.page.ts
diff --git a/packages/wallets/src/gamestop/index.ts b/packages/wallets/src/gamestop/index.ts
diff --git a/packages/wallets/src/index.ts b/packages/wallets/src/index.ts
@@ -8,7 +8,6 @@ export * from './phantom';
 export * from './coinbase';
 export * from './taho';
 export * from './exodus';
-export * from './gamestop';
 export * from './xdefi';
 export * from './okx';
 export * from './bitget';
diff --git a/packages/wallets/src/metamask/metamask.page.ts b/packages/wallets/src/metamask/metamask.page.ts
@@ -17,9 +17,8 @@ export class MetamaskPage implements WalletPage {
       this.page = await this.browserContext.newPage();
       await this.page.goto(
         this.extensionUrl + this.config.COMMON.EXTENSION_START_PATH,
+        { waitUntil: 'load' },
       );
-      await this.page.reload();
-      await this.page.waitForTimeout(1000);
       await this.closePopover();
       await this.unlock();
     });
@@ -28,20 +27,12 @@ export class MetamaskPage implements WalletPage {
   async setup() {
     await test.step('Setup', async () => {
       // added explicit route to #onboarding due to unexpected first time route from /home.html to /onboarding - page is close
-      this.page = await this.browserContext.newPage();
-      await this.page.goto(this.extensionUrl + '/home.html#onboarding/welcome');
+      await this.navigate();
       if (!this.page) throw "Page isn't ready";
-      // Remove me when MM to be more stable
-      // const firstTime =
-      //   (await this.page.locator('data-testid=onboarding-welcome').count()) > 0;
-      // if (firstTime) await this.firstTimeSetup();
-      do {
-        await this.page.reload();
-      } while (
-        (await this.page.locator('data-testid=onboarding-welcome').count()) ===
-        0
-      );
-      await this.firstTimeSetup();
+      const firstTime = await this.page
+        .locator('data-testid=onboarding-welcome')
+        .isVisible();
+      if (firstTime) await this.firstTimeSetup();
     });
   }
 
@@ -68,13 +59,16 @@ export class MetamaskPage implements WalletPage {
   async closePopover() {
     await test.step('Close popover if exists', async () => {
       if (!this.page) throw "Page isn't ready";
-      const popover =
-        (await this.page.getByTestId('popover-close').count()) > 0;
-      if (popover) {
-        await this.page.click('data-testid=popover-close');
+      const popover = this.page.getByTestId('popover-close');
+      try {
+        await popover.waitFor({ state: 'visible', timeout: 7000 });
+      } catch (error) {
+        return;
+      }
+
+      if (await popover.isVisible()) {
+        await popover.click();
         // Remove me when MM to be more stable
-        await this.page.waitForTimeout(1000);
-        expect((await this.page.getByTestId('popover-close').count()) === 0);
       }
     });
   }
@@ -174,9 +168,9 @@ export class MetamaskPage implements WalletPage {
         await this.closePopover();
         await this.page.click('data-testid=account-menu-icon');
       } while (
-        (await this.page
+        !(await this.page
           .locator('text=Add account or hardware wallet')
-          .count()) === 0
+          .isVisible())
       );
       await this.page.click('text=Add account or hardware wallet');
       await this.page.click('text=Import account');

diff --git a/wallets-testing/browser/browser.constants.ts b/wallets-testing/browser/browser.constants.ts
@@ -7,7 +7,6 @@ import {
   PhantomPage,
   CoinbasePage,
   TahoPage,
-  GameStopPage,
   XdefiPage,
   OkxPage,
   BitgetPage,
@@ -29,7 +28,6 @@ export const WALLET_PAGES = {
   phantom: PhantomPage,
   coinbase: CoinbasePage,
   taho: TahoPage,
-  gamestop: GameStopPage,
   xdefi: XdefiPage,
   okx: OkxPage,
   bitget: BitgetPage,

diff --git a/wallets-testing/test/widgets/ethereum.spec.ts b/wallets-testing/test/widgets/ethereum.spec.ts
@@ -5,7 +5,6 @@ import {
   COIN98_COMMON_CONFIG,
   MATHWALLET_COMMON_CONFIG,
   METAMASK_COMMON_CONFIG,
-  GAMESTOP_COMMON_CONFIG,
   TRUST_WALLET_COMMON_CONFIG,
   COINBASE_COMMON_CONFIG,
   TAHO_COMMON_CONFIG,
@@ -57,11 +56,6 @@ test.describe('Ethereum', () => {
     await browserService.connectWallet();
   });
 
-  test(`GameStop connect`, async () => {
-    await browserService.setup(GAMESTOP_COMMON_CONFIG, ETHEREUM_WIDGET_CONFIG);
-    await browserService.connectWallet();
-  });
-
   test.skip(`Exodus connect`, async () => {
     await browserService.setup(EXODUS_COMMON_CONFIG, ETHEREUM_WIDGET_CONFIG);
     await browserService.connectWallet();