@rash2x/bridge-widget 0.6.63 → 0.6.65

package/dist/evaa-bridge.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-CpKOf8oF.cjs");
+const index = require("./index-XPQb2NSf.cjs");
 exports.DEFAULT_SLIPPAGE_BPS = index.DEFAULT_SLIPPAGE_BPS;
 exports.EvaaBridge = index.EvaaBridge;
 exports.RoutePriority = index.RoutePriority;

package/dist/evaa-bridge.mjs

@@ -1,4 +1,4 @@
-import { L, d, f, e, D, Q, H, z, W, U, w, s, v, r, p, q, G, Z, a5, $, a2, x, A, y, a0, B, _, a3, a4, S, a1, P, I, V, Y, a6, J, K, X, F, N, t, o, i, u, l, m, j, n, h, k } from "./index-HznPfOtP.js";
+import { L, d, f, e, D, Q, H, z, W, U, w, s, v, r, p, q, G, Z, a5, $, a2, x, A, y, a0, B, _, a3, a4, S, a1, P, I, V, Y, a6, J, K, X, F, N, t, o, i, u, l, m, j, n, h, k } from "./index-Bf7M_Hjm.js";
 export {
   L as DEFAULT_SLIPPAGE_BPS,
   d as EvaaBridge,

package/dist/{index-HznPfOtP.js → index-Bf7M_Hjm.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", "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", "estTime": "Est. Time", "slippage": "Slippage", "minimumReceived": "Minimum received", "totalFee": "Total Fee", "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", "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", "estTime": "Est. Time", "slippage": "Slippage", "minimumReceived": "Minimum received", "totalFee": "Total Fee", "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", "gasOnDestinationDescription": "The default amount allows you to perform a couple of transactions (e.g. Approve and Swap).", "slippageTolerance": "Slippage tolerance", "slippageToleranceDescription": "Your transaction will revert if the amount you're receiving is outside of this tolerance", "routePriority": "Route Priority", "routePriorityDescription": "Choose how your transfer is routed. Recommended picks the best overall path for cost. Fastest prioritizes speed above all 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": "Сменит исходную сеть", "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": "Маршрут", "estTime": "Время", "slippage": "Проскальзывание", "minimumReceived": "Минимум к получению", "totalFee": "Общая комиссия", "noRouteFound": "Маршрут не найден", "notEnoughGas": "Недостаточно газа", "pasteAddressToTransfer": "Укажите адрес получателя", "noRouteFoundForSettings": "Маршрут не найден для текущих настроек.", "tryAdjustSettings": "Попробуйте отключить Gas on Destination или измените сумму/сети.", "quoteError": "Ошибка котировки", "steps": { "sent": "Отправлено", "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": "Маршрут", "estTime": "Время", "slippage": "Проскальзывание", "minimumReceived": "Минимум к получению", "totalFee": "Общая комиссия", "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": "Газ на назначении", "gasOnDestinationDescription": "Значение по умолчанию позволяет выполнить пару транзакций (например, Approve и Swap).", "slippageTolerance": "Толерантность к проскальзыванию", "slippageToleranceDescription": "Ваша транзакция будет отклонена, если получаемая сумма выйдет за пределы этой допустимой погрешности.", "routePriority": "Приоритет маршрута", "routePriorityDescription": "Выберите, как будет выполняться ваш трансфер. Recommended — выбирает оптимальный маршрут с учётом общей стоимости. Fastest — отдаёт приоритет максимальной скорости.", "highSlippageWarning": "Высокое проскальзывание", "gasPresets": { "auto": "Авто", "none": "Нет", "medium": "Средний", "max": "Макс" }, "routePresets": { "fastest": "Быстрейший", "cheapest": "Дешевейший", "recommended": "Рекомендуемый" } };
@@ -2922,6 +2922,7 @@ function useGasEstimate(amountNum) {
     const isNativeSelected = nativeSym === (selectedAssetSymbol || "").toUpperCase();
     let requiredNative = 0;
     let quoteFeesAvailable = false;
+    console.log(quoteFees);
     if (quoteFees && quoteSrcChainKey === chainKey) {
       const fees = quoteFees;
       const feesInNative = fees.filter(
@@ -2940,6 +2941,9 @@ function useGasEstimate(amountNum) {
     } else {
       hasEnoughGas = nativeBalance >= requiredNative;
     }
+    console.log("nativeBalance", nativeBalance);
+    console.log("requiredNative", requiredNative);
+    console.log("nativeBalance - (amountNum ?? 0)", nativeBalance - (amountNum ?? 0));
     const shouldCheckGas = balancesKnown && quoteFeesAvailable;
     return {
       nativeSym,
@@ -3264,6 +3268,16 @@ const useTransactionStore = create((set2, get2) => ({
     };
     set2({ current: next });
   },
+  updateCurrentStep: (type, index, total) => {
+    const cur = get2().current;
+    if (!cur) return;
+    const next = {
+      ...cur,
+      currentStep: { type, index, total },
+      updatedAt: Date.now()
+    };
+    set2({ current: next });
+  },
   reset: () => {
     set2({ current: void 0 });
   }
@@ -3527,10 +3541,25 @@ function useBridgeTransaction() {
         srcChainKey: quote.srcChainKey,
         dstChainKey: quote.dstChainKey
       };
-      const txResult = await strategy.executeSteps(steps, context, (hash) => {
-        txStore.setSrcHash(hash);
-        txStore.updateStatus("processing");
-      });
+      const txResult = await strategy.executeSteps(
+        steps,
+        context,
+        (hash, stepType, stepIndex, totalSteps) => {
+          txStore.updateCurrentStep(
+            stepType,
+            stepIndex,
+            totalSteps
+          );
+          if (stepIndex === 0) {
+            txStore.setSrcHash(hash);
+          }
+          if (stepType === "approve" && stepIndex < totalSteps - 1) {
+            txStore.updateStatus("approving");
+          } else {
+            txStore.updateStatus("processing");
+          }
+        }
+      );
       if (txResult?.hash) {
         const trackWithLayerZero = async () => {
           let hashForLayerZero = txResult.hash;
@@ -3671,6 +3700,8 @@ function useBalanceCheck(amountNum, gas) {
       };
     }
     const hasEnoughGasForTx = gas.nativeBalance >= gasReserve;
+    console.log("rawBalance", rawBalance);
+    console.log("amountNum", amountNum);
     return {
       availableBalance: rawBalance,
       hasInsufficientBalance: amountNum > rawBalance || !hasEnoughGasForTx,
@@ -4221,10 +4252,30 @@ const CircleLinedIcon = (props) => {
   );
 };
 const ProgressStep = ({
-  icon = /* @__PURE__ */ jsx(Loader2, { className: "w-16 h-16 animate-spin" })
+  icon = /* @__PURE__ */ jsx(Loader2, { className: "w-16 h-16 animate-spin" }),
+  isApproving = false
 }) => {
   const { t: t2 } = useBridgeTranslation();
-  const steps = [
+  const { current } = useTransactionStore();
+  const currentStep = current?.currentStep;
+  const steps = isApproving && currentStep ? [
+    {
+      icon: /* @__PURE__ */ jsx(Loader2, { className: "w-5 h-5 text-primary animate-spin", strokeWidth: 3 }),
+      title: t2("transaction.steps.approving"),
+      description: t2("transaction.steps.approvingNote", {
+        current: currentStep.index + 1,
+        total: currentStep.total
+      })
+    },
+    {
+      icon: /* @__PURE__ */ jsx(CircleLinedIcon, { className: "w-5 h-5" }),
+      title: t2("transaction.steps.bridging")
+    },
+    {
+      icon: /* @__PURE__ */ jsx(CircleLinedIcon, { className: "w-5 h-5" }),
+      title: t2("transaction.steps.completed")
+    }
+  ] : [
     {
       icon: /* @__PURE__ */ jsx(CheckIcon, { className: "w-5 h-5 " }),
       title: t2("transaction.steps.sent")
@@ -4564,6 +4615,9 @@ const StatusStepsDialog = ({
   if (status === "executing") {
     step = /* @__PURE__ */ jsx(ConfirmStep, { icon: icons?.confirm });
   }
+  if (status === "approving") {
+    step = /* @__PURE__ */ jsx(ProgressStep, { icon: icons?.progress, isApproving: true });
+  }
   if (status === "processing") {
     step = /* @__PURE__ */ jsx(ProgressStep, { icon: icons?.progress });
   }
@@ -5168,35 +5222,34 @@ class EvmChainStrategy {
     }
     return Number(formatUnits(totalFeeWei, 18));
   }
-  async executeSteps(steps, _context, onFirstHash) {
+  async executeSteps(steps, _context, onStepComplete) {
     if (!this.isConnected() || !this.walletClient) {
       throw new WalletNotConnectedError("evm");
     }
     this.validateSteps(steps);
     try {
       let firstTxHash;
-      for (const step of steps) {
+      const totalSteps = steps.length;
+      for (let i3 = 0; i3 < steps.length; i3++) {
+        const step = steps[i3];
         console.log(
-          `Executing ${step.type} transaction on ${step.chainKey}...`
+          `Executing ${step.type} transaction on ${step.chainKey} (${i3 + 1}/${totalSteps})...`
         );
+        let hash;
         if (step.type === "approve") {
-          const hash = await this.approveTransaction(step);
-          if (!firstTxHash) {
-            firstTxHash = hash;
-            onFirstHash?.(hash);
-          }
+          hash = await this.approveTransaction(step);
         } else if (step.type === "bridge") {
-          const hash = await this.executeTransaction(step);
-          if (!firstTxHash) {
-            firstTxHash = hash;
-            onFirstHash?.(hash);
-          }
+          hash = await this.executeTransaction(step);
         } else {
           throw new InvalidStepsError(
             "evm",
             `Unsupported step type: ${step.type}`
           );
         }
+        if (!firstTxHash) {
+          firstTxHash = hash;
+        }
+        onStepComplete?.(hash, step.type, i3, totalSteps);
       }
       return {
         hash: firstTxHash,
@@ -5460,7 +5513,7 @@ class TonChainStrategy {
       }
     }
   }
-  async executeSteps(steps, _context, onFirstHash) {
+  async executeSteps(steps, _context, onStepComplete) {
     if (!this.isConnected() || !this.config.tonConnectUI) {
       throw new WalletNotConnectedError("ton");
     }
@@ -5489,7 +5542,7 @@ class TonChainStrategy {
         const inMessage = loadMessage(Cell.fromBase64(bocBase64).beginParse());
         const messageHash = this.getNormalizedExtMessageHash(inMessage);
         const hexHash = messageHash.toString("hex");
-        onFirstHash?.(hexHash);
+        onStepComplete?.(hexHash, "bridge", 0, steps.length);
         return {
           chainKey: "ton",
           hash: hexHash
@@ -5497,7 +5550,7 @@ class TonChainStrategy {
         };
       } catch (error) {
         console.error("Error parsing BOC to hex hash:", error);
-        onFirstHash?.(bocBase64);
+        onStepComplete?.(bocBase64, "bridge", 0, steps.length);
         return {
           chainKey: "ton",
           hash: bocBase64
@@ -5909,7 +5962,7 @@ class TronChainStrategy {
     }
     return fee / 1e6;
   }
-  async executeSteps(steps, _context, onFirstHash) {
+  async executeSteps(steps, _context, onStepComplete) {
     const tronWeb = this.getClient();
     if (!tronWeb) {
       throw new ProviderNotAvailableError("tron");
@@ -5922,7 +5975,10 @@ class TronChainStrategy {
     const fromB58 = connector.address;
     this.ensureDefaultAddress(tronWeb, fromB58);
     let lastTxId;
-    let isFirstHash = true;
+    let stepIndex = 0;
+    const totalSteps = steps.filter(
+      (s2) => String(s2.chainKey).toLowerCase() === "tron"
+    ).length;
     for (const step of steps) {
       if (String(step.chainKey).toLowerCase() !== "tron") continue;
       const tx = step.transaction;
@@ -5992,10 +6048,8 @@ class TronChainStrategy {
         connector
       );
       lastTxId = txid;
-      if (isFirstHash) {
-        onFirstHash?.(txid);
-        isFirstHash = false;
-      }
+      onStepComplete?.(txid, step.type, stepIndex, totalSteps);
+      stepIndex++;
     }
     if (!lastTxId) {
       throw new TransactionFailedError(
@@ -25823,7 +25877,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await import("./index-DEi2-2_y.js");
+      await import("./index-PB3n7I7m.js");
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -26592,4 +26646,4 @@ export {
   getQuoteFees as y,
   calculateMinReceived as z
 };
-//# sourceMappingURL=index-HznPfOtP.js.map
+//# sourceMappingURL=index-Bf7M_Hjm.js.map