@rash2x/bridge-widget 0.1.13 → 0.1.16

package/dist/evaa-bridge.mjs

@@ -2,22 +2,22 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import require$$0, { useEffect, useState, useCallback, useMemo, createContext, useContext, memo, forwardRef, useRef } from "react";
+import require$$0, { useEffect, useState, useCallback, useMemo, createContext, useContext, memo, forwardRef } from "react";
 import { initReactI18next, useTranslation, I18nextProvider } from "react-i18next";
 import i18n, { t } from "i18next";
 import { create as create$1 } from "zustand";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from "@/components/ui/dialog";
+import { Badge } from "@/components/ui/badge";
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { Input } from "@/components/ui/input";
+import { Skeleton } from "@/components/ui/skeleton";
 import { useAccount, useConnect, useDisconnect, useWalletClient, usePublicClient } from "wagmi";
 import { useWallet } from "@tronweb3/tronwallet-adapter-react-hooks";
 import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { Address, beginCell as beginCell$1, storeMessage, loadMessage, Cell } from "@ton/core";
-import { VariableSizeList } from "react-window";
-import { Skeleton } from "@/components/ui/skeleton";
+import { Input } from "@/components/ui/input";
 import { CardHeader, CardTitle, CardAction, Card, CardContent, CardFooter } from "@/components/ui/card";
 import { Switch } from "@/components/ui/switch";
 import { X } from "lucide-react";
@@ -30,7 +30,7 @@ import { TonClient, Address as Address$1, beginCell } from "@ton/ton";
 import { TronLinkAdapterName } from "@tronweb3/tronwallet-adapters";
 const common$1 = { "connecting": "Connecting…", "initializing": "Initializing...", "loading": "Loading...", "paste": "paste", "close": "Close", "zeroPlaceholder": "0", "nativeToken": "Native Token" };
 const wallets$1 = { "addTonWallet": "Add TON wallet", "addEvmWallet": "Add EVM wallet", "connectTonWallet": "Connect TON wallet", "connectEvmWallet": "Connect EVM wallet", "initializingMetamask": "Initializing MetaMask SDK...", "initializingTronlink": "Initializing TronLink...", "failedToConnectTon": "Failed to connect to TON wallet", "failedToDisconnect": "Failed to disconnect", "metamaskConnectionError": "MetaMask connection error", "failedToConnectMetamask": "Failed to connect to MetaMask", "failedToDisconnectMetamask": "Failed to disconnect from MetaMask", "selectWallet": "Select Wallet", "tonWallets": "TON", "evmWallets": "EVM", "tronWallets": "TRON", "tonKeeper": "TonKeeper", "metaMask": "WalletConnect", "tronLink": "TronLink", "addTronWallet": "Add Tron wallet", "comingSoon": "Coming Soon", "connected": "CONNECTED", "disconnect": "Disconnect", "chooseWallet": "Choose wallet", "oneWalletPerEnv": "You can only connect one wallet per environment.", "connect": "Connect", "connectTronWallet": "Connect Tron wallet", "connectWallet": "Connect wallet" };
-const bridge$1 = { "sourceNetwork": "Source network", "destinationNetwork": "Destination network", "selectToken": "Select token", "selectNetwork": "Select network", "searchToken": "Search token", "searchDestinationChain": "Search destination chain", "myTokens": "My tokens", "allTokens": "All tokens", "willChangeSourceChain": "Will Change Source Chain", "noBalancesFound": "No balances found.", "noResults": "No results", "sendToAnotherAddress": "Send to another address", "youWillReceive": "You will receive", "tonAddressPlaceholder": "TON address", "evmAddressPlaceholder": "0x… EVM address", "addressDoesntMatch": "Address doesn't match the {{network}} network", "checkBeforeTransfer": "Check correctness before transfer" };
+const bridge$1 = { "sourceNetwork": "Source network", "destinationNetwork": "Destination network", "selectToken": "Select token", "selectNetwork": "Select network", "searchToken": "Search token", "searchDestinationChain": "Search destination chain", "myTokens": "My tokens", "allTokens": "All tokens", "willChangeSourceChain": "Will Change Source Chain", "noBalancesFound": "No balances found.", "noResults": "No results", "sendToAnotherAddress": "Send to another address", "youWillReceive": "You will receive", "anotherAddressPlaceholder": "Address", "addressDoesntMatch": "Address doesn't match the {{network}} network", "checkBeforeTransfer": "Check correctness before transfer" };
 const transaction$1 = { "enterAmount": "Enter amount", "transfer": "Transfer", "getQuote": "Get quote", "failed": "Transaction Failed", "confirm": "Confirm transaction", "signTransaction": "Sign in transaction in wallet", "quoting": "Quoting...", "inProgress": "Processing...", "checkingBalance": "Checking balance...", "insufficientBalance": "Insufficient balance", "amountTooSmall": "Min {{min}}", "amountTooLarge": "Max {{max}}", "successTitle": "Success", "bridged": "Bridged", "transferTitle": "Transfer", "hash": "Hash", "route": "Route", "estTime": "Est. Time", "slippage": "Slippage", "minimumReceived": "Minimum received", "totalFee": "Total Fee", "noRouteFound": "No route found", "notEnoughGas": "Not enough gas", "noRouteFoundForSettings": "No route found for current settings.", "tryAdjustSettings": "Try disabling Gas on Destination, or adjust amount/networks.", "quoteError": "Quote error" };
 const app$1 = { "stargateWidgetName": "Stargate Bridge Widget", "liveWidget": "Live Widget", "getStarted": "Get Started" };
 const settings$1 = { "title": "Settings", "gasOnDestination": "Gas on destination", "slippageTolerance": "Slippage tolerance", "routePriority": "Route Priority", "highSlippageWarning": "High slippage warning", "gasPresets": { "auto": "Auto", "none": "None", "medium": "Medium", "max": "Max" }, "routePresets": { "fastest": "Fastest", "cheapest": "Cheapest", "recommended": "Recommended" } };
@@ -44,7 +44,7 @@ const en = {
 };
 const common = { "connecting": "Подключение…", "initializing": "Инициализация...", "loading": "Загрузка...", "paste": "вставить", "close": "Закрыть", "zeroPlaceholder": "0", "nativeToken": "Нативный токен" };
 const wallets = { "addTonWallet": "Добавить TON кошелёк", "addEvmWallet": "Добавить EVM кошелёк", "connectTonWallet": "Подключить TON кошелёк", "connectEvmWallet": "Подключить EVM кошелёк", "initializingMetamask": "Инициализация MetaMask SDK...", "initializingTronlink": "Инициализация TronLink...", "failedToConnectTon": "Не удалось подключиться к TON кошельку", "failedToDisconnect": "Не удалось отключиться", "metamaskConnectionError": "Ошибка подключения MetaMask", "failedToConnectMetamask": "Не удалось подключиться к MetaMask", "failedToDisconnectMetamask": "Не удалось отключиться от MetaMask", "selectWallet": "Выберите кошелёк", "tonWallets": "TON", "evmWallets": "EVM", "tronWallets": "TRON", "tonKeeper": "TonKeeper", "metaMask": "WalletConnect", "tronLink": "TronLink", "addTronWallet": "Добавить Tron кошелёк", "comingSoon": "Скоро", "connected": "ПОДКЛЮЧЕНО", "disconnect": "Отключить", "chooseWallet": "Выберите кошелёк", "oneWalletPerEnv": "Можно подключить только один кошелёк на окружение.", "connect": "Подключить", "connectTronWallet": "Подключить Tron кошелёк", "connectWallet": "Подключить кошелёк" };
-const bridge = { "sourceNetwork": "Исходная сеть", "destinationNetwork": "Целевая сеть", "selectToken": "Выбрать токен", "selectNetwork": "Выбрать сеть", "searchToken": "Поиск токена", "searchDestinationChain": "Поиск целевой сети", "myTokens": "Мои токены", "allTokens": "Все токены", "willChangeSourceChain": "Сменит исходную сеть", "noBalancesFound": "Балансы не найдены.", "noResults": "Нет результатов", "sendToAnotherAddress": "Отправить на другой адрес", "youWillReceive": "Вы получите", "tonAddressPlaceholder": "TON адрес", "evmAddressPlaceholder": "0x… EVM адрес", "addressDoesntMatch": "Адрес не соответствует сети {{network}}", "checkBeforeTransfer": "Проверьте корректность перед переводом" };
+const bridge = { "sourceNetwork": "Исходная сеть", "destinationNetwork": "Целевая сеть", "selectToken": "Выбрать токен", "selectNetwork": "Выбрать сеть", "searchToken": "Поиск токена", "searchDestinationChain": "Поиск целевой сети", "myTokens": "Мои токены", "allTokens": "Все токены", "willChangeSourceChain": "Сменит исходную сеть", "noBalancesFound": "Балансы не найдены.", "noResults": "Нет результатов", "sendToAnotherAddress": "Отправить на другой адрес", "youWillReceive": "Вы получите", "anotherAddressPlaceholder": "Адрес", "addressDoesntMatch": "Адрес не соответствует сети {{network}}", "checkBeforeTransfer": "Проверьте корректность перед переводом" };
 const transaction = { "enterAmount": "Введите сумму", "transfer": "Перевести", "getQuote": "Получить котировку", "quoting": "Расчет котировки...", "failed": "Ошибка транзакции", "confirm": "Подтвердите транзакцию", "signTransaction": "Подпишите транзакцию в кошельке", "inProgress": "Выполнение...", "checkingBalance": "Проверка баланса...", "insufficientBalance": "Недостаточно средств", "amountTooSmall": "Минимум {{min}}", "amountTooLarge": "Максимум {{max}}", "successTitle": "Успех", "bridged": "Переведено", "transferTitle": "Перевод", "hash": "Хэш", "route": "Маршрут", "estTime": "Время", "slippage": "Проскальзывание", "minimumReceived": "Минимум к получению", "totalFee": "Общая комиссия", "noRouteFound": "Маршрут не найден", "notEnoughGas": "Недостаточно газа", "noRouteFoundForSettings": "Маршрут не найден для текущих настроек.", "tryAdjustSettings": "Попробуйте отключить Gas on Destination или измените сумму/сети.", "quoteError": "Ошибка котировки" };
 const app = { "stargateWidgetName": "Виджет Stargate Bridge", "liveWidget": "Живой виджет", "getStarted": "Начало работы" };
 const settings = { "title": "Настройки", "gasOnDestination": "Газ на назначении", "slippageTolerance": "Толерантность к проскальзыванию", "routePriority": "Приоритет маршрута", "highSlippageWarning": "Высокое проскальзывание", "gasPresets": { "auto": "Авто", "none": "Нет", "medium": "Средний", "max": "Макс" }, "routePresets": { "fastest": "Быстрейший", "cheapest": "Дешевейший", "recommended": "Рекомендуемый" } };
