@rash2x/bridge-widget 0.1.19 → 0.1.21

package/dist/evaa-bridge.mjs

@@ -170,7 +170,7 @@ const initialState = {
 };
 const useTokensStore = create$1((set) => ({
   ...initialState,
-  setTokens: async (data) => {
+  setTokens: (data) => {
     set({ tokens: data, assetMatrix: buildAssetMatrix(data) });
   },
   setSelectedToken: (data) => {
@@ -1086,7 +1086,9 @@ function useBalances(chainKey, address, priorityTokenSymbol) {
     const tokensList = [];
     for (const [, byChain] of Object.entries(assetMatrix)) {
       const token = byChain[chainKey];
-      if (token) tokensList.push(token);
+      if (token && token.address && token.address.length > 2) {
+        tokensList.push(token);
+      }
     }
     return tokensList;
   }, [assetMatrix, chainKey]);
@@ -1094,7 +1096,10 @@ function useBalances(chainKey, address, priorityTokenSymbol) {
     if (!priorityTokenSymbol || !chainKey || !assetMatrix) return void 0;
     const normalizedSymbol = normalizeTickerSymbol$1(priorityTokenSymbol);
     const token = assetMatrix[normalizedSymbol]?.[chainKey];
-    return token;
+    if (token && token.address && token.address.length > 2) {
+      return token;
+    }
+    return void 0;
   }, [priorityTokenSymbol, chainKey, assetMatrix]);
   const query = useQuery({
     queryKey: ["balances", chainKey, address, priorityTokenSymbol],
@@ -1109,7 +1114,7 @@ function useBalances(chainKey, address, priorityTokenSymbol) {
         priorityToken
       );
     },
-    enabled: !!address && !!chainKey && tokensOnChain.length > 0 && isAddressValidForChain(chainKey, address),
+    enabled: !!address && !!chainKey && !!assetMatrix && tokensOnChain.length > 0 && isAddressValidForChain(chainKey, address),
     staleTime: 6e4,
     gcTime: 5 * 6e4,
     refetchOnWindowFocus: false,
@@ -2171,7 +2176,9 @@ const SwapButton = () => {
 };
 const WalletBalance = (props) => {
   const { value, isLoading = false } = props;
-  if (isLoading) {
+  const hasNoData = !value || value === "0" || value === "0.00" || value === "0.0";
+  const shouldShowSkeleton = isLoading && hasNoData;
+  if (shouldShowSkeleton) {
     return /* @__PURE__ */ jsxs("div", { className: "flex gap-2 items-center", children: [
       /* @__PURE__ */ jsx(WalletIcon, { className: "text-muted-foreground" }),
       /* @__PURE__ */ jsx(Skeleton, { className: "h-4 w-16 rounded-md" })
@@ -2854,7 +2861,7 @@ const Details = () => {
   })();
   const currentSlippageText = formatPercentage(slippageBps);
   const routeText = quote?.route ? getRouteDisplayName(quote.route) : t2(`settings.routePresets.${routePriority}`);
-  return /* @__PURE__ */ jsx(Accordion, { type: "single", collapsible: true, className: "w-full", children: /* @__PURE__ */ jsxs(AccordionItem, { value: "item-1", className: "bg-muted rounded-lg", children: [
+  return /* @__PURE__ */ jsx(Accordion, { type: "single", collapsible: true, className: "w-full", children: /* @__PURE__ */ jsxs(AccordionItem, { value: "item-1", className: "bg-muted rounded", children: [
     /* @__PURE__ */ jsx(AccordionTrigger, { className: "w-full gap-1 items-center py-6 px-5 rounded-b-lg data-[state=open]:pb-3", children: /* @__PURE__ */ jsxs("div", { className: "w-full flex items-center justify-between", children: [
       /* @__PURE__ */ jsx("p", { className: "text-sm font-normal text-priority leading-4", children: t2("bridge.youWillReceive", { defaultValue: "You will receive" }) }),
       /* @__PURE__ */ jsxs("div", { className: "bg-transparent hover:bg-transparent shadow-none h-4 p-0 px-0 py-0 flex items-center gap-2", children: [
@@ -3206,10 +3213,11 @@ function useBridgeTransaction() {
         dstChainKey: quote.dstChainKey
       };
       console.log(steps);
-      const txResult = await strategy.executeSteps(steps, context);
-      if (txResult?.hash) {
-        txStore.setSrcHash(txResult.hash);
+      const txResult = await strategy.executeSteps(steps, context, (hash) => {
+        txStore.setSrcHash(hash);
         txStore.updateStatus("processing");
+      });
+      if (txResult?.hash) {
         strategy.waitForCompletion(txResult.hash, context).then((result) => {
           if (result.completed) {
             if (result.dstTxHash) {
@@ -5675,7 +5683,7 @@ const TransactionManager = () => {
   return /* @__PURE__ */ jsx(Dialog, { open: true, onOpenChange: () => {
   }, children: /* @__PURE__ */ jsx(DialogContent, { showCloseButton: false, className: "p-0 gap-0 border-none max-w-[calc(100%-2rem)] sm:max-w-md", children: step }) });
 };
-const useTokensRequest = () => {
+const useTokens = () => {
   const { setTokens, setSelectedToken, setSelectedAssetSymbol } = useTokensStore();
   const query = useQuery({
     queryKey: ["tokens"],
@@ -5710,7 +5718,7 @@ const useTokensRequest = () => {
   }, [query.isError, query.error]);
   return { ...query };
 };
-const useChainsRequest = () => {
+const useChains = () => {
   const { setChains, setFromChain } = useChainsStore();
   const query = useQuery({
     queryKey: ["chains"],
@@ -5767,7 +5775,7 @@ class ChainStrategyRegistry {
   async getBalances(chainKey, address, tokens, priorityToken) {
     const strategy = this.getStrategy(chainKey);
     if (!strategy) return {};
-    return await strategy.getBalances(address, tokens, chainKey, priorityToken);
+    return await strategy.getBalances(address, tokens, priorityToken);
   }
   isAddressValid(chainKey, address) {
     const strategy = this.getStrategy(chainKey);
@@ -5878,7 +5886,7 @@ function parseTonAddress(address) {
   }
   return Address$1.parse(address);
 }
-async function getEvmBalances(publicClient, address, tokens, chainKey, priorityToken) {
+async function getEvmBalances(publicClient, address, tokens, priorityToken) {
   const balances = {};
   try {
     if (!address || !isAddress(address)) {
@@ -5890,49 +5898,47 @@ async function getEvmBalances(publicClient, address, tokens, chainKey, priorityT
     }
     const nativeTokens = tokens.filter((t2) => isNativeAddress(t2.address));
     const erc20Tokens = tokens.filter(
-      (t2) => !isNativeAddress(t2.address) && isAddress(t2.address)
+      (t2) => !isNativeAddress(t2.address) && isAddress(t2.address) && (!priorityToken || t2.address !== priorityToken.address)
     );
     if (priorityToken) {
-      if (priorityToken.chainKey !== chainKey) {
-        console.debug(
-          `Skipping priority token ${priorityToken.symbol}: chain mismatch (expected ${chainKey}, got ${priorityToken.chainKey})`
-        );
-      } else {
-        try {
-          const isPriorityNative = isNativeAddress(priorityToken.address);
-          if (isPriorityNative) {
-            const ethBalance = await publicClient.getBalance({
-              address
-            });
-            const balance = parseFloat(
-              formatUnits(ethBalance, priorityToken.decimals)
-            );
-            if (balance > 0) {
-              balances[priorityToken.symbol] = { balance, address };
-            }
-          } else if (isAddress(priorityToken.address)) {
-            const tokenBalance = await publicClient.readContract({
-              address: priorityToken.address,
-              abi: [
-                {
-                  name: "balanceOf",
-                  type: "function",
-                  stateMutability: "view",
-                  inputs: [{ name: "owner", type: "address" }],
-                  outputs: [{ name: "balance", type: "uint256" }]
-                }
-              ],
-              functionName: "balanceOf",
-              args: [address]
-            });
-            const balance = parseFloat(
-              formatUnits(tokenBalance, priorityToken.decimals)
-            );
-            if (balance > 0) {
-              balances[priorityToken.symbol] = { balance, address };
-            }
+      try {
+        const isPriorityNative = isNativeAddress(priorityToken.address);
+        if (isPriorityNative) {
+          const ethBalance = await publicClient.getBalance({
+            address
+          });
+          const balance = parseFloat(
+            formatUnits(ethBalance, priorityToken.decimals)
+          );
+          if (balance > 0) {
+            balances[priorityToken.symbol] = { balance, address };
           }
-        } catch (error) {
+        } else if (isAddress(priorityToken.address)) {
+          const tokenBalance = await publicClient.readContract({
+            address: priorityToken.address,
+            abi: [
+              {
+                name: "balanceOf",
+                type: "function",
+                stateMutability: "view",
+                inputs: [{ name: "owner", type: "address" }],
+                outputs: [{ name: "balance", type: "uint256" }]
+              }
+            ],
+            functionName: "balanceOf",
+            args: [address]
+          });
+          const balance = parseFloat(
+            formatUnits(tokenBalance, priorityToken.decimals)
+          );
+          if (balance > 0) {
+            balances[priorityToken.symbol] = { balance, address };
+          }
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const isZeroDataError = errorMessage.includes('returned no data ("0x")');
+        if (!isZeroDataError) {
           console.debug(
             `Failed to get priority token balance for ${priorityToken.symbol}:`,
             error
@@ -6033,7 +6039,7 @@ async function getEvmBalances(publicClient, address, tokens, chainKey, priorityT
   }
   return balances;
 }
-async function getTonBalances(address, tokens, chainKey, customTonClient, tonApiKey) {
+async function getTonBalances(address, tokens, customTonClient, tonApiKey) {
   const balances = {};
   try {
     if (!isTonFriendlyAddress(address)) {
@@ -6192,7 +6198,7 @@ class EvmChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectEvmWallet");
   }
-  async getBalances(address, tokens, chainKey, priorityToken) {
+  async getBalances(address, tokens, priorityToken) {
     if (!this.publicClient) {
       console.warn("No publicClient available for balance query");
       return {};
@@ -6201,7 +6207,6 @@ class EvmChainStrategy {
       this.publicClient,
       address,
       tokens,
-      chainKey,
       priorityToken
     );
   }
@@ -6273,7 +6278,7 @@ class EvmChainStrategy {
       throw new InvalidStepsError("evm", "Missing transaction data in steps");
     }
   }
-  async executeSteps(steps) {
+  async executeSteps(steps, _context, onFirstHash) {
     if (!this.isConnected() || !this.provider) {
       throw new WalletNotConnectedError("evm");
     }
@@ -6287,11 +6292,17 @@ class EvmChainStrategy {
         if (step.type === "approve") {
           const hash = await this.approveTransaction(step);
           console.log(`Approval transaction hash: ${hash}`);
-          if (!firstTxHash) firstTxHash = hash;
+          if (!firstTxHash) {
+            firstTxHash = hash;
+            onFirstHash?.(hash);
+          }
         } else if (step.type === "bridge") {
           const hash = await this.executeTransaction(step);
           console.log(`Bridge transaction hash: ${hash}`);
-          if (!firstTxHash) firstTxHash = hash;
+          if (!firstTxHash) {
+            firstTxHash = hash;
+            onFirstHash?.(hash);
+          }
         } else {
           throw new InvalidStepsError(
             "evm",
@@ -6559,11 +6570,10 @@ class TonChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectTonWallet");
   }
-  async getBalances(address, tokens, chainKey) {
+  async getBalances(address, tokens) {
     return await getTonBalances(
       address,
       tokens,
-      chainKey,
       this.config.tonClient,
       this.config.tonApiKey
     );
@@ -6627,7 +6637,7 @@ class TonChainStrategy {
       }
     }
   }
-  async executeSteps(steps) {
+  async executeSteps(steps, _context, onFirstHash) {
     if (!this.isConnected() || !this.config.tonConnectUI) {
       throw new WalletNotConnectedError("ton");
     }
@@ -6653,9 +6663,11 @@ class TonChainStrategy {
       const result = await this.config.tonConnectUI.sendTransaction(
         transaction2
       );
+      const hash = result.boc;
+      onFirstHash?.(hash);
       return {
         chainKey: "ton",
-        hash: result.boc
+        hash
       };
     } catch (error) {
       throw toChainStrategyError(error, "ton", "transaction");
@@ -6864,7 +6876,7 @@ class TronChainStrategy {
       throw new InvalidTransactionDataError("tron", "Missing transaction data");
     }
   }
-  async executeSteps(steps) {
+  async executeSteps(steps, _context, onFirstHash) {
     console.log("executeSteps");
     const tronWeb = this.getTronWeb();
     if (!tronWeb) {
@@ -6879,6 +6891,7 @@ class TronChainStrategy {
       throw new WalletNotConnectedError("tron");
     }
     let lastTxId;
+    let isFirstHash = true;
     for (const step of steps) {
       if (String(step.chainKey).toLowerCase() !== "tron") continue;
       const tx = step.transaction;
@@ -6944,6 +6957,10 @@ class TronChainStrategy {
       }
       const { txid } = await this.signAndBroadcast(tronWeb, unsigned);
       lastTxId = txid;
+      if (isFirstHash) {
+        onFirstHash?.(txid);
+        isFirstHash = false;
+      }
     }
     if (!lastTxId) {
       throw new TransactionFailedError(
@@ -7500,8 +7517,8 @@ const EvaaBridgeContent = ({
   onChainChange
 } = {}) => {
   const { t: t2 } = useBridgeTranslation();
-  useTokensRequest();
-  useChainsRequest();
+  useTokens();
+  useChains();
   const swap = useSwapModel();
   const { fromChain, toChain } = swap;
   const { selectedAssetSymbol, assetMatrix } = useTokensStore();