diff --git a/src/widgets/swap-form/ui/SwapCard.tsx b/src/widgets/swap-form/ui/SwapCard.tsx index cb04b04..50fade1 100644 --- a/src/widgets/swap-form/ui/SwapCard.tsx +++ b/src/widgets/swap-form/ui/SwapCard.tsx @@ -47,7 +47,7 @@ export function SwapCard({
- {mode === 'from' ? ( + {mode === 'from' && (
{NETWORKS.map(n => (
- ) : ( - К )} - {token.network}
{/* Пиллы внутри карточки — только десктоп */} diff --git a/src/widgets/swap-form/ui/SwapForm.tsx b/src/widgets/swap-form/ui/SwapForm.tsx index af20bd9..81a8aea 100644 --- a/src/widgets/swap-form/ui/SwapForm.tsx +++ b/src/widgets/swap-form/ui/SwapForm.tsx @@ -25,11 +25,10 @@ export function SwapForm() { const tokenOptions = walletData ? buildTokensFromBalance(walletData) : TOKENS_LIST useEffect(() => { - if (tokenOptions.length > 0) { - setFromToken(tokenOptions[0]) - setToToken(tokenOptions[1] ?? tokenOptions[0]) - } - }, [fromNetwork]) + if (tokenOptions.length === 0) return + setFromToken(t => tokenOptions.find(o => o.symbol === t.symbol) ?? tokenOptions[0]) + setToToken(t => tokenOptions.find(o => o.symbol === t.symbol) ?? (tokenOptions[1] ?? tokenOptions[0])) + }, [walletData, fromNetwork]) return (