@@ -903,21 +903,21 @@ const SettingModal = ({ isOpen, onClose }) => {
     toChain?.chainKey,
     dstNativeToken?.decimals || 18
   );
-  const activeBtn = "bg-settings-active hover:bg-settings-active/80 text-settings-active-foreground";
-  const notActiveBtn = "bg-settings-button hover:bg-settings-button/80 text-settings-button-foreground";
+  const activeBtn = "bg-primary hover:bg-primary/80 text-primary-foreground transition-colors";
+  const notActiveBtn = "bg-accent hover:bg-accent/80 text-accent-foreground transition-colors";
   return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: (open) => !open && onClose(), children: /* @__PURE__ */ jsxs(DialogContent, { children: [
-    /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t2("settings.title", { defaultValue: "Settings" }) }) }),
+    /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t2("settings.title") }) }),
     /* @__PURE__ */ jsxs("div", { className: "space-y-5", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-5", children: [
         /* @__PURE__ */ jsxs("div", { className: "flex justify-between items-center", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
-            /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm font-medium leading-3.5", children: t2("settings.gasOnDestination") }),
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm font-medium leading-4", children: t2("settings.gasOnDestination") }),
             /* @__PURE__ */ jsx(Tip, { text: t2("settings.gasOnDestination"), children: /* @__PURE__ */ jsx(TipIcon, { className: "size-4 text-muted-foreground" }) })
           ] }),
-          /* @__PURE__ */ jsx("p", { className: "text-foreground text-sm font-medium leading-3.5", children: formatUsd(gasUsdValue) })
+          /* @__PURE__ */ jsx("p", { className: "text-foreground text-sm font-medium leading-4", children: formatUsd(gasUsdValue) })
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-3", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center w-1/3 gap-1.5 shrink-0", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center w-1/3 gap-2 shrink-0", children: [
             /* @__PURE__ */ jsx(
               TokenSymbol,
               {
@@ -930,13 +930,12 @@ const SettingModal = ({ isOpen, onClose }) => {
               gasDisplayAmount < 1e-3 ? 6 : 3
             ) }) })
           ] }),
