@ape.swap/bonds-sdk 1.0.308 → 1.0.310

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

@@ -1,35 +1,13 @@
 /** @jsxImportSource theme-ui */
 import React from 'react';
-import { BondsDataResponse } from '../../types/bonds';
 import '../../scss/YourBonds.scss';
 declare global {
     interface Window {
         ethereum?: any;
     }
 }
-interface BondsProps {
+interface YourBondsProps {
     connectionString?: string;
 }
-export interface UserBill {
-    address: string;
-    id: string;
-    vesting: string;
-    payout: string;
-    totalPayout?: string;
-    truePricePaid: string;
-    lastBlockTimestamp: string;
-    pendingRewards: string;
-    billNftAddress: string;
-    nftData?: UserBillNft;
-    bond: BondsDataResponse;
-}
-export interface UserBillNft {
-    image: string;
-    tokenId: string;
-    attributes: {
-        trait_type: string;
-        value: string;
-    }[];
-}
-declare const YourBonds: React.FC<BondsProps>;
+declare const YourBonds: React.FC<YourBondsProps>;
 export default YourBonds;

package/dist/components/YourBonds/YourBonds.js

@@ -47,9 +47,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "theme-ui/jsx-runtime";
 /** @jsxImportSource theme-ui */
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Flex, ThemeUIProvider } from 'theme-ui';
-import axios from 'axios';
 import { ethers } from 'ethers';
 import { useWeb3React } from '@web3-react/core';
 import { useSearchParams, useNavigate } from 'react-router-dom';
@@ -57,7 +56,7 @@ import getTimePeriods from '../../utils/getTimePeriods';
 import { defaultTheme } from '../../theme';
 import '../../scss/YourBonds.scss';
 import { BigNumber } from 'bignumber.js';
-import { BillVersion, ChainId } from '../../enum/apeswaplists';
+import { BillVersion } from '../../enum/apeswaplists';
 import { Text, Button } from '../uikit-sdk';
 import { MAINNET_CHAINS } from '../../config/constants/chains';
 import TokenInfoAndName from '../TokenInfoAndName';
@@ -113,58 +112,48 @@ var YourBonds = function (_a) {
             }
         });
     }); };
