@ape.swap/bonds-sdk 4.1.0-test.12 → 4.1.0-test.13

package/dist/main.js

@@ -65634,29 +65634,29 @@ const useSOLAccount = () => {
 };
 
 function useUserBonds(dontFetch) {
-    var _a, _b, _c;
+    var _a, _b;
     // First fetch the full list of bonds
     const { data: bondList } = useBondsList();
     const { address } = useEVMAccount();
     const { publicKey } = useSOLAccount();
     const solanaAccount = publicKey === null || publicKey === void 0 ? void 0 : publicKey.toBase58();
-    const SDKConfig = useSDKConfig();
     const { data: tokenPrices } = useTokenPrices();
-    const chains = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.chains;
-    const apiUrl = (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.apiV2;
-    // Once the full list is fetched, fetch user's purchased bonds
+    const queryClient = useQueryClient();
     return useQuery({
-        queryKey: [QUERY_KEYS.USER_BONDS, address, publicKey, (_c = (_b = Object.keys(tokenPrices !== null && tokenPrices !== void 0 ? tokenPrices : {})) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : null],
-        queryFn: () => getUserBonds(address, solanaAccount, bondList, chains, tokenPrices, apiUrl),
+        queryKey: [QUERY_KEYS.USER_BONDS, address, publicKey, (_b = (_a = Object.keys(tokenPrices !== null && tokenPrices !== void 0 ? tokenPrices : {})) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : null],
+        queryFn: () => getUserBonds(address, solanaAccount, bondList, queryClient),
         refetchInterval: 120000, // TODO rollback this
-        enabled: !!bondList && !!(address || solanaAccount) && !!tokenPrices && !dontFetch,
+        enabled: !!bondList && !!(address || solanaAccount) && !!tokenPrices && true,
         refetchOnWindowFocus: false,
         refetchOnMount: false,
         refetchOnReconnect: false,
         retry: 1,
     });
 }
-const getUserBonds = (account, solanaAccount, bondList, chains, tokenPrices, apiUrl) => __awaiter$9(void 0, void 0, void 0, function* () {
+const getUserBonds = (account, solanaAccount, bondList, queryClient) => __awaiter$9(void 0, void 0, void 0, function* () {
+    const { chains, urls } = queryClient === null || queryClient === void 0 ? void 0 : queryClient.getQueryData([QUERY_KEYS.SDK_CONFIG]);
+    const apiUrl = urls['apiV2'];
+    const tokenPrices = queryClient === null || queryClient === void 0 ? void 0 : queryClient.getQueryData([QUERY_KEYS.TOKEN_PRICES]);
     try {
         console.time('getUserBonds');
         const bondsByChain = bondList.reduce((acc, bond) => {
@@ -74918,10 +74918,9 @@ const SafeHTMLComponent = ({ html }) => {
     return jsx$2("div", { dangerouslySetInnerHTML: { __html: sanitizedHTML } });
 };
 
-const YourBondsModal = ({ billId, onDismiss }) => {
+const YourBondsModal = ({ userBill, onDismiss }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
-    const { data: userBonds, refetch: refetchUserBonds } = useUserBonds();
-    const userBill = userBonds === null || userBonds === void 0 ? void 0 : userBonds.find((bill) => bill.id === billId);
+    const { refetch: refetchUserBonds } = useUserBonds();
     // Hooks
     const SDKConfig = useSDKConfig();
     const chainId = useChainId();
@@ -75189,7 +75188,7 @@ const UserBondRow = ({ bill }) => {
     const { writeContractAsync } = useWriteContract();
     const { addToastError } = usePopups();
     const { refetch: refetchUserBonds } = useUserBonds();
-    const [onOpenPurchasedBond] = useModal(jsx$2(YourBondsModal, { billId: bill.id }));
+    const [onOpenPurchasedBond] = useModal(jsx$2(YourBondsModal, { userBill: bill }));
     // State
     const [claimTxHash, setClaimTxHash] = useState(null);
     const { isLoading: isConfirming, isSuccess: isConfirmed } = useMonitorTx(claimTxHash, (_a = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _a === void 0 ? void 0 : _a.chainId);
@@ -75272,20 +75271,19 @@ const UserBondRow = ({ bill }) => {
                                 : 'Claim' })) })] })] }));
 };
 
-const YourBondsModalSolana = ({ billId, onDismiss }) => {
+const YourBondsModalSolana = ({ userBill, onDismiss }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10;
     // Hooks
     const SDKConfig = useSDKConfig();
     const { publicKey: accountSolana, signTransaction } = useSOLAccount();
     const { setVisible } = useWalletModal();
     const { addToastError, addToastSuccess } = usePopups();
-    const { data: userBonds, refetch } = useUserBonds();
+    const { refetch } = useUserBonds();
     const connection = new Connection(getRPC(types$1.ChainId.SOL), 'confirmed');
     // State
     const [imgLoaded, setImgLoaded] = useState(false);
     const [loadingTx, setLoadingTx] = useState(false);
     // Static Data
-    const userBill = userBonds === null || userBonds === void 0 ? void 0 : userBonds.find((bill) => bill.asset === billId);
     const bondNFTData = userBill === null || userBill === void 0 ? void 0 : userBill.nftData;
     // Cliff display info:
     const vestingCliff = (_a = userBill === null || userBill === void 0 ? void 0 : userBill.bond) === null || _a === void 0 ? void 0 : _a.vestingCliff;
@@ -75460,7 +75458,7 @@ const UserBondRowSolana = ({ bill }) => {
     const lastBlockTimestamp = parseInt((_d = bill === null || bill === void 0 ? void 0 : bill.lastBlockTimestamp) !== null && _d !== void 0 ? _d : '0');
     const isPendingCliff = vestingCliff ? currentTime - lastBlockTimestamp < vestingCliff : false;
     const cliffCountdown = getTimePeriods(lastBlockTimestamp + (vestingCliff !== null && vestingCliff !== void 0 ? vestingCliff : 0) - currentTime, true);
-    const [onOpenPurchasedBond] = useModal(jsx$2(YourBondsModalSolana, { billId: bill.asset }));
+    const [onOpenPurchasedBond] = useModal(jsx$2(YourBondsModalSolana, { userBill: bill }));
     const ensureUserPayoutAtaExists = (_a) => __awaiter$9(void 0, [_a], void 0, function* ({ connection, payer, payoutMint, user, }) {
         const userPayoutAta = yield getAssociatedTokenAddress(payoutMint, user);
         try {
@@ -85240,9 +85238,9 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
                     usdAmount: parseFloat(inputValue) * ((_h = inputTokenPrice === null || inputTokenPrice === void 0 ? void 0 : inputTokenPrice.price) !== null && _h !== void 0 ? _h : 0),
                 },
             });
-            // waits 3 seconds before triggering after-purchase flow
-            yield new Promise((resolve) => setTimeout(resolve, 3000));
-            console.timeEnd('3 seconds elapsed. trigger bonds refetch');
+            // waits 2 seconds before triggering after-purchase flow
+            yield new Promise((resolve) => setTimeout(resolve, 2000));
+            console.timeEnd('2 seconds elapsed. trigger bonds refetch');
             addToastSuccess(txId, bondChain);
             setBillId === null || setBillId === void 0 ? void 0 : setBillId(nftMint.publicKey.toString());
         }
@@ -85324,11 +85322,16 @@ const ModalHandler = ({ onDismiss, bondAddress, bondChain, }) => {
     // State
     const [billId, setBillId] = useState('');
     const [buyTxHash, setBuyTxHash] = useState('');
+    const [userBill, setUserBill] = useState();
     // Hooks
     const { data: bondsData } = useBondsData();
-    const { refetch } = useUserBonds(true);
     const locationPath = window.location.pathname;
     const { data: txReceipt } = useMonitorTx(buyTxHash, bondChain);
+    const { address } = useEVMAccount();
+    const { publicKey } = useSOLAccount();
+    const solanaAccount = publicKey === null || publicKey === void 0 ? void 0 : publicKey.toBase58();
+    const { data: bondList } = useBondsList();
+    const queryClient = useQueryClient();
     // EVM - Look for billId on tx logs
     if (txReceipt) {
         try {
@@ -85356,13 +85359,36 @@ const ModalHandler = ({ onDismiss, bondAddress, bondChain, }) => {
         if (!hasRefetched.current) {
             if (billId) {
                 console.log('Trigger user bonds refetch');
-                refetch();
+                const bondToRefetch = bondList === null || bondList === void 0 ? void 0 : bondList.find((bond) => {
+                    var _a, _b;
+                    return (bondAddress === null || bondAddress === void 0 ? void 0 : bondAddress.toLowerCase()) === ((_b = (_a = bond === null || bond === void 0 ? void 0 : bond.contractAddress) === null || _a === void 0 ? void 0 : _a[bond === null || bond === void 0 ? void 0 : bond.chainId]) === null || _b === void 0 ? void 0 : _b.toLowerCase()) &&
+                        bondChain === (bond === null || bond === void 0 ? void 0 : bond.chainId);
+                });
+                if (!bondToRefetch)
+                    return;
                 hasRefetched.current = true;
+                getUserBonds(address, solanaAccount, [bondToRefetch], queryClient)
+                    .then((bonds) => {
+                    const purchasedBond = bonds.find((bond) => {
+                        var _a;
+                        if (((_a = bond === null || bond === void 0 ? void 0 : bond.bond) === null || _a === void 0 ? void 0 : _a.chainId) === types$1.ChainId.SOL) {
+                            return bond.asset === billId;
+                        }
+                        else {
+                            return bond.id === billId;
+                        }
+                    });
+                    console.log(purchasedBond);
+                    setUserBill(purchasedBond);
+                })
+                    .catch((e) => {
+                    console.error(e);
+                });
             }
         }
         /* eslint-disable react-hooks/exhaustive-deps */
     }, [billId]);
-    return billId ? (bondChain === types$1.ChainId.SOL ? (jsx$2(YourBondsModalSolana, { billId: billId, onDismiss: onDismiss })) : (jsx$2(YourBondsModal, { billId: billId, onDismiss: onDismiss }))) : (jsx$2(BuyBondModal, { bondAddress: bondAddress, bondChain: bondChain, handlePurchasedBond: setBuyTxHash, setBillId: setBillId, onDismiss: () => {
+    return billId ? (bondChain === types$1.ChainId.SOL ? (jsx$2(YourBondsModalSolana, { userBill: userBill, onDismiss: onDismiss })) : (jsx$2(YourBondsModal, { userBill: userBill, onDismiss: onDismiss }))) : (jsx$2(BuyBondModal, { bondAddress: bondAddress, bondChain: bondChain, handlePurchasedBond: setBuyTxHash, setBillId: setBillId, onDismiss: () => {
             window.history.pushState({}, '', `${locationPath !== '/bonds' ? locationPath : '/bonds'}`);
             onDismiss === null || onDismiss === void 0 ? void 0 : onDismiss();
         } }));

package/dist/state/bonds/useUserBonds.d.ts

@@ -1,6 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
-import { BillsConfig, ChainId } from '@ape.swap/apeswap-lists';
+import { QueryClient, UseQueryResult } from '@tanstack/react-query';
+import { BillsConfig } from '@ape.swap/apeswap-lists';
 import { UserBill } from '../../types/yourbonds';
-import { TokenPrices } from '../tokenPrices/useTokenPrices';
 export default function useUserBonds(dontFetch?: boolean): UseQueryResult<UserBill[]>;
-export declare const getUserBonds: (account: string, solanaAccount: string, bondList: BillsConfig[], chains: number[], tokenPrices: Partial<Record<ChainId, TokenPrices[]>>, apiUrl?: string) => Promise<UserBill[]>;
+export declare const getUserBonds: (account: string, solanaAccount: string, bondList: BillsConfig[], queryClient: QueryClient) => Promise<UserBill[]>;

package/dist/views/YourBondsModal/YourBondsModal.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-declare const YourBondsModal: ({ billId, onDismiss }: {
-    billId: string;
+import { UserBill } from '../../types/yourbonds';
+declare const YourBondsModal: ({ userBill, onDismiss }: {
+    userBill?: UserBill;
     onDismiss?: () => void;
 }) => React.JSX.Element;
 export default YourBondsModal;

package/dist/views/YourBondsModal/YourBondsModalSolana.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-declare const YourBondsModalSolana: ({ billId, onDismiss }: {
-    billId: string;
+import { UserBill } from '../../types/yourbonds';
+declare const YourBondsModalSolana: ({ userBill, onDismiss }: {
+    userBill?: UserBill;
     onDismiss?: () => void;
 }) => React.JSX.Element;
 export default YourBondsModalSolana;

package/package.json

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