-          /* @__PURE__ */ jsx("div", { className: "flex items-center gap-1.5", children: gasPresets.map((g) => /* @__PURE__ */ jsx(
-            Button,
+          /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: gasPresets.map((g) => /* @__PURE__ */ jsx(
+            Badge,
             {
-              type: "button",
               onClick: () => setGasPreset(g),
               className: cn(
-                `cursor-pointer rounded-6 px-2 py-2.5 h-7 text-xs font-semibold leading-2 transition`,
+                "cursor-pointer",
                 gasPreset === g ? activeBtn : notActiveBtn
               ),
               children: t2(`settings.gasPresets.${g}`)
@@ -948,26 +947,25 @@ const SettingModal = ({ isOpen, onClose }) => {
       /* @__PURE__ */ jsx("hr", {}),
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-5", children: [
         /* @__PURE__ */ jsxs("div", { className: "flex justify-between items-center", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
             /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm font-medium leading-3.5", children: t2("settings.slippageTolerance") }),
             /* @__PURE__ */ jsx(Tip, { text: t2("settings.slippageTolerance"), children: /* @__PURE__ */ jsx(TipIcon, { className: "size-4 text-muted-foreground" }) })
           ] }),
-          slippageBps >= 500 && /* @__PURE__ */ jsx("p", { className: "text-orange-500 text-xs font-medium", children: t2("settings.highSlippageWarning", {
+          slippageBps >= 500 && /* @__PURE__ */ jsx("p", { className: "text-destructive text-xs font-medium", children: t2("settings.highSlippageWarning", {
             defaultValue: "High slippage warning"
           }) })
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-6", children: [
           /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsx("p", { className: "text-lg text-foreground leading-4.5 font-semibold h-4.5", children: slippagePercent }) }),
           /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: slippagePresets.map((p) => /* @__PURE__ */ jsx(
-            Button,
+            Badge,
             {
-              type: "button",
               onClick: () => {
                 const bps = parseFloat(p.replace("%", "")) * 100;
                 setSlippageBps(bps);
               },
               className: cn(
-                `cursor-pointer rounded-6 px-2 py-2.5 h-7 text-xs font-semibold leading-2 transition`,
+                "cursor-pointer",
                 activeSlippagePreset === p ? activeBtn : notActiveBtn
               ),
               children: p
@@ -978,17 +976,16 @@ const SettingModal = ({ isOpen, onClose }) => {
       ] }),
       /* @__PURE__ */ jsx("hr", {}),
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-5", children: [
-        /* @__PURE__ */ jsx("div", { className: "flex justify-between items-center", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
+        /* @__PURE__ */ jsx("div", { className: "flex justify-between items-center", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
           /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm font-medium leading-3.5", children: t2("settings.routePriority") }),
           /* @__PURE__ */ jsx(Tip, { text: t2("settings.routePriority"), children: /* @__PURE__ */ jsx(TipIcon, { className: "size-4 text-muted-foreground" }) })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: "flex items-center justify-end gap-2", children: routePresets.map((r) => /* @__PURE__ */ jsx(
-          Button,
+          Badge,
           {
-            type: "button",
             onClick: () => setRoutePriority(r),
             className: cn(
-              `cursor-pointer rounded-6 px-2 py-2.5 h-7 text-xs font-semibold leading-2 transition`,
+              "cursor-pointer",
               routePriority === r ? activeBtn : notActiveBtn
             ),
             children: t2(`settings.routePresets.${r}`)
@@ -1056,168 +1053,31 @@ function useChainStrategies() {
   }
   return context;
 }
-function toLD(human, decimals) {
-  const [i = "0", f = ""] = human.replace(",", ".").split(".");
-  const frac = (f + "0".repeat(decimals)).slice(0, decimals);
-  return BigInt(i + frac).toString();
-}
-function fromLD(ld, decimals) {
-  const bi = BigInt(ld || "0");
-  if (decimals === 0) return Number(bi);
-  const base = BigInt(10) ** BigInt(decimals);
-  const int = bi / base;
-  const frac = Number(bi % base) / Number(base);
-  return Number(int) + frac;
-}
-function resolveTokenOnChainFromMatrix$2(assetMatrix, assetSymbol, chainKey) {
-  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
-  const byChain = assetMatrix[assetSymbol.toUpperCase()];
-  return byChain?.[chainKey];
-}
-const DEFAULT_SLIPPAGE_BPS = 50;
-const lower = (s) => (s ?? "").toLowerCase();
-const normSym = (s) => (s ?? "").toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
-function tonNorm(addr) {
-  if (!addr) return null;
+const isEvmAddress = (addr) => {
+  return /^0x[0-9a-fA-F]{40}$/.test(addr ?? "");
+};
+const isTronAddress = (addr) => {
+  return /^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addr ?? "");
+};
+const isTonAddress = (addr) => {
+  if (!addr) return false;
   try {
     if (addr.includes(":")) {
-      return Address.parseRaw(addr).toString({
-        bounceable: false,
-        urlSafe: true
-      });
+      Address.parseRaw(addr);
+      return true;
     }
-    return Address.parse(addr).toString({ bounceable: false, urlSafe: true });
+    Address.parse(addr);
+    return true;
   } catch {
-    return null;
+    return false;
   }
-}
-const isEvmAddress = (a) => /^0x[0-9a-fA-F]{40}$/.test(a ?? "");
-const isTronAddress = (a) => /^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(a ?? "");
-const isZeroAddr = (a) => (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  !!a && /^0x0{40}$/i.test(a) || /^0x[eE]{4}e{36}$/i.test(a)
-);
+};
 function isAddressValidForChain(chainKey, addr) {
   if (!chainKey || !addr) return false;
-  if (chainKey === "ton") return tonNorm(addr) !== null;
+  if (chainKey === "ton") return isTonAddress(addr);
   if (chainKey === "tron") return isTronAddress(addr);
   return isEvmAddress(addr);
 }
-function addrForApi(chainKey, addr) {
-  if (chainKey === "ton") return tonNorm(addr);
-  return addr;
-}
-function isNativeAddrEqual(chain, tokenAddr) {
-  if (!chain) return false;
-  if (!tokenAddr) return false;
-  if (isZeroAddr(tokenAddr)) return true;
-  const nativeAddr = chain.nativeCurrency?.address;
-  if (!nativeAddr) return false;
-  if (chain.chainKey === "ton") {
-    const a = tonNorm(tokenAddr);
-    const b = tonNorm(nativeAddr);
-    return !!a && !!b && a === b;
-  }
-  return lower(nativeAddr) === lower(tokenAddr);
-}
-function findNativeMeta(tokens, chain) {
-  if (!chain) return { decimals: 18, priceUsd: void 0 };
-  const sym = normSym(chain.nativeCurrency?.symbol);
-  if (!sym) {
-    return { decimals: chain.chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
-  }
-  const sameChain = tokens?.find(
-    (t2) => t2.chainKey === chain.chainKey && normSym(t2.symbol) === sym
-  ) ?? void 0;
-  if (sameChain)
-    return { decimals: sameChain.decimals, priceUsd: sameChain.price?.usd };
-  const anyChain = tokens?.find((t2) => normSym(t2.symbol) === sym);
-  if (anyChain)
-    return { decimals: anyChain.decimals, priceUsd: anyChain.price?.usd };
-  return { decimals: chain.chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
-}
-function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
-  if (!chainKey) return { decimals: 18, priceUsd: void 0 };
-  const chain = chains?.find((c) => c.chainKey === chainKey);
-  const hit = tokens?.find((t2) => {
-    if (t2.chainKey !== chainKey) return false;
-    if (chainKey === "ton") {
-      const a = tonNorm(t2.address);
-      const b = tonNorm(tokenAddr);
-      return !!a && !!b && a === b;
-    }
-    return lower(t2.address) === lower(tokenAddr);
-  }) ?? void 0;
-  if (hit) return { decimals: hit.decimals, priceUsd: hit.price?.usd };
-  if (isNativeAddrEqual(chain, tokenAddr)) {
-    return findNativeMeta(tokens, chain);
-  }
-  return { decimals: chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
-}
-function computeFeesUsdFromArray(fees, tokens, chains) {
-  if (!fees?.length) return { totalUsd: 0 };
-  let total = 0;
-  let protocolFeeUsd = 0;
-  let messageFeeUsd = 0;
-  const byType = /* @__PURE__ */ new Map();
-  for (const f of fees) {
-    let usd = Number(f.usd ?? 0);
-    if (!usd) {
-      const { decimals, priceUsd } = lookupTokenMeta(
-        tokens,
-        chains,
-        f.chainKey,
-        f.token
-      );
-      const human = fromLD(String(f.amount ?? "0"), decimals);
-      usd = (priceUsd ?? 0) * human;
-    }
-    total += usd;
-    const type = (f.type ?? "other").toLowerCase();
-    byType.set(type, (byType.get(type) ?? 0) + usd);
-    if (type === "protocol" || type === "service") {
-      protocolFeeUsd += usd;
-    } else if (type === "message" || type === "gas" || type === "network") {
-      messageFeeUsd += usd;
-    }
-  }
-  const serviceUsd = byType.get("protocol") ?? byType.get("service") ?? void 0;
-  const blockchainUsd = byType.get("gas") ?? byType.get("network") ?? byType.get("message") ?? void 0;
-  return {
-    totalUsd: total,
-    protocolFeeUsd: protocolFeeUsd > 0 ? protocolFeeUsd : void 0,
-    messageFeeUsd: messageFeeUsd > 0 ? messageFeeUsd : void 0,
-    serviceUsd,
-    blockchainUsd
-  };
-}
-function dollarsFromNativeFees(feeNative, feeLzToken, chain, tokens) {
-  let total = 0;
-  if (feeNative && chain) {
-    const { decimals, priceUsd } = findNativeMeta(tokens, chain);
-    const human = fromLD(String(feeNative), decimals);
-    total += (priceUsd ?? 0) * human;
-  }
-  if (feeLzToken) {
-    const lz = tokens?.find((t2) => normSym(t2.symbol) === "LZ");
-    if (lz?.price?.usd && lz.decimals != null) {
-      const human = fromLD(String(feeLzToken), lz.decimals);
-      total += lz.price.usd * human;
-    }
-  }
-  return total;
-}
-function sumFeeByTokenLD(fees, dstTokenAddr, dstChainKey) {
-  if (!fees?.length || !dstTokenAddr || !dstChainKey) return "0";
-  let acc = 0n;
-  for (const f of fees) {
-    if (f.chainKey !== dstChainKey) continue;
-    const same = dstChainKey === "ton" ? tonNorm(f.token) === tonNorm(dstTokenAddr) : lower(f.token) === lower(dstTokenAddr);
-    if (!same) continue;
-    acc += BigInt(f.amount ?? "0");
-  }
-  return acc.toString();
-}
 function useBalances(chainKey, address, priorityTokenSymbol) {
   const { chainRegistry } = useChainStrategies();
   const { assetMatrix } = useTokensStore();
@@ -1279,10 +1139,92 @@ function useBalances(chainKey, address, priorityTokenSymbol) {
     query
   };
 }
-function useTokenSelectData(items) {
+const SearchInput = ({
+  placeholder,
+  value,
+  onChange,
+  className,
+  containerClassName
+}) => {
+  const [isFocused, setIsFocused] = useState(false);
+  return /* @__PURE__ */ jsxs(
+    "div",
+    {
+      className: cn(
+        "flex items-center gap-3 px-5 py-4 bg-input rounded-md h-13 transition-all duration-200",
+        isFocused ? "border border-ring" : "border border-transparent",
+        containerClassName
+      ),
+      children: [
+        /* @__PURE__ */ jsx(SearchIcon, { className: "size-6 text-input-icon" }),
+        /* @__PURE__ */ jsx(
+          Input,
+          {
+            placeholder,
+            className: cn(
+              "w-full outline-none bg-transparent border-none ring-0 leading-0 p-0 h-6 text-base text-input-text placeholder:text-input-placeholder bg-none dark:bg-transparent",
+              className
+            ),
+            value,
+            onChange: (e) => onChange(e.target.value),
+            onFocus: () => setIsFocused(true),
+            onBlur: () => setIsFocused(false)
+          }
+        )
+      ]
+    }
+  );
+};
+const TokenRow = ({
+  symbol,
+  name,
+  isSelected,
+  hasAnyWallet,
+  balance,
+  usdValue,
+  isBalanceLoading,
+  onPick
+}) => {
+  return /* @__PURE__ */ jsxs(
+    Button,
+    {
+      onClick: onPick,
+      className: `w-full bg-transparent flex items-center justify-between gap-3 px-5 hover:bg-accent hover:scale-100 ${isSelected ? "border border-ring" : ""}`,
+      children: [
+        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
+          /* @__PURE__ */ jsx(
+            TokenSymbol,
+            {
+              symbol,
+              className: "size-8 rounded-full",
+              alt: symbol
+            }
+          ),
+          /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start gap-1", children: [
+            /* @__PURE__ */ jsx("p", { className: "font-extrabold text-foreground text-lg leading-4 truncate flex items-center gap-1", children: symbol }),
+            /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground truncate", children: name })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx("div", { className: "text-right space-y-1", children: isBalanceLoading && hasAnyWallet ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-end gap-1", children: [
+          /* @__PURE__ */ jsx(Skeleton, { className: "h-5 w-16 rounded-md" }),
+          /* @__PURE__ */ jsx(Skeleton, { className: "h-3 w-12 rounded-md" })
+        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx("div", { className: "font-extrabold text-foreground text-lg leading-4 truncate", children: hasAnyWallet ? formatBalance(balance) : "—" }),
+          /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 text-muted-foreground", children: hasAnyWallet && balance > 0 && usdValue > 0 ? formatUsd(usdValue) : "—" })
+        ] }) })
+      ]
+    }
+  );
+};
+const TokenSelectModal = ({
+  isOpen,
+  onClose,
+  items,
+  onChangeAsset
+}) => {
+  const { t: t2 } = useBridgeTranslation();
   const [query, setQuery] = useState("");
   const [tab, setTab] = useState("my");
-  const [isFocused, setIsFocused] = useState(false);
   const { srcAddress } = useAddresses();
   const { fromChain, setFromChain, chains } = useChainsStore();
   const { assetMatrix, selectedAssetSymbol } = useTokensStore();
@@ -1367,159 +1309,7 @@ function useTokenSelectData(items) {
   const resetState = useCallback(() => {
     setQuery("");
     setTab("my");
-    setIsFocused(false);
   }, []);
-  return {
-    query,
-    setQuery,
-    tab,
-    setTab,
-    isFocused,
-    setIsFocused,
-    effectiveTab,
-    resetState,
-    fromChain,
-    setFromChain,
-    selectedAssetSymbol,
-    balancesQuery,
-    groupedTokens,
-    myTokens,
-    getBalance,
-    getTokenUsdValue,
-    findFirstAvailableChain,
-    hasAnyWallet
-  };
-}
-const TokenRow = ({
-  symbol,
-  name,
-  isSelected,
-  hasAnyWallet,
-  balance,
-  usdValue,
-  isBalanceLoading,
-  onPick
-}) => {
-  return /* @__PURE__ */ jsxs(
-    Button,
-    {
-      onClick: onPick,
-      className: `w-full h-12.5 rounded-md cursor-pointer bg-transparent flex shadow-none items-center justify-between gap-2.5 px-5 py-2.5 hover:bg-modal-item-hover transition-[300] ${isSelected ? "border border-ring" : ""}`,
-      children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
-          /* @__PURE__ */ jsx(
-            TokenSymbol,
-            {
-              symbol,
-              className: "size-7.5 max-w-7.5 rounded-full",
-              alt: symbol
-            }
-          ),
-          /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start gap-1", children: [
-            /* @__PURE__ */ jsx("p", { className: "font-extrabold text-foreground text-lg leading-4 truncate flex items-center gap-1", children: symbol }),
-            /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground truncate", children: name })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsx("div", { className: "text-right space-y-1", children: isBalanceLoading && hasAnyWallet ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-end gap-1", children: [
-          /* @__PURE__ */ jsx(Skeleton, { className: "h-5 w-16 rounded-md" }),
-          /* @__PURE__ */ jsx(Skeleton, { className: "h-3 w-12 rounded-md" })
-        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("div", { className: "font-extrabold text-foreground text-lg leading-4 truncate", children: hasAnyWallet ? formatBalance(balance) : "—" }),
-          /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 text-muted-foreground", children: hasAnyWallet && balance > 0 && usdValue > 0 ? formatUsd(usdValue) : "—" })
-        ] }) })
-      ]
-    }
-  );
-};
-const HEADER_H = 30;
-const ROW_H = 50;
-const HEADER_TOP_GAP = 30;
-const VirtualizedTokenList = ({
-  nodes,
-  balancesLoading,
-  hasAnyWallet,
-  selectedAssetSymbol,
-  getBalance,
-  getTokenUsdValue,
-  onPick
-}) => {
-  const Row = ({ index, style }) => {
-    const node = nodes[index];
-    if (node.kind === "header") {
-      const gap = index === 0 ? 0 : HEADER_TOP_GAP;
-      return /* @__PURE__ */ jsx(
-        "div",
-        {
-          style: { ...style, paddingTop: gap },
-          className: "px-5 flex leading-4 text-base py-1.5 font-semibold text-muted-foreground uppercase",
-          children: /* @__PURE__ */ jsx("p", { children: node.title })
-        }
-      );
-    }
-    const bal = getBalance(node.token.symbol);
-    const usd = getTokenUsdValue(node.token.symbol, node.token.price?.usd);
-    const isSelected = selectedAssetSymbol?.toUpperCase() === node.token.symbol.toUpperCase();
-    return /* @__PURE__ */ jsx(
-      TokenRow,
-      {
-        symbol: node.token.symbol,
-        name: node.token.name,
-        isSelected: !!isSelected,
-        hasAnyWallet,
-        balance: bal,
-        usdValue: usd,
-        isBalanceLoading: balancesLoading,
-        onPick: () => onPick(node.token.symbol, node.willChangeSrc)
-      }
-    );
-  };
-  const getItemSize = (index) => {
-    const node = nodes[index];
-    if (node.kind === "header") {
-      const gap = index === 0 ? 0 : HEADER_TOP_GAP;
-      return HEADER_H + gap;
-    }
-    return ROW_H;
-  };
-  return /* @__PURE__ */ jsx(
-    VariableSizeList,
-    {
-      height: 480,
-      width: "100%",
-      itemCount: nodes.length,
-      itemSize: getItemSize,
-      overscanCount: 8,
-      style: { willChange: "transform", paddingBottom: "40px" },
-      children: Row
-    }
-  );
-};
-const TokenSelectModal = ({
-  isOpen,
-  onClose,
-  items,
-  onChangeAsset
-}) => {
-  const { t: t2 } = useBridgeTranslation();
-  const {
-    query,
-    setQuery,
-    tab,
-    setTab,
-    isFocused,
-    setIsFocused,
-    effectiveTab,
-    resetState,
-    setFromChain,
-    selectedAssetSymbol,
-    balancesQuery,
-    groupedTokens,
-    myTokens,
-    getBalance,
-    getTokenUsdValue,
-    findFirstAvailableChain,
-    hasAnyWallet
-  } = useTokenSelectData(items);
   const handleClose = useCallback(() => {
     resetState();
     onClose();
@@ -1536,68 +1326,41 @@ const TokenSelectModal = ({
     onChangeAsset(sym);
     handleClose();
   };
-  const virtualNodes = useMemo(() => {
-    const out = [];
+  const tokensToRender = useMemo(() => {
     if (effectiveTab === "my") {
-      for (const token of myTokens) {
-        out.push({
-          kind: "token",
-          key: `my:${token.symbol}`,
-          token,
-          willChangeSrc: false
-        });
-      }
-      return out;
-    }
-    const mainTokens = [
-      ...groupedTokens.withBalance,
-      ...groupedTokens.onSrcChain
-    ];
-    for (const token of mainTokens) {
-      out.push({
-        kind: "token",
-        key: `main:${token.symbol}`,
+      return myTokens.map((token) => ({
         token,
         willChangeSrc: false
-      });
-    }
-    if (groupedTokens.willChangeSrcChain.length > 0) {
-      out.push({
-        kind: "header",
-        key: "hdr:willChange",
-        title: t2("bridge.willChangeSourceChain")
-      });
-      for (const token of groupedTokens.willChangeSrcChain) {
-        out.push({
-          kind: "token",
-          key: `will:${token.symbol}`,
-          token,
-          willChangeSrc: true
-        });
-      }
+      }));
     }
-    return out;
-  }, [effectiveTab, myTokens, groupedTokens, t2]);
-  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxs(DialogContent, { className: "!max-h-[80dvh] overflow-auto", children: [
+    const mainTokens = [
+      ...groupedTokens.withBalance.map((token) => ({
+        token,
+        willChangeSrc: false
+      })),
+      ...groupedTokens.onSrcChain.map((token) => ({
+        token,
+        willChangeSrc: false
+      }))
+    ];
+    return mainTokens;
+  }, [effectiveTab, myTokens, groupedTokens]);
+  const willChangeSrcTokens = useMemo(
+    () => groupedTokens.willChangeSrcChain.map((token) => ({
+      token,
+      willChangeSrc: true
+    })),
+    [groupedTokens.willChangeSrcChain]
+  );
+  const hasNoResults = tokensToRender.length === 0 && willChangeSrcTokens.length === 0;
+  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxs(DialogContent, { className: "!h-[90dvh] overflow-hidden flex flex-col", children: [
     /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t2("bridge.selectToken") }) }),
-    /* @__PURE__ */ jsxs(
-      "div",
+    /* @__PURE__ */ jsx(
+      SearchInput,
       {
-        className: `flex items-center gap-2.5 px-5 py-3.5 bg-input rounded-12 h-12.5 transition-all duration-200 ${isFocused ? "border border-ring" : "border border-transparent"}`,
-        children: [
-          /* @__PURE__ */ jsx(SearchIcon, { className: "size-6 text-input-icon" }),
-          /* @__PURE__ */ jsx(
-            Input,
-            {
-              placeholder: t2("bridge.searchToken"),
-              className: "w-full outline-none leading-0 p-0 h-6 text-base text-input-text placeholder:text-input-placeholder bg-none dark:bg-transparent",
-              value: query,
-              onChange: (e) => setQuery(e.target.value),
-              onFocus: () => setIsFocused(true),
-              onBlur: () => setIsFocused(false)
-            }
-          )
-        ]
+        placeholder: t2("bridge.searchToken"),
+        value: query,
+        onChange: setQuery
       }
     ),
     hasAnyWallet() && /* @__PURE__ */ jsxs("div", { className: "flex gap-2", children: [
@@ -1620,20 +1383,52 @@ const TokenSelectModal = ({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx("div", { className: "flex-1 overflow-hidden -mx-5", children: virtualNodes.length === 0 ? /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground px-5 py-3.5", children: t2("bridge.noResults") }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx("div", { className: "flex-1 overflow-auto -mx-5", children: hasNoResults ? /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground px-5 py-4", children: t2("bridge.noResults") }) : /* @__PURE__ */ jsxs(Fragment, { children: [
       effectiveTab === "my" && myTokens.length === 0 && /* @__PURE__ */ jsx("p", { className: "leading-4 text-base font-semibold text-muted-foreground uppercase px-5 py-2", children: t2("bridge.noBalancesFound") }),
-      /* @__PURE__ */ jsx(
-        VirtualizedTokenList,
-        {
-          nodes: virtualNodes,
-          balancesLoading: balancesQuery.isLoading || balancesQuery.isFetching,
-          hasAnyWallet: hasAnyWallet(),
-          selectedAssetSymbol,
-          getBalance,
-          getTokenUsdValue,
-          onPick
-        }
-      )
+      tokensToRender.map(({ token, willChangeSrc }) => {
+        const bal = getBalance(token.symbol);
+        const usd = getTokenUsdValue(token.symbol, token.price?.usd);
+        const isSelected = selectedAssetSymbol?.toUpperCase() === token.symbol.toUpperCase();
+        return /* @__PURE__ */ jsx(
+          TokenRow,
+          {
+            symbol: token.symbol,
+            name: token.name,
+            isSelected: !!isSelected,
+            hasAnyWallet: hasAnyWallet(),
+            balance: bal,
+            usdValue: usd,
+            isBalanceLoading: balancesQuery.isLoading || balancesQuery.isFetching,
+            onPick: () => onPick(token.symbol, willChangeSrc)
+          },
+          `${effectiveTab}:${token.symbol}`
+        );
+      }),
+      effectiveTab === "all" && willChangeSrcTokens.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx("div", { className: "px-5 flex leading-4 text-base py-2 font-semibold text-muted-foreground uppercase mt-8", children: /* @__PURE__ */ jsx("p", { children: t2("bridge.willChangeSourceChain") }) }),
+        willChangeSrcTokens.map(({ token, willChangeSrc }) => {
+          const bal = getBalance(token.symbol);
+          const usd = getTokenUsdValue(
+            token.symbol,
+            token.price?.usd
+          );
+          const isSelected = selectedAssetSymbol?.toUpperCase() === token.symbol.toUpperCase();
+          return /* @__PURE__ */ jsx(
+            TokenRow,
+            {
+              symbol: token.symbol,
+              name: token.name,
+              isSelected: !!isSelected,
+              hasAnyWallet: hasAnyWallet(),
+              balance: bal,
+              usdValue: usd,
+              isBalanceLoading: balancesQuery.isLoading || balancesQuery.isFetching,
+              onPick: () => onPick(token.symbol, willChangeSrc)
+            },
+            `will:${token.symbol}`
+          );
+        })
+      ] })
     ] }) })
   ] }) });
 };
@@ -1747,7 +1542,7 @@ const SelectTokenButton = ({
       type: "button",
       "aria-label": label,
       children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 items-center", children: [
+        /* @__PURE__ */ jsxs("div", { className: "flex gap-2 items-center", children: [
           /* @__PURE__ */ jsx(
             TokenSymbol,
             {
@@ -1756,7 +1551,7 @@ const SelectTokenButton = ({
               alt: label
             }
           ),
-          /* @__PURE__ */ jsx("span", { className: "text-secondary-foreground text-sm leading-4.5 font-semibold ", children: label })
+          /* @__PURE__ */ jsx("span", { className: "text-secondary-foreground text-sm font-semibold", children: label })
         ] }),
         /* @__PURE__ */ jsx(ArrowDownIcon, { className: "size-4 text-secondary-foreground" })
       ]
@@ -1779,12 +1574,12 @@ const FormHeaderComponent = () => {
     const sum = selectedAssetSymbol.toUpperCase();
     return assets.find((a) => a.symbol.toUpperCase() === sum) ?? assets[0];
   }, [assets, selectedAssetSymbol]);
-  return /* @__PURE__ */ jsxs(CardHeader, { className: "gap-y-0 flex justify-between items-center", children: [
-    /* @__PURE__ */ jsxs(CardTitle, { className: "flex items-center gap-2.5", children: [
-      /* @__PURE__ */ jsx("span", { className: "text-sm font-normal leading-3.5 text-muted-foreground", children: t2("bridge.selectToken") }),
+  return /* @__PURE__ */ jsxs(CardHeader, { className: "gap-y-0 flex flex-row justify-between items-center", children: [
+    /* @__PURE__ */ jsxs(CardTitle, { className: "flex items-center gap-3", children: [
+      /* @__PURE__ */ jsx("span", { className: "text-sm font-normal leading-4 text-muted-foreground", children: t2("bridge.selectToken") }),
       /* @__PURE__ */ jsx(SelectTokenButton, { token: current, onClick: onOpen })
     ] }),
-    /* @__PURE__ */ jsxs(CardAction, { className: "flex items-center gap-2.5", children: [
+    /* @__PURE__ */ jsxs(CardAction, { className: "flex items-center gap-3", children: [
       /* @__PURE__ */ jsx(RefreshButton, {}),
       /* @__PURE__ */ jsx(Button, { onClick: onOpenSettings, size: "sm", variant: "secondary", children: /* @__PURE__ */ jsx(BoltIcon, { stroke: "currentColor" }) })
     ] }),
@@ -1800,16 +1595,23 @@ const FormHeaderComponent = () => {
         }
       }
     ),
-    /* @__PURE__ */ jsx(
-      SettingModal,
-      {
-        isOpen: isOpenSettings,
-        onClose: onCloseSettings
-      }
-    )
+    /* @__PURE__ */ jsx(SettingModal, { isOpen: isOpenSettings, onClose: onCloseSettings })
   ] });
 };
 const FormHeader = memo(FormHeaderComponent);
+function toLD(human, decimals) {
+  const [i = "0", f = ""] = human.replace(",", ".").split(".");
+  const frac = (f + "0".repeat(decimals)).slice(0, decimals);
+  return BigInt(i + frac).toString();
+}
+function fromLD(ld, decimals) {
+  const bi = BigInt(ld || "0");
+  if (decimals === 0) return Number(bi);
+  const base = BigInt(10) ** BigInt(decimals);
+  const int = bi / base;
+  const frac = Number(bi % base) / Number(base);
+  return Number(int) + frac;
+}
 async function fetchQuotes(req) {
   const params = {
     srcChainKey: req.srcChainKey,
@@ -1868,6 +1670,131 @@ async function getQuotesByPriority(req) {
   const priority = req.routePriority || RoutePriority.RECOMMENDED;
   return selectQuoteByPriority(routes, priority);
 }
+function resolveTokenOnChainFromMatrix$2(assetMatrix, assetSymbol, chainKey) {
+  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
+  const byChain = assetMatrix[assetSymbol.toUpperCase()];
+  return byChain?.[chainKey];
+}
+const DEFAULT_SLIPPAGE_BPS = 50;
+const lower = (s) => (s ?? "").toLowerCase();
+const normSym = (s) => (s ?? "").toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
+function tonNorm(addr) {
+  if (!addr) return null;
+  try {
+    if (addr.includes(":")) {
+      return Address.parseRaw(addr).toString({
+        bounceable: false,
+        urlSafe: true
+      });
+    }
+    return Address.parse(addr).toString({ bounceable: false, urlSafe: true });
+  } catch {
+    return null;
+  }
+}
+const isZeroAddr = (a) => (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  !!a && /^0x0{40}$/i.test(a) || /^0x[eE]{4}e{36}$/i.test(a)
+);
+function addrForApi(chainKey, addr) {
+  if (chainKey === "ton") return tonNorm(addr);
+  return addr;
+}
+function isNativeAddrEqual(chain, tokenAddr) {
+  if (!chain) return false;
+  if (!tokenAddr) return false;
+  if (isZeroAddr(tokenAddr)) return true;
+  const nativeAddr = chain.nativeCurrency?.address;
+  if (!nativeAddr) return false;
+  if (chain.chainKey === "ton") {
+    const a = tonNorm(tokenAddr);
+    const b = tonNorm(nativeAddr);
+    return !!a && !!b && a === b;
+  }
+  return lower(nativeAddr) === lower(tokenAddr);
+}
+function findNativeMeta(tokens, chain) {
+  if (!chain) return { decimals: 18, priceUsd: void 0 };
+  const sym = normSym(chain.nativeCurrency?.symbol);
+  if (!sym) {
+    return { decimals: chain.chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
+  }
+  const sameChain = tokens?.find(
+    (t2) => t2.chainKey === chain.chainKey && normSym(t2.symbol) === sym
+  ) ?? void 0;
+  if (sameChain)
+    return { decimals: sameChain.decimals, priceUsd: sameChain.price?.usd };
+  const anyChain = tokens?.find((t2) => normSym(t2.symbol) === sym);
+  if (anyChain)
+    return { decimals: anyChain.decimals, priceUsd: anyChain.price?.usd };
+  return { decimals: chain.chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
+}
+function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
+  if (!chainKey) return { decimals: 18, priceUsd: void 0 };
+  const chain = chains?.find((c) => c.chainKey === chainKey);
+  const hit = tokens?.find((t2) => {
+    if (t2.chainKey !== chainKey) return false;
+    if (chainKey === "ton") {
+      const a = tonNorm(t2.address);
+      const b = tonNorm(tokenAddr);
+      return !!a && !!b && a === b;
+    }
+    return lower(t2.address) === lower(tokenAddr);
+  }) ?? void 0;
+  if (hit) return { decimals: hit.decimals, priceUsd: hit.price?.usd };
+  if (isNativeAddrEqual(chain, tokenAddr)) {
+    return findNativeMeta(tokens, chain);
+  }
+  return { decimals: chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
+}
+function computeFeesUsdFromArray(fees, tokens, chains) {
+  if (!fees?.length) return { totalUsd: 0 };
+  let total = 0;
+  let protocolFeeUsd = 0;
+  let messageFeeUsd = 0;
+  const byType = /* @__PURE__ */ new Map();
+  for (const f of fees) {
+    let usd = Number(f.usd ?? 0);
+    if (!usd) {
+      const { decimals, priceUsd } = lookupTokenMeta(
+        tokens,
+        chains,
+        f.chainKey,
+        f.token
+      );
+      const human = fromLD(String(f.amount ?? "0"), decimals);
+      usd = (priceUsd ?? 0) * human;
+    }
+    total += usd;
+    const type = (f.type ?? "other").toLowerCase();
+    byType.set(type, (byType.get(type) ?? 0) + usd);
+    if (type === "protocol" || type === "service") {
+      protocolFeeUsd += usd;
+    } else if (type === "message" || type === "gas" || type === "network") {
+      messageFeeUsd += usd;
+    }
+  }
+  const serviceUsd = byType.get("protocol") ?? byType.get("service") ?? void 0;
+  const blockchainUsd = byType.get("gas") ?? byType.get("network") ?? byType.get("message") ?? void 0;
+  return {
+    totalUsd: total,
+    protocolFeeUsd: protocolFeeUsd > 0 ? protocolFeeUsd : void 0,
+    messageFeeUsd: messageFeeUsd > 0 ? messageFeeUsd : void 0,
+    serviceUsd,
+    blockchainUsd
+  };
+}
+function sumFeeByTokenLD(fees, dstTokenAddr, dstChainKey) {
+  if (!fees?.length || !dstTokenAddr || !dstChainKey) return "0";
+  let acc = 0n;
+  for (const f of fees) {
+    if (f.chainKey !== dstChainKey) continue;
+    const same = dstChainKey === "ton" ? tonNorm(f.token) === tonNorm(dstTokenAddr) : lower(f.token) === lower(dstTokenAddr);
+    if (!same) continue;
+    acc += BigInt(f.amount ?? "0");
+  }
+  return acc.toString();
+}
 function useBridgeQuote() {
   const { assetMatrix, selectedAssetSymbol } = useTokensStore();
   const { fromChain, toChain } = useChainsStore();
@@ -2245,14 +2172,14 @@ const SwapButton = () => {
 const WalletBalance = (props) => {
   const { value, isLoading = false } = props;
   if (isLoading) {
-    return /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 items-center", children: [
+    return /* @__PURE__ */ jsxs("div", { className: "flex gap-2 items-center", children: [
       /* @__PURE__ */ jsx(WalletIcon, { className: "text-muted-foreground" }),
       /* @__PURE__ */ jsx(Skeleton, { className: "h-4 w-16 rounded-md" })
     ] });
   }
-  return /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 items-center", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "flex gap-2 items-center", children: [
     /* @__PURE__ */ jsx(WalletIcon, { className: "text-muted-foreground" }),
-    /* @__PURE__ */ jsx("span", { className: "text-sm leading-4.5 font-medium text-muted-foreground", children: value })
+    /* @__PURE__ */ jsx("span", { className: "text-sm leading-5 font-medium text-muted-foreground", children: value })
   ] });
 };
 const BASE_URL = "https://icons-ckg.pages.dev/stargate-light/networks";
@@ -2282,7 +2209,7 @@ const SelectNetworkButton = ({
       type: "button",
       "aria-label": label,
       children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 items-center", children: [
+        /* @__PURE__ */ jsxs("div", { className: "flex gap-2 items-center", children: [
           /* @__PURE__ */ jsx(
             NetworkSymbol,
             {
@@ -2291,7 +2218,7 @@ const SelectNetworkButton = ({
               alt: label
             }
           ),
-          /* @__PURE__ */ jsx("span", { className: "text-secondary-foreground text-sm leading-4.5 font-semibold ", children: label })
+          /* @__PURE__ */ jsx("span", { className: "text-secondary-foreground text-sm leading-5 font-semibold ", children: label })
         ] }),
         /* @__PURE__ */ jsx(ArrowDownIcon, { className: "size-4 text-secondary-foreground" })
       ]
@@ -2349,7 +2276,7 @@ const CurrencyInput = forwardRef(
         pattern: "[0-9]*[.,]?[0-9]*",
         readOnly,
         className: cn(
-          "text-[32px] h-8.5 font-medium leading-8.5 rounded-none text-end bg-transparent dark:bg-transparent text-foreground shadow-none border-none outline-none ring-0 focus:outline-none",
+          "text-[32px] h-12 font-medium leading-9 rounded-none text-end bg-transparent dark:bg-transparent text-foreground shadow-none border-none outline-none ring-0 focus:outline-none",
           className
         ),
         max,
@@ -2368,12 +2295,10 @@ const ChainSelectModal = ({
 }) => {
   const { t: t2 } = useBridgeTranslation();
   const [query, setQuery] = useState("");
-  const [isFocused, setIsFocused] = useState(false);
   const { setFromChain, chains, fromChain, toChain } = useChainsStore();
   const { assetMatrix, selectedAssetSymbol } = useTokensStore();
   const handleClose = useCallback(() => {
     setQuery("");
-    setIsFocused(false);
     onClose();
   }, [onClose]);
   const findCompatibleSrcChain = useCallback(
@@ -2433,8 +2358,8 @@ const ChainSelectModal = ({
       Button,
       {
         onClick: () => onChainPick(chain, willChangeSrc),
-        className: `w-full cursor-pointer flex shadow-none items-center justify-between gap-2.5 px-5 py-3.5 h-12.5 font-extrabold capitalize hover:bg-muted bg-transparent rounded-12 transition-[300] ${isSelected ? "border border-ring" : ""}`,
-        children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2.5", children: [
+        className: `w-full cursor-pointer flex shadow-none items-center justify-between gap-3 px-5 py-3.5 h-12.5 font-extrabold capitalize hover:bg-muted bg-transparent rounded-md transition-[300] ${isSelected ? "border border-ring" : ""}`,
+        children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
           /* @__PURE__ */ jsx(
             NetworkSymbol,
             {
@@ -2449,26 +2374,16 @@ const ChainSelectModal = ({
       chain.chainKey
     );
   };
-  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxs(DialogContent, { className: "!max-h-[80dvh] overflow-hidden", children: [
+  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxs(DialogContent, { className: "!h-[90dvh] flex flex-col", children: [
     /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t2("bridge.selectNetwork") }) }),
-    /* @__PURE__ */ jsxs(
-      "div",
+    /* @__PURE__ */ jsx(
+      SearchInput,
       {
-        className: `flex items-center gap-2.5 px-5 py-3.5 bg-input rounded-md h-12.5 transition-all duration-200 ${isFocused ? "border border-ring" : "border border-transparent"}`,
-        children: [
-          /* @__PURE__ */ jsx(SearchIcon, { className: "size-6 text-muted-foreground" }),
-          /* @__PURE__ */ jsx(
-            Input,
-            {
-              placeholder: t2("bridge.searchDestinationChain"),
-              className: "w-full outline-none leading-0 p-0 h-6 text-base text-foreground placeholder:text-muted-foreground bg-none dark:bg-transparent",
-              value: query,
-              onChange: (e) => setQuery(e.target.value),
-              onFocus: () => setIsFocused(true),
-              onBlur: () => setIsFocused(false)
-            }
-          )
-        ]
+        placeholder: t2("bridge.searchDestinationChain"),
+        value: query,
+        onChange: setQuery,
+        containerClassName: "rounded-md",
+        className: "text-foreground placeholder:text-muted-foreground"
       }
     ),
     /* @__PURE__ */ jsxs("div", { className: "flex-1 overflow-y-auto", children: [
@@ -2493,9 +2408,9 @@ function short$1(addr) {
   return addr.slice(0, 4) + "…" + addr.slice(-4);
 }
 const prefixIcons = {
-  tronlink: /* @__PURE__ */ jsx(TronLinkIcon, { className: "size-4.5" }),
-  metamask: /* @__PURE__ */ jsx(MetaMaskIcon, { className: "size-4.5" }),
-  ton: /* @__PURE__ */ jsx(TonKeeperIcon, { className: "size-4.5" })
+  tronlink: /* @__PURE__ */ jsx(TronLinkIcon, { className: "size-5" }),
+  metamask: /* @__PURE__ */ jsx(MetaMaskIcon, { className: "size-5" }),
+  ton: /* @__PURE__ */ jsx(TonKeeperIcon, { className: "size-5" })
 };
 const mapWalletToType = (wallet) => {
   switch (wallet) {
@@ -2544,7 +2459,7 @@ const WalletButton = ({
           e.preventDefault();
         },
         disabled: isButtonDisabled,
-        className: "p-0 !px-0 py-0 flex gap-1 cursor-pointer shadow-none hover:bg-transparent bg-transparent rounded-none h-4.5",
+        className: "p-0 !px-0 py-0 flex gap-1 cursor-pointer shadow-none hover:bg-transparent bg-transparent rounded-none h-5",
         children: [
           isConnected ? prefixIcons[wallet] : null,
           /* @__PURE__ */ jsx("p", { className: "leading-4 text-sm font-medium text-link border-b-2 border-dotted border-link", children: buttonText })
@@ -2620,7 +2535,7 @@ const SwapSection = ({
         ),
         children: [
           /* @__PURE__ */ jsxs("div", { className: "flex justify-between items-center", children: [
-            /* @__PURE__ */ jsx("span", { className: "text-sm leading-4.5 font-medium text-muted-foreground", children: label }),
+            /* @__PURE__ */ jsx("span", { className: "text-sm leading-5 font-medium text-muted-foreground", children: label }),
             /* @__PURE__ */ jsx(
               WalletBalance,
               {
@@ -2683,63 +2598,30 @@ const useCustomAddressStore = create$1((set) => ({
   setCustomDstAddress: (address) => set({ customDstAddress: address }),
   clearCustomDstAddress: () => set({ customDstAddress: void 0 })
 }));
-const tonNormalize = (addr) => {
-  if (!addr) return null;
-  try {
-    if (addr.includes(":")) {
-      return Address.parseRaw(addr).toString({
-        bounceable: false,
-        urlSafe: true
-      });
-    }
-    return Address.parse(addr).toString({ bounceable: false, urlSafe: true });
-  } catch {
-    return null;
-  }
+const useIsAddressValid = (address, chainKey) => {
+  const isValid = useMemo(() => {
+    return isAddressValidForChain(chainKey, address);
+  }, [address, chainKey]);
+  return { isValid };
 };
-const ToggleRow = ({ enabled, onToggle }) => {
+const AnotherAddress = () => {
+  const [enabled, setEnabled] = useState(false);
+  const [isFocused, setIsFocused] = useState(false);
   const { t: t2 } = useBridgeTranslation();
   const { toChain } = useChainsStore();
-  const { dstAddress } = useAddresses();
-  const { setCustomDstAddress, clearCustomDstAddress } = useCustomAddressStore();
+  const { setCustomDstAddress } = useCustomAddressStore();
   const [value, setValue] = useState("");
-  const [invalid, setInvalid] = useState(false);
-  const prevDstRef = useRef(void 0);
-  const prevEnabledRef = useRef(enabled);
-  useEffect(() => {
-    const wasEnabled = prevEnabledRef.current;
-    if (enabled && !wasEnabled) {
-      prevDstRef.current = dstAddress;
-      setValue(dstAddress ?? "");
-      setInvalid(false);
-    }
-    if (!enabled && wasEnabled) {
-      clearCustomDstAddress();
-      setInvalid(false);
-    }
-    prevEnabledRef.current = enabled;
-  }, [enabled]);
+  const { isValid } = useIsAddressValid(value.trim(), toChain?.chainKey);
+  const invalid = value.trim() && !isValid;
   const pushToStoreIfValid = (raw) => {
     if (!enabled) return;
     const v = raw.trim();
     if (!v) {
       setCustomDstAddress(void 0);
-      setInvalid(false);
-      return;
-    }
-    const ck = toChain?.chainKey;
-    if (!ck) {
-      setInvalid(true);
       return;
     }
-    const valueForStore = ck === "ton" ? tonNormalize(v) ?? void 0 : v;
-    const valid = isAddressValidForChain(ck, valueForStore ?? "");
-    if (valid && valueForStore) {
-      setInvalid(false);
-      setCustomDstAddress(valueForStore);
-      if (ck === "ton") setValue(valueForStore);
-    } else {
-      setInvalid(true);
+    if (isValid) {
+      setCustomDstAddress(v);
     }
   };
   const onChange = (text) => {
@@ -2754,16 +2636,16 @@ const ToggleRow = ({ enabled, onToggle }) => {
     } catch {
     }
   };
-  return /* @__PURE__ */ jsxs("div", { className: "p-4 flex flex-col rounded-b-lg gap-2 bg-muted", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "p-4 flex flex-col rounded-b-lg bg-muted", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
-      /* @__PURE__ */ jsx("p", { className: "text-sm leading-4.5 font-medium text-muted-foreground", children: t2("bridge.sendToAnotherAddress") }),
+      /* @__PURE__ */ jsx("p", { className: "text-sm leading-5 font-medium text-muted-foreground", children: t2("bridge.sendToAnotherAddress") }),
       /* @__PURE__ */ jsx(
         Switch,
         {
           className: "data-[state=unchecked]:bg-switch-inactive data-[state=checked]:bg-switch-active",
           "aria-pressed": enabled,
           checked: enabled,
-          onClick: onToggle
+          onClick: () => setEnabled((v) => !v)
         }
       )
     ] }),
@@ -2778,16 +2660,27 @@ const ToggleRow = ({ enabled, onToggle }) => {
         children: /* @__PURE__ */ jsxs(
           "div",
           {
-            className: `bg-input py-2 px-4 w-full flex items-center gap-4 rounded-12 justify-between border ${invalid ? "border-destructive" : "border-transparent"}`,
+            className: cn(
+              "bg-input py-2 px-4 mt-2 w-full flex items-center gap-4 rounded-md justify-between border border-transparent transition-all",
+              {
+                "py-4": value,
+                "border border-ring": isFocused,
+                "border-destructive": invalid
+              }
+            ),
             children: [
-              /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1.5 w-full", children: [
+              /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2 w-full", children: [
                 /* @__PURE__ */ jsx(
                   Input,
                   {
-                    className: "p-0 h-auto text-base leading-5 font-semibold w-full bg-transparent dark:bg-transparent placeholder:text-input-placeholder text-input-text border-none",
-                    placeholder: toChain?.chainKey === "ton" ? t2("bridge.tonAddressPlaceholder") : t2("bridge.evmAddressPlaceholder"),
+                    className: cn(
+                      "p-0 h-auto text-base leading-5 font-semibold w-full bg-transparent dark:bg-transparent placeholder:text-muted-foreground/50 border-none"
+                    ),
+                    placeholder: t2("bridge.anotherAddressPlaceholder"),
                     type: "text",
                     value,
+                    onFocus: () => setIsFocused(true),
+                    onBlur: () => setIsFocused(false),
                     onChange: (e) => onChange(e.target.value)
                   }
                 ),
@@ -2797,21 +2690,14 @@ const ToggleRow = ({ enabled, onToggle }) => {
                   defaultValue: "Check correctness before transfer"
                 }) }) })
               ] }),
-              !value ? /* @__PURE__ */ jsx(
-                Button,
-                {
-                  variant: "default",
-                  className: "self-center py-2 h-8.5 px-3 hover:bg-input-button bg-input-button text-input-button-foreground text-sm leading-4.5 font-semibold uppercase !rounded-40",
-                  onClick: onPaste,
-                  children: t2("common.paste")
-                }
-              ) : /* @__PURE__ */ jsx(
+              !value ? /* @__PURE__ */ jsx(Button, { variant: "secondary", size: "sm", onClick: onPaste, children: t2("common.paste") }) : /* @__PURE__ */ jsx(
                 Button,
                 {
                   variant: "ghost",
-                  className: "h-5 w-5 self-start\n                    bg-input-x-bg hover:bg-input-x-bg \n                    p-0.5 m-0 rounded-full\n                    border-0 shadow-none\n                    focus:outline-none focus:ring-0 has-[>svg]:px-0",
+                  size: "sm",
+                  className: "rounded-full p-0 size-5 self-start",
                   onClick: () => setValue(""),
-                  children: /* @__PURE__ */ jsx(X, { className: "size-3 text-input-x" })
+                  children: /* @__PURE__ */ jsx(X, { className: "size-4" })
                 }
               )
             ]
@@ -2970,10 +2856,10 @@ const Details = () => {
   const routeText = quote?.route ? getRouteDisplayName(quote.route) : t2(`settings.routePresets.${routePriority}`);
   return /* @__PURE__ */ jsx(Accordion, { type: "single", collapsible: true, className: "w-full", children: /* @__PURE__ */ jsxs(AccordionItem, { value: "item-1", className: "bg-muted rounded-lg", children: [
     /* @__PURE__ */ jsx(AccordionTrigger, { className: "w-full gap-1 items-center py-6 px-5 rounded-b-lg data-[state=open]:pb-3", children: /* @__PURE__ */ jsxs("div", { className: "w-full flex items-center justify-between", children: [
-      /* @__PURE__ */ jsx("p", { className: "text-sm font-normal text-priority leading-3.5", children: t2("bridge.youWillReceive", { defaultValue: "You will receive" }) }),
-      /* @__PURE__ */ jsxs("div", { className: "bg-transparent hover:bg-transparent shadow-none h-4 p-0 px-0 py-0 flex items-center gap-1.5", children: [
+      /* @__PURE__ */ jsx("p", { className: "text-sm font-normal text-priority leading-4", children: t2("bridge.youWillReceive", { defaultValue: "You will receive" }) }),
+      /* @__PURE__ */ jsxs("div", { className: "bg-transparent hover:bg-transparent shadow-none h-4 p-0 px-0 py-0 flex items-center gap-2", children: [
         /* @__PURE__ */ jsx(TokenSymbol, { symbol, className: "w-4 h-4", alt: "token" }),
-        isLoading ? /* @__PURE__ */ jsx(Skeleton, { className: "h-4 w-24 rounded-md" }) : /* @__PURE__ */ jsxs("span", { className: "text-sm font-semibold leading-3.5 text-foreground", children: [
+        isLoading ? /* @__PURE__ */ jsx(Skeleton, { className: "h-4 w-24 rounded-md" }) : /* @__PURE__ */ jsxs("span", { className: "text-sm font-semibold leading-4 text-foreground", children: [
           receiveText,
           " ",
           symbol
@@ -2985,7 +2871,7 @@ const Details = () => {
         DetailsRow,
         {
           label: t2("transaction.route"),
-          value: /* @__PURE__ */ jsxs("strong", { className: "flex items-center gap-1.5", children: [
+          value: /* @__PURE__ */ jsxs("strong", { className: "flex items-center gap-2", children: [
             /* @__PURE__ */ jsx(StargateIcon, { className: "size-4" }),
             /* @__PURE__ */ jsx("p", { className: "", children: routeText })
           ] })
@@ -3025,7 +2911,7 @@ const DetailsRow = ({
   value,
   isLoading = false
 }) => /* @__PURE__ */ jsxs("div", { className: "flex justify-between items-center", children: [
-  /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
+  /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
     /* @__PURE__ */ jsx("p", { className: "text-sm text-priority font-normal", children: label }),
     /* @__PURE__ */ jsx(Tip, { text: label, children: /* @__PURE__ */ jsx(TipIcon, { className: "size-4 text-receive-icon" }) })
   ] }),
@@ -3789,9 +3675,9 @@ const WalletSelectModal = () => {
         /* @__PURE__ */ jsx("div", { className: "py-2 font-semibold text-muted-foreground uppercase", children: t2("wallets.connected") }),
         /* @__PURE__ */ jsx("div", { className: "", children: connectedWallets.map((wallet) => {
           const IconComponent = wallet.icon;
-          return /* @__PURE__ */ jsx("div", { className: "-mx-5", children: /* @__PURE__ */ jsxs(Button, { className: "w-full cursor-pointer bg-transparent flex shadow-none items-center justify-between gap-2.5 px-5 py-2.5 hover:bg-muted h-auto rounded-12 transition-[300]", children: [
-            /* @__PURE__ */ jsx("div", { className: "flex items-center gap-3 min-w-0", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2.5", children: [
-              /* @__PURE__ */ jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsx(IconComponent, { className: "size-7.5" }) }),
+          return /* @__PURE__ */ jsx("div", { className: "-mx-5", children: /* @__PURE__ */ jsxs(Button, { className: "w-full cursor-pointer bg-transparent flex shadow-none items-center justify-between gap-3 px-5 py-3 hover:bg-muted h-auto rounded-md transition-[300]", children: [
+            /* @__PURE__ */ jsx("div", { className: "flex items-center gap-3 min-w-0", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
+              /* @__PURE__ */ jsx("div", { className: "size-8 flex items-center justify-center", children: /* @__PURE__ */ jsx(IconComponent, { className: "size-8" }) }),
               /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start min-w-0", children: [
                 /* @__PURE__ */ jsx("p", { className: "font-extrabold text-foreground text-sm leading-4 truncate", children: short(wallet.address) }),
                 /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: wallet.name })
@@ -3830,9 +3716,9 @@ const WalletSelectModal = () => {
                 }
               },
               disabled: isEvmConnector ? isPending : !wallet.enabled,
-              className: "w-full cursor-pointer bg-transparent flex shadow-none items-center justify-between gap-2.5 px-5 py-2.5 hover:bg-muted h-auto rounded-12 transition-[300] disabled:opacity-50 disabled:cursor-not-allowed",
+              className: "w-full cursor-pointer bg-transparent flex shadow-none items-center justify-between gap-3 px-5 py-3 hover:bg-muted h-auto rounded-md transition-[300] disabled:opacity-50 disabled:cursor-not-allowed",
               children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 min-w-0", children: [
-                /* @__PURE__ */ jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsx(IconComponent, { className: "size-7.5" }) }),
+                /* @__PURE__ */ jsx("div", { className: "w-8 flex items-center justify-center", children: /* @__PURE__ */ jsx(IconComponent, { className: "size-8" }) }),
                 /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start min-w-0", children: [
                   /* @__PURE__ */ jsx("p", { className: "font-extrabold text-foreground text-sm leading-4 truncate", children: wallet.name }),
                   wallet.comingSoon ? /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: t2("wallets.comingSoon") }) : /* @__PURE__ */ jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: t2("wallets.connect") })
@@ -5881,7 +5767,7 @@ class ChainStrategyRegistry {
   async getBalances(chainKey, address, tokens, priorityToken) {
     const strategy = this.getStrategy(chainKey);
     if (!strategy) return {};
-    return await strategy.getBalances(address, tokens, priorityToken);
+    return await strategy.getBalances(address, tokens, chainKey, priorityToken);
   }
   isAddressValid(chainKey, address) {
     const strategy = this.getStrategy(chainKey);
@@ -5992,14 +5878,9 @@ function parseTonAddress(address) {
   }
   return Address$1.parse(address);
 }
-async function getEvmBalances(publicClient, address, tokens, priorityToken) {
+async function getEvmBalances(publicClient, address, tokens, chainKey, priorityToken) {
   const balances = {};
   try {
-    console.log("start getEvmBalances");
-    console.log("publicClient:", publicClient);
-    console.log("isAddress:", isAddress(address));
-    console.log("tokens:", tokens);
-    console.log("priorityToken:", priorityToken);
     if (!address || !isAddress(address)) {
       console.warn(`Invalid EVM address provided: ${address}`);
       return balances;
@@ -6008,40 +5889,55 @@ async function getEvmBalances(publicClient, address, tokens, priorityToken) {
       throw new Error("No public client provided");
     }
     const nativeTokens = tokens.filter((t2) => isNativeAddress(t2.address));
-    const erc20Tokens = tokens.filter((t2) => !isNativeAddress(t2.address) && isAddress(t2.address));
+    const erc20Tokens = tokens.filter(
+      (t2) => !isNativeAddress(t2.address) && isAddress(t2.address)
+    );
     if (priorityToken) {
-      try {
-        const isPriorityNative = isNativeAddress(priorityToken.address);
-        if (isPriorityNative) {
-          const ethBalance = await publicClient.getBalance({
-            address
-          });
-          const balance = parseFloat(formatUnits(ethBalance, priorityToken.decimals));
-          if (balance > 0) {
-            balances[priorityToken.symbol] = { balance, address };
-          }
-        } else if (isAddress(priorityToken.address)) {
-          const tokenBalance = await publicClient.readContract({
-            address: priorityToken.address,
-            abi: [
-              {
-                name: "balanceOf",
-                type: "function",
-                stateMutability: "view",
-                inputs: [{ name: "owner", type: "address" }],
-                outputs: [{ name: "balance", type: "uint256" }]
-              }
-            ],
-            functionName: "balanceOf",
-            args: [address]
-          });
-          const balance = parseFloat(formatUnits(tokenBalance, priorityToken.decimals));
-          if (balance > 0) {
-            balances[priorityToken.symbol] = { balance, address };
+      if (priorityToken.chainKey !== chainKey) {
+        console.debug(
+          `Skipping priority token ${priorityToken.symbol}: chain mismatch (expected ${chainKey}, got ${priorityToken.chainKey})`
+        );
+      } else {
+        try {
+          const isPriorityNative = isNativeAddress(priorityToken.address);
+          if (isPriorityNative) {
+            const ethBalance = await publicClient.getBalance({
+              address
+            });
+            const balance = parseFloat(
+              formatUnits(ethBalance, priorityToken.decimals)
+            );
+            if (balance > 0) {
+              balances[priorityToken.symbol] = { balance, address };
+            }
+          } else if (isAddress(priorityToken.address)) {
+            const tokenBalance = await publicClient.readContract({
+              address: priorityToken.address,
+              abi: [
+                {
+                  name: "balanceOf",
+                  type: "function",
+                  stateMutability: "view",
+                  inputs: [{ name: "owner", type: "address" }],
+                  outputs: [{ name: "balance", type: "uint256" }]
+                }
+              ],
+              functionName: "balanceOf",
+              args: [address]
+            });
+            const balance = parseFloat(
+              formatUnits(tokenBalance, priorityToken.decimals)
+            );
+            if (balance > 0) {
+              balances[priorityToken.symbol] = { balance, address };
+            }
           }
+        } catch (error) {
+          console.debug(
+            `Failed to get priority token balance for ${priorityToken.symbol}:`,
+            error
+          );
         }
-      } catch (error) {
-        console.debug(`Failed to get priority token balance for ${priorityToken.symbol}:`, error);
       }
     }
     for (const token of nativeTokens) {
@@ -6054,7 +5950,10 @@ async function getEvmBalances(publicClient, address, tokens, priorityToken) {
           balances[token.symbol] = { balance, address };
         }
       } catch (error) {
-        console.debug(`Failed to get native balance for ${token.symbol}:`, error);
+        console.debug(
+          `Failed to get native balance for ${token.symbol}:`,
+          error
+        );
       }
     }
     if (erc20Tokens.length > 0) {
@@ -6082,17 +5981,25 @@ async function getEvmBalances(publicClient, address, tokens, priorityToken) {
           if (!token) return;
           if (result.status === "success" && result.result !== void 0) {
             try {
-              const balance = parseFloat(formatUnits(result.result, token.decimals));
+              const balance = parseFloat(
+                formatUnits(result.result, token.decimals)
+              );
               if (balance > 0) {
                 balances[token.symbol] = { balance, address };
               }
             } catch (error) {
-              console.debug(`Failed to parse balance for ${token.symbol}:`, error);
+              console.debug(
+                `Failed to parse balance for ${token.symbol}:`,
+                error
+              );
             }
           }
         });
       } catch (error) {
-        console.warn("Multicall failed, falling back to individual calls:", error);
+        console.warn(
+          "Multicall failed, falling back to individual calls:",
+          error
+        );
         for (const token of erc20Tokens) {
           try {
             const tokenBalance = await publicClient.readContract({
@@ -6126,7 +6033,7 @@ async function getEvmBalances(publicClient, address, tokens, priorityToken) {
   }
   return balances;
 }
-async function getTonBalances(address, tokens, customTonClient, tonApiKey) {
+async function getTonBalances(address, tokens, chainKey, customTonClient, tonApiKey) {
   const balances = {};
   try {
     if (!isTonFriendlyAddress(address)) {
@@ -6285,13 +6192,18 @@ class EvmChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectEvmWallet");
   }
-  async getBalances(address, tokens, priorityToken) {
+  async getBalances(address, tokens, chainKey, priorityToken) {
     if (!this.publicClient) {
       console.warn("No publicClient available for balance query");
       return {};
     }
-    console.log("publicClient", this.publicClient);
-    return await getEvmBalances(this.publicClient, address, tokens, priorityToken);
+    return await getEvmBalances(
+      this.publicClient,
+      address,
+      tokens,
+      chainKey,
+      priorityToken
+    );
   }
   isAddressValid(address) {
     if (!address) return false;
@@ -6647,10 +6559,11 @@ class TonChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectTonWallet");
   }
-  async getBalances(address, tokens) {
+  async getBalances(address, tokens, chainKey) {
     return await getTonBalances(
       address,
       tokens,
+      chainKey,
       this.config.tonClient,
       this.config.tonApiKey
     );
@@ -6859,7 +6772,6 @@ class TronChainStrategy {
     __publicField(this, "config");
     this.config = config;
   }
-  // ========== Identity ==========
   canHandle(chainKey) {
     return chainKey.toLowerCase() === "tron";
   }
@@ -6869,7 +6781,6 @@ class TronChainStrategy {
   getName() {
     return "TRON Chain Strategy";
   }
-  // ========== Wallet Management ==========
   async connect() {
     const tronWeb = this.getTronWeb();
     if (!tronWeb && (typeof window === "undefined" || !window.tronLink)) {
@@ -6900,7 +6811,6 @@ class TronChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectTronWallet");
   }
-  // ========== Balance & Validation ==========
   async getBalances(address, tokens) {
     const tronWeb = this.getTronWeb();
     if (!tronWeb) return {};
@@ -6910,7 +6820,6 @@ class TronChainStrategy {
     if (!address) return false;
     return /^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(address);
   }
-  // ========== Gas Estimation ==========
   async estimateGasRequirement(params) {
     const {
       selectedToken,
@@ -7593,7 +7502,6 @@ const EvaaBridgeContent = ({
   const { t: t2 } = useBridgeTranslation();
   useTokensRequest();
   useChainsRequest();
-  const [sendToAnother, setSendToAnother] = useState(false);
   const swap = useSwapModel();
   const { fromChain, toChain } = swap;
   const { selectedAssetSymbol, assetMatrix } = useTokensStore();
@@ -7721,13 +7629,7 @@ const EvaaBridgeContent = ({
                 onSelect: handleToChainChange
               }
             ),
-            /* @__PURE__ */ jsx(
-              ToggleRow,
-              {
-                enabled: sendToAnother,
-                onToggle: () => setSendToAnother((v) => !v)
-              }
-            ),
+            /* @__PURE__ */ jsx(AnotherAddress, {}),
             /* @__PURE__ */ jsx(SubmitButton, {})
           ] }),
           /* @__PURE__ */ jsx(CardFooter, { children: /* @__PURE__ */ jsx(Details, {}) })
@@ -7803,7 +7705,6 @@ export {
   buildAssetMatrix,
   calculateMinReceived,
   computeFeesUsdFromArray,
-  dollarsFromNativeFees,
   findNativeMeta,
   formatBalance,
   formatHash,
@@ -7822,10 +7723,7 @@ export {
   getTokens,
   getTonBalances,
   getTronBalances,
-  isAddressValidForChain,
-  isEvmAddress,
   isNativeAddrEqual,
-  isTronAddress,
   isZeroAddr,
   listAssetsForSelect,
   lookupTokenMeta,