@goodaofi/bonds-sdk 3.0.175 → 3.0.177

package/dist/main.js

@@ -59494,9 +59494,7 @@ const QUERY_KEYS = {
     ACTIVE_VIEW: 'Goomoney-SDK-activeView',
     PRE_TGE_LIST: 'Goomoney-SDK-preTGEList',
     PRE_TGE_USER_BONDS: 'Goomoney-SDK-preTGEUserBonds',
-    USER_TOKENS_BALANCES: 'Goomoney-SDK-userTokensBalances',
-    REFUND_DATA: 'Goomoney-SDK-refundData',
-};
+    USER_TOKENS_BALANCES: 'Goomoney-SDK-userTokensBalances'};
 
 // Prod URLS. Do not make changes here
 const defaultUrls = {
@@ -65974,7 +65972,6 @@ const YourBondsModal = ({ onDismiss, bill }) => {
     const lastBlockTimestamp = parseInt(userBill?.lastBlockTimestamp ?? '0');
     const isPendingCliff = vestingCliff ? currentTime - lastBlockTimestamp < vestingCliff : false;
     const cliffCountdown = getTimePeriods(lastBlockTimestamp + (vestingCliff ?? 0) - currentTime, true);
-    const showImage = false;
     const handleClaim = async (billId, billAddress) => {
         const address = billAddress;
         const isVestingNft = billAddress?.toLowerCase() === VESTING_NFT_ADDRESS.toLowerCase();
@@ -66028,7 +66025,10 @@ const YourBondsModal = ({ onDismiss, bill }) => {
     };
     const earnTokenPrice = useCurrencyPrice(userBill?.bond?.earnToken ?? null, userBill?.bond?.chainId ?? null);
     const BILL_ATTRIBUTES = ['The Legend', 'The Location', 'The Moment', 'The Trend', 'The Innovation'];
-    bondNFTData?.attributes?.filter((attrib) => BILL_ATTRIBUTES.includes(attrib.trait_type));
+    const attributes = bondNFTData?.attributes?.filter((attrib) => BILL_ATTRIBUTES.includes(attrib.trait_type));
+    const handleImageLoad = () => {
+        setImgLoaded(true);
+    };
     const [onTransferBondModal] = useModal(jsx$2(TransferBondModal, { userBill: userBill }), true, true, `transferModal${userBill?.id}}`);
     useEffect(() => {
         if (isConfirmed) {
@@ -66037,9 +66037,32 @@ const YourBondsModal = ({ onDismiss, bill }) => {
         }
         /* eslint-disable react-hooks/exhaustive-deps */
     }, [isConfirmed]);
-    return (jsx$2(Modal, { className: "modal", children: jsxs(Flex$1, { className: "yourbondsmodal-content", children: [jsx$2(Flex$1, { className: "yourbondsmodal-header", children: jsx$2(Flex$1, { className: "svg-close", onClick: onDismiss, children: jsx$2(Svg, { icon: "close" }) }) }), jsxs(Flex$1, { className: "yourbondsmodal table-container", children: [showImage, jsxs(Flex$1, { className: "yourbondsmodal yourbondinfo", children: [jsxs(Flex$1, { className: "yourbondinfo title-container", children: [jsx$2(Flex$1, { className: "title-container bondicon", children: userBill && (jsx$2(TokenImage, { symbol: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken?.symbol, size: 40, chain: userBill?.bond?.chainId })) }), jsx$2(Flex$1, { className: "title-container tokenname", children: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken.symbol }), jsx$2(Flex$1, { className: "title-container tokentags", children: userBill?.bond?.tags?.slice(0, 1).map((tag) => {
+    return (jsx$2(Modal, { className: "modal", children: jsxs(Flex$1, { className: "yourbondsmodal-content", children: [jsx$2(Flex$1, { className: "yourbondsmodal-header", children: jsx$2(Flex$1, { className: "svg-close", onClick: onDismiss, children: jsx$2(Svg, { icon: "close" }) }) }), jsxs(Flex$1, { className: "yourbondsmodal table-container", children: [(jsxs(Flex$1, { className: "yourbondsmodal bondimage", children: [bondNFTData?.image && (jsx$2("img", { src: `${bondNFTData?.image}?img-width=720`, onLoad: handleImageLoad, style: { zIndex: 2 } })), !imgLoaded && (jsx$2(Flex$1, { sx: {
+                                        position: 'absolute',
+                                        top: 'calc(50% - 24px)',
+                                        right: 'calc(50% - 50px)',
+                                        justifyContent: 'center',
+                                        alignItems: 'center',
+                                        zIndex: 1,
+                                    }, children: jsx$2(Spinner, { width: 100 }) }))] })), jsxs(Flex$1, { className: "yourbondsmodal yourbondinfo", children: [jsxs(Flex$1, { className: "yourbondinfo title-container", children: [jsx$2(Flex$1, { className: "title-container bondicon", children: userBill && (jsx$2(TokenImage, { symbol: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken?.symbol, size: 40, chain: userBill?.bond?.chainId })) }), jsx$2(Flex$1, { className: "title-container tokenname", children: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken.symbol }), jsx$2(Flex$1, { className: "title-container tokentags", children: userBill?.bond?.tags?.slice(0, 1).map((tag) => {
                                                 return (jsx$2(Flex$1, { sx: { marginRight: '10px' }, children: jsx$2(ListTag, { text: tag?.toUpperCase() }) }, tag));
-                                            }) }), jsxs(Text, { sx: { color: 'text', opacity: '0.6', fontSize: ['12px', '12px', '12px', '16px'] }, children: ["#", userBill?.id] })] }), jsxs(Flex$1, { className: "yourbondinfo blocks-container", children: [showImage, bondNFTData?.data?.deposit && (jsxs(Flex$1, { className: "yourbondinfo-block row-vested", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "You Spent" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.YouSpent }), width: "270px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsx$2(Flex$1, { className: "yourbondinfo-block info", children: jsx$2(Flex$1, { className: "block-info text", children: jsxs(Text, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: ["$", bondNFTData?.data?.dollarValue.toFixed(2)] }) }) })] })), jsxs(Flex$1, { className: "yourbondinfo-block row-vested", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "Fully Vested" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.FullyVested }), width: "230px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsxs(Flex$1, { className: "yourbondinfo-block info", children: [jsx$2(Flex$1, { className: "block-info icon" }), jsx$2(Flex$1, { className: "block-info text", children: jsxs(Flex$1, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: [vestingTimeRemainingString(userBill), isPendingCliff && (jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsxs(Flex$1, { children: ["Bond will be claimable in", ' ', `${cliffCountdown.days !== 0 ? `${cliffCountdown.days} days` : cliffCountdown.hours !== 0 ? `${cliffCountdown.hours} hours` : `${cliffCountdown.minutes} mins`}`, "."] }), width: "180px", placement: "bottomRight", transformTip: "translate(13%, 0%)", children: jsx$2(Flex$1, { sx: { opacity: 0.6, ml: '6px' }, children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }))] }) })] })] }), jsxs(Flex$1, { className: "yourbondinfo-block row-pending", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "Pending" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.Pending }), width: "230px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsxs(Flex$1, { className: "yourbondinfo-block info", children: [jsx$2(Flex$1, { className: "block-info icon", children: userBill && (jsx$2(TokenImage, { symbol: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken?.symbol, size: 25, chain: userBill?.bond?.chainId })) }), jsxs(Flex$1, { className: "block-info text", children: [jsx$2(Text, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: formatNumberSI(parseFloat(totalPending(userBill).toFixed(4)), 4) }), jsx$2(Text, { sx: {
+                                            }) }), jsxs(Text, { sx: { color: 'text', opacity: '0.6', fontSize: ['12px', '12px', '12px', '16px'] }, children: ["#", userBill?.id] })] }), jsxs(Flex$1, { className: "yourbondinfo blocks-container", children: [(jsxs(Flex$1, { className: "attributes-container", children: [jsxs(Flex$1, { className: "attributes-header", sx: {
+                                                        borderRadius: `${isOpenTraits ? '6px 6px 0px 0px' : 'normal'}`,
+                                                    }, onClick: () => setIsOpenTraits(!isOpenTraits), children: [jsxs(Flex$1, { sx: { gap: '10px', alignItems: 'center' }, children: [jsx$2(Svg, { icon: "tag", direction: "down" }), jsx$2(Text, { sx: { fontSize: '12px', fontWeight: 400, color: 'text', opacity: '0.6' }, children: "Traits" })] }), jsx$2(Svg, { icon: "caret", direction: isOpenTraits ? 'up' : 'down' })] }), userBill?.bond?.billType === 'staking' && (jsxs(Flex$1, { sx: {
+                                                        p: '5px 10px',
+                                                        width: '100%',
+                                                        background: '#8E568F',
+                                                        borderRadius: 'normal',
+                                                        mt: '10px',
+                                                        fontSize: '12px',
+                                                        fontWeight: 400,
+                                                        justifyContent: 'center',
+                                                        display: 'block',
+                                                    }, children: ["Tokens bought through this bond went directly to the", ' ', jsx$2("span", { onClick: () => window.open('https://basepad.finance/earn', '_blank'), style: { textDecoration: 'underline', cursor: 'pointer', color: 'blue' }, children: "$BPAD staking pool" }), ' ', "with a 365 days lock."] })), jsx$2(AnimatePresence, { children: isOpenTraits && (jsx$2(motion.div, { initial: { height: 0 }, animate: { height: 'fit-content' }, transition: { opacity: { duration: 0.2 } }, exit: { height: 0 }, sx: { overflow: 'hidden', width: '100%' }, children: jsx$2(Flex$1, { sx: { flexDirection: 'column', gap: '1px' }, children: attributes
+                                                                ? attributes.map((a) => (jsxs(Flex$1, { sx: { background: 'white4', width: '100%', padding: '2px 8px' }, children: [jsx$2(Text, { sx: { fontSize: '10px', fontWeight: 500 }, children: a?.trait_type }), jsx$2(Text, { sx: { fontSize: '10px', fontWeight: 500 }, children: a?.value })] }, a.value)))
+                                                                : BILL_ATTRIBUTES.map((attrib) => {
+                                                                    return (jsxs(Flex$1, { sx: { background: 'white4', width: '100%', padding: '2px 8px' }, children: [jsx$2(Text, { sx: { fontSize: '10px', fontWeight: 500 }, children: attrib }), jsx$2(Skeleton, { width: "150px" })] }, attrib));
+                                                                }) }) })) })] })), bondNFTData?.data?.deposit && (jsxs(Flex$1, { className: "yourbondinfo-block row-vested", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "You Spent" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.YouSpent }), width: "270px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsx$2(Flex$1, { className: "yourbondinfo-block info", children: jsx$2(Flex$1, { className: "block-info text", children: jsxs(Text, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: ["$", bondNFTData?.data?.dollarValue.toFixed(2)] }) }) })] })), jsxs(Flex$1, { className: "yourbondinfo-block row-vested", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "Fully Vested" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.FullyVested }), width: "230px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsxs(Flex$1, { className: "yourbondinfo-block info", children: [jsx$2(Flex$1, { className: "block-info icon" }), jsx$2(Flex$1, { className: "block-info text", children: jsxs(Flex$1, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: [vestingTimeRemainingString(userBill), isPendingCliff && (jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsxs(Flex$1, { children: ["Bond will be claimable in", ' ', `${cliffCountdown.days !== 0 ? `${cliffCountdown.days} days` : cliffCountdown.hours !== 0 ? `${cliffCountdown.hours} hours` : `${cliffCountdown.minutes} mins`}`, "."] }), width: "180px", placement: "bottomRight", transformTip: "translate(13%, 0%)", children: jsx$2(Flex$1, { sx: { opacity: 0.6, ml: '6px' }, children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }))] }) })] })] }), jsxs(Flex$1, { className: "yourbondinfo-block row-pending", children: [jsxs(Flex$1, { className: "yourbondinfo-block header", children: [jsx$2(Flex$1, { className: "yourbondinfo-block header-title", children: "Pending" }), jsx$2(Flex$1, { className: "yourbondinfo-block header-tooltip", children: jsx$2(TooltipBubble, { className: "tooltip-bubble", body: jsx$2(Flex$1, { children: UserBillTooltipText.Pending }), width: "230px", placement: "bottomLeft", transformTip: "translate(-5%, 0%)", children: jsx$2(Flex$1, { className: "block-header icon", children: jsx$2(Svg, { icon: "questionCircle", width: "12px" }) }) }) })] }), jsxs(Flex$1, { className: "yourbondinfo-block info", children: [jsx$2(Flex$1, { className: "block-info icon", children: userBill && (jsx$2(TokenImage, { symbol: userBill?.bond?.showcaseTokenName ?? userBill?.bond?.earnToken?.symbol, size: 25, chain: userBill?.bond?.chainId })) }), jsxs(Flex$1, { className: "block-info text", children: [jsx$2(Text, { sx: { fontSize: ['12px', '12px', '12px', '19px'], fontWeight: 700 }, children: formatNumberSI(parseFloat(totalPending(userBill).toFixed(4)), 4) }), jsx$2(Text, { sx: {
                                                                         fontSize: ['10px', '10px', '10px', '12px'],
                                                                         fontWeight: [500, 500, 500, 400],
                                                                         paddingLeft: '10px',
@@ -66538,7 +66561,7 @@ const YourBondsMenu = ({ handleSort, }) => {
     return (jsx$2("div", { className: "bonds-menu", children: jsxs("div", { className: "table-header-container", children: [jsx$2("div", { className: "search-container", children: jsx$2(Flex$1, { sx: { width: '100%', maxWidth: '300px' } }) }), jsxs("div", { className: "headers-container", sx: { pr: ['0', '0', '0', '20px'] }, children: [jsxs("div", { className: "your-bonds-table-headers", onClick: () => handleSort('claimable'), children: ["CLAIMABLE", jsx$2(Flex$1, { sx: { ml: '5px' }, children: jsx$2(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), jsxs("div", { className: "your-bonds-table-headers", onClick: () => handleSort('pending'), children: ["PENDING", jsx$2(Flex$1, { sx: { ml: '5px' }, children: jsx$2(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), jsxs("div", { className: "your-bonds-table-headers", onClick: () => handleSort('terms'), children: ["TERMS", jsx$2(Flex$1, { sx: { ml: '5px' }, children: jsx$2(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), jsx$2(Flex$1, { className: "claim-all-button-container", children: SDKConfig.referenceId === 'apebond' && jsx$2(ClaimAll, {}) })] })] }) }));
 };
 
-var launchBondsABI = [
+var launchBondsABI_V2_2_0 = [
 	{
 		anonymous: false,
 		inputs: [
@@ -68968,7 +68991,7 @@ const fetchPreTGEUserBonds = async (chains, tokenPrices, preTGEList, account, ap
                     name: 'trueBillPrice',
                 },
             ];
-            const res = await multicall(bond.chainId, launchBondsABI, calls);
+            const res = await multicall(bond.chainId, launchBondsABI_V2_2_0, calls);
             const billId = res[0][0][0]?.toString();
             let userOwnedBillsData;
             if (billId) {
@@ -68988,7 +69011,7 @@ const fetchPreTGEUserBonds = async (chains, tokenPrices, preTGEList, account, ap
                         params: [billId],
                     },
                 ];
-                const billData = await multicall(bond.chainId, launchBondsABI, billDataCalls);
+                const billData = await multicall(bond.chainId, launchBondsABI_V2_2_0, billDataCalls);
                 userOwnedBillsData = {
                     address: bond.contractAddress[bond.chainId] ?? '',
                     id: billId,
@@ -69071,7 +69094,7 @@ const PreTgeActions = ({ userBond }) => {
         setLoading(true);
         writeContractAsync({
             address: userBond.contractAddress[userBond.chainId],
-            abi: launchBondsABI,
+            abi: launchBondsABI_V2_2_0,
             functionName: 'redeem',
             chain: userBond.chainId,
             account,
@@ -69099,7 +69122,7 @@ const PreTgeActions = ({ userBond }) => {
             return;
         writeContractAsync({
             address: userBond.contractAddress[userBond.chainId],
-            abi: launchBondsABI,
+            abi: launchBondsABI_V2_2_0,
             functionName: 'claim',
             args: [userBond?.userOwnedBillsData?.id],
             chain: userBond.chainId,
@@ -69364,7 +69387,7 @@ const fetchGooPreTGEUserBonds = async (chains, tokenPrices, gooContracts, accoun
                         name: 'trueBillPrice',
                     },
                 ];
-                const res = await multicall(contract.chainId, launchBondsABI, calls);
+                const res = await multicall(contract.chainId, launchBondsABI_V2_2_0, calls);
                 const billId = res[0][0][0]?.toString();
                 let userOwnedBillsData;
                 if (billId) {
@@ -69384,7 +69407,7 @@ const fetchGooPreTGEUserBonds = async (chains, tokenPrices, gooContracts, accoun
                             params: [billId],
                         },
                     ];
-                    const billData = await multicall(contract.chainId, launchBondsABI, billDataCalls);
+                    const billData = await multicall(contract.chainId, launchBondsABI_V2_2_0, billDataCalls);
                     userOwnedBillsData = {
                         address: contract.address,
                         id: billId,
@@ -72496,7 +72519,7 @@ const getPreTGEBondsData = async (chain, tokenPrices, preTGEBonds, apiUrl) => {
                 },
             ];
         });
-        const vals = await multicall(chainId, launchBondsABI, launchBondsCalls);
+        const vals = await multicall(chainId, launchBondsABI_V2_2_0, launchBondsCalls);
         const chunkSize = vals.length / preTGEBonds.length;
         const chunkedBills = lodashExports.chunk(vals, chunkSize);
         const returnedBills = chunkedBills?.map((chunk, index) => {
@@ -73119,7 +73142,7 @@ const useSoulZapTokenQuote = (typedValue, inputCurrency, outputToken, chainId, a
     const contractAddress = outputToken?.address[chainId];
     const chain = getChainParam(chainId);
     const isLP = outputToken?.lpToken ?? false;
-    const liquidityDex = outputToken?.liquidityDex?.[chainId];
+    const liquidityDex = outputToken?.liquiditySource?.[chainId] ?? outputToken?.liquidityDex?.[chainId];
     const protocol = main.dexFactories[chainId]?.[liquidityDex]?.protocol;
     const lpType = outputToken?.lpToken ? getLpType(protocol) : 'single';
     const ichiUnderlyingDex = outputToken?.ichiUnderlyingDex;
@@ -73220,6 +73243,139 @@ const useSoulZapTokenQuote = (typedValue, inputCurrency, outputToken, chainId, a
     return [isLoading, response, estimateOutput, zapError];
 };
 
+const useSoulZapBondQuote = (typedValue, inputCurrency, bond, account, tierProofSig) => {
+    const debouncedInput = useDebounce(typedValue, 400);
+    const [slippage] = useSlippage();
+    const principalToken = bond?.lpToken;
+    const bondContractAddress = bond?.contractAddress[bond?.chainId];
+    const chainId = bond?.chainId;
+    const inputCurrencyString = inputCurrency === 'NATIVE' ? '0x0000000000000000000000000000000000000000' : inputCurrency?.address[chainId];
+    const inputCurrencyDecimals = inputCurrency === 'NATIVE' ? 18 : inputCurrency?.decimals[chainId];
+    const principalContractAddress = principalToken?.address[chainId];
+    const chainName = getChainParam(chainId);
+    const isReserveBond = bond?.billType === 'reserve' || bond?.billType === 'staking';
+    const liquidityDex = principalToken?.liquiditySource?.[chainId] ?? principalToken?.liquidityDex?.[chainId];
+    const protocol = main.dexFactories[chainId]?.[liquidityDex]?.protocol;
+    const lpType = isReserveBond ? 'single' : getLpType(protocol);
+    const ichiUnderlyingDex = principalToken?.ichiUnderlyingDex;
+    const vault = principalToken?.address?.[chainId];
+    const router = main.dexFactories[chainId]?.[liquidityDex]?.router;
+    // Validates that the user did not pass an amount with 19 decimals or more
+    const validated18DecimalAmount = new BigNumber$1(debouncedInput ?? '0').toFixed(18, 5);
+    const bigishInputAmount = new BigNumber$1(validated18DecimalAmount ?? '0')
+        .times(new BigNumber$1(10).pow(inputCurrencyDecimals ?? 18))
+        .toString();
+    const zapInputData = useMemo(() => {
+        if (inputCurrencyString &&
+            inputCurrencyDecimals &&
+            bigishInputAmount !== 'NaN' &&
+            bigishInputAmount !== '0' &&
+            principalContractAddress &&
+            chainName &&
+            bondContractAddress &&
+            (inputCurrency === 'NATIVE' || inputCurrency?.address[chainId] !== principalToken.address[chainId])) {
+            return {
+                chain: chainName,
+                recipient: account ?? '0x0000000000000000000000000000000000000000',
+                user: account ?? '0x0000000000000000000000000000000000000000',
+                lpData: {
+                    lpType,
+                    fromToken: inputCurrencyString,
+                    fromAmount: bigishInputAmount,
+                    underlyingDex: ichiUnderlyingDex,
+                    vault: isReserveBond ? undefined : vault,
+                    slippage: slippage,
+                    lpAddress: lpType === 'solidly' || lpType === 'univ2' || lpType === 'curve' ? vault : undefined,
+                    router: lpType === 'solidly' || lpType === 'univ2' ? router : undefined,
+                    toToken: isReserveBond ? vault : undefined,
+                },
+                protocolData: {
+                    protocol: 'ApeBond',
+                    bond: bondContractAddress,
+                    depositer: account ?? '0x0000000000000000000000000000000000000000',
+                    tierProofSignature: bond.billVersion === main.BillVersion.V4 && tierProofSig ? tierProofSig : undefined,
+                },
+            };
+        }
+        else {
+            return null;
+        }
+        /* eslint-disable react-hooks/exhaustive-deps */
+    }, [
+        bigishInputAmount,
+        principalContractAddress,
+        chainName,
+        account,
+        ichiUnderlyingDex,
+        vault,
+        lpType,
+        router,
+        slippage,
+    ]);
+    const queryKey = useMemo(() => {
+        if (!zapInputData)
+            return null;
+        return [
+            'zapBondDetails',
+            zapInputData.chain,
+            zapInputData.user,
+            zapInputData.lpData.lpType,
+            zapInputData.lpData.fromToken,
+            zapInputData.lpData.fromAmount,
+            zapInputData.lpData.underlyingDex ?? '',
+            zapInputData.lpData.vault,
+            zapInputData.lpData.slippage,
+            zapInputData.lpData.lpAddress,
+            zapInputData.lpData.router ?? '',
+        ];
+    }, [zapInputData]);
+    const fetchZapDetails = async () => {
+        const response = await axios.post(SOUL_ZAP_API, {
+            '0': zapInputData,
+        });
+        return response.data?.[0]?.result?.data;
+    };
+    const { data: response, isLoading, isFetching, error, } = useQuery({
+        queryKey: [QUERY_KEYS.ZAP_TOKEN_QUOTE, queryKey],
+        queryFn: fetchZapDetails,
+        refetchInterval: 60000, // i.e. 60 sec
+        enabled: !!queryKey,
+        retry: 1,
+    });
+    const zapError = !!error;
+    const tokenList = zapInputTokens[chainId] ? zapInputTokens[chainId] : [];
+    // toToken0 data
+    const toToken0Estimate = response?.lpQuote?.token0?.fromAmountEstimate;
+    const toToken0 = [...tokenList, principalToken]?.find((token) => token?.address?.[chainId]?.toLowerCase() === response?.lpQuote?.token0?.address?.toLowerCase());
+    const toToken0Price = useCurrencyPrice(toToken0 ?? null, chainId);
+    // toToken1 data
+    const toToken1Estimate = response?.lpQuote?.token1?.fromAmountEstimate;
+    const toToken1 = zapInputTokens[chainId]?.find((token) => token.address[chainId]?.toLowerCase() === response?.lpQuote?.token1?.address?.toLowerCase());
+    const toToken1Price = useCurrencyPrice(toToken1 ?? null, chainId);
+    let toToken0USD = new BigNumber$1(toToken0Estimate ?? '0')
+        ?.div(new BigNumber$1(10).pow(toToken0?.decimals[chainId] ?? 18)) // this is amount of swap output
+        ?.times(new BigNumber$1(toToken0Price?.price ?? 0)); // convert it to usd price
+    if (response?.lpQuote?.token0?.fromAmountUSD) {
+        toToken0USD = new BigNumber$1(response?.lpQuote?.token0?.fromAmountUSD);
+    }
+    let toToken1USD = new BigNumber$1(toToken1Estimate ?? '0')
+        ?.div(new BigNumber$1(10).pow(toToken1?.decimals[chainId] ?? 18)) // this is amount of swap output
+        ?.times(new BigNumber$1(toToken1Price?.price ?? 0)); // convert it to usd price
+    if (response?.lpQuote?.token1?.fromAmountUSD) {
+        toToken1USD = new BigNumber$1(response?.lpQuote?.token1?.fromAmountUSD);
+    }
+    const youSpendUSD = toToken0USD.plus(toToken1USD); // youSpendUSD
+    const estimatedDepositAmount = youSpendUSD.div(bond?.principalTokenPrice ?? '0');
+    const isWrap = inputCurrency === 'NATIVE' &&
+        bond?.lpToken?.address?.[chainId]?.toLowerCase() === WNATIVE[chainId]?.address?.[chainId]?.toLowerCase();
+    const estimatedDepositAmountToReturn = isWrap ? typedValue : estimatedDepositAmount.toString();
+    const trueBondPrice = response?.protocolQuote?.trueBondPrice;
+    const zapLoading = isLoading || isFetching;
+    if (zapLoading)
+        return [true, undefined, '', false, undefined];
+    return [zapLoading, response, estimatedDepositAmountToReturn, zapError, trueBondPrice];
+};
+
 function useCurrencyBalance(currency, account, chainId) {
     return useQuery({
         queryKey: [
@@ -74296,7 +74452,7 @@ const SlippageModal = () => {
                                             }, children: jsx$2(Text, { weight: 700, children: "%" }) })] })] })] }) }) }) }));
 };
 
-const ZapModal = ({ onDismiss, outputToken, account, chainId }) => {
+const ZapModal = ({ onDismiss, outputToken, account, chainId, bondData }) => {
     // State
     const [pendingTx, setPendingTx] = useState(false);
     const [typedValue, setTypedValue] = useState('');
@@ -74320,8 +74476,14 @@ const ZapModal = ({ onDismiss, outputToken, account, chainId }) => {
     const isWrap = inputTokenString === 'NATIVE' &&
         outputToken?.address?.[chainId]?.toLowerCase() === WNATIVE[chainId]?.address?.[chainId]?.toLowerCase();
     const outputTokenBalanceString = outputTokenBalance ? new BigNumber$1(outputTokenBalance).toPrecision(5) : 'loading';
-    // Zap Quote
-    const [fetchingQuote, zapData, outputValue, zapError] = useSoulZapTokenQuote(typedValue, inputToken, outputToken, chainId, account);
+    // Zap Quote - use bond quote when bondData is present, token quote otherwise
+    const [tokenFetchingQuote, tokenZapData, tokenOutputValue, tokenZapError] = useSoulZapTokenQuote(typedValue, inputToken, bondData ? undefined : outputToken, chainId, account);
+    const [bondFetchingQuote, bondZapData, bondDepositAmount, bondZapError] = useSoulZapBondQuote(typedValue, inputToken, bondData, account);
+    const isBondZap = !!bondData;
+    const fetchingQuote = isBondZap ? bondFetchingQuote : tokenFetchingQuote;
+    const zapData = isBondZap ? bondZapData : tokenZapData;
+    const outputValue = isBondZap ? parseFloat(bondDepositAmount || '0') : tokenOutputValue;
+    const zapError = isBondZap ? bondZapError : tokenZapError;
     // Functions
     const handleCurrencySelect = useCallback((newInputToken) => {
         setTypedValue('');
@@ -74409,139 +74571,6 @@ const ZapModal = ({ onDismiss, outputToken, account, chainId }) => {
                                         : 'BUY' })) }), jsx$2(Flex, { sx: { marginTop: '10px', justifyContent: 'center' }, children: jsx$2(Link, { href: "https://docs.ape.bond/apebond/products-and-features/zap", target: "_blank", rel: "noopener noreferrer", sx: { textDecoration: 'none' }, children: jsxs(Text, { style: { fontSize: '12px', lineHeight: '18px', fontWeight: 400, borderBottom: '1px solid' }, children: ["Learn more", '>'] }) }) })] })] }));
 };
 
-const useSoulZapBondQuote = (typedValue, inputCurrency, bond, account, tierProofSig) => {
-    const debouncedInput = useDebounce(typedValue, 400);
-    const [slippage] = useSlippage();
-    const principalToken = bond?.lpToken;
-    const bondContractAddress = bond?.contractAddress[bond?.chainId];
-    const chainId = bond?.chainId;
-    const inputCurrencyString = inputCurrency === 'NATIVE' ? '0x0000000000000000000000000000000000000000' : inputCurrency?.address[chainId];
-    const inputCurrencyDecimals = inputCurrency === 'NATIVE' ? 18 : inputCurrency?.decimals[chainId];
-    const principalContractAddress = principalToken?.address[chainId];
-    const chainName = getChainParam(chainId);
-    const isReserveBond = bond?.billType === 'reserve' || bond?.billType === 'staking';
-    const liquidityDex = principalToken?.liquiditySource?.[chainId] ?? principalToken?.liquidityDex?.[chainId];
-    const protocol = main.dexFactories[chainId]?.[liquidityDex]?.protocol;
-    const lpType = isReserveBond ? 'single' : getLpType(protocol);
-    const ichiUnderlyingDex = principalToken?.ichiUnderlyingDex;
-    const vault = principalToken?.address?.[chainId];
-    const router = main.dexFactories[chainId]?.[liquidityDex]?.router;
-    // Validates that the user did not pass an amount with 19 decimals or more
-    const validated18DecimalAmount = new BigNumber$1(debouncedInput ?? '0').toFixed(18, 5);
-    const bigishInputAmount = new BigNumber$1(validated18DecimalAmount ?? '0')
-        .times(new BigNumber$1(10).pow(inputCurrencyDecimals ?? 18))
-        .toString();
-    const zapInputData = useMemo(() => {
-        if (inputCurrencyString &&
-            inputCurrencyDecimals &&
-            bigishInputAmount !== 'NaN' &&
-            bigishInputAmount !== '0' &&
-            principalContractAddress &&
-            chainName &&
-            bondContractAddress &&
-            (inputCurrency === 'NATIVE' || inputCurrency?.address[chainId] !== principalToken.address[chainId])) {
-            return {
-                chain: chainName,
-                recipient: account ?? '0x0000000000000000000000000000000000000000',
-                user: account ?? '0x0000000000000000000000000000000000000000',
-                lpData: {
-                    lpType,
-                    fromToken: inputCurrencyString,
-                    fromAmount: bigishInputAmount,
-                    underlyingDex: ichiUnderlyingDex,
-                    vault: isReserveBond ? undefined : vault,
-                    slippage: slippage,
-                    lpAddress: lpType === 'solidly' || lpType === 'univ2' || lpType === 'curve' ? vault : undefined,
-                    router: lpType === 'solidly' || lpType === 'univ2' ? router : undefined,
-                    toToken: isReserveBond ? vault : undefined,
-                },
-                protocolData: {
-                    protocol: 'ApeBond',
-                    bond: bondContractAddress,
-                    depositer: account ?? '0x0000000000000000000000000000000000000000',
-                    tierProofSignature: bond.billVersion === main.BillVersion.V4 && tierProofSig ? tierProofSig : undefined,
-                },
-            };
-        }
-        else {
-            return null;
-        }
-        /* eslint-disable react-hooks/exhaustive-deps */
-    }, [
-        bigishInputAmount,
-        principalContractAddress,
-        chainName,
-        account,
-        ichiUnderlyingDex,
-        vault,
-        lpType,
-        router,
-        slippage,
-    ]);
-    const queryKey = useMemo(() => {
-        if (!zapInputData)
-            return null;
-        return [
-            'zapBondDetails',
-            zapInputData.chain,
-            zapInputData.user,
-            zapInputData.lpData.lpType,
-            zapInputData.lpData.fromToken,
-            zapInputData.lpData.fromAmount,
-            zapInputData.lpData.underlyingDex ?? '',
-            zapInputData.lpData.vault,
-            zapInputData.lpData.slippage,
-            zapInputData.lpData.lpAddress,
-            zapInputData.lpData.router ?? '',
-        ];
-    }, [zapInputData]);
-    const fetchZapDetails = async () => {
-        const response = await axios.post(SOUL_ZAP_API, {
-            '0': zapInputData,
-        });
-        return response.data?.[0]?.result?.data;
-    };
-    const { data: response, isLoading, isFetching, error, } = useQuery({
-        queryKey: [QUERY_KEYS.ZAP_TOKEN_QUOTE, queryKey],
-        queryFn: fetchZapDetails,
-        refetchInterval: 60000, // i.e. 60 sec
-        enabled: !!queryKey,
-        retry: 1,
-    });
-    const zapError = !!error;
-    const tokenList = zapInputTokens[chainId] ? zapInputTokens[chainId] : [];
-    // toToken0 data
-    const toToken0Estimate = response?.lpQuote?.token0?.fromAmountEstimate;
-    const toToken0 = [...tokenList, principalToken]?.find((token) => token?.address?.[chainId]?.toLowerCase() === response?.lpQuote?.token0?.address?.toLowerCase());
-    const toToken0Price = useCurrencyPrice(toToken0 ?? null, chainId);
-    // toToken1 data
-    const toToken1Estimate = response?.lpQuote?.token1?.fromAmountEstimate;
-    const toToken1 = zapInputTokens[chainId]?.find((token) => token.address[chainId]?.toLowerCase() === response?.lpQuote?.token1?.address?.toLowerCase());
-    const toToken1Price = useCurrencyPrice(toToken1 ?? null, chainId);
-    let toToken0USD = new BigNumber$1(toToken0Estimate ?? '0')
-        ?.div(new BigNumber$1(10).pow(toToken0?.decimals[chainId] ?? 18)) // this is amount of swap output
-        ?.times(new BigNumber$1(toToken0Price?.price ?? 0)); // convert it to usd price
-    if (response?.lpQuote?.token0?.fromAmountUSD) {
-        toToken0USD = new BigNumber$1(response?.lpQuote?.token0?.fromAmountUSD);
-    }
-    let toToken1USD = new BigNumber$1(toToken1Estimate ?? '0')
-        ?.div(new BigNumber$1(10).pow(toToken1?.decimals[chainId] ?? 18)) // this is amount of swap output
-        ?.times(new BigNumber$1(toToken1Price?.price ?? 0)); // convert it to usd price
-    if (response?.lpQuote?.token1?.fromAmountUSD) {
-        toToken1USD = new BigNumber$1(response?.lpQuote?.token1?.fromAmountUSD);
-    }
-    const youSpendUSD = toToken0USD.plus(toToken1USD); // youSpendUSD
-    const estimatedDepositAmount = youSpendUSD.div(bond?.principalTokenPrice ?? '0');
-    const isWrap = inputCurrency === 'NATIVE' &&
-        bond?.lpToken?.address?.[chainId]?.toLowerCase() === WNATIVE[chainId]?.address?.[chainId]?.toLowerCase();
-    const estimatedDepositAmountToReturn = isWrap ? typedValue : estimatedDepositAmount.toString();
-    const trueBondPrice = response?.protocolQuote?.trueBondPrice;
-    const zapLoading = isLoading || isFetching;
-    if (zapLoading)
-        return [true, undefined, '', false, undefined];
-    return [zapLoading, response, estimatedDepositAmountToReturn, zapError, trueBondPrice];
-};
-
 const useSendReferenceId = () => {
     const config = useSDKConfig();
     const apiV2URL = useURLByEnvironment('apiV2');
@@ -75425,7 +75454,7 @@ const BuyBond$1 = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond, isP
     // Modals
     const [openNewRateModal] = useModal(jsx$2(NewRateModal$1, { bond: bondData, zapTrueBondPrice: zapTrueBondPrice, depositAmount: depositAmount, youSpendString: youSpendString, fetchingZapQuote: fetchingZapQuote, zapError: zapError }), true, false, 'newRateModal');
     const [openTxModal] = useModal(jsx$2(TransactionModal$2, { txChain: bondChain, approvalState: approvalState, approveCallback: handleApprove, loadingTx: loadingTx, txCallback: handleBothPurchases, bondData: bondData, inputToken: inputToken, inputValue: inputValue, depositAmount: depositAmount, buyTxHash: buyTxHash, rateChanged: rateChanged }), false, true, 'transactionModal');
-    const [onOpenZapModal] = useModal(jsx$2(ZapModal, { outputToken: bondData?.lpToken, account: account, chainId: bondData?.chainId }), true, true, 'zapModal');
+    const [onOpenZapModal] = useModal(jsx$2(ZapModal, { outputToken: bondData?.lpToken, account: account, chainId: bondData?.chainId, bondData: bondData }), true, true, 'zapModal');
     const [openNoBonusModal] = useModal(jsx$2(NoBonusModal, { onAcknowledge: openTxModal, showcaseTokenName: bondData?.showcaseTokenName }), true, true, 'NoBonusModal');
     // Effects
     const [hasChecked, setHasChecked] = useState(false);
@@ -75678,7 +75707,7 @@ const PreTGEBuyComponent = ({ bondAddress, bondChain, onDismiss, handlePurchased
         const args = [amount, maxPrice, address];
         await writeContractAsync({
             address: bond?.contractAddress?.[bond.chainId],
-            abi: launchBondsABI,
+            abi: launchBondsABI_V2_2_0,
             functionName: 'deposit',
             args: args,
             chain: bond.chainId,
@@ -99885,7 +99914,7 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond, isPro
     // Modals
     useModal(jsx$2(NewRateModal, { bond: bondData, zapTrueBondPrice: zapTrueBondPrice, depositAmount: depositAmount, youSpendString: youSpendString, fetchingZapQuote: fetchingZapQuote, zapError: zapError }), true, false, 'newRateModal');
     const [openTxModal] = useModal(jsx$2(TransactionModal$1, { txChain: bondChain, approvalState: approvalState, approveCallback: handleApprove, loadingTx: loadingTx, txCallback: handleBothPurchases, bondData: bondData, inputToken: inputToken, inputValue: inputValue, depositAmount: depositAmount, buyTxHash: buyTxHash, rateChanged: rateChanged, onDismiss: onDismiss }), false, true, 'transactionModal');
-    useModal(jsx$2(ZapModal, { outputToken: bondData?.lpToken, account: account, chainId: bondData?.chainId }), true, true, 'zapModal');
+    useModal(jsx$2(ZapModal, { outputToken: bondData?.lpToken, account: account, chainId: bondData?.chainId, bondData: bondData }), true, true, 'zapModal');
     // Effects
     const [hasChecked, setHasChecked] = useState(false);
     const [hasCheckedTrack, setHasCheckedTrack] = useState(false);
@@ -100376,283 +100405,6 @@ const getUserGooData = async (userAddress, apiAddress) => {
     }
 };
 
-// eslint-disable-next-line react/prop-types
-const CounterCard = ({ digit, text }) => {
-    return (jsxs(Flex, { sx: { flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }, children: [jsx$2(Flex, { sx: {
-                    background: 'linear-gradient(-45deg, #251c22 0%, #3a2327 100%)',
-                    borderRadius: 'normal',
-                    border: '1px solid #FE9E0450',
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                    p: '20px',
-                    fontSize: ['24px', '24px', '26px', '36px'],
-                    width: ['55px', '55px', '65px', '85px'],
-                    height: ['60px', '60px', '70px', '90px'],
-                    fontWeight: 700,
-                }, children: digit.toString().padStart(2, '0') }), jsx$2(Text, { color: "textNavbar", sx: {
-                    fontSize: ['12px', '12px', '12px', '14px'],
-                    fontWeight: 400,
-                    mt: '10px',
-                }, children: text })] }));
-};
-const Colon = () => {
-    return (jsxs(Flex, { sx: { flexDirection: 'column', alignItems: 'center' }, children: [jsx$2(Text, { sx: {
-                    fontSize: '34px',
-                    fontWeight: 700,
-                    lineHeight: '90px',
-                    background: 'linear-gradient(to bottom, #fe9e0420 40%, #FE9E04 60%)',
-                    WebkitBackgroundClip: 'text',
-                    WebkitTextFillColor: 'transparent',
-                    backgroundClip: 'text',
-                }, children: ":" }), jsx$2(Text, { color: "transparent", sx: { fontSize: '14px', fontWeight: 400, mt: '10px' }, children: "t" })] }));
-};
-const interval = 1000; // 1 sec
-const getCountdownObject = (targetIsoTime) => {
-    // Detect if timestamp is in seconds or milliseconds
-    // Timestamps in seconds are typically < 10^10, milliseconds are > 10^12
-    const isSeconds = targetIsoTime < 10000000000;
-    const targetTimeMs = isSeconds ? targetIsoTime * 1000 : targetIsoTime;
-    const targetTime = new Date(targetTimeMs);
-    const now = new Date();
-    let delta = (targetTime.getTime() - now.getTime()) / 1000; // difference in seconds
-    // If the target time has passed, return zero countdown
-    if (delta <= 0)
-        return {
-            days: 0,
-            hours: 0,
-            minutes: 0,
-            seconds: 0,
-        };
-    const days = Math.floor(delta / 86400);
-    delta -= days * 86400;
-    const hours = Math.floor(delta / 3600) % 24;
-    delta -= hours * 3600;
-    const minutes = Math.floor(delta / 60) % 60;
-    const seconds = Math.floor(delta % 60);
-    return {
-        days,
-        hours,
-        minutes,
-        seconds,
-    };
-};
-const CountdownTimer = ({ targetTime }) => {
-    const [show, setShow] = useState(false);
-    const [countdown, setCountdown] = useState(getCountdownObject(targetTime));
-    useEffect(() => {
-        if (!show)
-            setShow(true);
-        const intervalId = setInterval(() => {
-            setCountdown(getCountdownObject(targetTime));
-        }, interval);
-        return () => {
-            clearInterval(intervalId);
-        };
-        /* eslint-disable react-hooks/exhaustive-deps */
-    }, [targetTime]);
-    // Render a countdown
-    return (show && (jsxs(Flex, { sx: {
-            flexDirection: 'row',
-            justifyContent: 'center',
-            alignItems: 'center',
-            gap: ['10px', '10px', '20px', '20px'],
-        }, children: [jsx$2(CounterCard, { digit: countdown?.days || 0, text: "Days" }), jsx$2(Colon, {}), jsx$2(CounterCard, { digit: countdown?.hours || 0, text: "Hours" }), jsx$2(Colon, {}), jsx$2(CounterCard, { digit: countdown?.minutes || 0, text: "Minutes" }), jsx$2(Colon, {}), jsx$2(CounterCard, { digit: countdown?.seconds || 0, text: "Seconds" })] })));
-};
-
-function useRefundData() {
-    const { address } = useAccount();
-    const { chains } = useSDKConfig();
-    const apiUrl = useSDKConfig()?.urls?.apiV2;
-    const { data: saleInfo, isLoading: isSaleInfoLoading } = useSaleInfo();
-    // Get stage 1 and stage 2 contracts (refundable stages)
-    // Check by stageNumber since key naming may vary
-    const refundableStages = saleInfo?.stages?.filter((stage) => stage.stageNumber === 1 || stage.stageNumber === 2);
-    console.log('Refundable stages:', refundableStages);
-    console.log('All stages from saleInfo:', saleInfo?.stages);
-    // Flatten ALL contracts from refundable stages across ALL chains
-    const allContracts = [];
-    refundableStages?.forEach((stage) => {
-        console.log(`Stage ${stage.stageNumber} (${stage.key}) contractsByChain:`, stage.contractsByChain);
-        Object.entries(stage.contractsByChain).forEach(([chainId, contracts]) => {
-            contracts.forEach((contract) => {
-                console.log(`Adding contract: ${contract.address} on chain ${chainId} for stage ${stage.stageNumber}`);
-                allContracts.push({
-                    ...contract,
-                    chainId: parseInt(chainId),
-                    stageKey: stage.key,
-                    stageNumber: stage.stageNumber,
-                });
-            });
-        });
-    });
-    console.log('All contracts to check for refund:', allContracts);
-    return useQuery({
-        queryKey: [QUERY_KEYS.REFUND_DATA, address, allContracts?.length],
-        queryFn: () => fetchRefundData(chains, allContracts, address, apiUrl),
-        refetchInterval: 30000,
-        refetchOnWindowFocus: true,
-        enabled: !isSaleInfoLoading && allContracts.length > 0 && !!address,
-    });
-}
-const fetchRefundData = async (chains, contracts, account, apiUrl) => {
-    try {
-        console.log('fetchRefundData called with:', { chains, contractCount: contracts.length, account });
-        // Filter out invalid contracts
-        const validContracts = contracts.filter((contract) => contract.address !== '0x0000000000000000000000000000000000000000' && contract.address !== '');
-        console.log('Valid contracts after filtering:', validContracts.length, validContracts);
-        const results = await Promise.all(validContracts.map(async (contract) => {
-            try {
-                const calls = [
-                    {
-                        address: contract.address,
-                        name: 'accountInfo',
-                        params: [account],
-                    },
-                    {
-                        address: contract.address,
-                        name: 'accountStatus',
-                        params: [account],
-                    },
-                ];
-                console.log(`Calling multicall for ${contract.address} on chain ${contract.chainId}`);
-                const res = await multicall(contract.chainId, launchBondsABI, calls);
-                console.log(`Multicall result for ${contract.address}:`, res);
-                const depositAmount = res[0].depositAmount.toString();
-                const hasRefunded = res[1].hasRefunded;
-                console.log(`Contract ${contract.address}: depositAmount=${depositAmount}, hasRefunded=${hasRefunded}`);
-                return {
-                    address: contract.address,
-                    chainId: contract.chainId,
-                    type: contract.type,
-                    stageKey: contract.stageKey,
-                    stageNumber: contract.stageNumber,
-                    depositAmount,
-                    depositAmountBTC: Number(depositAmount) / 100000000,
-                    hasRefunded,
-                    principalToken: contract.principalToken,
-                };
-            }
-            catch (error) {
-                console.error(`Error fetching refund data for ${contract.address} on chain ${contract.chainId}:`, error);
-                return null;
-            }
-        }));
-        const validResults = results.filter((r) => r !== null);
-        // Filter to only show contracts with deposits
-        const contractsWithDeposits = validResults.filter((r) => r.depositAmountBTC > 0.00000001);
-        const totalDepositBTC = contractsWithDeposits.reduce((sum, c) => sum + c.depositAmountBTC, 0);
-        return {
-            contracts: contractsWithDeposits,
-            totalDepositBTC,
-        };
-    }
-    catch (e) {
-        console.error('fetchRefundData error:', e);
-        reportError$1({
-            apiUrl,
-            error: e,
-            extraInfo: { type: 'fetchRefundData', contracts, e },
-            account,
-        });
-        return {
-            contracts: [],
-            totalDepositBTC: 0,
-        };
-    }
-};
-
-const RefundRow = ({ contract, onRefundSuccess }) => {
-    const { address: account } = useAccount();
-    const chainId = useChainId();
-    const { switchChain } = useSwitchChain();
-    const { writeContractAsync } = useWriteContract();
-    const { addToastError, addToastSuccess } = usePopups();
-    const [txHash, setTxHash] = useState();
-    const [isLoading, setIsLoading] = useState(false);
-    const { isLoading: isConfirming, isSuccess: isConfirmed } = useMonitorTxHash(txHash, contract.chainId);
-    const needsChainSwitch = chainId !== contract.chainId;
-    const chainName = NETWORK_LABEL[contract.chainId] || `Chain ${contract.chainId}`;
-    const tokenSymbol = contract.type === 'goo' ? 'GOO' : 'sGOO';
-    const handleRefund = async () => {
-        if (needsChainSwitch) {
-            switchChain?.({ chainId: contract.chainId });
-            return;
-        }
-        setIsLoading(true);
-        try {
-            const hash = await writeContractAsync({
-                address: contract.address,
-                abi: launchBondsABI,
-                functionName: 'redeemRefund',
-                args: [],
-                chain: contract.chainId,
-                account,
-            });
-            if (hash) {
-                setTxHash(hash);
-                addToastSuccess('Refund transaction submitted!');
-                onRefundSuccess();
-            }
-        }
-        catch (error) {
-            console.error('Refund error:', error);
-            addToastError(error?.shortMessage || 'Failed to process refund');
-        }
-        finally {
-            setIsLoading(false);
-        }
-    };
-    const loading = isLoading || (isConfirming && !isConfirmed);
-    if (contract.hasRefunded) {
-        return (jsxs(Flex, { sx: {
-                width: '100%',
-                background: 'white2',
-                p: '20px',
-                borderRadius: 'normal',
-                mb: '10px',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-                opacity: 0.6,
-            }, children: [jsxs(Flex, { sx: { alignItems: 'center', gap: '15px' }, children: [jsx$2(TokenImage, { symbol: tokenSymbol, size: 40, chain: contract.chainId }), jsxs(Flex, { sx: { flexDirection: 'column' }, children: [jsx$2(Text, { sx: { fontSize: '16px', fontWeight: 'bold' }, children: tokenSymbol }), jsxs(Text, { sx: { fontSize: '12px', opacity: 0.7 }, children: ["Stage ", contract.stageNumber, " \u2022 ", chainName] })] })] }), jsxs(Flex, { sx: { alignItems: 'center', gap: '20px' }, children: [jsxs(Text, { sx: { fontSize: '14px', fontWeight: 500 }, children: [contract.depositAmountBTC.toFixed(8), " BTC"] }), jsx$2(Button, { disabled: true, sx: { minWidth: '120px' }, children: "REFUNDED" })] })] }));
-    }
-    return (jsxs(Flex, { sx: {
-            width: '100%',
-            background: 'white2',
-            p: '20px',
-            borderRadius: 'normal',
-            mb: '10px',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-            flexDirection: ['column', 'column', 'row', 'row'],
-            gap: ['15px', '15px', '0', '0'],
-        }, children: [jsxs(Flex, { sx: { alignItems: 'center', gap: '15px' }, children: [jsx$2(TokenImage, { symbol: tokenSymbol, size: 40, chain: contract.chainId }), jsxs(Flex, { sx: { flexDirection: 'column' }, children: [jsx$2(Text, { sx: { fontSize: '16px', fontWeight: 'bold' }, children: tokenSymbol }), jsxs(Text, { sx: { fontSize: '12px', opacity: 0.7 }, children: ["Stage ", contract.stageNumber, " \u2022 ", chainName] })] })] }), jsxs(Flex, { sx: { alignItems: 'center', gap: '20px', flexDirection: ['column', 'column', 'row', 'row'] }, children: [jsxs(Flex, { sx: { flexDirection: 'column', alignItems: ['center', 'center', 'flex-end', 'flex-end'] }, children: [jsxs(Text, { sx: { fontSize: '16px', fontWeight: 'bold' }, children: [contract.depositAmountBTC.toFixed(8), " BTC"] }), jsx$2(Text, { sx: { fontSize: '12px', opacity: 0.7 }, children: "Deposited" })] }), jsx$2(Button, { onClick: handleRefund, disabled: loading, load: loading, sx: { minWidth: '140px' }, variant: needsChainSwitch ? 'secondary' : 'primary', children: loading ? 'PROCESSING...' : needsChainSwitch ? `SWITCH CHAIN` : 'REFUND' })] })] }));
-};
-const RefundView = () => {
-    const { address } = useAccount();
-    const { data: refundData, isLoading, refetch } = useRefundData();
-    const handleRefundSuccess = () => {
-        // Refetch data after successful refund
-        setTimeout(() => refetch(), 2000);
-    };
-    if (!address) {
-        return (jsxs(Flex, { sx: { width: '100%', flexDirection: 'column', alignItems: 'center', p: '40px' }, children: [jsx$2(Text, { sx: { fontSize: '18px', fontWeight: 'bold', mb: '20px' }, children: "Connect wallet to view your refundable deposits" }), jsx$2(ConnectButton, {})] }));
-    }
-    if (isLoading) {
-        return (jsx$2(Flex, { sx: { justifyContent: 'center', alignItems: 'center', p: '60px', width: '100%' }, children: jsx$2(Spinner, {}) }));
-    }
-    const contracts = refundData?.contracts || [];
-    const hasDeposits = contracts.length > 0;
-    return (jsx$2(Flex, { sx: { width: '100%', flexDirection: 'column', p: ['10px', '20px', '20px', '40px'] }, children: !hasDeposits ? (jsxs(Flex, { sx: {
-                width: '100%',
-                background: 'white2',
-                p: '40px',
-                borderRadius: 'normal',
-                alignItems: 'center',
-                justifyContent: 'center',
-                flexDirection: 'column',
-            }, children: [jsx$2(Text, { sx: { fontSize: '16px', fontWeight: 500, opacity: 0.7 }, children: "No refundable deposits found" }), jsx$2(Text, { sx: { fontSize: '14px', opacity: 0.5, mt: '10px' }, children: "You have not participated in Stage 1 or Stage 2 on the selected chain." })] })) : (jsx$2(Fragment$1, { children: contracts.map((contract) => (jsx$2(RefundRow, { contract: contract, onRefundSuccess: handleRefundSuccess }, `${contract.address}-${contract.chainId}`))) })) }));
-};
-
 var BondsViewOptions;
 (function (BondsViewOptions) {
     BondsViewOptions["BONDSMARKET"] = "Bonds Market";
@@ -100663,25 +100415,16 @@ const GooSale = () => {
     const { data: chainFilterOption, setChainFilterOption } = useChainFilterOption();
     const { data: saleInfo, isLoading: isLoadingSaleInfo } = useSaleInfo();
     const SDKConfig = useSDKConfig();
-    const currentStageNumber = saleInfo?.isInBreakPeriod
+    saleInfo?.isInBreakPeriod
         ? saleInfo?.nextStage?.stageNumber || 1
         : saleInfo?.currentStage?.stageNumber || 1;
     const { address } = useAccount();
     const { data: yourGoo, isLoading, isFetching } = useYourGoo(address);
     const userParticipated = address && !isLoading && !isFetching && (yourGoo?.depositToGooBond !== '0' || yourGoo?.depositToSGooBond !== '0');
     const chainId = useChainId();
-    const { data: elegibleForSale, cbBTCBalance, isCbBTCBalanceLoading, cbBTCBalanceChecked, checkCbBTCBalance, addToWhitelist, isAddingToWhitelist, addToWhitelistSuccess, addToWhitelistError, } = useGooEligibility();
+    useGooEligibility();
     const [checkButtonPushed, setCheckButtonPushed] = useState(false);
-    const whitelisted = checkButtonPushed ? elegibleForSale : undefined;
-    // Handle check eligibility button click
-    const handleCheckEligibility = async () => {
-        setCheckButtonPushed(true);
-        if (elegibleForSale === null || elegibleForSale === undefined) {
-            // If not eligible, check cbBTC balance
-            await checkCbBTCBalance();
-        }
-    };
-    const currentStageSoldOut = saleInfo?.currentStage?.progressPercentage === 100;
+    saleInfo?.currentStage?.progressPercentage === 100;
     // // Wrapper function that sets chain filter AND switches wallet chain
     // const handleChainFilterChange = useCallback(
     //   (newChainFilter: string[]) => {
@@ -100720,59 +100463,21 @@ const GooSale = () => {
     //   return filtered
     // }, [saleInfo?.currentStage?.contractsByChain, chainFilterOption])
     // Dynamic title based on current period (hidden during refund period)
-    const pageTitle = useMemo(() => {
+    useMemo(() => {
         if (saleInfo?.isRefundPeriod)
             return null;
         if (saleInfo?.currentStage?.key === 'TGE')
             return 'GOO Token Generation Event';
         return 'Buy GOO at a discount';
     }, [saleInfo?.isRefundPeriod, saleInfo?.currentStage?.key]);
-    return (jsxs(Flex, { className: "bonds-container", children: [jsx$2(CheckUrl, {}), !SDKConfig.bondsComingSoon && pageTitle && (jsx$2(Flex, { sx: { justifyContent: 'center', alignItems: 'center', width: '100%' }, children: jsx$2(Text, { sx: { fontSize: '24px', fontWeight: 700, opacity: '0.9' }, children: pageTitle }) })), (saleInfo?.isInBreakPeriod || currentStageSoldOut) &&
-                saleInfo?.nextStage &&
-                !isLoadingSaleInfo &&
-                !saleInfo?.isSaleEnded && (jsxs(Flex, { sx: { width: '100%', justifyContent: 'center', mt: '40px', flexDirection: 'column', alignItems: 'center' }, children: [jsxs(Text, { sx: { fontSize: '20px', fontWeight: 'bold', mb: '20px' }, children: [saleInfo?.nextStage?.key === 'refund'
-                                ? 'Refund Period '
-                                : saleInfo?.nextStage?.key === 'TGE'
-                                    ? 'TGE '
-                                    : 'Stage ' + saleInfo?.nextStage?.stageNumber + ' ', "starts in:"] }), jsx$2(CountdownTimer, { targetTime: saleInfo?.nextStage?.startTime || 0 }), !(saleInfo?.nextStage?.key === 'refund' || saleInfo?.nextStage?.key === 'TGE') ? (jsxs(Fragment$1, { children: [jsxs(Flex, { sx: { flexDirection: 'column', alignItems: 'center' }, children: [jsxs(Flex, { sx: { flexDirection: 'row', alignItems: 'center', mt: '30px' }, children: [address && (jsxs(Flex, { sx: {
-                                                    mr: '1rem',
-                                                    p: '10px',
-                                                    borderRadius: 'normal',
-                                                    background: 'white3',
-                                                    alignItems: 'center',
-                                                }, children: [jsx$2(Flex, { sx: { mr: '10px' }, children: jsx$2(Svg, { icon: "wallet" }) }), jsxs(Text, { sx: { fontSize: '14px', fontWeight: 400 }, children: [address?.slice(0, 4), "...", address?.slice(address?.length - 4, address?.length)] })] })), jsx$2(Flex, { sx: { fontSize: '18px', fontWeight: 500 }, children: "Are You Eligible?" })] }), !address ? (jsx$2(Flex, { sx: { my: '20px', width: '100%' }, children: jsx$2(ConnectButton, {}) })) : (whitelisted === null ||
-                                        (whitelisted === undefined && !cbBTCBalanceChecked && (jsx$2(Button, { sx: { m: '20px', width: '100%' }, onClick: handleCheckEligibility, children: "CHECK ELIGIBILITY" }))))] }), whitelisted !== null && whitelisted !== undefined && (jsxs(Flex, { sx: {
-                                    flexDirection: 'row',
-                                    alignItems: 'center',
-                                    mt: '20px',
-                                    background: 'white2',
-                                    p: '20px',
-                                    m: '20px',
-                                    borderRadius: 'normal',
-                                }, children: [jsxs(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: ["You are whitelisted for Stage ", whitelisted, " and beyond!"] }), jsxs(Text, { color: "primaryButton", sx: { fontSize: '12px', fontWeight: 400, pl: '1rem' }, children: ["Tier ", whitelisted, " Access"] })] })), whitelisted === null && (jsx$2(Flex, { sx: {
-                                    flexDirection: 'column',
-                                    alignItems: 'center',
-                                    gap: '10px',
-                                    background: 'white2',
-                                    p: '20px',
-                                    m: '20px',
-                                    borderRadius: 'normal',
-                                }, children: cbBTCBalanceChecked && (jsx$2(Flex, { sx: { flexDirection: 'column', alignItems: 'center', gap: '10px', mt: '10px' }, children: isCbBTCBalanceLoading ? (jsx$2(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: "Checking BTC balance across all chains..." })) : cbBTCBalance ? (jsxs(Fragment$1, { children: [cbBTCBalance.isEligible ? (addToWhitelistSuccess ? (jsx$2(Text, { color: "primaryButton", sx: { fontSize: '12px', fontWeight: 700 }, children: "\u2713 Successfully added to whitelist! Please refresh to see your tier." })) : addToWhitelistError ? (jsx$2(Text, { sx: { fontSize: '12px', fontWeight: 400, color: 'error' }, children: "Failed to add to whitelist. Please try again." })) : (jsx$2(Fragment$1, { children: jsx$2(Flex, { sx: { flexDirection: 'row', alignItems: 'center' }, children: jsxs(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: ["You ", jsx$2("span", { sx: { fontWeight: 700 }, children: "ARE" }), " eligible for the sale"] }) }) }))) : (jsxs(Flex, { sx: { flexDirection: 'column', alignItems: 'center', gap: '10px' }, children: [jsxs(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: ["You are ", jsx$2("span", { sx: { fontWeight: 700 }, children: "NOT" }), " eligible for the sale"] }), jsx$2(Text, { sx: { fontSize: '12px', fontWeight: 400, color: 'error' }, children: "You need at least 0.001 BTC to be whitelisted" })] })), jsxs(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: ["Total BTC Balance: ", cbBTCBalance.balance] }), cbBTCBalance.chainsWithBalance && cbBTCBalance.chainsWithBalance.length > 0 && (jsx$2(Flex, { sx: { flexDirection: 'column', gap: '5px', mt: '5px' }, children: cbBTCBalance.chainsWithBalance.map((chain) => (jsxs(Flex, { sx: { flexDirection: 'row', alignItems: 'center', gap: '10px' }, children: [jsx$2(TokenImage, { symbol: chain.symbol, size: 25, chain: chain.chainId }), jsxs(Text, { sx: { fontSize: '10px', fontWeight: 400, opacity: 0.7 }, children: [chain.balance, " ", chain.symbol] })] }, chain.chainId))) })), cbBTCBalance.isEligible && (jsx$2(Button, { sx: { width: '100%' }, onClick: () => addToWhitelist(), disabled: isAddingToWhitelist, children: isAddingToWhitelist ? 'ADDING TO WHITELIST...' : 'ADD ME TO WHITELIST' }))] })) : (jsx$2(Text, { sx: { fontSize: '12px', fontWeight: 400 }, children: "Unable to fetch BTC balance. Please try again." })) })) }))] })) : (jsx$2(Fragment$1, {}))] })), !SDKConfig.bondsComingSoon && (jsx$2(Flex, { sx: {
+    return (jsxs(Flex, { className: "bonds-container", children: [jsx$2(CheckUrl, {}), !SDKConfig.bondsComingSoon && (jsx$2(Flex, { sx: {
                     display: 'flex',
                     flexDirection: 'column',
                     alignItems: 'center',
                     justifyContent: 'center',
                     width: '100%',
                     p: '6%',
-                }, children: jsx$2(Button, { sx: { width: '230px' }, onClick: () => (window.location.href = `${window.location.origin}/bonds`), children: "Start Bonding" }) })), jsxs(Flex, { sx: {
-                    width: '100%',
-                    alignItems: 'center',
-                    px: '12%',
-                    pt: (saleInfo?.isInBreakPeriod || currentStageSoldOut) && saleInfo?.nextStage ? '4rem' : '1rem',
-                    pb: '4rem',
-                }, children: [jsx$2(StepBubble, { number: 1, title: 'STAGE 1', currentStep: currentStageNumber, loading: false }), jsx$2(StepBubble, { number: 2, title: 'STAGE 2', currentStep: currentStageNumber, loading: false }), jsx$2(StepBubble, { number: 3, title: 'REFUND', currentStep: currentStageNumber, loading: false }), jsx$2(StepBubble, { number: 4, title: 'TGE', currentStep: currentStageNumber, loading: false, hideBar: true })] }), jsx$2(Divider, { sx: { width: '100%', height: '2px', backgroundColor: 'white2' } }), saleInfo?.isRefundPeriod ? (
-            // Refund period - show refund view for ALL chains
-            jsx$2(RefundView, {})) : userParticipated ? (
+                }, children: jsx$2(Button, { sx: { width: '230px' }, onClick: () => (window.location.href = `${window.location.origin}/bonds`), children: "Start Bonding" }) })), userParticipated ? (
             // Break period but user has participated - show their goo
             jsx$2(Fragment$1, { children: jsx$2(YourGoo, { yourGoo: yourGoo, isLoading: isLoading, isFetching: isFetching }) })) : (jsx$2(Fragment$1, {}))] }));
 };

package/dist/views/ZapModal/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { ChainId, Token } from '@ape.swap/apeswap-lists';
+import { BondsData } from '../../types/bonds';
 /**
  * @param chainId this is the chainId of the outputToken
  */
@@ -8,6 +9,7 @@ interface ZapModalProps {
     outputToken: Token;
     chainId: ChainId;
     account?: string;
+    bondData?: BondsData;
 }
-declare const ZapModal: ({ onDismiss, outputToken, account, chainId }: ZapModalProps) => React.JSX.Element;
+declare const ZapModal: ({ onDismiss, outputToken, account, chainId, bondData }: ZapModalProps) => React.JSX.Element;
 export default ZapModal;

package/package.json

@@ -3,7 +3,7 @@
   "description": "Goo Money Bond SDK",
   "author": "Goo Money",
   "license": "MIT",
-  "version": "3.0.175",
+  "version": "3.0.177",
   "proxy": "https://realtime-api-pr-99.herokuapp.com",
   "module": "dist/main.js",
   "type": "module",