@ape.swap/bonds-sdk 1.0.292 → 1.0.294

package/dist/components/YourBonds/YourBonds.js

@@ -58,9 +58,8 @@ import { defaultTheme } from '../../theme';
 import '../../scss/YourBonds.scss';
 import { BigNumber } from 'bignumber.js';
 import { BillVersion, ChainId } from '../../enum/apeswaplists';
-import { formatValue } from '../../utils/formatNumbers';
 import { Text, Button } from '../uikit-sdk';
-import { BLOCK_EXPLORER, MAINNET_CHAINS } from '../../config/constants/chains';
+import { MAINNET_CHAINS } from '../../config/constants/chains';
 import TokenInfoAndName from '../TokenInfoAndName';
 import { ACF_TO_ABOND } from '../../config/constants/addresses';
 import multicall from '../../utils/multicall';
@@ -68,6 +67,7 @@ import billAbi from '../../config/abi/bond.json';
 import { getBalanceNumber } from '../../utils/getBalanceNumber';
 import { getFirstNonZeroDigits } from '../../utils/roundNumber';
 import { formatNumberSI } from '../../utils/formatNumber';
+import useCurrentTime from '../../utils/useTimer';
 var YourBonds = function (_a) {
     var connectionString = _a.connectionString;
     var _b = useWeb3React(), account = _b.account, isActive = _b.isActive;
@@ -117,6 +117,10 @@ var YourBonds = function (_a) {
     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); });
@@ -165,30 +169,6 @@ var YourBonds = function (_a) {
         setIsModalOpen(true);
         navigate("/?bondAddress=".concat(bond.billAddress, "&bondChain=").concat(bond.chainId), { replace: true });
     };
-    var getDiscountColor = function (discount) {
-        return discount < 0 ? 'discount-negative' : 'discount-positive';
-    };
-    var remainingPercentage = function (bond) {
-        var _a, _b;
-        var totalMaxPayout = new BigNumber((_a = bond.maxTotalPayout) !== null && _a !== void 0 ? _a : '0').div(new BigNumber(10).pow(bond.payoutTokenDecimals));
-        var remainingTokens = new BigNumber((_b = bond.tokensRemaining) !== null && _b !== void 0 ? _b : '0');
-        return remainingTokens.div(totalMaxPayout).times(100).toNumber();
-    };
-    var remainingTokensFormat = function (bond) {
-        var _a;
-        return formatValue({ num: new BigNumber((_a = bond.tokensRemaining) !== null && _a !== void 0 ? _a : '0') });
-    };
-    var remainingTokensUsd = function (bond) {
-        var _a, _b;
-        var tokens = new BigNumber((_a = bond.tokensRemaining) !== null && _a !== void 0 ? _a : '0');
-        return tokens.times((_b = bond.payoutTokenPrice) !== null && _b !== void 0 ? _b : 0);
-    };
-    var getBillContractURL = function (bond) {
-        var _a;
-        var selectedChain = (_a = bond.chainId) !== null && _a !== void 0 ? _a : ChainId.BSC;
-        var explorerLink = BLOCK_EXPLORER[selectedChain];
-        return "".concat(explorerLink, "/address/").concat(bond === null || bond === void 0 ? void 0 : bond.billAddress);
-    };
     // const usePollUserBills = () => {
     //     const { slowRefresh } = useRefresh()
     //     // const dispatch = useAppDispatch()
@@ -334,13 +314,13 @@ var YourBonds = function (_a) {
         });
     }); };
     var chainId = useWeb3React().chainId;
