@ape.swap/bonds-sdk 4.0.0-test.15 → 4.0.0-test.17

package/dist/main.js

@@ -79899,17 +79899,20 @@ const UserBondRowPreTGE = ({ userBond }) => {
     const redeemableIn = formatTimeLeft(((_b = userBond === null || userBond === void 0 ? void 0 : userBond.redeemTime) !== null && _b !== void 0 ? _b : 0) - new Date().getTime() / 1000, true, true);
     const depositAmount = getBalanceNumber(new BigNumber$1((_d = (_c = userBond === null || userBond === void 0 ? void 0 : userBond.accountInfo) === null || _c === void 0 ? void 0 : _c.depositAmount) !== null && _d !== void 0 ? _d : '0'), (_f = (_e = userBond === null || userBond === void 0 ? void 0 : userBond.lpToken) === null || _e === void 0 ? void 0 : _e.decimals) === null || _f === void 0 ? void 0 : _f[userBond === null || userBond === void 0 ? void 0 : userBond.chainId]);
     const truePricePaid = getBalanceNumber(new BigNumber$1((_h = (_g = userBond === null || userBond === void 0 ? void 0 : userBond.accountInfo) === null || _g === void 0 ? void 0 : _g.truePricePaid) !== null && _h !== void 0 ? _h : '0'), (_k = (_j = userBond === null || userBond === void 0 ? void 0 : userBond.lpToken) === null || _j === void 0 ? void 0 : _j.decimals) === null || _k === void 0 ? void 0 : _k[userBond === null || userBond === void 0 ? void 0 : userBond.chainId]);
+    const initialRelease = userBond === null || userBond === void 0 ? void 0 : userBond.initialRelease;
     const vestingTimePeriods = getTimePeriods((_l = userBond.vestingTerm) !== null && _l !== void 0 ? _l : 0, false);
     const vestingString = hasRedeemed
         ? getPendingVestingString(userBond === null || userBond === void 0 ? void 0 : userBond.userOwnedBillsData)
-        : `${vestingTimePeriods.months} Months`;
+        : initialRelease === 1
+            ? `0 D`
+            : `${vestingTimePeriods.months} Months`;
     const userAllocation = depositAmount / ((_m = userBond === null || userBond === void 0 ? void 0 : userBond.initPrice) !== null && _m !== void 0 ? _m : 0);
-    const initialRelease = !hasRedeemed && saleFinalized && (userBond === null || userBond === void 0 ? void 0 : userBond.initialRelease) ? userAllocation * (userBond === null || userBond === void 0 ? void 0 : userBond.initialRelease) : 0;
+    const initialReleaseTokens = !hasRedeemed && saleFinalized && (userBond === null || userBond === void 0 ? void 0 : userBond.initialRelease) ? userAllocation * (userBond === null || userBond === void 0 ? void 0 : userBond.initialRelease) : 0;
     // pendingRewards variable follows the naming of the SC, but it actually means currently claimable tokens
     const pendingRewards = getBalanceNumber(new BigNumber$1((_p = (_o = userBond === null || userBond === void 0 ? void 0 : userBond.userOwnedBillsData) === null || _o === void 0 ? void 0 : _o.pendingRewards) !== null && _p !== void 0 ? _p : '0'), (_r = (_q = userBond === null || userBond === void 0 ? void 0 : userBond.earnToken) === null || _q === void 0 ? void 0 : _q.decimals) === null || _r === void 0 ? void 0 : _r[userBond.chainId]);
     // payout variable follows the naming of the SC, but it actually means total tokens vested
     const payout = getBalanceNumber(new BigNumber$1((_t = (_s = userBond === null || userBond === void 0 ? void 0 : userBond.userOwnedBillsData) === null || _s === void 0 ? void 0 : _s.payout) !== null && _t !== void 0 ? _t : '0'), (_v = (_u = userBond === null || userBond === void 0 ? void 0 : userBond.earnToken) === null || _u === void 0 ? void 0 : _u.decimals) === null || _v === void 0 ? void 0 : _v[userBond.chainId]);
-    const claimableAmount = hasRedeemed ? pendingRewards : initialRelease;
+    const claimableAmount = hasRedeemed ? pendingRewards : initialReleaseTokens;
     const claimableUSD = claimableAmount * ((_w = userBond.initPrice) !== null && _w !== void 0 ? _w : 0);
     const pendingAmount = hasRedeemed ? payout : depositAmount / truePricePaid;
     const pendingUSD = pendingAmount * ((_x = userBond === null || userBond === void 0 ? void 0 : userBond.earnTokenPrice) !== null && _x !== void 0 ? _x : 0);
@@ -85994,6 +85997,8 @@ const BuyBond$1 = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond, isP
             const maxPrice = new BigNumber$1(trueBondPrice !== null && trueBondPrice !== void 0 ? trueBondPrice : '0').times(102).div(100).toFixed(0); // multiply it by 1.02
             const rawAmount = adjustDecimals(inputValue);
             const amount = new BigNumber$1(rawAmount).times(new BigNumber$1(10).pow(decimals !== null && decimals !== void 0 ? decimals : 18)).toString();
+            console.log(maxPrice);
+            console.log(trueBondPrice);
             const shouldUseSig = (bondData === null || bondData === void 0 ? void 0 : bondData.billVersion) === types$1.BillVersion.V4 && SDKConfig.useTiers;
             const args = shouldUseSig ? [amount, maxPrice, account, tierProofSig] : [amount, maxPrice, account];
             const hash = yield writeContractAsync({
@@ -86285,7 +86290,7 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, isProjectView, setBillId }
         setInputTokenString(newInputToken);
     }, []);
     const handleBuyCallback = () => __awaiter$9(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         if (!accountSolana || !bondData || !inputValue || !inputToken || !bondData)
             return;
         try {
@@ -86296,12 +86301,13 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, isProjectView, setBillId }
             const amountBigInt = BigInt(depositAmount.toFixed(0));
             const user = accountSolana;
             const trueBondPriceWithoutFee = (_b = (_a = bondData === null || bondData === void 0 ? void 0 : bondData.trueBondPrices) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.trueBondPrice;
-            const feeInPrincipal = (_c = bondData.feeInPrincipal) !== null && _c !== void 0 ? _c : 0;
-            const slippage = feeInPrincipal + 2;
+            const slippage = 4;
             const maxPrice = new BigNumber$1(trueBondPriceWithoutFee !== null && trueBondPriceWithoutFee !== void 0 ? trueBondPriceWithoutFee : '0')
                 .times((100 + slippage) / 100)
                 .dividedBy(new BigNumber$1(1e6))
                 .toFixed(0);
+            console.log(maxPrice);
+            console.log(trueBondPriceWithoutFee);
             // Static addresses
             const bondIssuancePda = new PublicKey(bondData.contractAddress[bondData.chainId]);
             const principalMint = new PublicKey(bondData.lpToken.address[bondData.chainId]);
@@ -86381,10 +86387,10 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, isProjectView, setBillId }
             if (nftMint.publicKey.toString()) {
                 setBillId === null || setBillId === void 0 ? void 0 : setBillId(nftMint.publicKey.toString());
             }
-            const inputAmountUSD = parseFloat(inputValue) * parseFloat((_d = bondData === null || bondData === void 0 ? void 0 : bondData.principalTokenPrice) !== null && _d !== void 0 ? _d : '0');
-            axios.post(`${(_e = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _e === void 0 ? void 0 : _e.apiV2}/bills/galxe/quest`, {
+            const inputAmountUSD = parseFloat(inputValue) * parseFloat((_c = bondData === null || bondData === void 0 ? void 0 : bondData.principalTokenPrice) !== null && _c !== void 0 ? _c : '0');
+            axios.post(`${(_d = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _d === void 0 ? void 0 : _d.apiV2}/bills/galxe/quest`, {
                 wallet: accountSolana === null || accountSolana === void 0 ? void 0 : accountSolana.toString(),
-                bond: (_f = bondData === null || bondData === void 0 ? void 0 : bondData.contractAddress) === null || _f === void 0 ? void 0 : _f[bondData === null || bondData === void 0 ? void 0 : bondData.chainId],
+                bond: (_e = bondData === null || bondData === void 0 ? void 0 : bondData.contractAddress) === null || _e === void 0 ? void 0 : _e[bondData === null || bondData === void 0 ? void 0 : bondData.chainId],
                 amount: inputAmountUSD,
             });
         }
@@ -86392,7 +86398,7 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, isProjectView, setBillId }
             console.error('Error during bond purchase:', error);
             addToastError((error === null || error === void 0 ? void 0 : error.message) || 'Unknown error');
             reportError$1({
-                apiUrl: (_g = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _g === void 0 ? void 0 : _g.apiV2,
+                apiUrl: (_f = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _f === void 0 ? void 0 : _f.apiV2,
                 error: error.message,
                 extraInfo: { type: 'solanaBuyBond', error: error.message },
                 chainId: bondChain,
@@ -86447,8 +86453,7 @@ const BuyBond = ({ onDismiss, bondAddress, bondChain, isProjectView, setBillId }
                                         !accountSolana ||
                                         !inputValue ||
                                         parseFloat(inputValue) === 0 ||
-                                        exceedsMaxBuy ||
-                                        exceedsBalance, onClick: handleOpenModal, sx: { width: ['100%', '100%', '100%', '65%'] }, children: exceedsMaxBuy ? 'Exceeds Max Buy' : exceedsBalance ? 'Insufficient balance' : `buy` })] })) }) })] }) })) : (jsx$2(Fragment$1, {}));
+                                        exceedsMaxBuy, onClick: handleOpenModal, sx: { width: ['100%', '100%', '100%', '65%'] }, children: exceedsMaxBuy ? 'Exceeds Max Buy' : exceedsBalance ? 'Insufficient balance' : `buy` })] })) }) })] }) })) : (jsx$2(Fragment$1, {}));
 };
 
 const BuyBondModal = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond, setBillId, }) => {
@@ -88215,7 +88220,7 @@ const styles$5 = {
 };
 
 const Toast = ({ popIndex, popup }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { variant, title, description, url } = popup;
     const { removePopup } = usePopups();
     const [show, setShow] = useState(true);
@@ -88233,11 +88238,14 @@ const Toast = ({ popIndex, popup }) => {
         ((_c = popup === null || popup === void 0 ? void 0 : popup.description) === null || _c === void 0 ? void 0 : _c.includes('Slippage')) ||
         ((_d = popup === null || popup === void 0 ? void 0 : popup.description) === null || _d === void 0 ? void 0 : _d.includes('Return amount is not enough'));
     const isTimeoutError = (_e = popup === null || popup === void 0 ? void 0 : popup.description) === null || _e === void 0 ? void 0 : _e.includes('Blockhash not found');
+    const isInsufficientFundsError = (_f = popup === null || popup === void 0 ? void 0 : popup.description) === null || _f === void 0 ? void 0 : _f.includes('insufficient funds');
     const parsedErrorString = isSlippageError
         ? 'Slippage error. Try increasing Slippage in the cog icon ⚙️.'
         : isTimeoutError
-            ? 'Tx timeout. Please try again'
-            : popup === null || popup === void 0 ? void 0 : popup.description;
+            ? 'Tx timeout. Please try again.'
+            : isInsufficientFundsError
+                ? 'Insufficient funds.'
+                : popup === null || popup === void 0 ? void 0 : popup.description;
     return (jsx$2(AnimatePresence, { children: show && (jsxs(motion.div, { initial: { right: '-300px' }, animate: { right: '10px' }, transition: { duration: 0.5 }, exit: { right: '-300px' }, sx: Object.assign(Object.assign({}, styles$5.alert), { top: 108 * popIndex, zIndex: 103 }), children: [jsx$2(Flex, { children: jsx$2(Svg, { icon: variant, color: variant, width: "30px" }) }), jsxs(Flex, { sx: styles$5.content, children: [jsx$2(Text, { sx: { color: variant, fontSize: '14px', fontWeight: 500 }, children: title }), description && (jsx$2(Text, { sx: {
                                 fontSize: '12px',
                                 fontWeight: 400,

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ape Bond SDK",
   "author": "Ape Bond",
   "license": "MIT",
-  "version": "4.0.0-test.15",
+  "version": "4.0.0-test.17",
   "module": "dist/main.js",
   "type": "module",
   "types": "dist/main.d.ts",