forked from argentlabs/argent-x
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix/BLO-812-ui
- Loading branch information
Showing
24 changed files
with
432 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import type { Page } from "@playwright/test" | ||
|
|
||
| import { lang } from "../languages" | ||
| import Navigation from "./Navigation" | ||
|
|
||
| export default class AddressBook extends Navigation { | ||
| constructor(page: Page) { | ||
| super(page) | ||
| } | ||
|
|
||
| get add() { | ||
| return this.page.locator('button[aria-label="add"]') | ||
| } | ||
|
|
||
| get name() { | ||
| return this.page.locator('input[name="name"]') | ||
| } | ||
|
|
||
| get address() { | ||
| return this.page.locator('textarea[name="address"]') | ||
| } | ||
|
|
||
| get network() { | ||
| return this.page.locator('[aria-label="network-selector"]') | ||
| } | ||
|
|
||
| get save() { | ||
| return this.page.locator(`button:text-is("${lang.common.save}")`) | ||
| } | ||
|
|
||
| get cancel() { | ||
| return this.page.locator(`button:text-is("${lang.common.cancel}")`) | ||
| } | ||
|
|
||
| networkOption(name: "Localhost 5050" | "Testnet" | "Testnet 2" | "Mainnet") { | ||
| return this.page.locator(`div[aria-disabled="false"]:text-is("${name}")`) | ||
| } | ||
|
|
||
| get nameRequired() { | ||
| return this.page.locator( | ||
| `//input[@name="name"]/following::p[contains(text(), '${lang.address.nameRequired}')]`, | ||
| ) | ||
| } | ||
|
|
||
| get addressRequired() { | ||
| return this.page.locator( | ||
| `//textarea[@name="address"]/following::p[contains(text(), '${lang.address.addressRequired}')]`, | ||
| ) | ||
| } | ||
|
|
||
| addressByname(name: string) { | ||
| return this.page.locator( | ||
| `//button/following::*[contains(text(),'${name}')]`, | ||
| ) | ||
| } | ||
|
|
||
| get deleteAddress() { | ||
| return this.page.locator(`button:text-is("${lang.address.removeAddress}")`) | ||
| } | ||
|
|
||
| get delete() { | ||
| return this.page.locator(`button:text-is("${lang.address.delete}")`) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import { expect } from "@playwright/test" | ||
|
|
||
| import config from "../config" | ||
| import test from "../test" | ||
|
|
||
| test.describe("Address Book", () => { | ||
| test("Add, update, use and delete address", async ({ extension }) => { | ||
| await extension.wallet.newWalletOnboarding() | ||
| await extension.open() | ||
| await expect(extension.network.networkSelector).toBeVisible() | ||
| await extension.network.selectNetwork("Localhost 5050") | ||
| await extension.account.addAccount({}) | ||
| await extension.navigation.showSettings.click() | ||
| await extension.settings.addressBook.click() | ||
| //create | ||
| await extension.addressBook.add.click() | ||
| await extension.addressBook.save.click() | ||
| await expect(extension.addressBook.nameRequired).toBeVisible() | ||
| await expect(extension.addressBook.addressRequired).toBeVisible() | ||
| await extension.addressBook.name.fill("My first address") | ||
| await extension.addressBook.save.click() | ||
| await expect(extension.addressBook.nameRequired).not.toBeVisible() | ||
| await expect(extension.addressBook.addressRequired).toBeVisible() | ||
| await extension.addressBook.address.fill(config.wallets[0].accounts![0]) | ||
| await expect(extension.addressBook.nameRequired).not.toBeVisible() | ||
| await expect(extension.addressBook.addressRequired).not.toBeVisible() | ||
| await extension.addressBook.network.click() | ||
| await extension.addressBook.networkOption("Localhost 5050").click() | ||
| await extension.addressBook.save.click() | ||
|
|
||
| // update | ||
| await extension.addressBook.addressByname("My first address").click() | ||
| await extension.addressBook.name.fill("New name") | ||
| await extension.addressBook.save.click() | ||
| await expect(extension.addressBook.addressByname("New name")).toBeVisible() | ||
| await extension.navigation.back.click() | ||
| await extension.navigation.close.click() | ||
|
|
||
| //transfer to address | ||
| await extension.account.token("Ethereum").click() | ||
| await extension.account.send.click() | ||
| await extension.account.recipientAddress.click() | ||
| await extension.addressBook.addressByname("New name").click() | ||
| await extension.account.sendMax.click() | ||
| await extension.navigation.next.click() | ||
| await extension.navigation.approve.click() | ||
| await extension.activity.checkActivity(1) | ||
|
|
||
| //delete address | ||
| await extension.navigation.menuTokens.click() | ||
| await extension.navigation.showSettings.click() | ||
| await extension.settings.addressBook.click() | ||
| await extension.addressBook.addressByname("New name").click() | ||
| await extension.addressBook.deleteAddress.click() | ||
| await extension.addressBook.delete.click() | ||
| await expect( | ||
| extension.addressBook.addressByname("New name"), | ||
| ).not.toBeVisible() | ||
| }) | ||
|
|
||
| test("Add address from send window", async ({ extension }) => { | ||
| await extension.wallet.newWalletOnboarding() | ||
| await extension.open() | ||
| await expect(extension.network.networkSelector).toBeVisible() | ||
| await extension.network.selectNetwork("Localhost 5050") | ||
| await extension.account.addAccount({}) | ||
|
|
||
| await extension.account.token("Ethereum").click() | ||
| await extension.account.send.click() | ||
| await extension.account.recepientAddress.fill( | ||
| config.wallets[0].accounts![0], | ||
| ) | ||
| await extension.account.saveAddress.click() | ||
| await expect(extension.addressBook.address).toHaveText( | ||
| config.wallets[0].accounts![0], | ||
| ) | ||
| await extension.addressBook.name.fill("My address") | ||
| await extension.addressBook.save.click() | ||
| await expect(extension.account.contact).toHaveText("My address") | ||
|
|
||
| await extension.account.sendMax.click() | ||
| await extension.navigation.next.click() | ||
| await extension.navigation.approve.click() | ||
| await extension.activity.checkActivity(1) | ||
| }) | ||
| }) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
packages/extension/src/ui/features/accountTokens/dappland/banner.state.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import create from "zustand" | ||
| import { persist } from "zustand/middleware" | ||
|
|
||
| export interface DapplandBannerState { | ||
| hasSeenBanner: boolean | ||
| } | ||
|
|
||
| export const useDapplandBanner = create<DapplandBannerState>( | ||
| persist( | ||
| (_set, _get) => ({ | ||
| hasSeenBanner: false, | ||
| }), | ||
| { name: "hasSeenDapplandBanner" }, | ||
| ), | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.