@rash2x/bridge-widget 0.6.92 → 0.6.94

package/dist/{index-j6yDeMSt.js → index-DCLfFVh_.js}

@@ -34,7 +34,7 @@ import { FixedSizeList } from "react-window";
 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", "tonconnect": "TonConnect", "metaMask": "WalletConnect", "walletConnect": "WalletConnect", "tronLink": "TronLink", "addTronWallet": "Add Tron wallet", "comingSoon": "Coming Soon", "connected": "CONNECTED", "connectedStatus": "Connected", "disconnect": "Disconnect", "chooseWallet": "Connect wallet", "oneWalletPerEnv": "You can only connect one wallet per environment.", "connect": "Connect", "connectTronWallet": "Connect Tron wallet", "connectWallet": "Connect wallet" };
 const bridge$1 = { "max": "Max", "sourceNetwork": "Source network", "destinationNetwork": "Destination network", "selectToken": "Select token", "selectNetwork": "Select network", "selectSourceNetwork": "Select source network", "selectDestinationNetwork": "Select destination network", "searchToken": "Search token", "myTokens": "My tokens", "allTokens": "All tokens", "search": "Search", "select": "Select", "willChangeSourceChain": "Will change source network", "willChangeDestinationChain": "Will change destination network", "willChangeBothChains": "Will change both networks", "willChangeSourceNetworkAndToken": "Will change source token", "noBalancesFound": "No balances found.", "noResults": "No results", "tokenNotFound": "We couldn't find a token with that name or symbol. Please try again.", "chainNotFound": "We couldn't find a chain with that name. Please try again.", "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": "Transaction in progress...", "checkingBalance": "Checking balance...", "insufficientBalance": "Insufficient balance", "amountTooSmall": "Min {{min}}", "amountTooLarge": "Max {{max}}", "success": "Success", "successTitle": "Success", "done": "Done", "hashCopied": "Hash copied to clipboard", "bridged": "Bridged", "transferTitle": "Transfer", "hash": "Hash", "layerzeroScan": "TxHash", "finalFee": "Final Fee", "route": "Route", "routeTooltip": "Route is the path your transfer takes between networks. The bridge is powered by LayerZero, and the specific path can affect the fee, slippage, and estimated time.", "estTime": "Est. Time", "estTimeTooltip": "Estimated time is the approximate completion time. It depends on the route and network load; actual time may vary.", "slippage": "Slippage", "slippageTooltip": "If the received amount goes below this tolerance, the transaction will be reverted.", "minimumReceived": "Minimum received", "totalFee": "Total Fee", "totalFeeTooltip": "Total fee is the estimated total cost of the transfer. It includes network gas and bridge/route fees. The final fee may vary slightly.", "noRouteFound": "No route found", "notEnoughGas": "Not enough gas", "pasteAddressToTransfer": "Paste address to transfer", "noRouteFoundForSettings": "No route found for current settings.", "tryAdjustSettings": "Try disabling Gas on Destination, or adjust amount/networks.", "quoteError": "Quote error", "steps": { "sent": "Sent", "approving": "Approving Token", "approvingNote": "Step {{current}} of {{total}}: Confirm approval in wallet", "bridging": "Bridging", "processing": "Processing", "processingNote": "Up to 2 minutes", "completed": "Completed" } };
+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": "Transaction in progress...", "checkingBalance": "Checking balance...", "insufficientBalance": "Insufficient balance", "amountTooSmall": "Min {{min}}", "amountTooLarge": "Max {{max}}", "success": "Success", "successTitle": "Success", "done": "Done", "hashCopied": "Hash copied to clipboard", "bridged": "Bridged", "transferTitle": "Transfer", "hash": "Hash", "layerzeroScan": "TxHash", "finalFee": "Final Fee", "route": "Route", "routeTooltip": "Route is the path your transfer takes between networks. The bridge is powered by LayerZero, and the specific path can affect the fee, slippage, and estimated time.", "estTime": "Est. Time", "estTimeTooltip": "Estimated time is the approximate completion time. It depends on the route and network load; actual time may vary.", "slippage": "Slippage", "slippageTooltip": "If the received amount goes below this tolerance, the transaction will be reverted.", "minimumReceived": "Minimum received", "messageFee": "Message Fee", "messageFeeTooltip": "Message fee is the LayerZero cross-chain messaging cost paid to relay your transaction between networks.", "bridgeFee": "Bridge Fee", "bridgeFeeTooltip": "Bridge fee is the difference between the amount you send and the amount you receive, charged by the bridge protocol.", "totalFee": "Total Fee", "totalFeeTooltip": "Total fee is the estimated total cost of the transfer, including message and bridge fees. The final fee may vary slightly.", "gasEstimate": "Gas: {{gas}}", "noRouteFound": "No route found", "notEnoughGas": "Not enough gas", "pasteAddressToTransfer": "Paste address to transfer", "noRouteFoundForSettings": "No route found for current settings.", "tryAdjustSettings": "Try disabling Gas on Destination, or adjust amount/networks.", "quoteError": "Quote error", "steps": { "sent": "Sent", "approving": "Approving Token", "approvingNote": "Step {{current}} of {{total}}: Confirm approval in wallet", "bridging": "Bridging", "processing": "Processing", "processingNote": "Up to 2 minutes", "completed": "Completed" } };
 const telegram$1 = { "openWebVersion": "Open EVAA Web to Bridge", "restrictionMessage": "You can bridge between the chosen networks on EVAA web version" };
 const app$1 = { "stargateWidgetName": "Stargate Bridge Widget", "liveWidget": "Live Widget", "getStarted": "Get Started" };
 const settings$1 = { "title": "Settings", "gasOnDestination": "Gas on destination", "gasOnDestinationTooltip": "Adds the destination network's native token to cover fees for transactions after bridging. Increases the total fee.", "slippageTolerance": "Slippage tolerance", "slippageToleranceTooltip": "If the received amount goes below this tolerance, the transaction will be reverted.", "routePriority": "Route Priority", "routePriorityTooltip": "Select how the bridge chooses a route. Recommended balances options to find the best overall cost. Fastest prioritizes completion speed over everything else.", "highSlippageWarning": "High slippage warning", "gasPresets": { "auto": "Auto", "none": "None", "medium": "Medium", "max": "Max" }, "routePresets": { "fastest": "Fastest", "cheapest": "Cheapest", "recommended": "Recommended" } };
