@rash2x/bridge-widget 0.8.5 → 0.8.6

package/dist/{index-CytmPXNr.cjs → index-DUoTGuFx.cjs}

@@ -1351,9 +1351,14 @@ const ChainSelectModal = ({
   const switchToEquivalentIfNeeded = React.useCallback(
     (chainKey) => {
       if (!selectedAssetSymbol || !assetMatrix) return;
-      const effectiveSym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, chainKey);
-      if (effectiveSym !== selectedAssetSymbol.toUpperCase()) {
-        setSelectedAssetSymbol(effectiveSym);
+      const hasDirectToken = !!assetMatrix[selectedAssetSymbol.toUpperCase()]?.[chainKey];
+      if (!hasDirectToken) {
+        for (const eq of getEquivalentSymbols(selectedAssetSymbol)) {
+          if (assetMatrix[eq]?.[chainKey]) {
+            setSelectedAssetSymbol(eq);
+            break;
+          }
+        }
       }
     },
     [selectedAssetSymbol, assetMatrix, setSelectedAssetSymbol]
@@ -2320,6 +2325,21 @@ function resolveTokenOnChainFromMatrix$1(assetMatrix, assetSymbol, chainKey) {
   const byChain = assetMatrix[assetSymbol.toUpperCase()];
   return byChain?.[chainKey];
 }
+function resolveBridgeSourceTokenOnChainFromMatrix(assetMatrix, assetSymbol, chainKey) {
+  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
+  const resolvedSymbol = getBridgeTokenSymbol(assetSymbol, assetMatrix, chainKey);
+  return resolveTokenOnChainFromMatrix$1(assetMatrix, resolvedSymbol, chainKey);
+}
+function resolveBridgeDestinationTokenOnChainFromMatrix(assetMatrix, assetSymbol, chainKey) {
+  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
+  const direct = resolveTokenOnChainFromMatrix$1(assetMatrix, assetSymbol, chainKey);
+  if (direct) return direct;
+  for (const eq of getEquivalentSymbols(assetSymbol)) {
+    const eqToken = resolveTokenOnChainFromMatrix$1(assetMatrix, eq, chainKey);
+    if (eqToken) return eqToken;
+  }
+  return void 0;
+}
 const DEFAULT_SLIPPAGE_BPS = 50;
 const lower = (s2) => (s2 ?? "").toLowerCase();
 const normSym = (s2) => (s2 ?? "").toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
@@ -2666,12 +2686,25 @@ function useBridgeQuote() {
   const srcTokenOnFrom = React.useMemo(() => {
     if (!assetMatrix || !selectedAssetSymbol || !fromChain?.chainKey) return void 0;
     const sym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, fromChain.chainKey);
-    return resolveTokenOnChainFromMatrix$1(assetMatrix, sym, fromChain.chainKey);
+    const token = resolveTokenOnChainFromMatrix$1(assetMatrix, sym, fromChain.chainKey);
+    console.log("[quote] srcToken", { selected: selectedAssetSymbol, resolved: sym, chain: fromChain.chainKey, addr: token?.address });
+    return token;
   }, [assetMatrix, selectedAssetSymbol, fromChain?.chainKey]);
   const dstTokenOnTo = React.useMemo(() => {
     if (!assetMatrix || !selectedAssetSymbol || !toChain?.chainKey) return void 0;
-    const sym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, toChain.chainKey);
-    return resolveTokenOnChainFromMatrix$1(assetMatrix, sym, toChain.chainKey);
+    const direct = resolveTokenOnChainFromMatrix$1(assetMatrix, selectedAssetSymbol, toChain.chainKey);
+    if (direct) {
+      console.log("[quote] dstToken", { selected: selectedAssetSymbol, resolved: selectedAssetSymbol, chain: toChain.chainKey, addr: direct.address });
+      return direct;
+    }
+    for (const eq of getEquivalentSymbols(selectedAssetSymbol)) {
+      const eqToken = resolveTokenOnChainFromMatrix$1(assetMatrix, eq, toChain.chainKey);
+      if (eqToken) {
+        console.log("[quote] dstToken", { selected: selectedAssetSymbol, resolved: eq, chain: toChain.chainKey, addr: eqToken.address });
+        return eqToken;
+      }
+    }
+    return void 0;
   }, [assetMatrix, selectedAssetSymbol, toChain?.chainKey]);
   const [loading, setLoading] = React.useState(false);
   React.useEffect(() => {
@@ -3892,12 +3925,12 @@ function useFeeBreakdown() {
   const { tokens, allTokens, selectedAssetSymbol, assetMatrix } = useTokensStore();
   const { fromChain, toChain, chains } = useChainsStore();
   return React.useMemo(() => {
-    const srcToken = resolveTokenOnChainFromMatrix$1(
+    const srcToken = resolveBridgeSourceTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       fromChain?.chainKey
     );
-    const dstToken = resolveTokenOnChainFromMatrix$1(
+    const dstToken = resolveBridgeDestinationTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       toChain?.chainKey
@@ -3974,12 +4007,12 @@ function buildBridgeExternalData({
     dstChain: toChain?.chainKey,
     amount: normalizedAmount || void 0
   };
-  const sourceToken = resolveTokenOnChainFromMatrix$1(
+  const sourceToken = resolveBridgeSourceTokenOnChainFromMatrix(
     assetMatrix,
     selectedAssetSymbol,
     fromChain?.chainKey
   );
-  const destinationToken = resolveTokenOnChainFromMatrix$1(
+  const destinationToken = resolveBridgeDestinationTokenOnChainFromMatrix(
     assetMatrix,
     selectedAssetSymbol,
     toChain?.chainKey
@@ -4607,7 +4640,7 @@ function useBridgeTransaction() {
   const txStore = useTransactionStore();
   const gas = useGasEstimate();
   const srcToken = React.useMemo(
-    () => resolveTokenOnChainFromMatrix$1(
+    () => resolveBridgeSourceTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       quote?.srcChainKey
@@ -4615,7 +4648,7 @@ function useBridgeTransaction() {
     [assetMatrix, selectedAssetSymbol, quote?.srcChainKey]
   );
   const dstToken = React.useMemo(
-    () => resolveTokenOnChainFromMatrix$1(
+    () => resolveBridgeDestinationTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       quote?.dstChainKey
@@ -4913,8 +4946,13 @@ function useSilentValidations(amountString) {
     const hasTooManyDecimals = (() => {
       if (!amountString || !fromChain?.chainKey || !selectedAssetSymbol)
         return false;
+      const resolvedSym = getBridgeTokenSymbol(
+        selectedAssetSymbol,
+        assetMatrix,
+        fromChain.chainKey
+      );
       const sourceToken = tokens?.find(
-        (t2) => t2.chainKey === fromChain.chainKey && (t2.symbol ?? "").toUpperCase() === (selectedAssetSymbol ?? "").toUpperCase()
+        (t2) => t2.chainKey === fromChain.chainKey && (t2.symbol ?? "").toUpperCase() === resolvedSym
       );
       if (!sourceToken) return false;
       const decimalPart = amountString.split(".")[1];
@@ -4925,11 +4963,18 @@ function useSilentValidations(amountString) {
       if (!selectedAssetSymbol || !fromChain?.chainKey || !toChain?.chainKey)
         return false;
       if (!assetMatrix) return false;
-      const normalizedSymbol = selectedAssetSymbol.toUpperCase();
-      const tokenMatrix = assetMatrix[normalizedSymbol];
-      if (!tokenMatrix) return true;
-      const existsOnSource = !!tokenMatrix[fromChain.chainKey];
-      const existsOnDestination = !!tokenMatrix[toChain.chainKey];
+      const allSymbols = [
+        selectedAssetSymbol.toUpperCase(),
+        ...getEquivalentSymbols(selectedAssetSymbol).map(
+          (s2) => s2.toUpperCase()
+        )
+      ];
+      const existsOnSource = allSymbols.some(
+        (sym) => !!assetMatrix[sym]?.[fromChain.chainKey]
+      );
+      const existsOnDestination = allSymbols.some(
+        (sym) => !!assetMatrix[sym]?.[toChain.chainKey]
+      );
       return !existsOnSource || !existsOnDestination;
     })();
     const hasInsufficientLiquidity = (() => {
@@ -26621,7 +26666,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await Promise.resolve().then(() => require("./index-DiFbb5zn.cjs"));
+      await Promise.resolve().then(() => require("./index-BSfpUPGz.cjs"));
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -27334,12 +27379,12 @@ const EvaaBridgeContent = ({
   );
   const outputAmount = React.useMemo(() => {
     if (!quote || loading) return "";
-    const srcToken = resolveTokenOnChainFromMatrix$1(
+    const srcToken = resolveBridgeSourceTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       fromChain?.chainKey
     );
-    const dstToken = resolveTokenOnChainFromMatrix$1(
+    const dstToken = resolveBridgeDestinationTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       toChain?.chainKey
@@ -27510,6 +27555,8 @@ exports.makeTokenBalanceKey = makeTokenBalanceKey;
 exports.normalizeTickerSymbol = normalizeTickerSymbol;
 exports.pollUntilDelivered = pollUntilDelivered;
 exports.reportBridgeTransaction = reportBridgeTransaction;
+exports.resolveBridgeDestinationTokenOnChainFromMatrix = resolveBridgeDestinationTokenOnChainFromMatrix;
+exports.resolveBridgeSourceTokenOnChainFromMatrix = resolveBridgeSourceTokenOnChainFromMatrix;
 exports.resolveTokenOnChain = resolveTokenOnChain;
 exports.resolveTokenOnChainFromMatrix = resolveTokenOnChainFromMatrix$1;
 exports.toLD = toLD;
@@ -27524,4 +27571,4 @@ exports.useSettingsStore = useSettingsStore;
 exports.useSwapModel = useSwapModel;
 exports.useTokensStore = useTokensStore;
 exports.useTransactionStore = useTransactionStore;
-//# sourceMappingURL=index-CytmPXNr.cjs.map
+//# sourceMappingURL=index-DUoTGuFx.cjs.map