@rash2x/bridge-widget 0.1.4 → 0.1.6

package/dist/evaa-bridge.cjs

@@ -44,10 +44,11 @@ const reactWindow = require("react-window");
 const SwitchPrimitive = require("@radix-ui/react-switch");
 const lucideReact = require("lucide-react");
 const AccordionPrimitive = require("@radix-ui/react-accordion");
-const connectkit = require("connectkit");
 const i18next = require("i18next");
 const sonner = require("sonner");
 const ethers = require("ethers");
+const viem = require("viem");
+const ton = require("@ton/ton");
 const tronwalletAdapters = require("@tronweb3/tronwallet-adapters");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -551,7 +552,7 @@ function cn(...inputs) {
   return tailwindMerge.twMerge(clsx.clsx(inputs));
 }
 const buttonVariants = classVarianceAuthority.cva(
-  "inline-flex items-center rounded-full justify-center gap-2 whitespace-nowrap text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "inline-flex items-center rounded-full text-lg justify-center gap-2 whitespace-nowrap text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
   {
     variants: {
       variant: {
@@ -591,6 +592,23 @@ const Button = require$$0__namespace.forwardRef(
   }
 );
 Button.displayName = "Button";
+const ModalContainerContext = require$$0.createContext(void 0);
+const ModalContainerProvider = ({
+  containerId,
+  children
+}) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(ModalContainerContext.Provider, { value: containerId, children });
+};
+const useModalContainer = () => {
+  const containerId = require$$0.useContext(ModalContainerContext);
+  if (typeof document === "undefined") {
+    return null;
+  }
+  if (!containerId) {
+    return document.body;
+  }
+  return document.getElementById(containerId) || document.body;
+};
 const ModalContent = ({ children, className }) => {
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: cn("p-5 flex flex-col h-full", className), children });
 };
