Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import by url cancel fix #6291

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Import by url cancel fix #6291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ff16b8
Fix cancel click on validation by url
mstrasinskis Jan 29, 2025
1e511c6
Test for the fix
mstrasinskis Jan 29, 2025
fb258e1
Description
mstrasinskis Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions frontend/src/lib/modals/accounts/ImportTokenModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
substitutions: { $canisterId: canisterIdText },
});
close();
// Navigate to clear all query parameters.
goto(AppPath.Tokens);
}
};
let isLedgerCanisterIdProcessed = false;
Expand Down Expand Up @@ -170,6 +168,7 @@
level: "warn",
labelKey: "error__imported_tokens.is_duplication",
});
dispatch("nnsClose");
mstrasinskis marked this conversation as resolved.
Show resolved Hide resolved
goto(
buildWalletUrl({
universe: ledgerCanisterId.toText(),
Expand Down Expand Up @@ -242,27 +241,27 @@
}
};

const close = () => dispatch("nnsClose");
const close = () => {
dispatch("nnsClose");
// Navigate on close to clear all query parameters.
goto(AppPath.Tokens);
};
</script>

<WizardModal
testId="import-token-modal-component"
{steps}
bind:currentStep
bind:this={modal}
on:nnsClose={() => {
close();
// Navigate on close to clear all query parameters.
goto(AppPath.Tokens);
}}
on:nnsClose={close}
>
<svelte:fragment slot="title">{currentStep?.title}</svelte:fragment>

{#if currentStep?.name === STEP_FORM}
<ImportTokenForm
bind:ledgerCanisterId
bind:indexCanisterId
on:nnsClose
on:nnsClose={close}
mstrasinskis marked this conversation as resolved.
Show resolved Hide resolved
on:nnsSubmit={onSubmit}
/>
{/if}
Expand Down
43 changes: 43 additions & 0 deletions frontend/src/tests/lib/components/accounts/ImportTokenModal.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,49 @@ describe("ImportTokenModal", () => {
});
});

it("removes the URL parameters on cancel click", async () => {
vi.spyOn(console, "error").mockReturnValue();
queryIcrcTokenSpy = vi
.spyOn(ledgerApi, "queryIcrcToken")
.mockRejectedValue(new Error());

vi.spyOn(importedTokensApi, "getImportedTokens").mockResolvedValue({
imported_tokens: [],
});
vi.spyOn(importedTokensApi, "setImportedTokens").mockResolvedValue();

importedTokensStore.set({
importedTokens: [],
certified: true,
});

const po = renderComponent();
const formPo = po.getImportTokenFormPo();
const reviewPo = po.getImportTokenReviewPo();

await runResolvedPromises();

expect(await formPo.isPresent()).toEqual(true);
expect(await reviewPo.isPresent()).toEqual(false);

expect(get(pageStore)).toMatchObject({
path: AppPath.Tokens,
universe: OWN_CANISTER_ID_TEXT,
importTokenLedgerId: ledgerCanisterId.toText(),
importTokenIndexId: indexCanisterId.toText(),
});

await formPo.getCancelButtonPo().click();
await runResolvedPromises();

expect(get(pageStore)).toMatchObject({
path: AppPath.Tokens,
universe: OWN_CANISTER_ID_TEXT,
importTokenLedgerId: undefined,
importTokenIndexId: undefined,
});
});

it("does not auto validate when feature flag disabled", async () => {
overrideFeatureFlagsStore.setFlag("ENABLE_IMPORT_TOKEN_BY_URL", false);
vi.spyOn(importedTokensApi, "getImportedTokens").mockResolvedValue({
Expand Down