@skip-go/widget 2.4.7 → 2.4.8

package/build/index.es.js

@@ -4044,8 +4044,9 @@ priceImpactPercent, priceImpactThresholdReached, route, sourceAsset, sourceChain
                 maximumFractionDigits: 6,
             });
             return {
-                inAsset: `${computed} ${feeAsset.symbol}`,
-                inUSD: usdFeeAmount && `${formatUSD(usdFeeAmount)}`,
+                assetAmount: Number(computed),
+                formattedAssetAmount: `${computed} ${feeAsset.symbol}`,
+                formattedUsdAmount: usdFeeAmount ? `${formatUSD(usdFeeAmount)}` : undefined
             };
         }
         if (axelarTransferOperation) {
@@ -4054,8 +4055,9 @@ priceImpactPercent, priceImpactThresholdReached, route, sourceAsset, sourceChain
                 maximumFractionDigits: 6,
             });
             return {
-                inAsset: `${computed} ${feeAsset.symbol}`,
-                inUSD: `${formatUSD(usdFeeAmount)}`,
+                assetAmount: Number(computed),
+                formattedAssetAmount: `${computed} ${feeAsset.symbol}`,
+                formattedUsdAmount: usdFeeAmount ? `${formatUSD(usdFeeAmount)}` : undefined
             };
         }
     }, [axelarTransferOperation, hyperlaneTransferOperation]);
@@ -4073,17 +4075,15 @@ priceImpactPercent, priceImpactThresholdReached, route, sourceAsset, sourceChain
             maximumFractionDigits: 6,
         });
         return {
-            amount: Number(inAsset),
-            inAsset: `${inAsset} ${fee[0].originAsset.symbol}`,
-            inUSD: `${formatUSD(computedUsd)}`,
+            assetAmount: Number(inAsset),
+            formattedAssetAmount: `${inAsset} ${fee[0].originAsset.symbol}`,
+            formattedUsdAmount: `${formatUSD(computedUsd)}`
         };
     }, [isSmartRelay, route.estimatedFees]);
     const totalAmountOut = useMemo(() => {
-        if (isSmartRelay) {
-            return String(parseFloat(amountOut) + ((smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.amount) || 0));
-        }
-        return amountOut;
-    }, [amountOut, isSmartRelay, smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.amount]);
+        var _a, _b;
+        return String(parseFloat(amountOut) + ((_a = smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.assetAmount) !== null && _a !== void 0 ? _a : 0) + ((_b = bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.assetAmount) !== null && _b !== void 0 ? _b : 0));
+    }, [amountOut, smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.assetAmount, bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.assetAmount]);
     if (!(sourceChain && sourceAsset && destinationChain && destinationAsset)) {
         return null;
     }
@@ -4092,7 +4092,7 @@ priceImpactPercent, priceImpactThresholdReached, route, sourceAsset, sourceChain
                             return (jsxs("div", { children: [jsxs("button", { className: "mr-2 tabular-nums", onClick: toggle, children: ["1 ", ((_a = left.recommendedSymbol) !== null && _a !== void 0 ? _a : '').replace(/\sEthereum$/, ''), " =", ' ', conversion.toLocaleString('en-US', {
                                                 maximumFractionDigits: 4,
                                             }), ' ', ((_b = right.recommendedSymbol) !== null && _b !== void 0 ? _b : '').replace(/\sEthereum$/, '')] }), jsx("span", { className: "tabular-nums text-neutral-400", children: jsx(UsdValue, { error: null, chainId: right.chainID, denom: right.denom, coingeckoID: right.coingeckoID, value: conversion.toString() }) })] }));
