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

Jump to bottom

feat: adapted component ManageTokensModal to be able to treat both IC and Ethereum tokens #1519

Merged
merged 3 commits into from
Jun 21, 2024
Merged

feat: adapted component ManageTokensModal to be able to treat both IC and Ethereum tokens #1519

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4963b4c
feat: adapted component ManageTokensModal to be able to treat both IC…
AntonioVentilii-DFINITY Jun 21, 2024
6d1e334
fix: ERC20 network shall be the selected one from the user dropdown
AntonioVentilii-DFINITY Jun 21, 2024
1b99c94
Merge branch 'main' into feature/chain-fusion/adapt-manage-tokens-to-…
AntonioVentilii-DFINITY Jun 21, 2024
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
59 changes: 46 additions & 13 deletions src/frontend/src/icp-eth/components/tokens/ManageTokensModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
import { i18n } from '$lib/stores/i18n.store';
import { addTokenSteps } from '$lib/constants/steps.constants';
import InProgressWizard from '$lib/components/ui/InProgressWizard.svelte';
import IcAddTokenForm from '$icp/components/tokens/IcAddTokenForm.svelte';
import { authStore } from '$lib/stores/auth.store';
import { saveIcrcCustomToken } from '$icp/services/ic-custom-tokens.services';
import type { IcrcCustomToken } from '$icp/types/icrc-custom-token';
import type { Erc20Metadata } from '$eth/types/erc20';
import AddTokenByNetwork from '$icp-eth/components/tokens/AddTokenByNetwork.svelte';
import type { Network } from '$lib/types/network';
import AddTokenReview from '$eth/components/tokens/AddTokenReview.svelte';
import { isNetworkIdEthereum, isNetworkIdICP } from '$lib/utils/network.utils';
import { saveErc20Contract } from '$eth/services/erc20.services';
import { selectedChainId, selectedEthereumNetwork } from '$eth/derived/network.derived';
import { selectedNetwork } from '$lib/derived/network.derived';

const steps: WizardSteps = [
{
Expand Down Expand Up @@ -50,6 +57,20 @@
]);
};

const saveErc20Token = async () => {
await saveErc20Contract({
contractAddress: erc20ContractAddress,
metadata: erc20Metadata,
chainId: $selectedChainId,
AntonioVentilii-DFINITY marked this conversation as resolved.
Show resolved Hide resolved
network: $selectedEthereumNetwork,
updateSaveProgressStep: progress,
modalNext: modal.next,
onSuccess: close,
onError: modal.back,
identity: $authStore.identity
});
};

const progress = (step: ProgressStepsAddToken) => (saveProgressStep = step);

const save = async (
Expand All @@ -73,6 +94,14 @@

let ledgerCanisterId = '';
let indexCanisterId = '';

let erc20ContractAddress = '';
let erc20Metadata: Erc20Metadata | undefined;

let network: Network | undefined = $selectedNetwork;
let tokenData: Record<string, string> = {};

$: tokenData, ({ ledgerCanisterId, indexCanisterId, erc20ContractAddress } = tokenData);
</script>

<WizardModal
Expand All @@ -85,21 +114,25 @@
<svelte:fragment slot="title">{currentStep?.title ?? ''}</svelte:fragment>

{#if currentStep?.name === 'Review'}
<IcAddTokenReview
on:icBack={modal.back}
on:icSave={addToken}
{ledgerCanisterId}
{indexCanisterId}
/>
{#if isNetworkIdICP(network?.id)}
<IcAddTokenReview
on:icBack={modal.back}
on:icSave={addToken}
{ledgerCanisterId}
{indexCanisterId}
/>
{:else if isNetworkIdEthereum(network?.id)}
<AddTokenReview
on:icBack={modal.back}
on:icSave={saveErc20Token}
contractAddress={erc20ContractAddress}
bind:metadata={erc20Metadata}
/>
{/if}
{:else if currentStep?.name === 'Saving'}
<InProgressWizard progressStep={saveProgressStep} steps={addTokenSteps($i18n)} />
{:else if currentStep?.name === 'Import'}
<IcAddTokenForm
on:icBack={modal.back}
on:icNext={modal.next}
bind:ledgerCanisterId
bind:indexCanisterId
/>
<AddTokenByNetwork on:icBack={modal.back} on:icNext={modal.next} bind:network bind:tokenData />
{:else}
<ManageTokens on:icClose={close} on:icAddToken={modal.next} on:icSave={saveTokens} />
{/if}
Expand Down