@@ -52,7 +52,7 @@ const en$3 = {
 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", "tonconnect": "TonConnect", "metaMask": "WalletConnect", "walletConnect": "WalletConnect", "tronLink": "TronLink", "addTronWallet": "Добавить Tron кошелёк", "comingSoon": "Скоро", "connected": "ПОДКЛЮЧЕНО", "connectedStatus": "Подключён", "disconnect": "Отключить", "chooseWallet": "Подключите кошелек", "oneWalletPerEnv": "Можно подключить только один кошелёк на окружение.", "connect": "Подключить", "connectTronWallet": "Подключить Tron кошелёк", "connectWallet": "Подключить кошелёк" };
 const bridge = { "max": "Макс", "sourceNetwork": "Исходная сеть", "destinationNetwork": "Целевая сеть", "selectToken": "Выбрать токен", "selectNetwork": "Выбрать сеть", "selectSourceNetwork": "Выбрать исходную сеть", "selectDestinationNetwork": "Выбрать целевую сеть", "searchToken": "Поиск токена", "myTokens": "Мои токены", "allTokens": "Все токены", "search": "Поиск", "select": "Выбрать", "willChangeSourceChain": "Сменит исходную сеть", "willChangeDestinationChain": "Сменит целевую сеть", "willChangeBothChains": "Сменит обе сети", "willChangeSourceNetworkAndToken": "Сменит исходный токен", "noBalancesFound": "Балансы не найдены.", "noResults": "Нет результатов", "tokenNotFound": "Мы не смогли найти токен с таким названием или символом. Пожалуйста, попробуйте снова.", "chainNotFound": "Мы не смогли найти сеть с таким названием. Пожалуйста, попробуйте снова.", "sendToAnotherAddress": "Отправить на другой адрес", "youWillReceive": "Вы получите", "anotherAddressPlaceholder": "Адрес", "addressDoesntMatch": "Адрес не соответствует сети {{network}}", "checkBeforeTransfer": "Проверьте корректность перед переводом" };
-const transaction = { "enterAmount": "Введите сумму", "transfer": "Перевести", "getQuote": "Получить котировку", "quoting": "Расчет котировки...", "failed": "Ошибка транзакции", "confirm": "Подтвердите транзакцию", "signTransaction": "Подпишите транзакцию в кошельке", "inProgress": "Транзакция выполняется...", "checkingBalance": "Проверка баланса...", "insufficientBalance": "Недостаточно средств", "amountTooSmall": "Минимум {{min}}", "amountTooLarge": "Максимум {{max}}", "success": "Успех", "successTitle": "Успех", "done": "Готово", "hashCopied": "Хэш скопирован в буфер обмена", "bridged": "Переведено", "transferTitle": "Перевод", "hash": "Хэш", "layerzeroScan": "TxHash", "finalFee": "Итоговая комиссия", "route": "Маршрут", "routeTooltip": "Маршрут — это путь, по которому будет выполнен перевод. Мост работает на базе LayerZero, а конкретный путь передачи между сетями может влиять на комиссию, проскальзывание и время.", "estTime": "Время", "estTimeTooltip": "Среднее время — примерное время завершения перевода. Зависит от маршрута и нагрузки сети; фактическое время может отличаться.", "slippage": "Проскальзывание", "slippageTooltip": "Если получаемая сумма окажется ниже этого допуска, транзакция будет отклонена.", "minimumReceived": "Минимум к получению", "totalFee": "Общая комиссия", "totalFeeTooltip": "Общая комиссия за перевод. Включает оценку комиссии сети (газ) и комиссии моста/маршрута. Фактическая сумма может немного измениться.", "noRouteFound": "Маршрут не найден", "notEnoughGas": "Недостаточно газа", "pasteAddressToTransfer": "Укажите адрес получателя", "noRouteFoundForSettings": "Маршрут не найден для текущих настроек.", "tryAdjustSettings": "Попробуйте отключить Gas on Destination или измените сумму/сети.", "quoteError": "Ошибка котировки", "steps": { "sent": "Отправлено", "approving": "Одобрение токена", "approvingNote": "Шаг {{current}} из {{total}}: Подтвердите одобрение в кошельке", "bridging": "Перевод через мост", "processing": "Обработка", "processingNote": "До 2 минут", "completed": "Завершено" } };
+const transaction = { "enterAmount": "Введите сумму", "transfer": "Перевести", "getQuote": "Получить котировку", "quoting": "Расчет котировки...", "failed": "Ошибка транзакции", "confirm": "Подтвердите транзакцию", "signTransaction": "Подпишите транзакцию в кошельке", "inProgress": "Транзакция выполняется...", "checkingBalance": "Проверка баланса...", "insufficientBalance": "Недостаточно средств", "amountTooSmall": "Минимум {{min}}", "amountTooLarge": "Максимум {{max}}", "success": "Успех", "successTitle": "Успех", "done": "Готово", "hashCopied": "Хэш скопирован в буфер обмена", "bridged": "Переведено", "transferTitle": "Перевод", "hash": "Хэш", "layerzeroScan": "TxHash", "finalFee": "Итоговая комиссия", "route": "Маршрут", "routeTooltip": "Маршрут — это путь, по которому будет выполнен перевод. Мост работает на базе LayerZero, а конкретный путь передачи между сетями может влиять на комиссию, проскальзывание и время.", "estTime": "Время", "estTimeTooltip": "Среднее время — примерное время завершения перевода. Зависит от маршрута и нагрузки сети; фактическое время может отличаться.", "slippage": "Проскальзывание", "slippageTooltip": "Если получаемая сумма окажется ниже этого допуска, транзакция будет отклонена.", "minimumReceived": "Минимум к получению", "messageFee": "Комиссия сообщения", "messageFeeTooltip": "Комиссия сообщения — стоимость кросс-чейн передачи через LayerZero для ретрансляции транзакции между сетями.", "bridgeFee": "Комиссия моста", "bridgeFeeTooltip": "Комиссия моста — разница между отправленной и полученной суммой, взимаемая протоколом моста.", "totalFee": "Общая комиссия", "totalFeeTooltip": "Общая комиссия за перевод, включая комиссию сообщения и моста. Фактическая сумма может немного измениться.", "gasEstimate": "Газ: {{gas}}", "noRouteFound": "Маршрут не найден", "notEnoughGas": "Недостаточно газа", "pasteAddressToTransfer": "Укажите адрес получателя", "noRouteFoundForSettings": "Маршрут не найден для текущих настроек.", "tryAdjustSettings": "Попробуйте отключить Gas on Destination или измените сумму/сети.", "quoteError": "Ошибка котировки", "steps": { "sent": "Отправлено", "approving": "Одобрение токена", "approvingNote": "Шаг {{current}} из {{total}}: Подтвердите одобрение в кошельке", "bridging": "Перевод через мост", "processing": "Обработка", "processingNote": "До 2 минут", "completed": "Завершено" } };
 const telegram = { "openWebVersion": "Открыть EVAA веб для трансфера", "restrictionMessage": "Трансфер между выбранными сетями доступен только в веб-версии EVAA" };
 const app = { "stargateWidgetName": "Виджет Stargate Bridge", "liveWidget": "Живой виджет", "getStarted": "Начало работы" };
 const settings = { "title": "Настройки", "gasOnDestination": "Газ на назначении", "gasOnDestinationTooltip": "Добавляет нативный токен целевой сети для оплаты комиссий за транзакции после бриджа. Увеличивает общую комиссию.", "slippageTolerance": "Толерантность к проскальзыванию", "slippageToleranceTooltip": "Если получаемая сумма окажется ниже этого допуска, транзакция будет отклонена.", "routePriority": "Приоритет маршрута", "routePriorityTooltip": "Выберите маршрут перевода. Рекомендуемый — подбирает самый выгодный вариант по общей стоимости. Быстрый — выбирает маршрут с приоритетом скорости, даже если это дороже.", "highSlippageWarning": "Высокое проскальзывание", "gasPresets": { "auto": "Авто", "none": "Нет", "medium": "Средний", "max": "Макс" }, "routePresets": { "fastest": "Быстрый", "cheapest": "Дешевый", "recommended": "Рекомендуемый" } };
@@ -2285,62 +2285,6 @@ function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
     priceUsd: void 0
   };
 }
