w3wallets 0.6.0 → 0.8.0

package/dist/index.d.mts

@@ -67,7 +67,12 @@ declare class Metamask extends Wallet {
      * @param mnemonic 12-word mnemonic seed phrase
      */
     onboard(mnemonic: string, password?: string): Promise<void>;
-    switchAccount(nameOrAddress: string, network?: "ETH" | "SOL"): Promise<void>;
+    switchAccount(accountName: {
+        name: string;
+    }): Promise<void>;
+    switchAccount(accountAddress: {
+        address: string;
+    }): Promise<void>;
     importAccount(privateKey: string): Promise<void>;
     addAccount(accountName?: string): Promise<void>;
     getAccountName(): Promise<string>;

package/dist/index.d.ts

@@ -67,7 +67,12 @@ declare class Metamask extends Wallet {
      * @param mnemonic 12-word mnemonic seed phrase
      */
     onboard(mnemonic: string, password?: string): Promise<void>;
-    switchAccount(nameOrAddress: string, network?: "ETH" | "SOL"): Promise<void>;
+    switchAccount(accountName: {
+        name: string;
+    }): Promise<void>;
+    switchAccount(accountAddress: {
+        address: string;
+    }): Promise<void>;
     importAccount(privateKey: string): Promise<void>;
     addAccount(accountName?: string): Promise<void>;
     getAccountName(): Promise<string>;

package/dist/index.js

@@ -136,6 +136,7 @@ var Backpack = class extends Wallet {
       await (0, import_test.expect)(this.page.getByText("You're all good!")).toBeVisible();
     }
     await this.page.goto(`chrome-extension://${this.extensionId}/popup.html`);
+    await this.page.getByTestId("AccountBalanceRoundedIcon").waitFor({ state: "visible" });
   }
 };
 
@@ -198,6 +199,13 @@ var PolkadotJS = class extends Wallet {
 
 // src/metamask/metamask.ts
 var import_test3 = require("@playwright/test");
+
+// tests/utils/address.ts
+var shortenAddress = (address) => {
+  return `${address.slice(0, 7)}...${address.slice(-5)}`;
+};
+
+// src/metamask/metamask.ts
 var Metamask = class extends Wallet {
   defaultPassword = "11111111";
   async gotoOnboardPage() {
@@ -224,13 +232,13 @@ var Metamask = class extends Wallet {
     await this.page.waitForTimeout(1e3);
     await this.clickTopRightCornerToCloseAllTheMarketingBullshit();
   }
-  async switchAccount(nameOrAddress, network = "ETH") {
-    if (nameOrAddress.startsWith("0x"))
-      nameOrAddress = nameOrAddress.slice(0, 7);
+  async switchAccount(accountNameOrAddress) {
     await this.page.getByTestId("account-menu-icon").click();
-    await this.page.locator(".multichain-account-menu-popover__list--menu-item").filter({ hasText: nameOrAddress }).filter({
-      has: this.page.getByTestId("second-currency-display").filter({ hasText: network })
-    }).click();
+    if ("name" in accountNameOrAddress) {
+      await this.page.locator(".multichain-account-list-item__account-name").getByRole("button", { name: accountNameOrAddress.name, exact: true }).click();
+    } else {
+      await this.page.getByTestId("account-list-address").filter({ hasText: shortenAddress(accountNameOrAddress.address) }).click();
+    }
   }
   async importAccount(privateKey) {
     await this.page.getByTestId("account-menu-icon").click();
@@ -274,20 +282,11 @@ var Metamask = class extends Wallet {
       typeof settingsOrName === "string" ? settingsOrName : settingsOrName.name
     ).click();
   }
-  // async approve() {
-  //   return this.usingNotificationPage((p) =>
-  //     p
-  //       .locator(
-  //         '[data-test-id="confirm-footer-button"], [data-test-id="confirm-btn"]',
-  //       )
-  //       .click(),
-  //   );
-  // }
   async approve() {
     const p = await this.page.context().newPage();
     await p.goto(`chrome-extension://${this.extensionId}/notification.html`);
     await p.locator(
-      '[data-testid="confirm-footer-button"], [data-testid="confirm-btn"]'
+      '[data-testid="confirm-footer-button"], [data-testid="confirm-btn"], [data-testid="page-container-footer-next"], [data-testid="confirmation-submit-button"]'
     ).click();
     await p.close();
   }

package/dist/index.mjs

@@ -102,6 +102,7 @@ var Backpack = class extends Wallet {
       await expect(this.page.getByText("You're all good!")).toBeVisible();
     }
     await this.page.goto(`chrome-extension://${this.extensionId}/popup.html`);
+    await this.page.getByTestId("AccountBalanceRoundedIcon").waitFor({ state: "visible" });
   }
 };
 
@@ -164,6 +165,13 @@ var PolkadotJS = class extends Wallet {
 
 // src/metamask/metamask.ts
 import { expect as expect3 } from "@playwright/test";
+
+// tests/utils/address.ts
+var shortenAddress = (address) => {
+  return `${address.slice(0, 7)}...${address.slice(-5)}`;
+};
+
+// src/metamask/metamask.ts
 var Metamask = class extends Wallet {
   defaultPassword = "11111111";
   async gotoOnboardPage() {
@@ -190,13 +198,13 @@ var Metamask = class extends Wallet {
     await this.page.waitForTimeout(1e3);
     await this.clickTopRightCornerToCloseAllTheMarketingBullshit();
   }
-  async switchAccount(nameOrAddress, network = "ETH") {
-    if (nameOrAddress.startsWith("0x"))
-      nameOrAddress = nameOrAddress.slice(0, 7);
+  async switchAccount(accountNameOrAddress) {
     await this.page.getByTestId("account-menu-icon").click();
-    await this.page.locator(".multichain-account-menu-popover__list--menu-item").filter({ hasText: nameOrAddress }).filter({
-      has: this.page.getByTestId("second-currency-display").filter({ hasText: network })
-    }).click();
+    if ("name" in accountNameOrAddress) {
+      await this.page.locator(".multichain-account-list-item__account-name").getByRole("button", { name: accountNameOrAddress.name, exact: true }).click();
+    } else {
+      await this.page.getByTestId("account-list-address").filter({ hasText: shortenAddress(accountNameOrAddress.address) }).click();
+    }
   }
   async importAccount(privateKey) {
     await this.page.getByTestId("account-menu-icon").click();
@@ -240,20 +248,11 @@ var Metamask = class extends Wallet {
       typeof settingsOrName === "string" ? settingsOrName : settingsOrName.name
     ).click();
   }
-  // async approve() {
-  //   return this.usingNotificationPage((p) =>
-  //     p
-  //       .locator(
-  //         '[data-test-id="confirm-footer-button"], [data-test-id="confirm-btn"]',
-  //       )
-  //       .click(),
-  //   );
-  // }
   async approve() {
     const p = await this.page.context().newPage();
     await p.goto(`chrome-extension://${this.extensionId}/notification.html`);
     await p.locator(
-      '[data-testid="confirm-footer-button"], [data-testid="confirm-btn"]'
+      '[data-testid="confirm-footer-button"], [data-testid="confirm-btn"], [data-testid="page-container-footer-next"], [data-testid="confirmation-submit-button"]'
     ).click();
     await p.close();
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "w3wallets",
   "description": "browser wallets for playwright",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/Maksandre/w3wallets",