@avail-project/widgets 2.0.0 → 2.0.2

package/dist/nexus-widget/components/swap-intent-preview.d.ts

@@ -11,6 +11,7 @@ export interface SwapIntentSource {
     token: {
         contractAddress: string;
         decimals: number;
+        logo?: string;
         symbol: string;
     };
     value?: string;
@@ -28,12 +29,14 @@ export interface SwapIntentDestination {
         token: {
             contractAddress: string;
             decimals: number;
+            logo?: string;
             symbol: string;
         };
     };
     token: {
         contractAddress: string;
         decimals: number;
+        logo?: string;
         symbol: string;
     };
     value?: string;
@@ -65,6 +68,7 @@ export interface SwapIntentPreviewProps {
     };
     fromAmount: string;
     fromAmountUsd?: string;
+    destinationGasFeeUsd?: string;
     fromToken?: SwapTokenOption;
     fromTokens?: SwapTokenOption[];
     intentData?: SwapIntentData | null;
@@ -91,5 +95,5 @@ export interface SwapIntentPreviewProps {
     toToken?: SwapTokenOption;
     totalFeeUsd?: string;
 }
-export declare function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount, fromAmountUsd, toAmount, toAmountUsd, toAmountTokens, totalFeeUsd, isLoading, isRefreshing, isExecuting, swapType, intentData, mode, opportunity, recipientAddress, activeMode, steps, explorerUrls, onAccept, onTransitionChange, }: SwapIntentPreviewProps): import("react/jsx-runtime").JSX.Element;
+export declare function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount, fromAmountUsd, destinationGasFeeUsd, toAmount, toAmountUsd, toAmountTokens, totalFeeUsd, isLoading, isRefreshing, isExecuting, swapType, intentData, mode, opportunity, recipientAddress, activeMode, steps, explorerUrls, onAccept, onTransitionChange, }: SwapIntentPreviewProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=swap-intent-preview.d.ts.map

package/dist/nexus-widget/components/swap-intent-preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swap-intent-preview.d.ts","sourceRoot":"","sources":["../../../.build-src/nexus-widget/components/swap-intent-preview.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"swap-intent-preview.d.ts","sourceRoot":"","sources":["../../../.build-src/nexus-widget/components/swap-intent-preview.tsx"],"names":[],"mappings":"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"}

package/dist/nexus-widget/components/swap-intent-preview.js

@@ -88,6 +88,13 @@ const isNativeTokenAddress = (address) => {
         lower === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" ||
         lower === "0x0000000000000000000000000000000000000000");
 };
+const getSourceDisplayKey = (chainId, address, symbol) => {
+    const chainKey = chainId ?? "";
+    const normalizedAddress = address?.toLowerCase();
+    return normalizedAddress
+        ? `${chainKey}-${normalizedAddress}`
+        : `${chainKey}-symbol-${(symbol ?? "").toUpperCase()}`;
+};
 const normalizeIntentToken = (token, chainId) => {
     const chainMeta = chainId ? CHAIN_METADATA[chainId] : undefined;
     const shouldUseNative = isNativeTokenAddress(token?.contractAddress) && Boolean(chainMeta);
@@ -100,7 +107,7 @@ const normalizeIntentToken = (token, chainId) => {
     return {
         contractAddress: token?.contractAddress ?? "",
         decimals,
-        logo: shouldUseNative ? chainMeta?.logo : undefined,
+        logo: token?.logo || (shouldUseNative ? chainMeta?.logo : undefined),
         symbol,
     };
 };
@@ -334,7 +341,7 @@ function AnimatedDetails({ open, children, background = "#F9F9F8", gap = "9px",
                     transition: "padding 220ms ease",
                 }, children: children }) }) }));
 }