-    var _d = useState([]), bondData = _d[0], setBondData = _d[1];
-    var _e = useState([]), hotBonds = _e[0], setHotBonds = _e[1];
-    var vestingTime = function (vestingTerm) {
-        return getTimePeriods(vestingTerm !== null && vestingTerm !== void 0 ? vestingTerm : 0, true);
-    };
-    var currentTime = useCurrentTime() / 1000;
-    var vestingTimeRemaining = function (userBill) {
-        return getTimePeriods(parseInt(userBill.lastBlockTimestamp) + parseInt(userBill.vesting) - currentTime, true);
-    };
-    useEffect(function () {
-        axios.get('https://realtime-api.ape.bond/bonds').then(function (response) {
-            var bonds = response.data.bonds.filter(function (bond) { return !isSoldOut(bond); });
-            setBondData(bonds);
-        });
-    }, []);
-    useEffect(function () {
-        axios.get('https://apeswap-strapi.herokuapp.com/hot-bonds').then(function (response) {
-            var hotBondAddresses = response.data.map(function (bond) {
-                return bond.BondAddress.toLowerCase();
-            });
-            setHotBonds(hotBondAddresses);
-        });
-    }, []);
-    var isSoldOut = useCallback(function (bond) {
-        var _a, _b;
-        var thresholdToHide = new BigNumber(100).div((_a = bond.payoutTokenPrice) !== null && _a !== void 0 ? _a : 0);
-        if (bond.soldOut)
-            return true;
-        if (bond.discount == null)
-            return true;
-        if (!bond.tokensRemaining)
-            return false;
-        if (bond.discount && bond.discount > 25 && bond.chainId === ChainId.BASE /*BASE*/)
-            return true;
-        return ((_b = new BigNumber(bond.tokensRemaining)) === null || _b === void 0 ? void 0 : _b.lte(thresholdToHide)) || bond.discount === 100;
-    }, []);
-    var sortedBonds = bondData.sort(function (a, b) {
-        var _a, _b;
-        var aIsHot = hotBonds.includes(a.billAddress.toLowerCase()) && ((_a = a.discount) !== null && _a !== void 0 ? _a : 0) > 0;
-        var bIsHot = hotBonds.includes(b.billAddress.toLowerCase()) && ((_b = b.discount) !== null && _b !== void 0 ? _b : 0) > 0;
-        if (aIsHot && !bIsHot) {
-            return -1;
-        }
-        else if (!aIsHot && bIsHot) {
-            return 1;
-        }
-        else {
-            return b.discount - a.discount;
-        }
-    });
-    var _f = useState(false), isModalOpen = _f[0], setIsModalOpen = _f[1];
-    var _g = useState(null), selectedBond = _g[0], setSelectedBond = _g[1];
+    // const [hotBonds, setHotBonds] = useState<string[]>([]);
+    // const vestingTime = (vestingTerm: number) => {
+    //     return getTimePeriods(vestingTerm ?? 0, true);
+    // }
+    // useEffect(() => {
+    //     axios.get('https://realtime-api.ape.bond/bonds').then((response) => {
+    //         const bonds = response.data.bonds.filter((bond: BondsDataResponse) => !isSoldOut(bond));
+    //         setBondData(bonds);
+    //     })
+    // }, []);
+    // useEffect(() => {
+    //     axios.get('https://apeswap-strapi.herokuapp.com/hot-bonds').then((response) => {
+    //         const hotBondAddresses = response.data.map((bond: { BondAddress: string }) =>
+    //         bond.BondAddress.toLowerCase(),
+    //     );
+    //         setHotBonds(hotBondAddresses);
+    //     })
+    // }, []);
+    // const isSoldOut = useCallback((bond: BondsDataResponse) => {
+    //     const thresholdToHide = new BigNumber(100).div(bond.payoutTokenPrice ?? 0);
+    //     if (bond.soldOut) return true;
+    //     if (bond.discount == null) return true;
+    //     if (!bond.tokensRemaining) return false;
+    //     if (bond.discount && bond.discount > 25 && bond.chainId === ChainId.BASE /*BASE*/) return true;
+    //     return new BigNumber(bond.tokensRemaining)?.lte(thresholdToHide) || bond.discount === 100;
+    // }, []);
+    // const sortedBonds = bondData.sort((a, b) => {
+    //     const aIsHot = hotBonds.includes(a.billAddress.toLowerCase()) && (a.discount ?? 0) > 0;
+    //     const bIsHot = hotBonds.includes(b.billAddress.toLowerCase()) && (b.discount ?? 0) > 0;
+    //     if (aIsHot && !bIsHot) {
+    //         return -1;
+    //     } 
+    //     else if (!aIsHot && bIsHot) {
+    //         return 1;
+    //     } 
+    //     else {
+    //         return b.discount - a.discount;
+    //     }
+    // });
+    var _d = useState(false), isModalOpen = _d[0], setIsModalOpen = _d[1];
+    var _e = useState(null), selectedBond = _e[0], setSelectedBond = _e[1];
+    var _f = useState([]), bondData = _f[0], setBondData = _f[1];
     var rowClick = function (bond) {
         setSelectedBond(bond);
         setIsModalOpen(true);
@@ -180,6 +169,10 @@ var YourBonds = function (_a) {
     //       }
     //     }, [account, slowRefresh])
     // }
+    var currentTime = useCurrentTime() / 1000;
+    var vestingTimeRemaining = function (userBill) {
+        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;
         return __generator(this, function (_a) {
@@ -211,7 +204,7 @@ var YourBonds = function (_a) {
             }
         });
     }); };
