@rash2x/bridge-widget 0.1.6 → 0.1.7

package/dist/evaa-bridge.mjs

@@ -647,37 +647,40 @@ const Modal = ({
   }, [isOpen, onClose]);
   if (typeof document === "undefined") return null;
   return createPortal(
-    /* @__PURE__ */ jsx(AnimatePresence, { children: isOpen && /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(AnimatePresence, { children: isOpen && /* @__PURE__ */ jsxs(
       motion.div,
       {
-        className: "fixed inset-0 border border-border z-[100] bg-dialog sm:absolute sm:inset-0 sm:top-0 sm:bottom-0 sm:w-full sm:rounded-3xl",
+        className: "fixed m-auto border border-border max-w-md max-h-[80%] z-[100] bg-dialog sm:absolute sm:inset-0 sm:top-0 sm:bottom-0 sm:w-full rounded-xl",
         initial: { opacity: 0 },
         animate: { opacity: 1 },
         exit: { opacity: 0 },
-        children: /* @__PURE__ */ jsx(
-          motion.div,
-          {
-            ref: panelRef,
-            role: "dialog",
-            "aria-modal": "true",
-            tabIndex: -1,
-            className: cn(
-              "outline-none overflow-auto w-screen h-screen rounded-none sm:w-full sm:h-full sm:rounded-3xl",
-              className
-            ),
-            initial: { opacity: 0, scale: 0.9 },
-            animate: { opacity: 1, scale: 1 },
-            exit: { opacity: 0, scale: 0.9 },
-            transition: {
-              type: "spring",
-              stiffness: 480,
-              damping: 32,
-              mass: 0.6
-            },
-            onMouseDown: (e) => e.stopPropagation(),
-            children
-          }
-        )
+        children: [
+          /* @__PURE__ */ jsx(
+            motion.div,
+            {
+              ref: panelRef,
+              role: "dialog",
+              "aria-modal": "true",
+              tabIndex: -1,
+              className: cn(
+                "outline-none overflow-auto relative z-30 w-screen h-screen rounded-none sm:w-full sm:h-full sm:rounded-3xl",
+                className
+              ),
+              initial: { opacity: 0, scale: 0.9 },
+              animate: { opacity: 1, scale: 1 },
+              exit: { opacity: 0, scale: 0.9 },
+              transition: {
+                type: "spring",
+                stiffness: 480,
+                damping: 32,
+                mass: 0.6
+              },
+              onMouseDown: (e) => e.stopPropagation(),
+              children
+            }
+          ),
+          /* @__PURE__ */ jsx("div", { className: "fixed inset-0 backdrop-blur-sm bg-background/10 z-10" })
+        ]
       }
     ) }),
     container
@@ -1430,7 +1433,7 @@ function sumFeeByTokenLD(fees, dstTokenAddr, dstChainKey) {
   }
   return acc.toString();
 }
-function useBalances(chainKey, address) {
+function useBalances(chainKey, address, priorityTokenSymbol) {
   const { chainRegistry } = useChainStrategies();
   const { assetMatrix } = useTokensStore();
   const tokensOnChain = useMemo(() => {
@@ -1442,13 +1445,24 @@ function useBalances(chainKey, address) {
     }
     return tokensList;
   }, [assetMatrix, chainKey]);
+  const priorityToken = useMemo(() => {
+    if (!priorityTokenSymbol || !chainKey || !assetMatrix) return void 0;
+    const normalizedSymbol = normalizeTickerSymbol$1(priorityTokenSymbol);
+    const token = assetMatrix[normalizedSymbol]?.[chainKey];
+    return token;
+  }, [priorityTokenSymbol, chainKey, assetMatrix]);
   const query = useQuery({
-    queryKey: ["balances", chainKey, address],
+    queryKey: ["balances", chainKey, address, priorityTokenSymbol],
     queryFn: async () => {
       if (!address || !chainKey)
         return {};
       if (!isAddressValidForChain(chainKey, address)) return {};
-      return await chainRegistry.getBalances(chainKey, address, tokensOnChain);
+      return await chainRegistry.getBalances(
+        chainKey,
+        address,
+        tokensOnChain,
+        priorityToken
+      );
     },
     enabled: !!address && !!chainKey && tokensOnChain.length > 0 && isAddressValidForChain(chainKey, address),
     staleTime: 6e4,
@@ -2413,8 +2427,16 @@ function useSwapModel() {
   const tokensStore = useTokensStore();
   const { srcAddress, dstAddress } = useAddresses();
   const { allowedFromChains, allowedToChains, isLoadingToChains } = useChainDerivations();
-  const srcBalances = useBalances(chainsStore.fromChain?.chainKey, srcAddress);
-  const dstBalances = useBalances(chainsStore.toChain?.chainKey, dstAddress);
+  const srcBalances = useBalances(
+    chainsStore.fromChain?.chainKey,
+    srcAddress,
+    tokensStore.selectedAssetSymbol
+  );
+  const dstBalances = useBalances(
+    chainsStore.toChain?.chainKey,
+    dstAddress,
+    tokensStore.selectedAssetSymbol
+  );
   const { loading } = useBridgeQuote();
   const { inputAmount, setInputAmount, resetWithIdle } = useBridgeQuoteStore();
   const fromBalance = useMemo(
@@ -2497,10 +2519,10 @@ const SwapButton = () => {
     {
       onClick: handleSwap,
       disabled: !canSwap || isSwapping,
+      variant: "secondary",
+      size: "sm",
       className: cn(
-        "has-[>svg]:p-0 h-9 bg-swap rounded-full p-2 max-w-9 w-full",
         "absolute top-1/2 -translate-y-1/2 left-1/2 -translate-x-1/2",
-        "hover:bg-swap transition-all duration-200 shadow-none select-none",
         !canSwap || isSwapping ? "opacity-50 cursor-not-allowed" : "hover:scale-110"
       ),
       children: /* @__PURE__ */ jsx(
@@ -2509,8 +2531,7 @@ const SwapButton = () => {
           style: {
             transform: `rotate(${turns * 180}deg)`,
             transition: "transform 300ms linear"
-          },
-          className: "size-5 text-swap-foreground will-change-transform"
+          }
         }
       )
     }
@@ -2541,7 +2562,6 @@ const NetworkSymbol = ({
 };
 const SelectNetworkButton = ({
   onClick,
-  className,
   network
 }) => {
   const { t: t2 } = useTranslation();
@@ -2552,7 +2572,8 @@ const SelectNetworkButton = ({
     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: [
@@ -2919,8 +2940,7 @@ const SwapSection = ({
               SelectNetworkButton,
               {
                 network: chain,
-                onClick: disableNetworkSelect ? void 0 : onOpen,
-                className: disableNetworkSelect ? "opacity-80 cursor-not-allowed" : ""
+                onClick: disableNetworkSelect ? void 0 : onOpen
               }
             ),
             /* @__PURE__ */ jsx(
@@ -6247,10 +6267,10 @@ class ChainStrategyRegistry {
     const strategy = this.getStrategy(chainKey);
     return strategy?.isConnected() || false;
   }
-  async getBalances(chainKey, address, tokens) {
+  async getBalances(chainKey, address, tokens, priorityToken) {
     const strategy = this.getStrategy(chainKey);
     if (!strategy) return {};
-    return await strategy.getBalances(address, tokens);
+    return await strategy.getBalances(address, tokens, priorityToken);
   }
   isAddressValid(chainKey, address) {
     const strategy = this.getStrategy(chainKey);
@@ -6361,13 +6381,14 @@ function parseTonAddress(address) {
   }
   return Address$1.parse(address);
 }
-async function getEvmBalances(publicClient, address, tokens) {
+async function getEvmBalances(publicClient, address, tokens, priorityToken) {
   const balances = {};
   try {
     console.log("start getEvmBalances");
     console.log("publicClient:", publicClient);
     console.log("isAddress:", isAddress(address));
     console.log("tokens:", tokens);
+    console.log("priorityToken:", priorityToken);
     if (!address || !isAddress(address)) {
       console.warn(`Invalid EVM address provided: ${address}`);
       return balances;
@@ -6375,25 +6396,93 @@ async function getEvmBalances(publicClient, address, tokens) {
     if (!publicClient) {
       throw new Error("No public client provided");
     }
-    for (const token of tokens) {
+    const nativeTokens = tokens.filter((t2) => isNativeAddress(t2.address));
+    const erc20Tokens = tokens.filter((t2) => !isNativeAddress(t2.address) && isAddress(t2.address));
+    if (priorityToken) {
       try {
-        let balance = 0;
-        const isNative = isNativeAddress(token.address);
-        if (isNative) {
+        const isPriorityNative = isNativeAddress(priorityToken.address);
+        if (isPriorityNative) {
           const ethBalance = await publicClient.getBalance({
             address
           });
-          balance = parseFloat(formatUnits(ethBalance, token.decimals));
-        } else {
-          if (!isAddress(token.address)) {
-            continue;
+          const balance = parseFloat(formatUnits(ethBalance, priorityToken.decimals));
+          if (balance > 0) {
+            balances[priorityToken.symbol] = { balance, address };
           }
-          const bytecode = await publicClient.getBytecode({
-            address: token.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]
           });
-          if (!bytecode || bytecode === "0x") {
-            continue;
+          const balance = parseFloat(formatUnits(tokenBalance, priorityToken.decimals));
+          if (balance > 0) {
+            balances[priorityToken.symbol] = { balance, address };
           }
+        }
+      } catch (error) {
+        console.debug(`Failed to get priority token balance for ${priorityToken.symbol}:`, error);
+      }
+    }
+    for (const token of nativeTokens) {
+      try {
+        const ethBalance = await publicClient.getBalance({
+          address
+        });
+        const balance = parseFloat(formatUnits(ethBalance, token.decimals));
+        if (balance > 0) {
+          balances[token.symbol] = { balance, address };
+        }
+      } catch (error) {
+        console.debug(`Failed to get native balance for ${token.symbol}:`, error);
+      }
+    }
+    if (erc20Tokens.length > 0) {
+      try {
+        const multicallContracts = erc20Tokens.map((token) => ({
+          address: token.address,
+          abi: [
+            {
+              name: "balanceOf",
+              type: "function",
+              stateMutability: "view",
+              inputs: [{ name: "owner", type: "address" }],
+              outputs: [{ name: "balance", type: "uint256" }]
+            }
+          ],
+          functionName: "balanceOf",
+          args: [address]
+        }));
+        const results = await publicClient.multicall({
+          contracts: multicallContracts,
+          allowFailure: true
+        });
+        results.forEach((result, index) => {
+          const token = erc20Tokens[index];
+          if (!token) return;
+          if (result.status === "success" && result.result !== void 0) {
+            try {
+              const balance = parseFloat(formatUnits(result.result, token.decimals));
+              if (balance > 0) {
+                balances[token.symbol] = { balance, address };
+              }
+            } catch (error) {
+              console.debug(`Failed to parse balance for ${token.symbol}:`, error);
+            }
+          }
+        });
+      } catch (error) {
+        console.warn("Multicall failed, falling back to individual calls:", error);
+        for (const token of erc20Tokens) {
           try {
             const tokenBalance = await publicClient.readContract({
               address: token.address,
@@ -6409,23 +6498,16 @@ async function getEvmBalances(publicClient, address, tokens) {
               functionName: "balanceOf",
               args: [address]
             });
-            balance = parseFloat(
+            const balance = parseFloat(
               formatUnits(tokenBalance, token.decimals)
             );
-          } catch {
-            continue;
+            if (balance > 0) {
+              balances[token.symbol] = { balance, address };
+            }
+          } catch (error2) {
+            console.debug(`Failed to get balance for ${token.symbol}:`, error2);
           }
         }
-        if (balance > 0) {
-          balances[token.symbol] = { balance, address };
-        }
-      } catch (error) {
-        if (error instanceof Error && !error.message.includes("could not decode")) {
-          console.warn(
-            `Network error fetching balance for ${token.symbol}:`,
-            error
-          );
-        }
       }
     }
   } catch (error) {
@@ -6487,7 +6569,11 @@ async function getTonBalances(address, tokens, customTonClient, tonApiKey) {
           }
         }
       } catch (error) {
-        console.debug(`Failed to get balance for ${token.symbol}:`, error);
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const isNoWalletError = errorMessage.includes("exit_code: -13") || errorMessage.includes("exit_code:-13") || errorMessage.includes("exitCode: -13");
+        if (!isNoWalletError) {
+          console.debug(`Failed to get balance for ${token.symbol}:`, error);
+        }
       }
     }
   } catch (error) {
@@ -6588,12 +6674,12 @@ class EvmChainStrategy {
   getConnectLabel(t2) {
     return t2("wallets.connectEvmWallet");
   }
-  async getBalances(address, tokens) {
+  async getBalances(address, tokens, priorityToken) {
     if (!this.publicClient) {
       console.warn("No publicClient available for balance query");
       return {};
     }
-    return await getEvmBalances(this.publicClient, address, tokens);
+    return await getEvmBalances(this.publicClient, address, tokens, priorityToken);
   }
   isAddressValid(address) {
     if (!address) return false;