Merge to main

.github/workflows/pull-request.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.48.2-jammy
+      image: mcr.microsoft.com/playwright:v1.54.1-jammy
     env:
       ARGENT_X_ENVIRONMENT: "hydrogen"
       E2E_REPO: ${{ secrets.E2E_REPO }}
@@ -70,7 +70,7 @@ jobs:
   test-argentX:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.48.2-jammy
+      image: mcr.microsoft.com/playwright:v1.54.1-jammy
     needs: [build]
     env:
       ARGENT_X_ENVIRONMENT: "hydrogen"

.github/workflows/weekly-e2e-schedule.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.48.2-jammy
+      image: mcr.microsoft.com/playwright:v1.54.1-jammy
     env:
       ARGENT_X_ENVIRONMENT: "hydrogen"
       E2E_REPO: ${{ secrets.E2E_REPO }}
@@ -73,7 +73,7 @@ jobs:
   test-argentX:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.48.2-jammy
+      image: mcr.microsoft.com/playwright:v1.54.1-jammy
     needs: [build]
     env:
       ARGENT_X_ENVIRONMENT: "hydrogen"

.gitignore

@@ -9,6 +9,7 @@
 !.yarn/plugins
 !.yarn/releases
 !.yarn/versions
+.pnpm-store
 
 # testing
 /coverage
@@ -51,4 +52,6 @@ argent-x-dist
 /e2e/node_modules/
 
 settings.json
-.idea
+.idea
+
+certificates

e2e/package.json

@@ -17,7 +17,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@playwright/test": "^1.48.1",
+    "@playwright/test": "^1.54.1",
     "@types/axios": "^0.14.0",
     "@types/fs-extra": "^11.0.4",
     "@types/imap-simple": "^4.2.9",

e2e/src/argent-x/page-objects/Dapps.ts

@@ -60,6 +60,18 @@ export default class Dapps extends Navigation {
     )
   }
 
