@rash2x/bridge-widget 0.6.99 → 0.7.1

package/dist/{index-UMHkIgdO.cjs → index-CCfRExBc.cjs}

@@ -2211,6 +2211,31 @@ function resolveTokenOnChainFromMatrix$1(assetMatrix, assetSymbol, chainKey) {
 const DEFAULT_SLIPPAGE_BPS = 50;
 const lower = (s2) => (s2 ?? "").toLowerCase();
 const normSym = (s2) => (s2 ?? "").toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
+const isPositivePrice = (v2) => typeof v2 === "number" && Number.isFinite(v2) && v2 > 0;
+const NATIVE_SYMBOL_ALIASES = {
+  ETH: ["WETH"],
+  BNB: ["WBNB"],
+  AVAX: ["WAVAX"],
+  TRX: ["WTRX"],
+  MATIC: ["WMATIC", "POL", "WPOL"],
+  POL: ["MATIC", "WMATIC", "WPOL"]
+};
+function nativeSymbolCandidates(symbol) {
+  const out = /* @__PURE__ */ new Set([symbol]);
+  if (symbol.startsWith("W") && symbol.length > 1) {
+    out.add(symbol.slice(1));
+  } else {
+    out.add(`W${symbol}`);
+  }
+  for (const alias of NATIVE_SYMBOL_ALIASES[symbol] ?? []) {
+    out.add(alias);
+  }
+  return out;
+}
+function pickBestPricedToken(tokens) {
+  if (!tokens.length) return void 0;
+  return tokens.find((t2) => isPositivePrice(t2.price?.usd)) ?? tokens[0];
+}
 function tonNorm(addr) {
   if (!addr) return null;
   try {
@@ -2258,14 +2283,25 @@ function findNativeMeta(tokens, chain2) {
   if (!sym) {
     return { decimals: nativeDecimals, priceUsd: void 0 };
   }
-  const sameChain = tokens?.find(
-    (t2) => t2.chainKey === chain2.chainKey && normSym(t2.symbol) === sym
-  ) ?? void 0;
-  if (sameChain)
-    return { decimals: sameChain.decimals, priceUsd: sameChain.price?.usd };
-  const anyChain = tokens?.find((t2) => normSym(t2.symbol) === sym);
-  if (anyChain)
-    return { decimals: anyChain.decimals, priceUsd: anyChain.price?.usd };
+  const symbols = nativeSymbolCandidates(sym);
+  const sameChainMatches = tokens?.filter(
+    (t2) => t2.chainKey === chain2.chainKey && symbols.has(normSym(t2.symbol))
+  ) ?? [];
+  const sameChain = pickBestPricedToken(sameChainMatches);
+  if (sameChain) {
+    return {
+      decimals: sameChain.decimals,
+      priceUsd: isPositivePrice(sameChain.price?.usd) ? sameChain.price?.usd : void 0
+    };
+  }
+  const anyChainMatches = tokens?.filter((t2) => symbols.has(normSym(t2.symbol))) ?? [];
+  const anyChain = pickBestPricedToken(anyChainMatches);
+  if (anyChain) {
+    return {
+      decimals: anyChain.decimals,
+      priceUsd: isPositivePrice(anyChain.price?.usd) ? anyChain.price?.usd : void 0
+    };
+  }
   return { decimals: nativeDecimals, priceUsd: void 0 };
 }
 function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
@@ -2280,7 +2316,13 @@ function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
     }
     return lower(t2.address) === lower(tokenAddr);
   }) ?? void 0;
-  if (hit) return { decimals: hit.decimals, priceUsd: hit.price?.usd };
+  if (hit) {
+    const hitPriceUsd = isPositivePrice(hit.price?.usd) ? hit.price?.usd : void 0;
+    if (hitPriceUsd !== void 0 || !isNativeAddrEqual(chain2, tokenAddr)) {
+      return { decimals: hit.decimals, priceUsd: hitPriceUsd };
+    }
+    return findNativeMeta(tokens, chain2);
+  }
   if (isNativeAddrEqual(chain2, tokenAddr)) {
     return findNativeMeta(tokens, chain2);
   }
