Skip to content

style(frontend): Move cross-network swap info box near the tokens #12290

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

Merged
AntonioVentilii merged 8 commits into from
Apr 2, 2026
Merged

style(frontend): Move cross-network swap info box near the tokens #12290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f65f31
style(frontend): Move cross-network swap info box near the tokens
AntonioVentilii Apr 2, 2026
dcb8fbf
spacing
AntonioVentilii Apr 2, 2026
0b83ae9
more
AntonioVentilii Apr 2, 2026
d2dceb1
🤖 Apply formatting changes
github-actions[bot] Apr 2, 2026
ad6324b
remove
AntonioVentilii Apr 2, 2026
674e6c8
review
AntonioVentilii Apr 2, 2026
e51bc70
Merge branch 'main' into style-frontend/Move-cross-network-swap-info-…
AntonioVentilii Apr 2, 2026
465f98b
🤖 Apply formatting changes
github-actions[bot] Apr 2, 2026
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
3 changes: 0 additions & 3 deletions src/frontend/src/eth/components/swap/SwapEthForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { ETH_FEE_CONTEXT_KEY, type EthFeeContext } from '$eth/stores/eth-fee.store';
import { isSupportedEthTokenId } from '$eth/utils/eth.utils';
import { isSupportedEvmNativeTokenId } from '$evm/utils/native-token.utils';
import SwapCrossChainInfo from '$lib/components/swap/SwapCrossChainInfo.svelte';
import SwapForm from '$lib/components/swap/SwapForm.svelte';
import SwapGaslessFee from '$lib/components/swap/SwapGaslessFee.svelte';
import SwapProvider from '$lib/components/swap/SwapProvider.svelte';
Expand Down Expand Up @@ -155,8 +154,6 @@
{#if nonNullish($destinationToken) && nonNullish($sourceToken) && nonNullish($feeTokenIdStore)}
<Hr spacing="md" />

<SwapCrossChainInfo />

<div class="flex flex-col gap-3">
<SwapProvider {onShowProviderList} showSelectButton {slippageValue} />

Expand Down
30 changes: 10 additions & 20 deletions src/frontend/src/lib/components/swap/SwapCrossChainInfo.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,23 @@
import { Html } from '@dfinity/gix-components';
import { nonNullish } from '@dfinity/utils';
import { getContext } from 'svelte';
import Hr from '$lib/components/ui/Hr.svelte';
import MessageBox from '$lib/components/ui/MessageBox.svelte';
import { i18n } from '$lib/stores/i18n.store';
import { SWAP_CONTEXT_KEY, type SwapContext } from '$lib/stores/swap.store';
import type { Size } from '$lib/types/components';
import { replacePlaceholders } from '$lib/utils/i18n.utils';

interface Props {
hrSpacing?: 'none' | Extract<Size, 'lg' | 'md'>;
}

let { hrSpacing }: Props = $props();

const { sourceToken, destinationToken } = getContext<SwapContext>(SWAP_CONTEXT_KEY);
</script>

{#if nonNullish($destinationToken) && nonNullish($sourceToken) && $sourceToken.network.id !== $destinationToken.network.id}
{#if nonNullish(hrSpacing)}
<Hr spacing={hrSpacing} />
{/if}

<MessageBox styleClass="sm:text-sm">
<Html
text={replacePlaceholders($i18n.swap.text.cross_chain_networks_info, {
$sourceNetwork: $sourceToken.network.name,
$destinationNetwork: $destinationToken.network.name
})}
/>
</MessageBox>
<div class="mt-6">
<MessageBox styleClass="sm:text-sm">
<Html
text={replacePlaceholders($i18n.swap.text.cross_chain_networks_info, {
$sourceNetwork: $sourceToken.network.name,
$destinationNetwork: $destinationToken.network.name
})}
/>
</MessageBox>
</div>
{/if}
3 changes: 3 additions & 0 deletions src/frontend/src/lib/components/swap/SwapForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { slide } from 'svelte/transition';
import { isDefaultEthereumToken } from '$eth/utils/eth.utils';
import MaxBalanceButton from '$lib/components/common/MaxBalanceButton.svelte';
import SwapCrossChainInfo from '$lib/components/swap/SwapCrossChainInfo.svelte';
import SwapSlippage from '$lib/components/swap/SwapSlippage.svelte';
import SwapSwitchTokensButton from '$lib/components/swap/SwapSwitchTokensButton.svelte';
import SwapValueDifference from '$lib/components/swap/SwapValueDifference.svelte';
Expand Down Expand Up @@ -255,6 +256,8 @@
</TokenInputNetworkWrapper>
</div>

<SwapCrossChainInfo />

<SwapSlippage
maxSlippageInvalidValue={isNetworkIdICP($sourceToken?.network.id)
? SWAP_SLIPPAGE_INVALID_VALUE
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/lib/components/swap/SwapReview.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@
sourceTokenExchangeRate={$sourceTokenExchangeRate}
/>

<SwapCrossChainInfo />

{#if nonNullish($sourceTokenExchangeRate) && nonNullish($destinationTokenExchangeRate)}
<ModalValue>
{#snippet label()}
Expand Down Expand Up @@ -152,8 +154,6 @@
{@render swapFees()}
</div>

<SwapCrossChainInfo hrSpacing="md" />

{#if isNearIntentsProvider}
<div class="mt-4">
<SwapNearIntentsTos />
Expand Down
3 changes: 0 additions & 3 deletions src/frontend/src/sol/components/swap/SwapSolForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script lang="ts">
import { isNullish, nonNullish } from '@dfinity/utils';
import { getContext, onDestroy, untrack } from 'svelte';
import SwapCrossChainInfo from '$lib/components/swap/SwapCrossChainInfo.svelte';
import SwapForm from '$lib/components/swap/SwapForm.svelte';
import SwapProvider from '$lib/components/swap/SwapProvider.svelte';
import Hr from '$lib/components/ui/Hr.svelte';
Expand Down Expand Up @@ -140,8 +139,6 @@
{#if nonNullish($destinationToken) && nonNullish($sourceToken)}
<Hr spacing="md" />

<SwapCrossChainInfo />

<div class="flex flex-col gap-3">
<SwapProvider {onShowProviderList} showSelectButton {slippageValue} />
</div>
Expand Down
Loading