diff --git a/web-wallet/CHANGELOG.md b/web-wallet/CHANGELOG.md index 536be25a4..6aaf0a12e 100644 --- a/web-wallet/CHANGELOG.md +++ b/web-wallet/CHANGELOG.md @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- Remove "Swap to nDUSK" step (Create Wallet flow) [#3333] + ### Fixed ## [1.0.0] - 2024-12-23 @@ -503,6 +505,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#3267]: https://github.com/dusk-network/rusk/issues/3267 [#3270]: https://github.com/dusk-network/rusk/issues/3270 [#3287]: https://github.com/dusk-network/rusk/issues/3287 +[#3333]: https://github.com/dusk-network/rusk/issues/3333 diff --git a/web-wallet/src/routes/(welcome)/setup/create/+page.svelte b/web-wallet/src/routes/(welcome)/setup/create/+page.svelte index 903e82d36..3fea8663f 100644 --- a/web-wallet/src/routes/(welcome)/setup/create/+page.svelte +++ b/web-wallet/src/routes/(welcome)/setup/create/+page.svelte @@ -14,7 +14,6 @@ import MnemonicPhrase from "./MnemonicPhrase.svelte"; import MnemonicValidate from "./MnemonicValidate.svelte"; import NetworkSync from "./NetworkSync.svelte"; - import SwapNDUSK from "./SwapNDUSK.svelte"; import AllSet from "../AllSet.svelte"; import MnemonicPreSetup from "./MnemonicPreSetup.svelte"; import PasswordSetup from "../PasswordSetup.svelte"; @@ -63,7 +62,7 @@ {:else} - + loginInfoStorage.remove(), disabled: false, }} - > -

- Swap ERC20
- to Native Dusk -

- -
- { await initializeWallet(mnemonicPhrase.join(" ")); @@ -166,7 +154,7 @@ - import { Button } from "$lib/dusk/components"; - import { logo } from "$lib/dusk/icons"; - - -

- The ERC20 token swap functionality is currently disabled and will be provided - after the launch of the Dusk mainnet. -

- - -
- - - - -
- - - - - - `; @@ -2564,7 +2336,7 @@ exports[`Create > lets the user proceed if they have entered a matching Mnemonic
lets the user proceed if they have entered a matching Mnemonic 6 - - 7 - -
@@ -2965,8 +2731,6 @@ exports[`Create > lets the user proceed if they have entered a matching Mnemonic - - `; @@ -2989,7 +2753,7 @@ exports[`Create > should render the \`Securely store your mnemonic phrase!\` agr
should render the \`Securely store your mnemonic phrase!\` agr 6 - - 7 - -
@@ -3198,8 +2956,6 @@ exports[`Create > should render the \`Securely store your mnemonic phrase!\` agr - - `; diff --git a/web-wallet/src/routes/(welcome)/setup/create/__tests__/page.spec.js b/web-wallet/src/routes/(welcome)/setup/create/__tests__/page.spec.js index 9712a27bd..382a4b827 100644 --- a/web-wallet/src/routes/(welcome)/setup/create/__tests__/page.spec.js +++ b/web-wallet/src/routes/(welcome)/setup/create/__tests__/page.spec.js @@ -282,31 +282,6 @@ describe("Create", async () => { expect(container.firstChild).toMatchSnapshot(); }); - it("ensures the Swap To Native Dusk step renders as expected", async () => { - const { container, getByRole, getAllByRole } = render(Create); - - await fireEvent.click(getByRole("button", { name: "Accept" })); - - await fireEvent.click(getAllByRole("checkbox")[0]); - await fireEvent.click(getAllByRole("checkbox")[1]); - - await fireEvent.click(getByRole("button", { name: "Next" })); - await fireEvent.click(getByRole("button", { name: "Next" })); - - const mnemonicSplit = mnemonic.split(" "); - - mnemonicSplit.forEach(async (word) => { - await fireEvent.click(getByRole("button", { name: word })); - }); - - await tick(); - - await fireEvent.click(getByRole("button", { name: "Next" })); - await fireEvent.click(getByRole("button", { name: "Next" })); - - expect(container.firstChild).toMatchSnapshot(); - }); - it("ensures the Network Syncing step renders as expected", async () => { const { container, getByRole, getAllByRole } = render(Create); @@ -326,7 +301,6 @@ describe("Create", async () => { await tick(); - await fireEvent.click(getByRole("button", { name: "Next" })); await fireEvent.click(getByRole("button", { name: "Next" })); await fireEvent.click(getByRole("button", { name: "Next" })); @@ -359,7 +333,6 @@ describe("Create", async () => { await fireEvent.click(getByRole("button", { name: "Next" })); await fireEvent.click(getByRole("button", { name: "Next" })); await fireEvent.click(getByRole("button", { name: "Next" })); - await fireEvent.click(getByRole("button", { name: "Next" })); expect(container.firstChild).toMatchSnapshot(); @@ -411,9 +384,6 @@ describe("Create", async () => { expect(loginInfoStorage.get()).toBeNull(); - // Swap ERC20 to Native Dusk step - await fireEvent.click(getByRole("button", { name: "Next" })); - // Network Syncing step await fireEvent.click(getByRole("button", { name: "Next" })); @@ -484,9 +454,6 @@ describe("Create", async () => { expect(loginInfoStorage.get()).not.toBeNull(); }); - // Swap ERC20 to Native Dusk step - await fireEvent.click(getByRole("button", { name: "Next" })); - // Network Syncing step await fireEvent.click(getByRole("button", { name: "Next" }));