-    var totalPending = function (userbill) {
+    var totalPending = function (userBill) {
         var _a, _b, _c, _d;
-        return getBalanceNumber(new BigNumber((_a = userbill === null || userbill === void 0 ? void 0 : userbill.totalPayout) !== null && _a !== void 0 ? _a : 0), (_d = (_c = (_b = userbill === null || userbill === void 0 ? void 0 : 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);
+        return getBalanceNumber(new BigNumber((_a = userBill === null || userBill === void 0 ? void 0 : userBill.totalPayout) !== 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 claimable = function (userBill) {
         var _a, _b, _c;
-        return getBalanceNumber(new BigNumber(userbill.pendingRewards), (_c = (_b = (_a = userbill.bond.earnToken) === null || _a === void 0 ? void 0 : _a.decimals) === null || _b === void 0 ? void 0 : _b[chainId]) !== null && _c !== void 0 ? _c : 18);
+        return getBalanceNumber(new BigNumber(userBill.pendingRewards), (_c = (_b = (_a = userBill.bond.earnToken) === null || _a === void 0 ? void 0 : _a.decimals) === null || _b === void 0 ? void 0 : _b[chainId]) !== null && _c !== void 0 ? _c : 18);
     };
     var earnTokenPrice = function (bond) {
         var _a;
@@ -354,14 +334,14 @@ var YourBonds = function (_a) {
                                                 width: '100%',
                                             } }, { children: "Claim All" })) }))] }))] })), userOwnedBillsData.flat().map(function (data) {
                         return data.userOwnedBills.map(function (bill) {
-                            var _a, _b, _c;
-                            return (_jsxs(Flex, __assign({ className: "container bondrow-container", onClick: function () { return rowClick(bill.bond); } }, { children: [_jsxs(Flex, __assign({ className: "column column-tokens" }, { children: [_jsx(Flex, __assign({ className: "column column-tokeninfoname" }, { children: _jsx(TokenInfoAndName, { bond: bill.bond }) })), _jsx(Flex, { className: "column column-tokenicons" })] })), _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), ")")] })), _jsx(Flex, __assign({ className: "column column-pending" }, { children: "".concat(((((_c = (_b = bill.bond) === null || _b === void 0 ? void 0 : _b.discount) !== null && _c !== void 0 ? _c : 0) * 365) / vestingTime(bill.bond.vestingTerm).days).toFixed(2), "%") })), _jsx(Flex, __assign({ className: "column column-term" }, { children: vestingTime(bill.bond.vestingTerm).days ? "".concat(vestingTime(bill.bond.vestingTerm).days, " D") : '-' })), _jsx(Flex, __assign({ className: "column column-claimall" }, { children: _jsx(Button, __assign({ disabled: !account, sx: {
-                                                        height: ['36px', '36px', '36px', '26px'],
-                                                        lineHeight: '12px',
-                                                        fontSize: '14px',
-                                                        fontWeight: 600,
-                                                        width: '100%',
-                                                    } }, { children: "Claim" })) }))] }))] }), bill.bond.billAddress));
+                            var _a, _b;
+                            return (_jsxs(Flex, __assign({ className: "container bondrow-container", onClick: function () { return rowClick(bill.bond); } }, { children: [_jsxs(Flex, __assign({ className: "column column-tokens" }, { children: [_jsx(Flex, __assign({ className: "column column-tokeninfoname" }, { children: _jsx(TokenInfoAndName, { bond: bill.bond }) })), _jsx(Flex, { className: "column column-tokenicons" })] })), _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'],
+                                                            lineHeight: '12px',
+                                                            fontSize: '14px',
+                                                            fontWeight: 600,
+                                                            width: '100%',
+                                                        } }, { children: "Claim" })) })) }))] }))] }), bill.bond.billAddress));
                         });
                     })] }))] })));
 };

package/dist/scss/YourBonds.scss

@@ -106,4 +106,11 @@
     justify-content: center;
     align-items: center;
     width: 20%;
+}
+
+.column-claimall.button {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
 }

package/dist/utils/useTimer.d.ts

@@ -0,0 +1,2 @@
+export declare const useCurrentTime: () => number;
+export default useCurrentTime;

package/dist/utils/useTimer.js

@@ -0,0 +1,13 @@
+import { useState, useEffect } from 'react';
+export var useCurrentTime = function () {
+    var _a = useState(new Date().getTime()), currentMillis = _a[0], setCurrentMillis = _a[1];
+    useEffect(function () {
+        var tick = function () {
+            setCurrentMillis(function (prevMillis) { return prevMillis + 1000; });
+        };
+        var timerID = setInterval(function () { return tick(); }, 1000);
+        return function () { return clearInterval(timerID); };
+    }, []);
+    return currentMillis;
+};
+export default useCurrentTime;

package/package.json

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