@@ -644,11 +662,11 @@ const Modal = ({
   isOpen,
   onClose,
   children,
-  className,
-  modalContainer
+  className
 }) => {
   const panelRef = require$$0.useRef(null);
   const lastActiveRef = require$$0.useRef(null);
+  const container = useModalContainer();
   require$$0.useEffect(() => {
     if (!isOpen) return;
     lastActiveRef.current = document.activeElement;
@@ -670,7 +688,6 @@ const Modal = ({
     return () => window.removeEventListener("keydown", onKey);
   }, [isOpen, onClose]);
   if (typeof document === "undefined") return null;
-  const container = modalContainer || document.body;
   return reactDom.createPortal(
     /* @__PURE__ */ jsxRuntime.jsx(framerMotion.AnimatePresence, { children: isOpen && /* @__PURE__ */ jsxRuntime.jsx(
       framerMotion.motion.div,
@@ -824,19 +841,6 @@ const Tip = (props) => {
     /* @__PURE__ */ jsxRuntime.jsx(TooltipContent, { children: /* @__PURE__ */ jsxRuntime.jsx("p", { children: text }) })
   ] });
 };
-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 getChains() {
   const res = await fetch("https://stargate.finance/api/v1/chains", {
     credentials: "same-origin"
@@ -884,49 +888,16 @@ async function getDestTokens(srcChainKey, srcTokenAddr) {
   });
   return unique;
 }
-const isTonFriendly = (a) => !!a && /^[A-Za-z0-9_-]{48,}$/.test(a);
-function normalizeTickerSymbol(s) {
+function normalizeTickerSymbol$1(s) {
   return s.toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
 }
-async function getSwapBalances(accountFriendly) {
-  if (!isTonFriendly(accountFriendly)) throw new Error("Invalid TON address");
-  const accRes = await fetch(
-    `https://tonapi.io/v2/accounts/${accountFriendly}`
-  );
-  if (!accRes.ok) throw new Error(`TON account fetch failed: ${accRes.status}`);
-  const acc = await accRes.json();
-  const ton = fromLD(String(acc?.balance ?? "0"), 9);
-  const result = {
-    TON: { balance: ton, address: "ton-native" }
-  };
-  const jetsRes = await fetch(
-    `https://tonapi.io/v2/accounts/${accountFriendly}/jettons?limit=200`
-  );
-  if (!jetsRes.ok) return result;
-  const jets = await jetsRes.json();
-  const items = jets?.balances ?? jets?.jettons ?? jets?.items ?? [];
-  for (const it of items) {
-    const rawSym = (it?.jetton?.symbol ?? it?.symbol ?? "").toString();
-    if (!rawSym) continue;
-    const symUpper = rawSym.toUpperCase();
-    const symNorm = normalizeTickerSymbol(symUpper);
-    const master = (it?.jetton?.address ?? it?.address ?? "").toString();
-    const decimals = Number(it?.jetton?.decimals ?? it?.decimals ?? 9) || 9;
-    const raw = (it?.balance ?? "0").toString();
-    const human = fromLD(raw, decimals);
-    const entry = { balance: human, address: master };
-    result[symUpper] = entry;
-    if (symNorm !== symUpper) result[symNorm] = entry;
-  }
-  return result;
-}
 const BASE_URL$1 = "https://icons-ckg.pages.dev/stargate-light/tokens";
 const TokenSymbol = ({
   symbol,
   className = "w-4 h-4",
   alt
 }) => {
-  const normalizedSymbol = normalizeTickerSymbol(symbol).toLowerCase();
+  const normalizedSymbol = normalizeTickerSymbol$1(symbol).toLowerCase();
   const src = `${BASE_URL$1}/${normalizedSymbol}.svg`;
   return /* @__PURE__ */ jsxRuntime.jsx("img", { src, alt: alt ?? symbol, className });
 };
@@ -1136,8 +1107,7 @@ const routePresets = [
 ];
 const SettingModal = ({
   isOpen,
-  onClose,
-  modalContainer
+  onClose
 }) => {
   const { t } = reactI18next.useTranslation();
   const { toChain } = useChainsStore();
@@ -1171,7 +1141,7 @@ const SettingModal = ({
   );
   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";
-  return /* @__PURE__ */ jsxRuntime.jsx(Modal, { isOpen, onClose, modalContainer, children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(Modal, { isOpen, onClose, children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs(ModalHeader, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(ModalTitle, { children: t("settings.title", { defaultValue: "Settings" }) }),
       /* @__PURE__ */ jsxRuntime.jsx(ModalClose, { className: "", onClick: onClose, children: /* @__PURE__ */ jsxRuntime.jsx(CloseIcon, { className: "size-6 p-0 [&>rect]:fill-modal-x [&>path]:stroke-modal-x-foreground" }) })
@@ -1340,6 +1310,19 @@ 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()];
@@ -1521,20 +1504,17 @@ function useBalances(chainKey, address) {
     const data = query.data;
     if (data) {
       for (const [sum, v] of Object.entries(data)) {
-        map.set(normalizeTickerSymbol(sum), Number(v.balance ?? 0));
+        map.set(normalizeTickerSymbol$1(sum), Number(v.balance ?? 0));
       }
     }
     return map;
   }, [query.data]);
   const getBalance = require$$0.useCallback(
-    (symbol) => balanceBySymbol.get(normalizeTickerSymbol(symbol)) ?? 0,
+    (symbol) => balanceBySymbol.get(normalizeTickerSymbol$1(symbol)) ?? 0,
     [balanceBySymbol]
   );
   const isLoading = query.isLoading || query.isFetching;
-  const balances = require$$0.useMemo(
-    () => query.data || {},
-    [query.data]
-  );
+  const balances = require$$0.useMemo(() => query.data || {}, [query.data]);
   return {
     balances,
     getBalance,
@@ -1764,8 +1744,7 @@ const TokenSelectModal = ({
   isOpen,
   onClose,
   items,
-  onChangeAsset,
-  modalContainer
+  onChangeAsset
 }) => {
   const { t } = reactI18next.useTranslation();
   const {
@@ -1850,7 +1829,6 @@ const TokenSelectModal = ({
     {
       isOpen,
       onClose: handleClose,
-      modalContainer,
       children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs(ModalHeader, { children: [
           /* @__PURE__ */ jsxRuntime.jsx(ModalTitle, { children: t("bridge.selectToken") }),
@@ -1990,17 +1968,17 @@ const RefreshButton = () => {
   return /* @__PURE__ */ jsxRuntime.jsx(
     Button,
     {
-      className: `cursor-pointer py-1.5 h-8.5 hover:scale-110 shadow-none px-8.5 hover:bg-secondary bg-secondary !rounded-40 ${spinning ? "opacity-70" : ""}`,
       onClick: handleRefresh,
       disabled: spinning,
+      variant: "secondary",
+      size: "sm",
       children: /* @__PURE__ */ jsxRuntime.jsx(
         ReloadIcon,
         {
           style: {
             transform: `rotate(${turns * 180}deg)`,
             transition: "transform 300ms linear"
-          },
-          className: "size-4 text-foreground m-1 will-change-transform"
+          }
         }
       )
     }
@@ -2008,7 +1986,6 @@ const RefreshButton = () => {
 };
 const SelectTokenButton = ({
   onClick,
-  className,
   token
 }) => {
   const { t } = reactI18next.useTranslation();
@@ -2019,7 +1996,8 @@ const SelectTokenButton = ({
     Button,
     {
       onClick,
-      className: `cursor-pointer hover:scale-[1.1] p-1.5 h-8.5 pr-3 !pl-1.5 bg-secondary hover:bg-secondary shadow-none rounded-full flex items-center justify-between gap-3 w-fit shrink-0 ${className ?? ""}`,
+      size: "sm",
+      variant: "secondary",
       type: "button",
       "aria-label": label,
       children: [
@@ -2039,7 +2017,76 @@ const SelectTokenButton = ({
     }
   );
 };
-const FormHeaderComponent = ({ modalContainer }) => {
+function Card({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card",
+      className: cn(
+        "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
+        className
+      ),
+      ...props
+    }
+  );
+}
+function CardHeader({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card-header",
+      className: cn(
+        "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-2 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
+        className
+      ),
+      ...props
+    }
+  );
+}
+function CardTitle({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card-title",
+      className: cn("leading-none font-semibold", className),
+      ...props
+    }
+  );
+}
+function CardAction({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card-action",
+      className: cn(
+        "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
+        className
+      ),
+      ...props
+    }
+  );
+}
+function CardContent({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card-content",
+      className: cn("px-6", className),
+      ...props
+    }
+  );
+}
+function CardFooter({ className, ...props }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      "data-slot": "card-footer",
+      className: cn("flex items-center px-6 [.border-t]:pt-6", className),
+      ...props
+    }
+  );
+}
+const FormHeaderComponent = () => {
   const { t } = reactI18next.useTranslation();
   const { isOpen, onClose, onOpen } = useModal();
   const {
@@ -2055,29 +2102,14 @@ const FormHeaderComponent = ({ modalContainer }) => {
     const sum = selectedAssetSymbol.toUpperCase();
     return assets.find((a) => a.symbol.toUpperCase() === sum) ?? assets[0];
   }, [assets, selectedAssetSymbol]);
-  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2.5", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm font-normal leading-3.5 text-muted-foreground", children: t("bridge.selectToken") }),
-        /* @__PURE__ */ jsxRuntime.jsx(SelectTokenButton, { token: current, onClick: onOpen })
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2.5", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RefreshButton, {}),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          Button,
-          {
-            className: "cursor-pointer py-1.5 h-8.5 hover:scale-110 shadow-none px-8.5 hover:bg-secondary bg-secondary !rounded-40",
-            onClick: onOpenSettings,
-            children: /* @__PURE__ */ jsxRuntime.jsx(
-              BoltIcon,
-              {
-                className: "size-4 text-foreground m-1",
-                stroke: "currentColor"
-              }
-            )
-          }
-        )
-      ] })
+  return /* @__PURE__ */ jsxRuntime.jsxs(CardHeader, { className: "gap-y-0 flex justify-between items-center", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(CardTitle, { className: "flex items-center gap-2.5", children: [
+      /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm font-normal leading-3.5 text-muted-foreground", children: t("bridge.selectToken") }),
+      /* @__PURE__ */ jsxRuntime.jsx(SelectTokenButton, { token: current, onClick: onOpen })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsxs(CardAction, { className: "flex items-center gap-2.5", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RefreshButton, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(Button, { onClick: onOpenSettings, size: "sm", variant: "secondary", children: /* @__PURE__ */ jsxRuntime.jsx(BoltIcon, { stroke: "currentColor" }) })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsx(
       TokenSelectModal,
@@ -2088,24 +2120,19 @@ const FormHeaderComponent = ({ modalContainer }) => {
         onChangeAsset: (symbol) => {
           setSelectedAssetSymbol(symbol);
           onClose();
-        },
-        modalContainer
+        }
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx(
       SettingModal,
       {
         isOpen: isOpenSettings,
-        onClose: onCloseSettings,
-        modalContainer
+        onClose: onCloseSettings
       }
     )
   ] });
 };
-const FormHeader = require$$0.memo(
-  FormHeaderComponent,
-  (prev, next) => prev.modalContainer === next.modalContainer
-);
+const FormHeader = require$$0.memo(FormHeaderComponent);
 async function fetchQuotes(req) {
   const params = {
     srcChainKey: req.srcChainKey,
@@ -2653,8 +2680,7 @@ const ChainSelectModal = ({
   onClose,
   items,
   allowedItems,
-  onChangeChain,
-  modalContainer
+  onChangeChain
 }) => {
   const { t } = reactI18next.useTranslation();
   const [query, setQuery] = require$$0.useState("");
@@ -2743,7 +2769,6 @@ const ChainSelectModal = ({
     {
       isOpen,
       onClose: handleClose,
-      modalContainer,
       children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs(ModalHeader, { children: [
           /* @__PURE__ */ jsxRuntime.jsx(ModalTitle, { children: t("bridge.selectNetwork") }),
@@ -2881,8 +2906,7 @@ const SwapSection = ({
   disableNetworkSelect,
   isSource,
   onSelect,
-  onAmountChange,
-  modalContainer
+  onAmountChange
 }) => {
   const { isOpen, onClose, onOpen } = useModal();
   const { assetMatrix, selectedAssetSymbol } = useTokensStore();
@@ -2915,9 +2939,9 @@ const SwapSection = ({
       "div",
       {
         className: cn(
-          "p-4 flex flex-col gap-4 transition-colors bg-muted",
+          "p-4 flex flex-col gap-4 transition-colors bg-input",
           {
-            "bg-muted-focus": isSource && isFocused
+            "bg-input-focus": isSource && isFocused
           },
           className
         ),
@@ -2977,8 +3001,7 @@ const SwapSection = ({
         onClose,
         items: chains,
         allowedItems: allowedChains,
-        onChangeChain,
-        modalContainer
+        onChangeChain
       }
     )
   ] });
@@ -3963,7 +3986,7 @@ function useSilentValidations(amountString) {
   ]);
   return validationResult;
 }
-function useTransferAction() {
+const SubmitButton = () => {
   const { t } = reactI18next.useTranslation();
   const { chainRegistry } = useChainStrategies();
   const { srcAddress, dstAddress } = useAddresses();
@@ -4039,7 +4062,7 @@ function useTransferAction() {
     maximumAmountFormatted,
     chainRegistry
   ]);
-  const onClick = async () => {
+  const handleClick = async () => {
     if (isBusy) return;
     if (missingSrc && srcChainKey) {
       onOpen("src");
@@ -4059,33 +4082,15 @@ function useTransferAction() {
     }
   };
   const disabled = isBusy || amountNum <= 0 || status === "loading" || isBalanceLoading || hasInsufficientBalance || hasAmountTooLarge || !gas.hasEnoughGas || noRoute || !isValidForTransfer;
-  return {
-    // состояния
-    isBusy,
-    canTransfer,
-    missingSrc,
-    missingDst,
-    hasEnoughGas: gas.hasEnoughGas,
-    noRoute,
-    // представление
-    label,
-    disabled,
-    // действие
-    onClick
-  };
-}
-const SubmitButton = () => {
-  const { label, disabled, onClick } = useTransferAction();
-  return /* @__PURE__ */ jsxRuntime.jsx(Button, { onClick, disabled, size: "lg", children: label });
+  return /* @__PURE__ */ jsxRuntime.jsx(Button, { onClick: handleClick, disabled, className: "w-full", children: label });
 };
 function short(addr) {
   return addr.slice(0, 4) + "…" + addr.slice(-4);
 }
-const WalletSelectModal = ({
-  modalContainer
-}) => {
+const WalletSelectModal = () => {
   const { t } = reactI18next.useTranslation();
   const { isOpen, onClose } = useWalletSelectModal();
+  const { connect, connectors, isPending } = wagmi.useConnect();
   const { chainRegistry } = useChainStrategies();
   const tonWallet = chainRegistry.getStrategyByType("ton");
   const metaMaskWallet = chainRegistry.getStrategyByType("evm");
@@ -4118,7 +4123,13 @@ const WalletSelectModal = ({
       onDisconnect: () => tronWallet.disconnect()
     });
   }
-  const isWalletConnected = (walletId) => connectedWallets.some((w) => w.id === walletId);
+  const isWalletConnected = (walletId) => {
+    const isEvmConnector = connectors.some((c) => c.id === walletId);
+    if (isEvmConnector && metaMaskWallet?.isConnected()) {
+      return true;
+    }
+    return connectedWallets.some((w) => w.id === walletId);
+  };
   const tonWallets = [
     {
       id: "ton",
@@ -4127,14 +4138,15 @@ const WalletSelectModal = ({
       enabled: true
     }
   ];
-  const evmWallets = [
-    {
-      id: "metamask",
-      name: t("wallets.metaMask"),
-      icon: MetaMaskIcon,
-      enabled: true
-    }
-  ];
+  const evmWallets = connectors.filter(
+    (connector) => connector.id === "walletConnect" || connector.id === "metaMaskSDK"
+  ).map((connector) => ({
+    id: connector.id,
+    name: connector.name,
+    icon: MetaMaskIcon,
+    // You can add a WalletConnect icon here
+    enabled: true
+  }));
   const tronWallets = [
     {
       id: "tronlink",
@@ -4164,9 +4176,6 @@ const WalletSelectModal = ({
         case "ton":
           await tonWallet?.connect();
           break;
-        case "metamask":
-          await metaMaskWallet?.connect();
-          break;
         case "tronlink":
           await tronWallet?.connect();
           break;
@@ -4178,7 +4187,7 @@ const WalletSelectModal = ({
       console.error("Failed to connect wallet:", error);
     }
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(Modal, { isOpen, onClose, modalContainer, children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(Modal, { isOpen, onClose, children: /* @__PURE__ */ jsxRuntime.jsxs(ModalContent, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs(ModalHeader, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(ModalTitle, { children: t("wallets.chooseWallet", { defaultValue: "Choose wallet" }) }),
       /* @__PURE__ */ jsxRuntime.jsx(ModalDescription, { children: t("wallets.oneWalletPerEnv", {
@@ -4191,56 +4200,47 @@ const WalletSelectModal = ({
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-5 py-2 leading-4 text-base font-semibold text-muted-foreground uppercase", children: t("wallets.connected") }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "", children: connectedWallets.map((wallet) => {
           const IconComponent = wallet.icon;
-          return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "", children: /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-3 min-w-0", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2.5", children: [
-                  /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(IconComponent, { className: "size-7.5" }) }),
-                  /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-start min-w-0", children: [
-                    /* @__PURE__ */ jsxRuntime.jsx("p", { className: "font-extrabold text-foreground text-sm leading-4 truncate", children: short(wallet.address) }),
-                    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: wallet.name })
-                  ] })
-                ] }) }),
-                /* @__PURE__ */ jsxRuntime.jsx("div", { onClick: () => {
+          return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "", children: /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-3 min-w-0", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2.5", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(IconComponent, { className: "size-7.5" }) }),
+              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-start min-w-0", children: [
+                /* @__PURE__ */ jsxRuntime.jsx("p", { className: "font-extrabold text-foreground text-sm leading-4 truncate", children: short(wallet.address) }),
+                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: wallet.name })
+              ] })
+            ] }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              "div",
+              {
+                onClick: () => {
                   wallet.onDisconnect();
                   onClose();
-                }, className: "text-sm font-medium text-muted-foreground", children: /* @__PURE__ */ jsxRuntime.jsx(ExitIcon, { className: "text-[#808080] size-6" }) })
-              ]
-            }
-          ) }, wallet.id);
+                },
+                className: "text-sm font-medium text-muted-foreground",
+                children: /* @__PURE__ */ jsxRuntime.jsx(ExitIcon, { className: "text-[#808080] size-6" })
+              }
+            )
+          ] }) }, wallet.id);
         }) })
       ] }),
       categories.map((category) => /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-5 py-2 leading-4 text-base font-semibold text-muted-foreground uppercase", children: category.title }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "", children: category.wallets.map((wallet) => {
           const IconComponent = wallet.icon;
-          if (wallet.id === "metamask") {
-            return /* @__PURE__ */ jsxRuntime.jsx("div", { id: wallet.id, children: /* @__PURE__ */ jsxRuntime.jsx(connectkit.ConnectKitButton.Custom, { children: ({ isConnecting, show }) => {
-              return /* @__PURE__ */ jsxRuntime.jsx(
-                Button,
-                {
-                  type: "button",
-                  onClick: show,
-                  disabled: isConnecting,
-                  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",
-                  children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3 min-w-0", children: [
-                    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(IconComponent, { className: "size-7.5" }) }),
-                    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-start min-w-0", children: [
-                      /* @__PURE__ */ jsxRuntime.jsx("p", { className: "font-extrabold text-foreground text-sm leading-4 truncate", children: wallet.name }),
-                      wallet.comingSoon ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: t("wallets.comingSoon") }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs leading-3 font-semibold text-muted-foreground", children: t("wallets.connect") })
-                    ] })
-                  ] })
-                }
-              );
-            } }) }, wallet.id);
-          }
+          const isEvmConnector = category.title === t("wallets.evmWallets");
+          const connector = isEvmConnector ? connectors.find((c) => c.id === wallet.id) : null;
           return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "", children: /* @__PURE__ */ jsxRuntime.jsx(
             Button,
             {
-              onClick: () => handleWalletSelect(wallet.id),
-              disabled: !wallet.enabled,
+              type: "button",
+              onClick: () => {
+                if (connector) {
+                  connect({ connector });
+                  onClose();
+                } else {
+                  handleWalletSelect(wallet.id);
+                }
+              },
+              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",
               children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3 min-w-0", children: [
                 /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-7.5 h-7.5 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(IconComponent, { className: "size-7.5" }) }),
@@ -4256,39 +4256,6 @@ const WalletSelectModal = ({
     ] })
   ] }) });
 };