@@ -2338,26 +2380,58 @@ function getRouteDisplayName(route) {
   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 };
+  const empty = {
+    messageFeeAmount: 0,
+    messageFeeSymbol: "",
+    messageFeeUsd: 0,
+    bridgeFeeAmount: 0,
+    bridgeFeeSymbol: "",
+    bridgeFeeUsd: 0,
+    totalFeeUsd: 0
+  };
   if (!quote || !srcToken) return empty;
   let messageFeeUsd = 0;
+  let messageFeeAmount = 0;
+  let messageFeeSymbol = "";
   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 { decimals, priceUsd } = lookupTokenMeta(
+      tokens,
+      chains,
+      f4.chainKey,
+      f4.token
+    );
     const human = fromLD(f4.amount || "0", decimals);
+    messageFeeAmount += human;
     messageFeeUsd += human * (priceUsd ?? 0);
+    if (!messageFeeSymbol) {
+      const chain2 = chains?.find((c2) => c2.chainKey === f4.chainKey);
+      const token = tokens?.find(
+        (t2) => t2.chainKey === f4.chainKey && t2.address.toLowerCase() === f4.token.toLowerCase()
+      );
+      messageFeeSymbol = token?.symbol?.toUpperCase() ?? chain2?.nativeCurrency?.symbol?.toUpperCase() ?? "";
+    }
   }
+  let bridgeFeeAmount = 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 bridgeFeeSymbol = srcToken.symbol?.toUpperCase() ?? "";
+  const srcHuman = fromLD(quote.srcAmount, srcToken.decimals);
+  const dstHuman = fromLD(quote.dstAmount, srcToken.decimals);
+  const diff = srcHuman - dstHuman;
+  if (diff > 0) {
+    bridgeFeeAmount = diff;
+    bridgeFeeUsd = (srcToken.price?.usd ?? 0) * diff;
   }
   const totalFeeUsd = messageFeeUsd + bridgeFeeUsd;