-    var _h = useState([]), userOwnedBillsData = _h[0], setUserOwnedBillsData = _h[1];
+    var _g = useState([]), userOwnedBillsData = _g[0], setUserOwnedBillsData = _g[1];
     useEffect(function () {
         var fetchData = function () { return __awaiter(void 0, void 0, void 0, function () {
             var results, error_3;
@@ -226,7 +219,6 @@ var YourBonds = function (_a) {
                     case 2:
                         results = _a.sent();
                         setUserOwnedBillsData(results);
-                        console.log('User owned bills data:', results);
                         return [3 /*break*/, 4];
                     case 3:
                         error_3 = _a.sent();
@@ -316,12 +308,8 @@ var YourBonds = function (_a) {
     }); };
     var chainId = useWeb3React().chainId;
     var totalPending = function (userBill) {
-        var _a, _b, _c, _d, _e, _f;
-        console.log(userBill);
-        console.log('CHAINID)');
-        console.log((_b = (_a = userBill.bond.earnToken) === null || _a === void 0 ? void 0 : _a.decimals) === null || _b === void 0 ? void 0 : _b[chainId]);
-        console.log(userBill.payout);
-        return getBalanceNumber(new BigNumber((_c = userBill === null || userBill === void 0 ? void 0 : userBill.payout) !== null && _c !== void 0 ? _c : 0), (_f = (_e = (_d = userBill.bond.earnToken) === null || _d === void 0 ? void 0 : _d.decimals) === null || _e === void 0 ? void 0 : _e[chainId]) !== null && _f !== void 0 ? _f : 18);
+        var _a, _b, _c, _d;
+        return getBalanceNumber(new BigNumber((_a = userBill === null || userBill === void 0 ? void 0 : userBill.payout) !== null && _a !== void 0 ? _a : 0), (_d = (_c = (_b = userBill.bond.earnToken) === null || _b === void 0 ? void 0 : _b.decimals) === null || _c === void 0 ? void 0 : _c[chainId]) !== null && _d !== void 0 ? _d : 18);
     };
     var claimable = function (userBill) {
         var _a, _b, _c;
@@ -338,7 +326,14 @@ var YourBonds = function (_a) {
                                                 fontWeight: 600,
                                                 width: '100%',
                                             } }, { children: "Claim All" })) }))] }))] })), userOwnedBillsData.flat().map(function (data) {
-                        return data.userOwnedBills.map(function (bill) {
+                        var sortedBills = data.userOwnedBills.sort(function (a, b) {
+                            var claimableDifference = claimable(b) - claimable(a);
+                            if (claimableDifference !== 0) {
+                                return claimableDifference;
+                            }
+                            return totalPending(b) - totalPending(a);
+                        });
+                        return sortedBills.map(function (bill) {
                             var _a, _b;
                             return (_jsxs(Flex, __assign({ className: "container bondrow-container", onClick: function () { return rowClick(bill.bond); } }, { children: [_jsx(Flex, __assign({ className: "column column-tokens" }, { children: _jsx(Flex, __assign({ className: "column column-tokeninfoname" }, { children: _jsx(TokenInfoAndName, { bill: bill.bond, vestEnds: "Ends in ".concat(getPendingVesting(bill.lastBlockTimestamp, bill.vesting)) }) })) })), _jsxs(Flex, __assign({ className: "column column-bondinfo" }, { children: [_jsxs(Flex, __assign({ className: "column column-claimable" }, { children: [formatNumberSI(parseFloat(claimable(bill).toFixed(3)), 0), "($".concat((claimable(bill) * ((_a = parseFloat(earnTokenPrice(bill.bond))) !== null && _a !== void 0 ? _a : 0)).toFixed(2), ")")] })), _jsxs(Flex, __assign({ className: "column column-pending" }, { children: [formatNumberSI(parseFloat(totalPending(bill).toFixed(0)), 0), "($".concat((totalPending(bill) * ((_b = parseFloat(earnTokenPrice(bill.bond))) !== null && _b !== void 0 ? _b : 0)).toFixed(2), ")")] })), _jsx(Flex, __assign({ className: "column column-term" }, { children: "".concat(vestingTimeRemaining(bill).days, "d, ").concat(vestingTimeRemaining(bill).hours, "h, ").concat(vestingTimeRemaining(bill).minutes, "m") })), _jsx(Flex, __assign({ className: "column column-claimall" }, { children: _jsx(Flex, __assign({ className: "column-claimall button" }, { children: _jsx(Button, __assign({ disabled: !account, sx: {
                                                             height: ['36px', '36px', '36px', '26px'],

package/dist/types/yourbonds.d.ts

@@ -0,0 +1,26 @@
+import { BondsDataResponse } from "./bonds";
+export interface UserOwnedBillsData {
+    index: number;
+    userOwnedBills: UserBill[];
+}
+export interface UserBill {
+    address: string;
+    id: string;
+    vesting: string;
+    payout: string;
+    totalPayout?: string;
+    truePricePaid: string;
+    lastBlockTimestamp: string;
+    pendingRewards: string;
+    billNftAddress: string;
+    nftData?: UserBillNft;
+    bond: BondsDataResponse;
+}
+export interface UserBillNft {
+    image: string;
+    tokenId: string;
+    attributes: {
+        trait_type: string;
+        value: string;
+    }[];
+}

package/dist/types/yourbonds.js

@@ -0,0 +1 @@
+export {};

package/package.json

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