-                        } }), jsx("div", { className: "flex-grow" }), jsxs(Collapsible.Trigger, { className: cn('relative flex items-center gap-1 text-xs', "before:absolute before:-inset-2 before:content-['']", 'text-neutral-400'), children: [jsxs("span", { className: cn('animate-slide-left-and-fade tabular-nums text-neutral-400 transition-opacity', detailsOpen && 'hidden'), children: ["Slippage: ", slippage, "%"] }), jsx(ChevronDownIcon$1, { className: cn('h-4 w-4 transition', detailsOpen ? 'rotate-180' : 'rotate-0') })] })] }), jsx(Collapsible.Content, { className: cn('overflow-hidden', 'data-[state=open]:animate-collapsible-open', 'data-[state=closed]:animate-collapsible-closed'), children: jsxs("dl", { className: cn('mb-2 mt-4 grid grid-cols-2 gap-2', '[&_dt]:text-start [&_dt]:text-neutral-400', '[&_dd]:text-end [&_dd]:tabular-nums'), children: [priceImpactPercent ? (jsxs(Fragment, { children: [jsx("dt", { className: priceImpactThresholdReached ? 'text-red-500' : '', children: "Price Impact" }), jsx("dd", { className: priceImpactThresholdReached ? 'text-red-500' : '', children: formatPercent(priceImpactPercent) })] })) : null, jsx("dt", { children: "Slippage" }), jsxs("dd", { children: [jsx(SimpleTooltip, { label: "Click to change maximum slippage", children: jsx(StyledThemedButton, { className: cn('mr-1 inline-flex items-center gap-1 p-1 text-xs transition-colors', 'text-red-500', 'rounded'), onClick: () => disclosure.open('settingsDialog'), children: jsx(PencilSquareIcon, { className: "h-3 w-3" }) }) }), slippage, "%"] }), sourceFeeAsset && (jsxs(Fragment, { children: [jsx("dt", { children: "Estimated Transaction Fee" }), sourceChain.chainID !== 'stride-1' ? (jsxs("dd", { children: [gasRequired !== null && gasRequired !== void 0 ? gasRequired : '-', " ", sourceFeeAsset.recommendedSymbol] })) : (jsx("dd", { children: "--" }))] })), bridgingFee && (jsxs(Fragment, { children: [jsx("dt", { children: "Bridging Fee" }), jsxs("dd", { children: [(_b = bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.inAsset) !== null && _b !== void 0 ? _b : '-', ' ', jsx("span", { className: "text-sm tabular-nums text-neutral-400", children: (_c = bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.inUSD) !== null && _c !== void 0 ? _c : '-' })] })] })), smartRelayFee && (jsxs(Fragment, { children: [jsx("dt", { children: "Relayer Fee" }), jsxs("dd", { children: [(_d = smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.inAsset) !== null && _d !== void 0 ? _d : '-', ' ', jsx("span", { className: "text-sm tabular-nums text-neutral-400", children: (_e = smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.inUSD) !== null && _e !== void 0 ? _e : '-' })] })] }))] }) })] }));
+                        } }), jsx("div", { className: "flex-grow" }), jsxs(Collapsible.Trigger, { className: cn('relative flex items-center gap-1 text-xs', "before:absolute before:-inset-2 before:content-['']", 'text-neutral-400'), children: [jsxs("span", { className: cn('animate-slide-left-and-fade tabular-nums text-neutral-400 transition-opacity', detailsOpen && 'hidden'), children: ["Slippage: ", slippage, "%"] }), jsx(ChevronDownIcon$1, { className: cn('h-4 w-4 transition', detailsOpen ? 'rotate-180' : 'rotate-0') })] })] }), jsx(Collapsible.Content, { className: cn('overflow-hidden', 'data-[state=open]:animate-collapsible-open', 'data-[state=closed]:animate-collapsible-closed'), children: jsxs("dl", { className: cn('mb-2 mt-4 grid grid-cols-2 gap-2', '[&_dt]:text-start [&_dt]:text-neutral-400', '[&_dd]:text-end [&_dd]:tabular-nums'), children: [priceImpactPercent ? (jsxs(Fragment, { children: [jsx("dt", { className: priceImpactThresholdReached ? 'text-red-500' : '', children: "Price Impact" }), jsx("dd", { className: priceImpactThresholdReached ? 'text-red-500' : '', children: formatPercent(priceImpactPercent) })] })) : null, jsx("dt", { children: "Slippage" }), jsxs("dd", { children: [jsx(SimpleTooltip, { label: "Click to change maximum slippage", children: jsx(StyledThemedButton, { className: cn('mr-1 inline-flex items-center gap-1 p-1 text-xs transition-colors', 'text-red-500', 'rounded'), onClick: () => disclosure.open('settingsDialog'), children: jsx(PencilSquareIcon, { className: "h-3 w-3" }) }) }), slippage, "%"] }), sourceFeeAsset && (jsxs(Fragment, { children: [jsx("dt", { children: "Estimated Transaction Fee" }), sourceChain.chainID !== 'stride-1' ? (jsxs("dd", { children: [gasRequired !== null && gasRequired !== void 0 ? gasRequired : '-', " ", sourceFeeAsset.recommendedSymbol] })) : (jsx("dd", { children: "--" }))] })), bridgingFee && (jsxs(Fragment, { children: [jsx("dt", { children: "Bridging Fee" }), jsxs("dd", { children: [(_b = bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.formattedAssetAmount) !== null && _b !== void 0 ? _b : '-', ' ', jsx("span", { className: "text-sm tabular-nums text-neutral-400", children: (_c = bridgingFee === null || bridgingFee === void 0 ? void 0 : bridgingFee.formattedUsdAmount) !== null && _c !== void 0 ? _c : '-' })] })] })), smartRelayFee && (jsxs(Fragment, { children: [jsx("dt", { children: "Relayer Fee" }), jsxs("dd", { children: [(_d = smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.formattedAssetAmount) !== null && _d !== void 0 ? _d : '-', ' ', jsx("span", { className: "text-sm tabular-nums text-neutral-400", children: (_e = smartRelayFee === null || smartRelayFee === void 0 ? void 0 : smartRelayFee.formattedUsdAmount) !== null && _e !== void 0 ? _e : '-' })] })] }))] }) })] }));
 };
 
 const iconMap = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@skip-go/widget",
   "description": "Swap widget",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "repository": "https://github.com/skip-mev/widget",
   "type": "module",
   "exports": {