+  get connectReadyWalletButton() {
+    return this.dApp.getByRole("button", {
+      name: "Ready Wallet (formerly Argent",
+    })
+  }
+
+  get connectReadyWalletButtonStarknetKitModal() {
+    return this.dApp
+      .locator("#starknetkit-modal-container")
+      .getByRole("button", { name: "Ready Wallet (formerly Argent" })
+  }
+
   async requestConnectionFromDapp({
     browserContext,
     useStarknetKitModal = false,
@@ -77,18 +89,11 @@ export default class Dapps extends Navigation {
     await this.dApp.getByRole("button", { name: "Connection" }).click()
     if (useStarknetKitModal) {
       await this.dApp.getByRole("button", { name: "Starknetkit Modal" }).click()
-      await this.dApp
-        .locator("#starknetkit-modal-container")
-        .getByRole("button", { name: "Ready Wallet (formerly Argent)" })
-        .click()
+      await this.connectReadyWalletButtonStarknetKitModal.click()
     } else {
-      await expect(
-        this.dApp.locator('button :text-is("Ready Wallet (formerly Argent)")'),
-      ).toBeVisible()
+      await expect(this.connectReadyWalletButton).toBeVisible()
+      await this.connectReadyWalletButton.click()
     }
-    await this.dApp
-      .locator('button :text-is("Ready Wallet (formerly Argent)")')
-      .click()
   }
 
   async sendERC20transaction({

e2e/src/argent-x/page-objects/ExtensionPage.ts

@@ -94,8 +94,7 @@
   async recoverWallet(seed: string, password?: string) {
     await this.page.setViewportSize({ width: 1080, height: 720 })
 
     await this.wallet.restoreExistingWallet.click()
-    await this.wallet.agreeLoc.click()
     await this.clipboard.setClipboardText(seed)
     await this.pasteSeed()
     await this.navigation.continueLocator.click()
@@ -108,6 +107,7 @@
       expect(this.wallet.finish).toBeVisible(),
       expect(this.page.getByText("Your account is ready!")).toBeVisible(),
       expect(this.page.getByText("Your smart account is ready!")).toBeVisible(),
+      expect(this.page.getByTestId("get-started")).toBeVisible(),
     ])
 
     await this.open()

e2e/src/argent-x/page-objects/Navigation.ts

@@ -41,9 +41,7 @@ export default class Navigation extends Clipboard {
   }
 
   get continueLocator() {
-    return this.page
-      .locator(`button:text-is("${lang.common.continue}")`)
-      .first()
+    return this.page.getByTestId("continue").first()
   }
 
   get yesLocator() {

e2e/src/argent-x/page-objects/Wallet.ts

@@ -21,7 +21,7 @@ export default class Wallet extends Navigation {
     return this.page.locator(`button:text-is("${lang.wallet.createButton}")`)
   }
   get restoreExistingWallet() {
-    return this.page.locator(`button:text-is("${lang.wallet.restoreButton}")`)
+    return this.page.getByTestId("have-a-wallet")
   }
 
   //second screen
@@ -55,14 +55,13 @@ export default class Wallet extends Navigation {
     return this.page.locator(`div p:text-is("${lang.wallet.desc3}")`)
   }
   get password() {
-    return this.page.locator(
-      `input[name="password"][placeholder="${lang.wallet.password}"]`,
-    )
+    return this.page.getByRole("textbox", { name: "Password", exact: true })
   }
   get repeatPassword() {
-    return this.page.locator(
-      `input[name="repeatPassword"][placeholder="${lang.wallet.repeatPassword}"]`,
-    )
+    return this.page.getByRole("textbox", {
+      name: "Repeat password",
+      exact: true,
+    })
   }
   get createWallet() {
     return this.page.locator(`button:text-is("${lang.wallet.createWallet}")`)

e2e/src/argent-x/specs/connect.spec.ts

@@ -1,3 +1,3 @@
 import { expect } from "@playwright/test"
 
 import test from "../test"
@@ -26,17 +26,18 @@
       await extension.navigation.showSettingsLocator.click()
       await extension.settings.account(extension.account.accountName1).click()
       await extension.page
-        // .locator(`//a//*[text()="Authorized dapps"]`)
         .getByRole("button", { name: "Connected dapps" })
         .click()
 
       await expect(extension.dapps.connected()).toBeVisible()
       //disconnect dapp from Ready
       await extension.dapps.disconnect().click()
       await expect(extension.dapps.connected()).toBeHidden()
-
+      await extension.page
+        .getByRole("button", { name: "Connected dapps" })
+        .click()
       await expect(
-        extension.page.getByRole("heading", { name: "No authorized dapps" }),
+        extension.page.getByText("No authorized dapps"),
       ).toBeVisible()
     })
   }

e2e/src/argent-x/specs/transactions.spec.ts

@@ -34,8 +34,6 @@ test.describe(`Transactions`, () => {
     await expect(extension.network.networkSelector).toBeVisible()
     await extension.network.selectDefaultNetwork()
 
-    console.log(extension.account.accountAddress)
-
     await extension.dapps.requestConnectionFromDapp({
       browserContext,
       useStarknetKitModal: true,

e2e/src/argent-x/test.ts

@@ -132,7 +132,7 @@ const initBrowserWithExtension = async (
     .locator('[id="extension-id"]')
     .first()
     .textContent()
-    .then((text) => text?.replace("ID: ", ""))
+    .then((text) => text?.replace("ID: ", "").replace(/[\n\s]/g, ""))
 
   const extensionURL = `chrome-extension://${extensionId}/index.html`
   await page.goto(extensionURL)
@@ -143,7 +143,11 @@ const initBrowserWithExtension = async (
 }
 
 function createExtension(label: string, upgrade: boolean = false) {
-  return async ({ }, use: any, testInfo: TestInfo) => {
+  return async (
+    {},
+    use: (ext: ExtensionPage) => Promise<void>,
+    testInfo: TestInfo,
+  ) => {
     const userDataDir = `/tmp/test-user-data-${uuid()}`
     let buildDir = process.env.ARGENTX_DIST_DIR!
     if (upgrade) {
@@ -167,7 +171,7 @@ function createExtension(label: string, upgrade: boolean = false) {
 }
 
 function getContext() {
-  return async ({ }, use: any, _testInfo: TestInfo) => {
+  return async ({}, use: (ext: ChromiumBrowserContext) => Promise<void>) => {
     await use(browserCtx)
   }
 }

package.json

@@ -17,20 +17,20 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@argent/x-sessions": "8.0.1",
-    "@starknet-io/get-starknet-core": "4.0.4",
-    "@starknet-react/chains": "^3.1.2",
-    "@starknet-react/core": "^3.7.2",
-    "next": "15.2.2",
+    "@argent/x-sessions": "9.0.0",
+    "@starknet-io/get-starknet-core": "4.0.7",
+    "@starknet-react/chains": "^5.0.3",
+    "@starknet-react/core": "^5.0.3",
+    "next": "15.4.7",
     "react": "19.0.0-rc-02c0e824-20241028",
     "react-dom": "19.0.0-rc-02c0e824-20241028",
-    "starknet": "7.5.1",
-    "starknetkit": "3.0.0"
+    "starknet": "^8.5.2",
+    "starknetkit": "3.1.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
-    "@playwright/test": "^1.48.2",
+    "@playwright/test": "^1.54.1",
     "@starknet-io/types-js": "0.8.4",
     "@types/node": "^20",
     "@types/react": "^18",