-function computeFeesUsdFromArray(fees, tokens, chains) {
-  const emptyResult = {
-    usd: /* @__PURE__ */ new Map(),
-    human: /* @__PURE__ */ new Map(),
-    original: void 0
-  };
-  if (!fees?.length) return emptyResult;
-  let totalUsd = 0;
-  const byTypeUsd = /* @__PURE__ */ new Map();
-  const byTypeHuman = /* @__PURE__ */ new Map();
-  for (const f4 of fees) {
-    let usd = Number(f4.usd ?? 0);
-    let human = 0;
-    const amount = String(f4.amount ?? "0");
-    if (!usd) {
-      const { decimals, priceUsd } = lookupTokenMeta(
-        tokens,
-        chains,
-        f4.chainKey,
-        f4.token
-      );
-      human = fromLD(amount, decimals);
-      usd = (priceUsd ?? 0) * human;
-    }
-    totalUsd += usd;
-    const type = (f4.type ?? "other").toLowerCase();
-    byTypeUsd.set(type, (byTypeUsd.get(type) ?? 0) + usd);
-    const existing = byTypeHuman.get(type);
-    if (existing) {
-      existing.amount += human;
-    } else {
-      byTypeHuman.set(type, {
-        amount: human,
-        token: f4.token,
-        chainKey: f4.chainKey
-      });
-    }
-  }
-  byTypeUsd.set("total", totalUsd);
-  return {
-    usd: byTypeUsd,
-    human: byTypeHuman,
-    original: fees
-  };
-}
-function sumFeeByTokenLD(fees, dstTokenAddr, dstChainKey) {
-  if (!fees?.length || !dstTokenAddr || !dstChainKey) return "0";
-  let acc = 0n;
-  for (const f4 of fees) {
-    if (f4.chainKey !== dstChainKey) continue;
-    const same = dstChainKey === "ton" ? tonNorm(f4.token) === tonNorm(dstTokenAddr) : lower(f4.token) === lower(dstTokenAddr);
-    if (!same) continue;
-    acc += BigInt(f4.amount ?? "0");
-  }
-  return acc.toString();
-}
 function getQuoteAmounts(quote, srcToken, dstToken) {
   if (!quote || !srcToken || !dstToken) {
     return {
@@ -2361,48 +2305,6 @@ function getQuoteAmounts(quote, srcToken, dstToken) {
     minReceivedHuman
   };
 }
-function getQuoteFees(quote, tokens, chains, srcToken, dstToken) {
-  if (!quote || !tokens || !chains) {
-    return {
-      fees: { usd: /* @__PURE__ */ new Map(), original: /* @__PURE__ */ new Map(), formatted: /* @__PURE__ */ new Map() },
-      inSrcToken: void 0,
-      inDstToken: void 0
-    };
-  }
-  const feeData = computeFeesUsdFromArray(quote.fees, tokens, chains);
-  let inSrcToken = void 0;
-  let inDstToken = void 0;
-  if (srcToken && quote.srcChainKey) {
-    const feeInSrcLD = sumFeeByTokenLD(
-      quote.fees,
-      srcToken.address,
-      quote.srcChainKey
-    );
-    const feeInSrcHuman = fromLD(feeInSrcLD, srcToken.decimals);
-    if (feeInSrcHuman > 0) {
-      inSrcToken = Number(truncateToDecimals(feeInSrcHuman, 8));
-    } else if ((feeData.usd.get("total") || 0) > 0 && srcToken.price?.usd) {
-      const feeInSrcApprox = (feeData.usd.get("total") || 0) / srcToken.price.usd;
-      inSrcToken = Number(truncateToDecimals(feeInSrcApprox, 8));
-    }
-  }
-  if (dstToken && quote.dstChainKey) {
-    const feeInDstLD = sumFeeByTokenLD(
-      quote.fees,
-      dstToken.address,
-      quote.dstChainKey
-    );
-    const feeInDstHuman = fromLD(feeInDstLD, dstToken.decimals);
-    if (feeInDstHuman > 0) {
-      inDstToken = Number(truncateToDecimals(feeInDstHuman, 8));
-    }
-  }
-  return {
-    fees: feeData,
-    inSrcToken,
-    inDstToken
-  };
-}
 function calculateMinReceived(quote, slippageBps, dstToken) {
   if (!quote || !dstToken) return 0;
   const dstAmountLD = BigInt(quote.dstAmount);
@@ -2411,7 +2313,7 @@ function calculateMinReceived(quote, slippageBps, dstToken) {
 }
 function getQuoteDetails(quote, srcToken, dstToken, tokens, chains, slippageBps) {
   const amounts = getQuoteAmounts(quote, srcToken, dstToken);
-  const fees = getQuoteFees(quote, tokens, chains, srcToken, dstToken);
+  const fees = computeFeeBreakdownUsd(quote, srcToken, tokens, chains);
   const minimumReceived = calculateMinReceived(quote, slippageBps, dstToken);
   return {
     inputAmount: amounts.inputHuman,
@@ -2431,6 +2333,28 @@ function getRouteDisplayName(route) {
   if (routeLower.includes("v2")) return "Stargate V2";
   return route.split(/[/\-_]/).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
 }
+function computeFeeBreakdownUsd(quote, srcToken, tokens, chains) {
+  const empty = { messageFeeUsd: 0, bridgeFeeUsd: 0, totalFeeUsd: 0 };
+  if (!quote || !srcToken) return empty;
+  let messageFeeUsd = 0;
+  const messageFees = quote.fees.filter((f4) => f4.type === "message");
+  for (const f4 of messageFees) {
+    const { decimals, priceUsd } = lookupTokenMeta(tokens, chains, f4.chainKey, f4.token);
+    const human = fromLD(f4.amount || "0", decimals);
+    messageFeeUsd += human * (priceUsd ?? 0);
+  }
+  let bridgeFeeUsd = 0;
+  if (srcToken.price?.usd) {
+    const srcHuman = fromLD(quote.srcAmount, srcToken.decimals);
+    const dstHuman = fromLD(quote.dstAmount, srcToken.decimals);
+    const diff = srcHuman - dstHuman;
+    if (diff > 0) {
+      bridgeFeeUsd = diff * srcToken.price.usd;
+    }
+  }
+  const totalFeeUsd = messageFeeUsd + bridgeFeeUsd;
+  return { messageFeeUsd, bridgeFeeUsd, totalFeeUsd };
+}
 async function addNetworkFeesToQuote(quote, chainRegistry, chains) {
   if (!quote || !chains) {
     return quote;
@@ -2936,79 +2860,18 @@ const TokenSymbol = ({
   const src2 = `${BASE_URL}/${normalizedSymbol}.svg`;
   return /* @__PURE__ */ jsx("img", { src: src2, alt: alt ?? symbol, className });
 };
-function useGasEstimate(amountNum) {
-  const { fromChain } = useChainsStore();
-  const { selectedAssetSymbol } = useTokensStore();
-  const { srcAddress } = useAddresses();
-  const { balances, isLoading: balancesLoading } = useBalances(
-    fromChain?.chainKey,
-    srcAddress
-  );
+function useFeeBreakdown() {
   const { quote } = useBridgeQuoteStore();
-  const balancesKnown = !balancesLoading;
-  const chainKey = fromChain?.chainKey;
-  const nativeCurrencySymbol = fromChain?.nativeCurrency?.symbol;
-  const nativeCurrencyAddress = fromChain?.nativeCurrency?.address;
-  const nativeCurrencyDecimals = fromChain?.nativeCurrency?.decimals;
-  const quoteFees = quote?.fees;
-  const quoteSrcChainKey = quote?.srcChainKey;
-  const nativeBalanceValue = nativeCurrencySymbol ? Number(balances[nativeCurrencySymbol.toUpperCase()]?.balance ?? 0) : 0;
-  const result = useMemo(() => {
-    if (!chainKey || !nativeCurrencySymbol) {
-      return {
-        nativeSym: "",
-        nativeBalance: 0,
-        requiredNative: 0,
-        balancesKnown,
-        isNativeSelected: false,
-        hasEnoughGas: true
-      };
-    }
-    const nativeSym = nativeCurrencySymbol.toUpperCase();
-    const nativeBalance = nativeBalanceValue;
-    const isNativeSelected = nativeSym === (selectedAssetSymbol || "").toUpperCase();
-    let requiredNative = 0;
-    let quoteFeesAvailable = false;
-    if (quoteFees && quoteSrcChainKey === chainKey) {
-      const fees = quoteFees;
-      const feesInNative = fees.filter(
-        (f4) => f4.chainKey === chainKey && f4.token === nativeCurrencyAddress
-      ).reduce(
-        (sum, f4) => sum + BigInt(f4.amount || "0"),
-        0n
-      );
-      const decimals = nativeCurrencyDecimals || 18;
-      requiredNative = Number(feesInNative) / Math.pow(10, decimals);
-      quoteFeesAvailable = true;
-    }
-    let hasEnoughGas = true;
-    if (isNativeSelected) {
-      hasEnoughGas = nativeBalance - (amountNum ?? 0) >= requiredNative;
-    } else {
-      hasEnoughGas = nativeBalance >= requiredNative;
-    }
-    const shouldCheckGas = balancesKnown && quoteFeesAvailable;
-    return {
-      nativeSym,
-      nativeBalance,
-      requiredNative,
-      balancesKnown,
-      isNativeSelected,
-      hasEnoughGas: shouldCheckGas ? hasEnoughGas : true
-    };
-  }, [
-    chainKey,
-    nativeCurrencySymbol,
-    nativeCurrencyAddress,
-    nativeCurrencyDecimals,
-    selectedAssetSymbol,
-    quoteFees,
-    quoteSrcChainKey,
-    amountNum,
-    balancesKnown,
-    nativeBalanceValue
-  ]);
-  return result;
+  const { tokens, selectedAssetSymbol, assetMatrix } = useTokensStore();
+  const { fromChain, chains } = useChainsStore();
+  return useMemo(() => {
+    const srcToken = resolveTokenOnChainFromMatrix$1(
+      assetMatrix,
+      selectedAssetSymbol,
+      fromChain?.chainKey
+    );
+    return computeFeeBreakdownUsd(quote, srcToken, tokens, chains);
+  }, [quote, tokens, chains, selectedAssetSymbol, assetMatrix, fromChain]);
 }
 function useBridgeExternalData(options) {
   const selectedAssetSymbol = useTokensStore(
@@ -3148,7 +3011,7 @@ const Details = () => {
   const { selectedAssetSymbol } = useTokensStore();
   const { quote, status } = useBridgeQuoteStore();
   const { slippageBps } = useSettingsStore();
-  const gas = useGasEstimate();
+  const fees = useFeeBreakdown();
   const bridgeData = useBridgeExternalData();
   const symbol = (selectedAssetSymbol ?? bridgeData.dstToken?.symbol ?? "—").toUpperCase();
   const isLoading = status === "loading";
@@ -3157,7 +3020,9 @@ const Details = () => {
     1,
     Math.round(bridgeData.quoteDetails?.etaSeconds / 60)
   )}m` : "—";
-  const totalFeeDisplay = !quote ? "—" : gas.requiredNative > 0 ? `${truncateToDecimals(gas.requiredNative, 6)} ${gas.nativeSym}` : "—";
+  const messageFeeDisplay = !quote ? "—" : formatUsd(fees.messageFeeUsd);
+  const bridgeFeeDisplay = !quote ? "—" : formatUsd(fees.bridgeFeeUsd);
+  const totalFeeDisplay = !quote ? "—" : formatUsd(fees.totalFeeUsd);
   const currentSlippageText = !quote ? "—" : formatPercentage(slippageBps);
   const routeText = getRouteDisplayName(quote?.route);
   return /* @__PURE__ */ jsx(Accordion, { type: "single", collapsible: true, className: "w-full border-none", children: /* @__PURE__ */ jsxs(AccordionItem, { value: "item-1", className: "bg-muted rounded-sm", children: [
@@ -3198,22 +3063,30 @@ const Details = () => {
           value: currentSlippageText
         }
       ),
+      /* @__PURE__ */ jsx(
+        DetailsRow,
+        {
+          label: t2("transaction.messageFee"),
+          tooltip: t2("transaction.messageFeeTooltip"),
+          value: messageFeeDisplay,
+          isLoading
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        DetailsRow,
+        {
+          label: t2("transaction.bridgeFee"),
+          tooltip: t2("transaction.bridgeFeeTooltip"),
+          value: bridgeFeeDisplay,
+          isLoading
+        }
+      ),
       /* @__PURE__ */ jsx(
         DetailsRow,
         {
           label: t2("transaction.totalFee"),
           tooltip: t2("transaction.totalFeeTooltip"),
-          value: /* @__PURE__ */ jsxs("strong", { className: "inline-flex items-center gap-1", children: [
-            /* @__PURE__ */ jsx("span", { children: totalFeeDisplay }),
-            /* @__PURE__ */ jsx(
-              TokenSymbol,
-              {
-                symbol: gas.nativeSym,
-                className: "w-4 h-4",
-                alt: "token"
-              }
-            )
-          ] }),
+          value: /* @__PURE__ */ jsx("strong", { children: totalFeeDisplay }),
           isLoading
         }
       )
@@ -3607,6 +3480,93 @@ async function reportBridgeTransaction(params, config) {
     };
   }
 }
+function useGasEstimate(amountNum) {
+  const { fromChain } = useChainsStore();
+  const { selectedAssetSymbol } = useTokensStore();
+  const { srcAddress } = useAddresses();
+  const { balances, isLoading: balancesLoading } = useBalances(
+    fromChain?.chainKey,
+    srcAddress
+  );
+  const { quote } = useBridgeQuoteStore();
+  const balancesKnown = !balancesLoading;
+  const chainKey = fromChain?.chainKey;
+  const nativeCurrencySymbol = fromChain?.nativeCurrency?.symbol;
+  const nativeCurrencyAddress = fromChain?.nativeCurrency?.address;
+  const nativeCurrencyDecimals = fromChain?.nativeCurrency?.decimals;
+  const quoteFees = quote?.fees;
+  const quoteSrcChainKey = quote?.srcChainKey;
+  const nativeBalanceValue = nativeCurrencySymbol ? Number(balances[nativeCurrencySymbol.toUpperCase()]?.balance ?? 0) : 0;
+  const result = useMemo(() => {
+    if (!chainKey || !nativeCurrencySymbol) {
+      return {
+        nativeSym: "",
+        nativeBalance: 0,
+        requiredNative: 0,
+        gasOnlyNative: 0,
+        gasDisplayText: "",
+        balancesKnown,
+        isNativeSelected: false,
+        hasEnoughGas: true
+      };
+    }
+    const nativeSym = nativeCurrencySymbol.toUpperCase();
+    const nativeBalance = nativeBalanceValue;
+    const isNativeSelected = nativeSym === (selectedAssetSymbol || "").toUpperCase();
+    let requiredNative = 0;
+    let quoteFeesAvailable = false;
+    let gasOnlyNative = 0;
+    if (quoteFees && quoteSrcChainKey === chainKey) {
+      const fees = quoteFees;
+      const feesInNative = fees.filter(
+        (f4) => f4.chainKey === chainKey && f4.token === nativeCurrencyAddress
+      ).reduce(
+        (sum, f4) => sum + BigInt(f4.amount || "0"),
+        0n
+      );
+      const decimals = nativeCurrencyDecimals || 18;
+      requiredNative = Number(feesInNative) / Math.pow(10, decimals);
+      const networkFeesInNative = fees.filter(
+        (f4) => f4.chainKey === chainKey && f4.token === nativeCurrencyAddress && f4.type === "network"
+      ).reduce(
+        (sum, f4) => sum + BigInt(f4.amount || "0"),
+        0n
+      );
+      gasOnlyNative = Number(networkFeesInNative) / Math.pow(10, decimals);
+      quoteFeesAvailable = true;
+    }
+    let hasEnoughGas = true;
+    if (isNativeSelected) {
+      hasEnoughGas = nativeBalance - (amountNum ?? 0) >= requiredNative;
+    } else {
+      hasEnoughGas = nativeBalance >= requiredNative;
+    }
+    const shouldCheckGas = balancesKnown && quoteFeesAvailable;
+    const gasDisplayText = gasOnlyNative > 0 ? `~${gasOnlyNative.toFixed(6).replace(/0+$/, "").replace(/\.$/, "")} ${nativeSym}` : "";
+    return {
+      nativeSym,
+      nativeBalance,
+      requiredNative,
+      gasOnlyNative,
+      gasDisplayText,
+      balancesKnown,
+      isNativeSelected,
+      hasEnoughGas: shouldCheckGas ? hasEnoughGas : true
+    };
+  }, [
+    chainKey,
+    nativeCurrencySymbol,
+    nativeCurrencyAddress,
+    nativeCurrencyDecimals,
+    selectedAssetSymbol,
+    quoteFees,
+    quoteSrcChainKey,
+    amountNum,
+    balancesKnown,
+    nativeBalanceValue
+  ]);
+  return result;
+}
 function useBridgeTransaction() {
   const { quote } = useBridgeQuoteStore();
   const { chainRegistry } = useChainStrategies();
@@ -4137,7 +4097,8 @@ const MainButton = ({
         className: "w-full",
         children: label
       }
-    )
+    ),
+    gas.gasDisplayText && quote && /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground text-center", children: t2("transaction.gasEstimate", { gas: gas.gasDisplayText }) })
   ] });
 };
 const WalletModalButton = (props) => {
@@ -5305,6 +5266,15 @@ class EvmChainStrategy {
       throw toChainStrategyError(error, "evm", "transaction");
     }
   }
+  async getNextNonce() {
+    if (!this.publicClient || !this.config.evmAddress) {
+      throw new WalletNotConnectedError("evm");
+    }
+    return await this.publicClient.getTransactionCount({
+      address: this.config.evmAddress,
+      blockTag: "pending"
+    });
+  }
   async executeTransaction(step) {
     const walletClient = this.walletClient;
     if (!walletClient) {
@@ -5317,12 +5287,14 @@ class EvmChainStrategy {
       );
     }
     const tx = step.transaction;
+    const nonce = await this.getNextNonce();
     const hash = await walletClient.sendTransaction({
       to: tx.to,
       data: tx.data,
       account: tx.from || this.config.evmAddress,
       value: tx.value ? BigInt(tx.value) : void 0,
-      chain: walletClient.chain
+      chain: walletClient.chain,
+      nonce
     });
     return hash;
   }
@@ -5364,13 +5336,15 @@ class EvmChainStrategy {
       });
       if (currentAllowance > 0n) {
         try {
+          const resetNonce = await this.getNextNonce();
           const resetHash = await walletClient.writeContract({
             address: tokenAddress,
             abi: ERC20_ABI,
             functionName: "approve",
             args: [spenderAddress, 0n],
             account: this.config.evmAddress,
-            chain: walletClient.chain
+            chain: walletClient.chain,
+            nonce: resetNonce
           });
           await publicClient.waitForTransactionReceipt({
             hash: resetHash
@@ -5387,13 +5361,15 @@ class EvmChainStrategy {
         console.log("USDT allowance is 0, no reset needed");
       }
       try {
+        const approveNonce = await this.getNextNonce();
         const approveHash = await walletClient.writeContract({
           address: tokenAddress,
           abi: ERC20_ABI,
           functionName: "approve",
           args: [spenderAddress, amount],
           account: this.config.evmAddress,
-          chain: walletClient.chain
+          chain: walletClient.chain,
+          nonce: approveNonce
         });
         return approveHash;
       } catch (approveError) {
@@ -6258,6 +6234,13 @@ class TronChainStrategy {
     } else {
       signedTx = await tronWeb.trx.sign(unsignedTx);
     }
+    const signatures = signedTx.signature;
+    if (!Array.isArray(signatures) || signatures.length === 0) {
+      throw new TransactionFailedError(
+        "tron",
+        "Wallet returned unsigned transaction"
+      );
+    }
     const sent = await tronWeb.trx.sendRawTransaction(signedTx);
     if (!sent?.result || !sent?.txid) {
       throw new TransactionFailedError(
@@ -25760,7 +25743,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await import("./index--FWEmzfG.js");
+      await import("./index-DVx8ZHwV.js");
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -25806,6 +25789,59 @@ const useThemeStore = create((set2) => ({
 }));
 const TRON_MAINNET_CHAIN_ID = "tron:0x2b6653dc";
 const CONNECTION_TIMEOUT = 6e4;
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function hasValidSignature(transaction2) {
+  if (!isRecord(transaction2)) return false;
+  const signature = transaction2.signature;
+  return Array.isArray(signature) && signature.length > 0 && signature.every((item) => typeof item === "string" && item.length > 0);
+}
+function normalizeSignature(signature) {
+  return signature.replace(/^0x/i, "");
+}
+function toSignedTransaction(result, unsignedTx) {
+  if (hasValidSignature(result)) {
+    return result;
+  }
+  if (isRecord(result)) {
+    const nestedTx = result.transaction;
+    if (hasValidSignature(nestedTx)) {
+      return nestedTx;
+    }
+    const nestedSignedTx = result.signedTransaction;
+    if (hasValidSignature(nestedSignedTx)) {
+      return nestedSignedTx;
+    }
+    const signature = result.signature;
+    if (typeof signature === "string" && signature.length > 0) {
+      return {
+        ...unsignedTx,
+        signature: [normalizeSignature(signature)]
+      };
+    }
+    if (Array.isArray(signature) && signature.length > 0 && signature.every((item) => typeof item === "string" && item.length > 0)) {
+      return {
+        ...unsignedTx,
+        signature: signature.map((item) => normalizeSignature(item))
+      };
+    }
+  }
+  if (typeof result === "string" && result.length > 0) {
+    return {
+      ...unsignedTx,
+      signature: [normalizeSignature(result)]
+    };
+  }
+  return null;
+}
+function isUserRejectedError(error) {
+  if (isRecord(error) && typeof error.code === "number" && error.code === 4001) {
+    return true;
+  }
+  const msg = error instanceof Error ? error.message.toLowerCase() : "";
+  return msg.includes("user rejected") || msg.includes("rejected by user");
+}
 function useTronWalletConnect(projectId) {
   const { address, isConnected, isConnecting } = useTronWalletConnectStore();
   const { setAddress, setActions, reset } = useTronWalletConnectStore();
@@ -25986,11 +26022,41 @@ function useTronWalletConnect(projectId) {
         throw new Error("WalletConnect not connected");
       }
       try {
-        const result = await providerRef.current.request({
-          method: "tron_signTransaction",
-          params: [transaction2]
-        });
-        return result;
+        const requestVariants = [
+          [transaction2],
+          [transaction2, address],
+          [{ transaction: transaction2, address }],
+          { transaction: transaction2, address }
+        ];
+        let lastResponse;
+        let lastError;
+        for (const params of requestVariants) {
+          try {
+            const result = await providerRef.current.request(
+              {
+                method: "tron_signTransaction",
+                params
+              },
+              TRON_MAINNET_CHAIN_ID
+            );
+            lastResponse = result;
+            const signedTx = toSignedTransaction(result, transaction2);
+            if (signedTx) {
+              return signedTx;
+            }
+          } catch (error) {
+            if (isUserRejectedError(error)) {
+              throw error;
+            }
+            lastError = error;
+          }
+        }
+        if (lastError) {
+          throw lastError;
+        }
+        throw new Error(
+          `WalletConnect returned unsigned transaction: ${JSON.stringify(lastResponse)}`
+        );
       } catch (error) {
         console.error("TRON WalletConnect transaction signing failed:", error);
         throw error;
@@ -26453,9 +26519,9 @@ const EvaaBridgeContent = ({
 };
 const EvaaBridge = EvaaBridgeWithProviders;
 export {
-  getDestTokens as $,
-  getQuoteDetails as A,
-  getRouteDisplayName as B,
+  isNativeAddress as $,
+  getRouteDisplayName as A,
+  computeFeeBreakdownUsd as B,
   ConfigCtrl as C,
   addNetworkFeesToQuote as D,
   EventsCtrl as E,
@@ -26476,20 +26542,18 @@ export {
   ToastCtrl as T,
   findNativeMeta as U,
   lookupTokenMeta as V,
-  computeFeesUsdFromArray as W,
-  sumFeeByTokenLD as X,
-  normalizeTickerSymbol$1 as Y,
-  getChains as Z,
-  getTokens as _,
+  normalizeTickerSymbol$1 as W,
+  getChains as X,
+  getTokens as Y,
+  getDestTokens as Z,
+  getQuotesByPriority as _,
   ThemeCtrl as a,
-  getQuotesByPriority as a0,
-  isNativeAddress as a1,
-  getEvmBalances as a2,
-  getTonBalances as a3,
-  getTronBalances as a4,
-  getDeliveryStatus as a5,
-  pollUntilDelivered as a6,
-  reportBridgeTransaction as a7,
+  getEvmBalances as a0,
+  getTonBalances as a1,
+  getTronBalances as a2,
+  getDeliveryStatus as a3,
+  pollUntilDelivered as a4,
+  reportBridgeTransaction as a5,
   ExplorerCtrl as b,
   CoreUtil as c,
   EvaaBridge as d,
@@ -26513,7 +26577,7 @@ export {
   formatHash as v,
   formatAddress as w,
   getQuoteAmounts as x,
-  getQuoteFees as y,
-  calculateMinReceived as z
+  calculateMinReceived as y,
+  getQuoteDetails as z
 };
-//# sourceMappingURL=index-j6yDeMSt.js.map
+//# sourceMappingURL=index-DCLfFVh_.js.map