-function Card({ className, ...props }) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "div",
-    {
-      "data-slot": "card",
-      className: cn(
-        "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
-        className
-      ),
-      ...props
-    }
-  );
-}
-function CardContent({ className, ...props }) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "div",
-    {
-      "data-slot": "card-content",
-      className: cn("px-6", className),
-      ...props
-    }
-  );
-}
-function CardFooter({ className, ...props }) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "div",
-    {
-      "data-slot": "card-footer",
-      className: cn("flex items-center px-6 [.border-t]:pt-6", className),
-      ...props
-    }
-  );
-}
 const TransactionProgressVector = (props) => {
   return /* @__PURE__ */ jsxRuntime.jsxs("svg", { width: "200", height: "200", viewBox: "0 0 200 200", fill: "none", xmlns: "http://www.w3.org/2000/svg", ...props, children: [
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -6213,7 +6180,7 @@ const ConfirmStep = () => {
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-3xl font-black relative z-10", children: formatTime })
   ] }) });
 };
-const TransactionManager = ({ modalContainer }) => {
+const TransactionManager = () => {
   const { current } = useTransactionStore();
   const status = current?.status;
   if (!status || status === "idle") return null;
@@ -6231,7 +6198,7 @@ const TransactionManager = ({ modalContainer }) => {
     step = /* @__PURE__ */ jsxRuntime.jsx(SuccessStep, {});
   }
   return /* @__PURE__ */ jsxRuntime.jsx(Modal, { isOpen: true, onClose: () => {
-  }, modalContainer, children: step });
+  }, children: step });
 };
 const useTokensRequest = () => {
   const { setTokens, setSelectedToken, setSelectedAssetSymbol } = useTokensStore();
@@ -6352,6 +6319,49 @@ class ChainStrategyRegistry {
     await strategy.disconnect();
   }
 }