-export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount, fromAmountUsd, toAmount, toAmountUsd, toAmountTokens, totalFeeUsd, isLoading, isRefreshing, isExecuting, swapType, intentData, mode, opportunity, recipientAddress, activeMode, steps, explorerUrls, onAccept, onTransitionChange, }) {
+export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount, fromAmountUsd, destinationGasFeeUsd, toAmount, toAmountUsd, toAmountTokens, totalFeeUsd, isLoading, isRefreshing, isExecuting, swapType, intentData, mode, opportunity, recipientAddress, activeMode, steps, explorerUrls, onAccept, onTransitionChange, }) {
     const [showSourceDetails, setShowSourceDetails] = useState(false);
     const [showFeeDetails, setShowFeeDetails] = useState(false);
     const [showImpactDetails, setShowImpactDetails] = useState(false);
@@ -482,22 +489,32 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
             : undefined);
     const protocolFeeNumber = parseDecimal(bridgeFeeData?.protocol);
     const solverFeeNumber = parseDecimal(bridgeFeeData?.solver);
-    const gasSuppliedNumber = parseDecimal(bridgeFeeData?.gasSupplied);
+    const bridgeGasSuppliedNumber = parseDecimal(bridgeFeeData?.gasSupplied);
+    const destinationGasValueNumber = parseDecimal(normalizedIntentDest?.gas?.value) ??
+        parseDecimal(destinationGasFeeUsd);
+    const destinationGasSuppliedNumber = bridgeGasSuppliedNumber ?? destinationGasValueNumber;
+    const bridgeTotalWithDestinationGas = bridgeTotalNumber &&
+        !bridgeGasSuppliedNumber &&
+        destinationGasValueNumber &&
+        destinationGasValueNumber.gt(0)
+        ? bridgeTotalNumber.plus(destinationGasValueNumber)
+        : bridgeTotalNumber;
     const swapBufferNumber = parseDecimal(intentData?.feesAndBuffer?.buffer);
     const bridgeComponentsTotalNumber = bridgeFeeData
         ? [
             executionGasFeeNumber,
             protocolFeeNumber,
             solverFeeNumber,
-            gasSuppliedNumber,
+            destinationGasSuppliedNumber,
         ].reduce((sum, value) => sum.plus(value ?? new Decimal(0)), new Decimal(0))
         : undefined;
-    const explicitFeeNumber = bridgeTotalNumber ??
+    const explicitFeeNumber = bridgeTotalWithDestinationGas ??
         (bridgeComponentsTotalNumber && bridgeComponentsTotalNumber.gt(0)
             ? bridgeComponentsTotalNumber
             : undefined) ??
         parseDecimal(totalFeeUsd) ??