-  return { messageFeeUsd, bridgeFeeUsd, totalFeeUsd };
+  return {
+    messageFeeAmount,
+    messageFeeSymbol,
+    messageFeeUsd,
+    bridgeFeeAmount,
+    bridgeFeeSymbol,
+    bridgeFeeUsd,
+    totalFeeUsd
+  };
 }
 async function addNetworkFeesToQuote(quote, chainRegistry, chains) {
   if (!quote || !chains) {
@@ -2375,7 +2449,9 @@ async function addNetworkFeesToQuote(quote, chainRegistry, chains) {
     if (!strategy) continue;
     const chain2 = chains.find((c2) => c2.chainKey === chainKey);
     if (!chain2) continue;
-    const stepsForChain = quote.steps.filter((step) => step.chainKey === chainKey);
+    const stepsForChain = quote.steps.filter(
+      (step) => step.chainKey === chainKey
+    );
     if (!stepsForChain.length) continue;
     try {
       const networkFeeHuman = await strategy.estimateNetworkFee(stepsForChain);
@@ -2392,7 +2468,10 @@ async function addNetworkFeesToQuote(quote, chainRegistry, chains) {
         });
       }
     } catch (error) {
-      console.warn(`Failed to estimate network fee for chain ${chainKey}:`, error);
+      console.warn(
+        `Failed to estimate network fee for chain ${chainKey}:`,
+        error
+      );
     }
   }
   return {
@@ -2866,7 +2945,7 @@ const TokenSymbol = ({
 };
 function useFeeBreakdown() {
   const { quote } = useBridgeQuoteStore();
-  const { tokens, selectedAssetSymbol, assetMatrix } = useTokensStore();
+  const { tokens, allTokens, selectedAssetSymbol, assetMatrix } = useTokensStore();
   const { fromChain, chains } = useChainsStore();
   return react.useMemo(() => {
     const srcToken = resolveTokenOnChainFromMatrix$1(
@@ -2874,8 +2953,8 @@ function useFeeBreakdown() {
       selectedAssetSymbol,
       fromChain?.chainKey
     );
-    return computeFeeBreakdownUsd(quote, srcToken, tokens, chains);
-  }, [quote, tokens, chains, selectedAssetSymbol, assetMatrix, fromChain]);
+    return computeFeeBreakdownUsd(quote, srcToken, allTokens ?? tokens, chains);
+  }, [quote, allTokens, tokens, chains, selectedAssetSymbol, assetMatrix, fromChain]);
 }
 function useBridgeExternalData(options) {
   const selectedAssetSymbol = useTokensStore(
@@ -2883,6 +2962,7 @@ function useBridgeExternalData(options) {
   );
   const assetMatrix = useTokensStore((state2) => state2.assetMatrix);
   const tokens = useTokensStore((state2) => state2.tokens);
+  const allTokens = useTokensStore((state2) => state2.allTokens);
   const fromChain = useChainsStore((state2) => state2.fromChain);
   const toChain = useChainsStore((state2) => state2.toChain);
   const chains = useChainsStore((state2) => state2.chains);
@@ -2897,7 +2977,7 @@ function useBridgeExternalData(options) {
       dstChain: toChain,
       assetMatrix,
       chains,
-      tokens,
+      tokens: allTokens ?? tokens,
       quote,
       slippageBps
     }),
@@ -2908,6 +2988,7 @@ function useBridgeExternalData(options) {
       toChain,
       assetMatrix,
       chains,
+      allTokens,
       tokens,
       quote,
       slippageBps
@@ -3024,6 +3105,8 @@ const Details = () => {
     1,
     Math.round(bridgeData.quoteDetails?.etaSeconds / 60)
   )}m` : "—";
+  const messageFeeDisplay = !quote ? "—" : fees.messageFeeAmount > 0 ? `${truncateToDecimals(fees.messageFeeAmount, 6)} ${fees.messageFeeSymbol}` : "—";
+  const bridgeFeeDisplay = !quote ? "—" : fees.bridgeFeeAmount > 0 ? `${truncateToDecimals(fees.bridgeFeeAmount, 6)} ${fees.bridgeFeeSymbol}` : "—";
   const totalFeeDisplay = !quote ? "—" : formatUsd(fees.totalFeeUsd);
   const currentSlippageText = !quote ? "—" : formatPercentage(slippageBps);
   const routeText = getRouteDisplayName(quote?.route);
@@ -3065,6 +3148,24 @@ const Details = () => {
           value: currentSlippageText
         }
       ),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        DetailsRow,
+        {
+          label: t2("transaction.messageFee"),
+          tooltip: t2("transaction.messageFeeTooltip"),
+          value: messageFeeDisplay,
+          isLoading
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        DetailsRow,
+        {
+          label: t2("transaction.bridgeFee"),
+          tooltip: t2("transaction.bridgeFeeTooltip"),
+          value: bridgeFeeDisplay,
+          isLoading
+        }
+      ),
       /* @__PURE__ */ jsxRuntime.jsx(
         DetailsRow,
         {
@@ -25735,7 +25836,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await Promise.resolve().then(() => require("./index-CRWwEw3g.cjs"));
+      await Promise.resolve().then(() => require("./index-C7NE-Dmd.cjs"));
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -26581,4 +26682,4 @@ exports.useSettingsStore = useSettingsStore;
 exports.useSwapModel = useSwapModel;
 exports.useTokensStore = useTokensStore;
 exports.useTransactionStore = useTransactionStore;
-//# sourceMappingURL=index-UMHkIgdO.cjs.map
+//# sourceMappingURL=index-CCfRExBc.cjs.map