+const EVM_CONFIG = {
+  usdtAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+  gasEstimates: {
+    approve: 65000n,
+    bridge: 300000n
+  },
+  gasBuffer: 1.2,
+  // 20% buffer
+  timeout: 3e5,
+  // 5 minutes (increased for slower networks)
+  requiredConfirmations: 3
+  // Wait for 3 confirmations for reorg protection
+};
+const TON_CONFIG = {
+  apiUrl: "https://toncenter.com/api/v2",
+  timeout: 36e4,
+  // 6 minutes
+  validUntil: 600
+  // 10 minutes
+};
+const TRON_CONFIG = {
+  timeout: 12e4,
+  // 2 minutes (for 19 confirmations)
+  feeLimit: 1e8,
+  // 100 TRX in sun
+  requiredConfirmations: 19,
+  // TRON standard: 19 blocks for confirmation
+  pollingInterval: 3e3
+  // 3 seconds between checks
+};
+let tonClientInstance = null;
+function getTonClient(customClient, apiKey) {
+  if (customClient) {
+    return customClient;
+  }
+  if (!tonClientInstance) {
+    tonClientInstance = new ton.TonClient({
+      endpoint: `${TON_CONFIG.apiUrl}/jsonRPC`,
+      apiKey
+    });
+  }
+  return tonClientInstance;
+}
 function isNativeAddress(addr) {
   if (!addr) return false;
   const a = addr.toLowerCase();
@@ -6377,44 +6387,72 @@ function formatUnitsFromBigIntStr(valueStr, decimals) {
   const tail = s.slice(s.length - decimals).replace(/0+$/, "");
   return Number(tail ? `${head}.${tail}` : head);
 }
-async function getEvmBalances(address, tokens) {
+function isTonFriendlyAddress(address) {
+  return !!address && /^[A-Za-z0-9_-]{48,}$/.test(address);
+}
+function normalizeTickerSymbol(symbol) {
+  return symbol.toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
+}
+function parseTonAddress(address) {
+  if (address.startsWith("0x")) {
+    const hex = address.slice(2);
+    return ton.Address.parseRaw(`0:${hex}`);
+  }
+  if (address.includes(":")) {
+    return ton.Address.parseRaw(address);
+  }
+  return ton.Address.parse(address);
+}
+async function getEvmBalances(publicClient, address, tokens) {
   const balances = {};
   try {
-    if (!address || !ethers.ethers.isAddress(address)) {
+    console.log("start getEvmBalances");
+    console.log("publicClient:", publicClient);
+    console.log("isAddress:", viem.isAddress(address));
+    console.log("tokens:", tokens);
+    if (!address || !viem.isAddress(address)) {
       console.warn(`Invalid EVM address provided: ${address}`);
       return balances;
     }
-    if (typeof window === "undefined" || !window.ethereum) {
-      throw new Error("No ethereum provider found");
+    if (!publicClient) {
+      throw new Error("No public client provided");
     }
-    const provider = new ethers.ethers.BrowserProvider(window.ethereum);
     for (const token of tokens) {
       try {
         let balance = 0;
         const isNative = isNativeAddress(token.address);
         if (isNative) {
-          const ethBalance = await provider.getBalance(address);
-          balance = parseFloat(ethers.ethers.formatUnits(ethBalance, token.decimals));
+          const ethBalance = await publicClient.getBalance({
+            address
+          });
+          balance = parseFloat(viem.formatUnits(ethBalance, token.decimals));
         } else {
-          if (!ethers.ethers.isAddress(token.address)) {
+          if (!viem.isAddress(token.address)) {
             continue;
           }
-          const code = await provider.getCode(token.address);
-          if (code === "0x") {
+          const bytecode = await publicClient.getBytecode({
+            address: token.address
+          });
+          if (!bytecode || bytecode === "0x") {
             continue;
           }
-          const contract = new ethers.ethers.Contract(
-            token.address,
-            [
-              "function balanceOf(address owner) view returns (uint256)",
-              "function decimals() view returns (uint8)"
-            ],
-            provider
-          );
           try {
-            const tokenBalance = await contract.balanceOf(address);
+            const tokenBalance = await publicClient.readContract({
+              address: token.address,
+              abi: [
+                {
+                  name: "balanceOf",
+                  type: "function",
+                  stateMutability: "view",
+                  inputs: [{ name: "owner", type: "address" }],
+                  outputs: [{ name: "balance", type: "uint256" }]
+                }
+              ],
+              functionName: "balanceOf",
+              args: [address]
+            });
             balance = parseFloat(
-              ethers.ethers.formatUnits(tokenBalance, token.decimals)
+              viem.formatUnits(tokenBalance, token.decimals)
             );
           } catch {
             continue;
@@ -6437,6 +6475,68 @@ async function getEvmBalances(address, tokens) {
   }
   return balances;
 }
+async function getTonBalances(address, tokens, customTonClient, tonApiKey) {
+  const balances = {};
+  try {
+    if (!isTonFriendlyAddress(address)) {
+      console.warn(`Invalid TON address provided: ${address}`);
+      return balances;
+    }
+    const client = getTonClient(customTonClient, tonApiKey);
+    const accountAddress = ton.Address.parse(address);
+    console.log(address);
+    console.log(tokens);
+    try {
+      const balance = await client.getBalance(accountAddress);
+      const tonBalance = Number(balance) / 1e9;
+      console.log("tonBalance", tonBalance);
+      if (tonBalance > 0) {
+        balances.TON = { balance: tonBalance, address: "ton-native" };
+      }
+    } catch (error) {
+      console.warn("Failed to get native TON balance:", error);
+    }
+    for (const token of tokens) {
+      try {
+        if (isNativeAddress(token.address) || token.symbol.toUpperCase() === "TON") {
+          continue;
+        }
+        const jettonMasterAddress = parseTonAddress(token.address);
+        const jettonWalletAddress = await client.runMethod(
+          jettonMasterAddress,
+          "get_wallet_address",
+          [
+            {
+              type: "slice",
+              cell: ton.beginCell().storeAddress(accountAddress).endCell()
+            }
+          ]
+        );
+        const jettonWalletAddr = jettonWalletAddress.stack.readAddress();
+        const jettonData = await client.runMethod(
+          jettonWalletAddr,
+          "get_wallet_data"
+        );
+        const jettonBalance = jettonData.stack.readBigNumber();
+        const humanBalance = Number(jettonBalance) / Math.pow(10, token.decimals);
+        if (humanBalance > 0) {
+          const symbolUpper = token.symbol.toUpperCase();
+          const symbolNorm = normalizeTickerSymbol(symbolUpper);
+          const entry = { balance: humanBalance, address: token.address };
+          balances[symbolUpper] = entry;
+          if (symbolNorm !== symbolUpper) {
+            balances[symbolNorm] = entry;
+          }
+        }
+      } catch (error) {
+        console.debug(`Failed to get balance for ${token.symbol}:`, error);
+      }
+    }
+  } catch (error) {
+    console.error("Failed to get TON balances:", error);
+  }
+  return balances;
+}
 async function getTronBalances(tronWeb, address, tokens) {
   const balances = {};
   try {
@@ -6480,30 +6580,6 @@ async function getTronBalances(tronWeb, address, tokens) {
   }
   return balances;
 }
-const EVM_CONFIG = {
-  usdtAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-  gasEstimates: {
-    approve: 65000n,
-    bridge: 300000n
-  },
-  gasBuffer: 1.2,
-  // 20% buffer
-  timeout: 12e4
-  // 2 minutes
-};
-const TON_CONFIG = {
-  apiUrl: "https://toncenter.com/api/v2",
-  timeout: 36e4,
-  // 6 minutes
-  validUntil: 600
-  // 10 minutes
-};
-const TRON_CONFIG = {
-  timeout: 6e4,
-  // 1 minute
-  feeLimit: 1e8
-  // 100 TRX in sun
-};
 const ERC20_ABI = [
   "function approve(address spender, uint256 amount) returns (bool)",
   "function allowance(address owner, address spender) view returns (uint256)",
@@ -6514,7 +6590,9 @@ class EvmChainStrategy {
   constructor(config) {
     __publicField(this, "config");
     __publicField(this, "provider");
+    __publicField(this, "publicClient");
     this.config = config;
+    this.publicClient = config.publicClient;
     if (config.walletClient) {
       this.provider = new ethers.BrowserProvider(config.walletClient.transport);
     }
@@ -6553,7 +6631,11 @@ class EvmChainStrategy {
     return t("wallets.connectEvmWallet");
   }
   async getBalances(address, tokens) {
-    return await getEvmBalances(address, tokens);
+    if (!this.publicClient) {
+      console.warn("No publicClient available for balance query");
+      return {};
+    }
+    return await getEvmBalances(this.publicClient, address, tokens);
   }
   isAddressValid(address) {
     if (!address) return false;
@@ -6666,17 +6748,14 @@ class EvmChainStrategy {
       if (!provider) {
         throw new ProviderNotAvailableError("evm");
       }
-      const deadline = Date.now() + EVM_CONFIG.timeout;
-      let receipt = null;
-      while (Date.now() < deadline) {
-        try {
-          receipt = await provider.getTransactionReceipt(txHash);
-          if (receipt) break;
-        } catch (e) {
-          console.debug("Error fetching receipt:", e);
-        }
-        await new Promise((r) => setTimeout(r, 2500));
-      }
+      console.log(
+        `Waiting for ${EVM_CONFIG.requiredConfirmations} confirmations for tx: ${txHash}`
+      );
+      const receipt = await provider.waitForTransaction(
+        txHash,
+        EVM_CONFIG.requiredConfirmations,
+        EVM_CONFIG.timeout
+      );
       if (!receipt) {
         const error = new TransactionTimeoutError("evm", txHash);
         return {
@@ -6691,11 +6770,35 @@ class EvmChainStrategy {
           error: error.message
         };
       }
-      console.log("EVM transaction confirmed on-chain");
+      console.log(
+        `EVM transaction confirmed in block ${receipt.blockNumber} with ${EVM_CONFIG.requiredConfirmations} confirmations`
+      );
       return {
         completed: true
       };
     } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "TRANSACTION_REPLACED") {
+        console.log(
+          `Transaction was replaced: ${"reason" in error ? String(error.reason) : "unknown"}`
+        );
+        if ("receipt" in error && error.receipt) {
+          const replacementReceipt = error.receipt;
+          if (replacementReceipt.status === 1) {
+            console.log(
+              `Replacement transaction succeeded in block ${replacementReceipt.blockNumber}`
+            );
+            return {
+              completed: true
+            };
+          } else {
+            const chainError2 = new TransactionRevertedError("evm", txHash);
+            return {
+              completed: false,
+              error: chainError2.message
+            };
+          }
+        }
+      }
       const chainError = toChainStrategyError(
         error,
         "evm",
@@ -6809,13 +6912,52 @@ class EvmChainStrategy {
       return false;
     }
   }
+  /**
+   * Check if a block has reached finality status (optional, for critical transactions)
+   * This is more stringent than confirmations and protects against long-range reorgs
+   *
+   * Usage: Call this method after waitForCompletion if you need additional security
+   * for high-value transactions. The method checks if the block has been marked as
+   * "finalized" by the Ethereum consensus layer (2/3 of validators).
+   *
+   * @param blockNumber - The block number to check for finality
+   * @returns true if the block is finalized, false otherwise
+   */
+  async checkFinality(blockNumber) {
+    try {
+      const provider = this.provider;
+      if (!provider) {
+        return false;
+      }
+      const finalizedBlock = await provider.getBlock("finalized");
+      if (!finalizedBlock) {
+        console.debug(
+          "Finalized block not available (pre-merge or unsupported)"
+        );
+        return false;
+      }
+      const isFinalized = blockNumber <= finalizedBlock.number;
+      if (isFinalized) {
+        console.log(
+          `Block ${blockNumber} has reached finality (finalized block: ${finalizedBlock.number})`
+        );
+      } else {
+        console.debug(
+          `Block ${blockNumber} not yet finalized (finalized block: ${finalizedBlock.number})`
+        );
+      }
+      return isFinalized;
+    } catch (error) {
+      console.debug("Error checking finality:", error);
+      return false;
+    }
+  }
 }
 class TonChainStrategy {
   constructor(config) {
     __publicField(this, "config");
     this.config = config;
   }
-  // ========== Identity ==========
   canHandle(chainKey) {
     return chainKey.toLowerCase() === "ton";
   }
@@ -6825,7 +6967,6 @@ class TonChainStrategy {
   getName() {
     return "TON Chain Strategy";
   }
-  // ========== Wallet Management ==========
   async connect() {
     await this.config.tonConnectUI?.openModal();
   }
@@ -6850,17 +6991,26 @@ class TonChainStrategy {
   getConnectLabel(t) {
     return t("wallets.connectTonWallet");
   }
-  // ========== Balance & Validation ==========
-  async getBalances(address) {
-    return await getSwapBalances(address);
+  async getBalances(address, tokens) {
+    return await getTonBalances(
+      address,
+      tokens,
+      this.config.tonClient,
+      this.config.tonApiKey
+    );
   }
   isAddressValid(address) {
     if (!address) return false;
     return true;
   }
-  // ========== Gas Estimation ==========
   async estimateGasRequirement(params) {
-    const { selectedToken, nativeTokenSymbol, amount, balances, reserveFallback } = params;
+    const {
+      selectedToken,
+      nativeTokenSymbol,
+      amount,
+      balances,
+      reserveFallback
+    } = params;
     const nativeSym = nativeTokenSymbol.toUpperCase();
     const isNativeSelected = nativeSym === (selectedToken?.symbol ?? "").toUpperCase();
     const nativeBalance = Number(balances[nativeSym]?.balance ?? 0);
@@ -6882,7 +7032,6 @@ class TonChainStrategy {
       isNativeSelected
     };
   }
-  // ========== Transaction Execution ==========
   validateSteps(steps) {
     if (!steps || steps.length === 0) {
       throw new InvalidStepsError("ton", "No transaction steps provided");
@@ -6935,19 +7084,17 @@ class TonChainStrategy {
       const result = await this.config.tonConnectUI.sendTransaction(
         transaction
       );
-      const hash = this.getTxHash(result.boc);
       return {
         chainKey: "ton",
-        hash
+        hash: result.boc
       };
     } catch (error) {
       throw toChainStrategyError(error, "ton", "transaction");
     }
   }
-  async waitForCompletion(txHash, context) {
+  async waitForCompletion(txHash) {
     try {
       const confirmed = await this.checkTonTransaction(
-        context.srcAddress,
         txHash,
         TON_CONFIG.timeout
       );
@@ -6977,39 +7124,78 @@ class TonChainStrategy {
       };
     }
   }
-  // ========== Private Helper Methods ==========
-  getTxHash(boc) {
-    const cell = core.Cell.fromBase64(boc);
-    const buffer = cell.hash();
-    return buffer.toString("hex");
+  getNormalizedExtMessageHash(message) {
+    if (message.info.type !== "external-in") {
+      throw new Error(`Expected external-in message, got ${message.info.type}`);
+    }
+    const normalizedInfo = {
+      ...message.info,
+      src: void 0,
+      importFee: 0n
+    };
+    const normalizedMessage = {
+      ...message,
+      info: normalizedInfo,
+      init: null
+    };
+    return core.beginCell().store(core.storeMessage(normalizedMessage, { forceRef: true })).endCell().hash();
   }
-  async checkTonTransaction(address, txHash, timeoutMs = 36e4) {
+  async checkTonTransaction(bocBase64, timeoutMs = 36e4) {
     const deadline = Date.now() + timeoutMs;
-    const normalizedHash = txHash.toLowerCase();
-    while (Date.now() < deadline) {
-      try {
-        const response = await fetch(
-          `${TON_CONFIG.apiUrl}/getTransactions?address=${address}&limit=20`
+    const client = getTonClient(this.config.tonClient, this.config.tonApiKey);
+    try {
+      const inMessage = core.loadMessage(core.Cell.fromBase64(bocBase64).beginParse());
+      if (inMessage.info.type !== "external-in") {
+        console.debug(
+          "Expected external-in message, got:",
+          inMessage.info.type
         );
-        if (!response.ok) {
-          console.debug("TonCenter API error:", response.status);
-          await new Promise((r) => setTimeout(r, 3e3));
-          continue;
-        }
-        const data = await response.json();
-        const transactions = data.result || [];
-        for (const tx of transactions) {
-          const txIdHash = tx.transaction_id?.hash;
-          if (txIdHash && txIdHash.toLowerCase() === normalizedHash) {
-            return true;
+        return false;
+      }
+      const accountAddress = inMessage.info.dest;
+      const targetMessageHash = this.getNormalizedExtMessageHash(inMessage);
+      let lt = void 0;
+      let hash = void 0;
+      while (Date.now() < deadline) {
+        try {
+          const transactions = await client.getTransactions(accountAddress, {
+            lt,
+            hash,
+            limit: 10,
+            archival: true
+          });
+          if (transactions.length === 0) {
+            await new Promise((r) => setTimeout(r, 3e3));
+            lt = void 0;
+            hash = void 0;
+            continue;
           }
+          for (const tx of transactions) {
+            if (tx.inMessage?.info.type === "external-in") {
+              const txInMessageHash = this.getNormalizedExtMessageHash(
+                tx.inMessage
+              );
+              if (txInMessageHash.equals(targetMessageHash)) {
+                console.debug("Transaction found by in-message hash");
+                return true;
+              }
+            }
+          }
+          const lastTx = transactions[transactions.length - 1];
+          lt = lastTx.lt.toString();
+          hash = lastTx.hash().toString("base64");
+        } catch (error) {
+          console.debug("Error fetching transactions:", error);
+          await new Promise((r) => setTimeout(r, 3e3));
+          lt = void 0;
+          hash = void 0;
         }
-      } catch (e) {
-        console.debug("TonCenter polling error:", e);
       }
-      await new Promise((r) => setTimeout(r, 3e3));
+      return false;
+    } catch (error) {
+      console.debug("Error parsing BOC or checking transaction:", error);
+      return false;
     }
-    return false;
   }
 }
 class TronChainStrategy {
@@ -7070,7 +7256,13 @@ class TronChainStrategy {
   }
   // ========== Gas Estimation ==========
   async estimateGasRequirement(params) {
-    const { selectedToken, nativeTokenSymbol, amount, balances, reserveFallback } = params;
+    const {
+      selectedToken,
+      nativeTokenSymbol,
+      amount,
+      balances,
+      reserveFallback
+    } = params;
     const nativeSym = nativeTokenSymbol.toUpperCase();
     const isNativeSelected = nativeSym === (selectedToken?.symbol ?? "").toUpperCase();
     const nativeBalance = Number(balances[nativeSym]?.balance ?? 0);
@@ -7092,7 +7284,6 @@ class TronChainStrategy {
       isNativeSelected
     };
   }
-  // ========== Transaction Execution ==========
   validateSteps(steps) {
     console.log("validateSteps");
     if (!steps?.length) {
@@ -7127,7 +7318,10 @@ class TronChainStrategy {
       if (String(step.chainKey).toLowerCase() !== "tron") continue;
       const tx = step.transaction;
       if (!tx) {
-        throw new InvalidTransactionDataError("tron", "Missing transaction data");
+        throw new InvalidTransactionDataError(
+          "tron",
+          "Missing transaction data"
+        );
       }
       const hexData = typeof tx?.data === "string" ? tx.data : "";
       const parsed = this.parseTronStep(step, tx, hexData);
@@ -7178,13 +7372,19 @@ class TronChainStrategy {
           break;
         }
         default:
-          throw new InvalidStepsError("tron", "Unsupported TRON parsed tx kind");
+          throw new InvalidStepsError(
+            "tron",
+            "Unsupported TRON parsed tx kind"
+          );
       }
       const { txid } = await this.signAndBroadcast(tronWeb, unsigned);
       lastTxId = txid;
     }
     if (!lastTxId) {
-      throw new TransactionFailedError("tron", "No TRON transaction was executed");
+      throw new TransactionFailedError(
+        "tron",
+        "No TRON transaction was executed"
+      );
     }
     return { hash: lastTxId, chainKey: "tron" };
   }
@@ -7194,47 +7394,84 @@ class TronChainStrategy {
       if (!tronWeb) {
         throw new ProviderNotAvailableError("tron");
       }
+      console.log(
+        `Waiting for ${TRON_CONFIG.requiredConfirmations} confirmations for TRON tx: ${txHash}`
+      );
       const deadline = Date.now() + TRON_CONFIG.timeout;
-      while (Date.now() < deadline) {
+      let txBlockNumber = null;
+      while (Date.now() < deadline && !txBlockNumber) {
         try {
           const info = await tronWeb.trx.getTransactionInfo(txHash);
-          console.log("TRON transaction info:", info);
-          if (info) {
+          if (info && info.blockNumber) {
             const result = info.receipt?.result;
-            if (result === "SUCCESS") {
-              console.log("TRON transaction confirmed on-chain");
+            if (result !== "SUCCESS") {
+              const msg = this.hexToAscii(info.resMessage) || null;
+              let reason = msg;
+              const cr = info.contractResult?.[0];
+              if (cr && /^0x?08c379a0/i.test(cr)) {
+                try {
+                  const clean = cr.replace(/^0x/, "");
+                  const len = parseInt(clean.slice(8 + 64, 8 + 64 + 64), 16);
+                  const strHex = clean.slice(
+                    8 + 64 + 64,
+                    8 + 64 + 64 + len * 2
+                  );
+                  const str = this.hexToAscii("0x" + strHex);
+                  if (str) reason = str;
+                } catch (e) {
+                  console.debug("TRON revert string decode error", e);
+                }
+              }
+              const error2 = new TransactionRevertedError(
+                "tron",
+                txHash,
+                reason || "Unknown error"
+              );
               return {
-                completed: true
+                completed: false,
+                error: error2.message
               };
             }
-            const msg = this.hexToAscii(info.resMessage) || null;
-            let reason = msg;
-            const cr = info.contractResult?.[0];
-            if (cr && /^0x?08c379a0/i.test(cr)) {
-              try {
-                const clean = cr.replace(/^0x/, "");
-                const len = parseInt(clean.slice(8 + 64, 8 + 64 + 64), 16);
-                const strHex = clean.slice(8 + 64 + 64, 8 + 64 + 64 + len * 2);
-                const str = this.hexToAscii("0x" + strHex);
-                if (str) reason = str;
-              } catch (e) {
-                console.debug("TRON revert string decode error", e);
-              }
+            txBlockNumber = info.blockNumber;
+            console.log(`TRON transaction found in block ${txBlockNumber}`);
+          }
+        } catch (e) {
+          console.debug("TRON getTransactionInfo error:", e);
+        }
+        if (!txBlockNumber) {
+          await new Promise((r) => setTimeout(r, TRON_CONFIG.pollingInterval));
+        }
+      }
+      if (!txBlockNumber) {
+        const error2 = new TransactionTimeoutError("tron", txHash);
+        return {
+          completed: false,
+          error: error2.message
+        };
+      }
+      let confirmations = 0;
+      while (Date.now() < deadline) {
+        try {
+          const currentBlock = await tronWeb.trx.getCurrentBlock();
+          const currentBlockNumber = currentBlock?.block_header?.raw_data?.number;
+          if (currentBlockNumber) {
+            confirmations = currentBlockNumber - txBlockNumber;
+            if (confirmations >= TRON_CONFIG.requiredConfirmations) {
+              console.log(
+                `TRON transaction confirmed in block ${txBlockNumber} with ${confirmations} confirmations`
+              );
+              return {
+                completed: true
+              };
             }
-            const error2 = new TransactionRevertedError(
-              "tron",
-              txHash,
-              reason || "Unknown error"
+            console.log(
+              `TRON transaction confirmations: ${confirmations}/${TRON_CONFIG.requiredConfirmations}`
             );
-            return {
-              completed: false,
-              error: error2.message
-            };
           }
         } catch (e) {
-          console.debug("TRON getTransactionInfo error:", e);
+          console.debug("TRON getCurrentBlock error:", e);
         }
-        await new Promise((r) => setTimeout(r, 3e3));
+        await new Promise((r) => setTimeout(r, TRON_CONFIG.pollingInterval));
       }
       const error = new TransactionTimeoutError("tron", txHash);
       return {
@@ -7242,14 +7479,17 @@ class TronChainStrategy {
         error: error.message
       };
     } catch (error) {
-      const chainError = toChainStrategyError(error, "tron", "waitForCompletion");
+      const chainError = toChainStrategyError(
+        error,
+        "tron",
+        "waitForCompletion"
+      );
       return {
         completed: false,
         error: chainError.message
       };
     }
   }
-  // ========== Private Helper Methods ==========
   getTronWeb() {
     return typeof window !== "undefined" ? window.tronWeb : void 0;
   }
@@ -7302,7 +7542,10 @@ class TronChainStrategy {
           amount: this.extractAmountFromTxData(tx.data)
         };
       }
-      throw new InvalidTransactionDataError("tron", "Cannot parse approve transaction");
+      throw new InvalidTransactionDataError(
+        "tron",
+        "Cannot parse approve transaction"
+      );
     }
     if (step?.type === "transfer" || step?.type === "bridge") {
       const s = step;
@@ -7332,7 +7575,10 @@ class TronChainStrategy {
           feeLimit: raw2.feeLimit
         };
       }
-      throw new InvalidTransactionDataError("tron", "Cannot parse transfer/bridge transaction");
+      throw new InvalidTransactionDataError(
+        "tron",
+        "Cannot parse transfer/bridge transaction"
+      );
     }
     if (tx?.to && tx?.value && !tx?.data) {
       const v = BigInt(tx.value.toString());
@@ -7352,19 +7598,28 @@ class TronChainStrategy {
         feeLimit: raw.feeLimit
       };
     }
-    throw new InvalidTransactionDataError("tron", `Unsupported TRON step type: ${step?.type ?? "unknown"}`);
+    throw new InvalidTransactionDataError(
+      "tron",
+      `Unsupported TRON step type: ${step?.type ?? "unknown"}`
+    );
   }
   extractSpenderFromTxData(data) {
     const clean = data.replace(/^0x/, "");
     if (clean.length < 74) {
-      throw new InvalidTransactionDataError("tron", "Invalid transaction data length");
+      throw new InvalidTransactionDataError(
+        "tron",
+        "Invalid transaction data length"
+      );
     }
     return "41" + clean.slice(32, 72);
   }
   extractAmountFromTxData(data) {
     const clean = data.replace(/^0x/, "");
     if (clean.length < 138) {
-      throw new InvalidTransactionDataError("tron", "Invalid transaction data length");
+      throw new InvalidTransactionDataError(
+        "tron",
+        "Invalid transaction data length"
+      );
     }
     const amountHex = clean.slice(72, 136);
     return BigInt("0x" + amountHex).toString();
@@ -7372,7 +7627,10 @@ class TronChainStrategy {
   extractRecipientFromTxData(data) {
     const clean = data.replace(/^0x/, "");
     if (clean.length < 74) {
-      throw new InvalidTransactionDataError("tron", "Invalid transaction data length");
+      throw new InvalidTransactionDataError(
+        "tron",
+        "Invalid transaction data length"
+      );
     }
     return "41" + clean.slice(32, 72);
   }
@@ -7447,7 +7705,6 @@ class TronChainStrategy {
       return null;
     }
   }
-  // ========== Transaction Builders ==========
   async buildApprove(tronWeb, p) {
     const res = await tronWeb.transactionBuilder.triggerSmartContract(
       p.token,
@@ -7460,7 +7717,10 @@ class TronChainStrategy {
       p.from
     );
     if (!res?.transaction) {
-      throw new TransactionFailedError("tron", "Failed to build approve transaction");
+      throw new TransactionFailedError(
+        "tron",
+        "Failed to build approve transaction"
+      );
     }
     return res.transaction;
   }
@@ -7476,7 +7736,10 @@ class TronChainStrategy {
       p.from
     );
     if (!res?.transaction) {
-      throw new TransactionFailedError("tron", "Failed to build transfer transaction");
+      throw new TransactionFailedError(
+        "tron",
+        "Failed to build transfer transaction"
+      );
     }
     return res.transaction;
   }
@@ -7496,12 +7759,13 @@ class TronChainStrategy {
       p.from
     );
     if (!res?.transaction) {
-      throw new TransactionFailedError("tron", "Failed to build raw call transaction");
+      throw new TransactionFailedError(
+        "tron",
+        "Failed to build raw call transaction"
+      );
     }
     return res.transaction;
   }
-  // ========== Transaction Sender ==========
-  /* eslint-disable @typescript-eslint/no-explicit-any */
   async signAndBroadcast(tronWeb, unsignedTx) {
     const signed = await tronWeb.trx.sign(unsignedTx);
     const sent = await tronWeb.trx.sendRawTransaction(signed);
@@ -7513,33 +7777,77 @@ class TronChainStrategy {
     }
     return { txid: sent.txid };
   }
+  /**
+   * Check if a transaction has been solidified (confirmed by solidityNode)
+   * This is an additional check for critical transactions to ensure they are
+   * truly confirmed and available through the solidityNode API.
+   *
+   * Usage: Call this method after waitForCompletion for high-value transactions
+   * to get additional assurance that the transaction is solidified.
+   *
+   * @param txHash - Transaction hash to check
+   * @returns true if the transaction is solidified, false otherwise
+   */
+  async checkSolidified(txHash) {
+    try {
+      const tronWeb = this.getTronWeb();
+      if (!tronWeb) {
+        return false;
+      }
+      const info = await tronWeb.trx.getTransactionInfo(txHash);
+      if (!info || !info.blockNumber) {
+        console.debug(
+          "Transaction not yet solidified (no blockNumber in info)"
+        );
+        return false;
+      }
+      const result = info.receipt?.result;
+      if (result === "SUCCESS") {
+        console.log(
+          `Transaction ${txHash} is solidified in block ${info.blockNumber}`
+        );
+        return true;
+      }
+      console.debug(`Transaction solidified but result is: ${result}`);
+      return false;
+    } catch (error) {
+      console.debug("Error checking solidified status:", error);
+      return false;
+    }
+  }
 }
 function ChainStrategyProvider({
   children,
   evmWallet,
   tonWallet,
-  tronWallet
+  tronWallet,
+  tonClient,
+  tonApiKey
 }) {
   const evmStrategy = require$$0.useMemo(
     () => new EvmChainStrategy({
       evmAddress: evmWallet.address,
       evmIsConnected: evmWallet.isConnected,
       evmDisconnect: evmWallet.disconnect,
-      walletClient: evmWallet.walletClient
+      walletClient: evmWallet.walletClient,
+      publicClient: evmWallet.publicClient
     }),
     [
       evmWallet.address,
       evmWallet.isConnected,
       evmWallet.disconnect,
-      evmWallet.walletClient
+      evmWallet.walletClient,
+      evmWallet.publicClient
     ]
   );
   const tonStrategy = require$$0.useMemo(
     () => new TonChainStrategy({
       tonConnectUI: tonWallet.tonConnectUI,
-      tonAddress: tonWallet.address
+      tonAddress: tonWallet.address,
+      tonClient,
+      tonApiKey
     }),
-    [tonWallet.tonConnectUI, tonWallet.address]
+    [tonWallet.tonConnectUI, tonWallet.address, tonClient, tonApiKey]
   );
   const tronStrategy = require$$0.useMemo(
     () => new TronChainStrategy({
@@ -7575,6 +7883,7 @@ const EvaaBridgeWithProviders = (props) => {
   const { address: evmAddress, isConnected: evmIsConnected } = wagmi.useAccount();
   const { disconnect: evmDisconnect } = wagmi.useDisconnect();
   const { data: walletClient } = wagmi.useWalletClient();
+  const publicClient = wagmi.usePublicClient();
   const {
     address: tronAddress,
     connected: tronConnected,
@@ -7592,14 +7901,15 @@ const EvaaBridgeWithProviders = (props) => {
   require$$0.useEffect(() => {
     setTronConnected(!!tronConnected);
   }, [tronConnected, setTronConnected]);
-  return /* @__PURE__ */ jsxRuntime.jsx(
+  return /* @__PURE__ */ jsxRuntime.jsx(ModalContainerProvider, { containerId: props.modalContainerId, children: /* @__PURE__ */ jsxRuntime.jsx(
     ChainStrategyProvider,
     {
       evmWallet: {
         address: evmAddress,
         isConnected: evmIsConnected,
         disconnect: evmDisconnect,
-        walletClient
+        walletClient,
+        publicClient
       },
       tonWallet: {
         tonConnectUI,
@@ -7612,9 +7922,11 @@ const EvaaBridgeWithProviders = (props) => {
         connect: tronConnect,
         disconnect: tronDisconnect
       },
+      tonClient: props.tonClient,
+      tonApiKey: props.tonApiKey,
       children: /* @__PURE__ */ jsxRuntime.jsx(EvaaBridgeContent, { ...props })
     }
-  );
+  ) });
 };
 const EvaaBridgeContent = ({
   className,
@@ -7623,7 +7935,6 @@ const EvaaBridgeContent = ({
   onChainChange
 } = {}) => {
   const { t } = reactI18next.useTranslation();
-  const modalContainerRef = require$$0.useRef(null);
   useTokensRequest();
   useChainsRequest();
   const [sendToAnother, setSendToAnother] = require$$0.useState(false);
@@ -7716,16 +8027,15 @@ const EvaaBridgeContent = ({
   }, [chains, assetMatrix, allowedFromChains]);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs(
-      "section",
+      Card,
       {
         className: cn(
-          "p-5 bg-card max-w-md w-full rounded-3xl mx-auto flex flex-col gap-4 relative",
+          "max-w-md w-full mx-auto flex flex-col relative",
           className
         ),
-        ref: modalContainerRef,
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(FormHeader, { modalContainer: modalContainerRef.current }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-[1px]", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(FormHeader, {}),
+          /* @__PURE__ */ jsxRuntime.jsxs(CardContent, { className: "space-y-[1px]", children: [
             /* @__PURE__ */ jsxRuntime.jsx(
               SwapSection,
               {
@@ -7738,8 +8048,7 @@ const EvaaBridgeContent = ({
                 amount,
                 isSource: true,
                 onAmountChange: handleAmountChange,
-                onSelect: handleFromChainChange,
-                modalContainer: modalContainerRef.current || void 0
+                onSelect: handleFromChainChange
               }
             ),
             /* @__PURE__ */ jsxRuntime.jsx(SwapButton, {}),
@@ -7753,8 +8062,7 @@ const EvaaBridgeContent = ({
                 allowedChains: allowedToChains,
                 amount: outputAmount,
                 readOnlyAmount: true,
-                onSelect: handleToChainChange,
-                modalContainer: modalContainerRef.current || void 0
+                onSelect: handleToChainChange
               }
             ),
             /* @__PURE__ */ jsxRuntime.jsx(
@@ -7763,15 +8071,15 @@ const EvaaBridgeContent = ({
                 enabled: sendToAnother,
                 onToggle: () => setSendToAnother((v) => !v)
               }
-            )
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(SubmitButton, {})
           ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(SubmitButton, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(ReceiveRow, {})
+          /* @__PURE__ */ jsxRuntime.jsx(CardFooter, { children: /* @__PURE__ */ jsxRuntime.jsx(ReceiveRow, {}) })
         ]
       }
     ),
-    /* @__PURE__ */ jsxRuntime.jsx(WalletSelectModal, { modalContainer: modalContainerRef.current }),
-    /* @__PURE__ */ jsxRuntime.jsx(TransactionManager, { modalContainer: modalContainerRef.current }),
+    /* @__PURE__ */ jsxRuntime.jsx(WalletSelectModal, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(TransactionManager, {}),
     /* @__PURE__ */ jsxRuntime.jsx(sonner.Toaster, { position: "top-right", richColors: true })
   ] });
 };
@@ -7854,8 +8162,8 @@ exports.getQuoteAmounts = getQuoteAmounts;
 exports.getQuoteDetails = getQuoteDetails;
 exports.getQuoteFees = getQuoteFees;
 exports.getQuotesByPriority = getQuotesByPriority;
-exports.getSwapBalances = getSwapBalances;
 exports.getTokens = getTokens;
+exports.getTonBalances = getTonBalances;
 exports.getTronBalances = getTronBalances;
 exports.isAddressValidForChain = isAddressValidForChain;
 exports.isEvmAddress = isEvmAddress;
@@ -7864,7 +8172,7 @@ exports.isTronAddress = isTronAddress;
 exports.isZeroAddr = isZeroAddr;
 exports.listAssetsForSelect = listAssetsForSelect;
 exports.lookupTokenMeta = lookupTokenMeta;
-exports.normalizeTickerSymbol = normalizeTickerSymbol;
+exports.normalizeTickerSymbol = normalizeTickerSymbol$1;
 exports.pollUntilDelivered = pollUntilDelivered;
 exports.resolveTokenOnChain = resolveTokenOnChain;
 exports.resolveTokenOnChainFromMatrix = resolveTokenOnChainFromMatrix$2;