@ape.swap/bonds-sdk 1.0.342 → 1.0.344

package/dist/components/YourBonds/YourBonds.js

@@ -45,6 +45,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { jsx as _jsx, jsxs as _jsxs } from "theme-ui/jsx-runtime";
 /** @jsxImportSource theme-ui */
 import { useEffect, useState } from 'react';
@@ -69,7 +78,7 @@ import { formatNumberSI } from '../../utils/formatNumber';
 import useCurrentTime from '../../hooks/useTimer';
 import { getPendingVesting } from '../../hooks/usePendingVesting';
 import axios from 'axios';
-import { usePollUserBills } from '../../state/bills/hooks';
+import { fetchUserOwnedBillNftData } from './fetchBillsUser';
 var YourBonds = function (_a) {
     var connectionString = _a.connectionString;
     var _b = useWeb3React(), account = _b.account, isActive = _b.isActive;
@@ -176,33 +185,56 @@ var YourBonds = function (_a) {
         return getTimePeriods(parseInt(userBill.lastBlockTimestamp) + parseInt(userBill.vesting) - currentTime, true);
     };
     var fetchUserOwnedBillsDataAsync = function (chainId, account) { return __awaiter(void 0, void 0, void 0, function () {
-        var bonds, userOwnedBills_1, mapUserOwnedBills_1, userOwnedBillsData_1, error_2;
+        var bonds_1, userOwnedBills_1, mapUserOwnedBills_1, userOwnedBillsData_1, ownedBillsData, userBillNftData_1, ownedBillsWithNftData, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    bonds = bondData.filter(function (bond) {
+                    _a.trys.push([0, 3, , 4]);
+                    bonds_1 = bondData.filter(function (bond) {
                         return bond.billVersion !== BillVersion.FixedPrice &&
                             (bond === null || bond === void 0 ? void 0 : bond.chainId) === chainId &&
                             bond.type !== 'migration' &&
                             bond.billAddress.toLowerCase() !== ACF_TO_ABOND.toLowerCase();
                     });
-                    return [4 /*yield*/, fetchUserOwnedBills(chainId, account, bonds)];
+                    return [4 /*yield*/, fetchUserOwnedBills(chainId, account, bonds_1)];
                 case 1:
                     userOwnedBills_1 = _a.sent();
-                    mapUserOwnedBills_1 = bonds.map(function (bill) {
+                    mapUserOwnedBills_1 = bonds_1.map(function (bill) {
                         return userOwnedBills_1.filter(function (b) { return b.address.toLowerCase() === bill.billAddress.toLowerCase(); });
                     });
-                    userOwnedBillsData_1 = bonds.map(function (bill, i) { return ({
+                    userOwnedBillsData_1 = bonds_1.map(function (bill, i) { return ({
                         index: bill.index,
                         userOwnedBills: mapUserOwnedBills_1[i],
                     }); });
-                    return [2 /*return*/, Promise.resolve(userOwnedBillsData_1)];
+                    ownedBillsData = mapUserOwnedBills_1.flatMap(function (bs) {
+                        return bs.map(function (b) {
+                            return { id: b.id, billNftAddress: b.billNftAddress, contractAddress: b.address };
+                        });
+                    });
+                    return [4 /*yield*/, fetchUserOwnedBillNftData(ownedBillsData, chainId, bonds_1)];
                 case 2:
+                    userBillNftData_1 = _a.sent();
+                    ownedBillsWithNftData = mapUserOwnedBills_1.map(function (bs, index) {
+                        return {
+                            index: bonds_1[index].index,
+                            userOwnedBillsNfts: __spreadArray([], bs.map(function (b) {
+                                var _a;
+                                return (_a = userBillNftData_1.find(function (nftB) { return parseInt(nftB.id) === parseInt(b.id); })) === null || _a === void 0 ? void 0 : _a.data;
+                            }), true),
+                        };
+                    });
+                    console.log("ownedBillsWithNftData");
+                    console.log(ownedBillsWithNftData);
+                    console.log("ownedBillsWithNftData");
+                    console.log("userOwnedBillsData");
+                    console.log(userOwnedBillsData_1);
+                    console.log("userOwnedBillsData");
+                    return [2 /*return*/, Promise.resolve(userOwnedBillsData_1)];
+                case 3:
                     error_2 = _a.sent();
                     console.error('Error fetching user owned bills data:', error_2);
                     return [2 /*return*/, Promise.reject(error_2)];
-                case 3: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     }); };
@@ -321,10 +353,6 @@ var YourBonds = function (_a) {
         var _a;
         return getFirstNonZeroDigits(parseFloat((_a = bond === null || bond === void 0 ? void 0 : bond.payoutTokenPrice) !== null && _a !== void 0 ? _a : '0'));
     };
-    var bills = usePollUserBills();
-    console.log("USERBILLS");
-    console.log(bills);
-    console.log("USERBILLS");
     return (_jsxs(ThemeUIProvider, __assign({ theme: defaultTheme }, { children: [isActive && account && _jsx("p", { children: account }), isActive && account && _jsx("button", __assign({ onClick: handleApprove }, { children: "Approve USDT" })), _jsxs(Flex, __assign({ className: "container table-container" }, { children: [_jsxs(Flex, __assign({ className: "container header-container" }, { children: [_jsx(Flex, __assign({ className: "column column-tokens" }, { children: _jsx(Flex, { className: "column column-tokeninfoname" }) })), _jsxs(Flex, __assign({ className: "column column-bondinfo" }, { children: [_jsx(Flex, __assign({ className: "column column-claimable" }, { children: _jsx(Text, { children: "Claimable" }) })), _jsx(Flex, __assign({ className: "column column-pending" }, { children: _jsx(Text, { children: "Pending" }) })), _jsx(Flex, __assign({ className: "column column-term" }, { children: _jsx(Text, { children: "Terms" }) })), _jsx(Flex, __assign({ className: "column column-claimall" }, { children: _jsx(Button, __assign({ disabled: !account, sx: {
                                                 height: ['36px', '36px', '36px', '26px'],
                                                 lineHeight: '12px',

package/dist/components/YourBonds/fetchBillsUser.d.ts

@@ -1,4 +1,4 @@
-import { Bills, CleanedBondsState, UserBill } from '../../types/bonds';
+import { BondsDataResponse, CleanedBondsState, UserBill } from '../../types/bonds';
 import { ChainId } from '../../enum/apeswaplists';
 /**
  * Fetches user-owned bill NFT data for a given set of owned bills data, chain ID, and bills.
@@ -11,5 +11,5 @@ export declare const fetchUserOwnedBillNftData: (ownedBillsData: {
     id: string;
     billNftAddress: string;
     contractAddress: string;
-}[], chainId: ChainId, bills: (CleanedBondsState | Bills)[]) => Promise<any[]>;
+}[], chainId: ChainId, bills: BondsDataResponse[]) => Promise<any[]>;
 export declare const fetchUserOwnedBills: (chainId: ChainId, account: string, bills: CleanedBondsState[]) => Promise<UserBill[]>;

package/dist/components/YourBonds/fetchBillsUser.js

@@ -55,10 +55,10 @@ export var fetchUserOwnedBillNftData = function (ownedBillsData, chainId, bills)
                 billsFetched = [];
                 // Loop through each owned bill and check if it exists in the bills array
                 ownedBillsData === null || ownedBillsData === void 0 ? void 0 : ownedBillsData.forEach(function (_a) {
-                    var _b, _c;
                     var id = _a.id, billNftAddress = _a.billNftAddress, contractAddress = _a.contractAddress;
-                    var bill = (_c = (_b = bills
-                        .find(function (b) { return b.contractAddress[chainId] === contractAddress; })) === null || _b === void 0 ? void 0 : _b.userOwnedBillsNftData) === null || _c === void 0 ? void 0 : _c.find(function (u) { return +u.tokenId === +id; });
+                    var bill = bills
+                        .find(function (b) { return b.billAddress[chainId] === contractAddress; });
+                    // ?.userOwnedBillsNftData?.find((u) => +u.tokenId === +id)
                     // If the bill exists in the bills array, add it to the billsFetched array
                     if (bill) {
                         billsFetched.push({ id: id, data: bill });

package/dist/state/bills/index.d.ts

@@ -33,7 +33,16 @@ export declare const setBillsList: import("@reduxjs/toolkit").ActionCreatorWithP
 }, "Bills/setBillsPublicData">, setUserOwnedBillsData: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "Bills/setUserOwnedBillsData">, setUserOwnedBillsNftData: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "Bills/setUserOwnedBillsNftData">;
 export declare const fetchBondsStats: (tokenPrices: TokenPrices[]) => (dispatch: Dispatch, getState: any) => Promise<void>;
 export declare const fetchSingleBillPublicData: (chainId: ChainId, tokenPrices: TokenPrices[], bondAddress: string) => (dispatch: Dispatch, getState: any) => Promise<void>;
-export declare const fetchUserOwnedBillsDataAsync: (chainId: ChainId, account: string) => (dispatch: Dispatch, getState: any) => Promise<void>;
+export declare const fetchUserOwnedBillsDataAsync: (chainId: ChainId, account: string) => (dispatch: Dispatch, getState: any) => Promise<{
+    userOwnedBillsData: {
+        index: number;
+        userOwnedBills: import("../../types/bonds").UserBill[];
+    }[];
+    ownedBillsWithNftData: {
+        index: number;
+        userOwnedBillsNfts: any[];
+    }[];
+}>;
 declare const _default: import("redux").Reducer<BillsState, import("redux").UnknownAction, BillsState>;
 export default _default;
 export declare const parseBondApiData: (billApiData: BondsDataResponse) => CleanedBondsState;

package/dist/state/bills/index.js

@@ -249,11 +249,12 @@ export var fetchUserOwnedBillsDataAsync = function (chainId, account) {
                         };
                     });
                     dispatch(setUserOwnedBillsNftData({ value: ownedBillsWithNftData }));
-                    return [3 /*break*/, 4];
+                    // Return the data
+                    return [2 /*return*/, { userOwnedBillsData: userOwnedBillsData, ownedBillsWithNftData: ownedBillsWithNftData }];
                 case 3:
                     error_3 = _a.sent();
                     console.warn(error_3);
-                    return [3 /*break*/, 4];
+                    return [2 /*return*/, { userOwnedBillsData: [], ownedBillsWithNftData: [] }];
                 case 4: return [2 /*return*/];
             }
         });

package/dist/types/yourbonds.d.ts

@@ -3,6 +3,10 @@ export interface UserOwnedBillsData {
     index: number;
     userOwnedBills: UserBill[];
 }
+export interface ownedBillsWithNftData {
+    index: number;
+    userOwnedBillsNfts: any[];
+}
 export interface UserBill {
     address: string;
     id: string;

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ape Bond SDK",
   "author": "Ape Bond",
   "license": "MIT",
-  "version": "1.0.342",
+  "version": "1.0.344",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",