-        parseDecimal(intentData?.fees?.total);
+        parseDecimal(intentData?.fees?.total) ??
+        destinationGasSuppliedNumber;
     const feeNumber = explicitFeeNumber ?? (hasFiatQuote ? new Decimal(0) : undefined);
     const quotedDestinationUsdNumber = parseDecimal(normalizedIntentDest?.value);
     const exactOutPaidUsdNumber = (() => {
@@ -556,13 +573,25 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
                 label: "Solver Fee",
                 value: solverFeeNumber ?? new Decimal(0),
             },
-            ...(gasSuppliedNumber && gasSuppliedNumber.gt(0)
-                ? [{ label: "Gas Sponsorship", value: gasSuppliedNumber }]
+            ...(destinationGasSuppliedNumber && destinationGasSuppliedNumber.gt(0)
+                ? [{ label: "Gas Sponsorship", value: destinationGasSuppliedNumber }]
                 : []),
         ]
-        : feeNumber !== undefined
-            ? [{ label: "Network & protocol", value: feeNumber }]
-            : [];
+        : destinationGasSuppliedNumber && destinationGasSuppliedNumber.gt(0)
+            ? [
+                ...(feeNumber && feeNumber.gt(destinationGasSuppliedNumber)
+                    ? [
+                        {
+                            label: "Network & protocol",
+                            value: feeNumber.minus(destinationGasSuppliedNumber),
+                        },
+                    ]
+                    : []),
+                { label: "Gas Sponsorship", value: destinationGasSuppliedNumber },
+            ]
+            : feeNumber !== undefined
+                ? [{ label: "Network & protocol", value: feeNumber }]
+                : [];
     const pendingLabel = isLoading ? "Fetching quote" : "Quote unavailable";
     const pendingValue = isLoading ? "..." : "--";
     const sourceUsd = exactOutPaidUsdNumber !== undefined
@@ -587,26 +616,16 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
     const destinationTokenDisplay = hasResolvedQuote
         ? `${formatTokenAmount(destinationTokenAmount)} ${destTokenSymbol}`
         : pendingLabel;
-    const destinationSourceKey = [
-        normalizedIntentDest?.chain.id ?? toToken?.chainId ?? "",
-        (normalizedIntentDest?.token.contractAddress ??
-            toToken?.contractAddress ??
-            "").toLowerCase(),
-    ].join("-");
-    const hasDestinationSourceRow = Boolean(destinationSourceKey !== "-" &&
+    const destinationSourceAddress = normalizedIntentDest?.token.contractAddress || toToken?.contractAddress;
+    const destinationSourceKey = getSourceDisplayKey(normalizedIntentDest?.chain.id ?? toToken?.chainId, destinationSourceAddress, destTokenSymbol);
+    const hasDestinationSourceRow = Boolean(destinationSourceKey &&
         (normalizedIntentSources.length > 0
             ? normalizedIntentSources.some((source) => {
-                const sourceKey = [
-                    source.chain.id,
-                    source.token.contractAddress.toLowerCase(),
-                ].join("-");
+                const sourceKey = getSourceDisplayKey(source.chain.id, source.token.contractAddress, source.token.symbol);
                 return sourceKey === destinationSourceKey;
             })
             : fallbackSources.some((source) => {
-                const sourceKey = [
-                    source.chainId ?? "",
-                    source.contractAddress.toLowerCase(),
-                ].join("-");
+                const sourceKey = getSourceDisplayKey(source.chainId ?? "", source.contractAddress, source.symbol);
                 return sourceKey === destinationSourceKey;
             })));
     const swapBufferDisplay = swapBufferNumber !== undefined
@@ -618,10 +637,7 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
                 (token.contractAddress?.toLowerCase() ===
                     source.token.contractAddress?.toLowerCase() ||
                     token.symbol === source.token.symbol));
-            const sourceKey = [
-                source.chain.id,
-                source.token.contractAddress.toLowerCase(),
-            ].join("-");
+            const sourceKey = getSourceDisplayKey(source.chain.id, source.token.contractAddress, source.token.symbol);
             const isDestinationSource = sourceKey === destinationSourceKey &&
                 displayOnlyDestinationSourceAmount !== undefined;
             const sourceAmountNumber = parseDecimal(source.amount);
@@ -652,10 +668,7 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
         : fallbackSources.map((source, index) => {
             const sourceAmount = source.userAmount ||
                 (fallbackSources.length === 1 ? fromAmount : "");
-            const sourceKey = [
-                source.chainId ?? "",
-                source.contractAddress.toLowerCase(),
-            ].join("-");
+            const sourceKey = getSourceDisplayKey(source.chainId ?? "", source.contractAddress, source.symbol);
             const isDestinationSource = sourceKey === destinationSourceKey &&
                 displayOnlyDestinationSourceAmount !== undefined;
             const sourceAmountNumber = parseDecimal(sourceAmount);
@@ -769,7 +782,9 @@ export function SwapIntentPreview({ fromTokens, fromToken, toToken, fromAmount,
         const count = sourceAssetCount || 1;
         return `${count} asset${count === 1 ? "" : "s"}`;
     })();
-    const shouldScrollSourceDetails = sourceDetailRows.length > 5;
+    // The preview panel owns vertical scrolling; nested source scrollbars make
+    // confirm screens show multiple scrollbars.
+    const shouldScrollSourceDetails = false;
     const progressExplorerUrls = explorerUrls ?? {
         destinationExplorerUrl: null,
         sourceExplorerUrl: null,

package/dist/nexus-widget/nexus-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nexus-widget.d.ts","sourceRoot":"","sources":["../../.build-src/nexus-widget/nexus-widget.tsx"],"names":[],"mappings":"AAmFA,OAAO,EAUL,KAAK,gBAAgB,EAGtB,MAAM,SAAS,CAAC;AA6kGjB,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,2CA0DlD;AAw2PD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"nexus-widget.d.ts","sourceRoot":"","sources":["../../.build-src/nexus-widget/nexus-widget.tsx"],"names":[],"mappings":"AAmFA,OAAO,EAUL,KAAK,gBAAgB,EAGtB,MAAM,SAAS,CAAC;AA2yGjB,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,2CA0DlD;AA+nRD,eAAe,WAAW,CAAC"}