@ape.swap/bonds-sdk 1.0.582 → 1.0.584

package/dist/components/Modals/BondModal/BondModal.js

@@ -70,7 +70,7 @@ var BondModal = function (_a) {
     //user to buy
     //Check with Fede if this needs to be temp, if we force approval everytime, isn't this fine?
     var handleBuy = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var billAddress, decimals, maxPrice, amount, maxPriceBigNumber;
+        var billAddress, decimals, maxPrice, amount;
         return __generator(this, function (_a) {
             billAddress = bondData[0].billAddress;
             decimals = 18;
@@ -78,7 +78,6 @@ var BondModal = function (_a) {
                 console.log('HANDLEBUY CLICKED');
                 maxPrice = new BigNumber(bondData[0].trueBillPrice).times(102).div(100);
                 amount = convertToTokenValue(inputValue, decimals);
-                maxPriceBigNumber = ethers.BigNumber.from(maxPrice.toFixed(0));
                 console.log('BillAddress:', billAddress);
                 console.log('Amount:', amount);
                 console.log('MaxPrice:', maxPrice);
@@ -86,7 +85,7 @@ var BondModal = function (_a) {
                     address: billAddress,
                     abi: BOND_ABI,
                     functionName: 'deposit',
-                    args: [amount, maxPriceBigNumber, account],
+                    args: [amount, maxPrice, account],
                 });
                 console.log('BuyTransaction:', hash);
                 if (hash) {

package/dist/pages/YourBonds/YourBonds.js

@@ -68,45 +68,46 @@ import BOND_ABI from '../../config/abi/bond.json';
 import { useWriteContract } from 'wagmi';
 var YourBonds = function (_a) {
     var account = _a.account;
-    var writeContract = useWriteContract().writeContract;
+    var _b = useWriteContract(), hash = _b.data, isPending = _b.isPending, writeContract = _b.writeContract;
     var handleClaim = function (billId, billAddress) { return __awaiter(void 0, void 0, void 0, function () {
-        var address, tx, error_1;
+        var address;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    address = billAddress;
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    //const uint256BillId = ethers.BigNumber.from(billId);
-                    console.log('claimClicked');
-                    // console.log('billId:', uint256BillId);
-                    console.log('billAddress:', billAddress);
-                    return [4 /*yield*/, writeContract({
-                            address: address,
-                            abi: BOND_ABI,
-                            functionName: 'redeem',
-                            args: [billId],
-                        })];
-                case 2:
-                    tx = _a.sent();
-                    console.log('ClaimTransaction:', tx);
-                    if (tx != null) {
-                        setClaimTx(tx);
-                    }
-                    return [3 /*break*/, 4];
-                case 3:
-                    error_1 = _a.sent();
-                    console.error('Approval failed:', error_1);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+            address = billAddress;
+            try {
+                //const uint256BillId = ethers.BigNumber.from(billId);
+                console.log('claimClicked');
+                // console.log('billId:', uint256BillId);
+                console.log('billAddress:', billAddress);
+                // @ts-ignore
+                writeContract({
+                    address: address,
+                    abi: BOND_ABI,
+                    functionName: 'redeem',
+                    args: [billId],
+                });
+                console.log('ClaimTransaction:', hash);
+                if (hash) {
+                    setClaimTx(hash);
+                    console.log('SetClaimTx:', hash);
+                }
+            }
+            catch (error) {
+                console.error('Approval failed:', error);
             }
+            return [2 /*return*/];
         });
     }); };
-    var _b = useState(null), claimTx = _b[0], setClaimTx = _b[1];
+    var _c = useState(null), claimTx = _c[0], setClaimTx = _c[1];
+    var _d = useState(null), toastMessage = _d[0], setToastMessage = _d[1];
+    useEffect(function () {
+        if (hash) {
+            setToastMessage("Transaction complete: ".concat(hash));
+            setTimeout(function () { return setToastMessage(null); }, 5000); // Hide toast after 5 seconds
+        }
+    }, [hash]);
     // Fetch data
-    var _c = useState([]), bondData = _c[0], setBondData = _c[1];
-    var _d = useState([]), mappedUserBills = _d[0], setMappedUserBills = _d[1];
+    var _e = useState([]), bondData = _e[0], setBondData = _e[1];
+    var _f = useState([]), mappedUserBills = _f[0], setMappedUserBills = _f[1];
     useEffect(function () {
         axios.get('https://realtime-api.ape.bond/bonds').then(function (response) {
             var bonds = response.data.bonds;
@@ -115,7 +116,7 @@ var YourBonds = function (_a) {
     }, []);
     useEffect(function () {
         var fetchData = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var results, mappedBills, error_2;
+            var results, mappedBills, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -131,8 +132,8 @@ var YourBonds = function (_a) {
                         console.log('User owned bills data:', mappedBills);
                         return [3 /*break*/, 4];
                     case 3:
-                        error_2 = _a.sent();
-                        console.error('Error fetching user owned bills data:', error_2);
+                        error_1 = _a.sent();
+                        console.error('Error fetching user owned bills data:', error_1);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }
@@ -140,8 +141,8 @@ var YourBonds = function (_a) {
         }); };
         fetchData();
     }, [account, bondData, claimTx]);
-    var _e = useState(null), sortConfig = _e[0], setSortConfig = _e[1];
-    var _f = useState(mappedUserBills), sortedBonds = _f[0], setSortedBonds = _f[1];
+    var _g = useState(null), sortConfig = _g[0], setSortConfig = _g[1];
+    var _h = useState(mappedUserBills), sortedBonds = _h[0], setSortedBonds = _h[1];
     var handleSort = function (key) {
         var direction = 'asc';
         if ((sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.key) === key && (sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.direction) === 'asc') {
@@ -222,8 +223,8 @@ var YourBonds = function (_a) {
         return getFirstNonZeroDigits(parseFloat((_a = bond === null || bond === void 0 ? void 0 : bond.payoutTokenPrice) !== null && _a !== void 0 ? _a : '0'));
     };
     // Modal
-    var _g = useState(false), isModalOpen = _g[0], setIsModalOpen = _g[1];
-    var _h = useState(undefined), selectedBill = _h[0], setSelectedBill = _h[1];
+    var _j = useState(false), isModalOpen = _j[0], setIsModalOpen = _j[1];
+    var _k = useState(undefined), selectedBill = _k[0], setSelectedBill = _k[1];
     var rowClick = function (bill) {
         console.log(bill);
         setSelectedBill(bill);
@@ -231,8 +232,8 @@ var YourBonds = function (_a) {
         // navigate(`/yourBonds/?bondAddress=${bill.address}&bondChain=${bill.bond.chainId}`, { replace: true });
     };
     // Search logic
-    var _j = useState(''), inputValue = _j[0], setInputValue = _j[1];
-    var _k = useState(sortedBonds), filteredBonds = _k[0], setFilteredBonds = _k[1];
+    var _l = useState(''), inputValue = _l[0], setInputValue = _l[1];
+    var _m = useState(sortedBonds), filteredBonds = _m[0], setFilteredBonds = _m[1];
     useEffect(function () {
         if (inputValue === '') {
             setFilteredBonds(sortedBonds);
@@ -247,7 +248,7 @@ var YourBonds = function (_a) {
         setInputValue(event.target.value);
     };
     // Page render logic
-    var _l = useState(false), bondsRendered = _l[0], setBondsRendered = _l[1];
+    var _o = useState(false), bondsRendered = _o[0], setBondsRendered = _o[1];
     useEffect(function () {
         if (filteredBonds.length > 0) {
             setBondsRendered(true);
@@ -257,7 +258,7 @@ var YourBonds = function (_a) {
         setIsModalOpen(false);
     };
     return (_jsxs(ThemeUIProvider, { theme: defaultTheme, children: [isModalOpen &&
-                _jsx(YourBondsModal, { isOpen: true, onClose: closeModal, userBill: selectedBill }), bondsRendered && (_jsxs(Flex, { className: "container table-container", children: [_jsxs(Flex, { className: "container header-container", children: [_jsx(Flex, { className: "column column-tokens", children: _jsx(Flex, { className: "column column-search", sx: { width: '100%', maxWidth: ['200px', '200px', '200px', '340px'] }, children: _jsx(Input, { value: inputValue, onChange: handleInputChange, variant: "search", sx: { fontWeight: 400, background: 'white2', height: '30px', fontSize: '14px', color: 'white' }, width: '100%', placeholder: 'Search...' }) }) }), _jsxs(Flex, { className: "column column-bondinfo", children: [_jsxs(Flex, { className: "column header-claimable", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "CLAIMABLE" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('claimable'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsxs(Flex, { className: "column header-pending", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "PENDING" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('pending'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsxs(Flex, { className: "column header-terms", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "TERMS" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('terms'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsx(Flex, { className: "column header-claimall" })] })] }), filteredBonds.map(function (bill) {
+                _jsx(YourBondsModal, { isOpen: true, onClose: closeModal, userBill: selectedBill }), toastMessage && (_jsx(Flex, { className: "toast", children: toastMessage })), bondsRendered && (_jsxs(Flex, { className: "container table-container", children: [_jsxs(Flex, { className: "container header-container", children: [_jsx(Flex, { className: "column column-tokens", children: _jsx(Flex, { className: "column column-search", sx: { width: '100%', maxWidth: ['200px', '200px', '200px', '340px'] }, children: _jsx(Input, { value: inputValue, onChange: handleInputChange, variant: "search", sx: { fontWeight: 400, background: 'white2', height: '30px', fontSize: '14px', color: 'white' }, width: '100%', placeholder: 'Search...' }) }) }), _jsxs(Flex, { className: "column column-bondinfo", children: [_jsxs(Flex, { className: "column header-claimable", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "CLAIMABLE" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('claimable'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsxs(Flex, { className: "column header-pending", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "PENDING" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('pending'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsxs(Flex, { className: "column header-terms", children: [_jsx(Text, { sx: { fontSize: '11px', color: 'textDisabledButton' }, children: "TERMS" }), _jsx(Flex, { className: "column header-icon", onClick: function () { return handleSort('terms'); }, children: _jsx(Svg, { icon: "sort", width: "12px", color: "textDisabledButton" }) })] }), _jsx(Flex, { className: "column header-claimall" })] })] }), filteredBonds.map(function (bill) {
                         var _a, _b;
                         return (_jsxs(Flex, { className: "container bondrow-container", onClick: function () { return rowClick(bill); }, children: [_jsx(Flex, { className: "column column-tokens", children: _jsx(Flex, { className: "column column-tokeninfoname", children: _jsx(TokenInfoAndName, { bill: bill.bond, vestEnds: "Ends in ".concat(getPendingVesting(bill.lastBlockTimestamp, bill.vesting)) }) }) }), _jsxs(Flex, { className: "column column-bondinfo", children: [_jsxs(Flex, { className: "column column-claimable", children: [formatNumberSI(parseFloat(claimable(bill).toFixed(3)), 0), _jsx(Text, { sx: { opacity: '0.6', fontSize: '12px', paddingLeft: '5px' }, children: "($".concat((claimable(bill) * ((_a = parseFloat(earnTokenPrice(bill.bond))) !== null && _a !== void 0 ? _a : 0)).toFixed(2), ")") })] }), _jsxs(Flex, { className: "column column-pending", children: [formatNumberSI(parseFloat(totalPending(bill).toFixed(0)), 0), _jsx(Text, { sx: { opacity: '0.6', fontSize: '12px', paddingLeft: '5px' }, children: "($".concat((totalPending(bill) * ((_b = parseFloat(earnTokenPrice(bill.bond))) !== null && _b !== void 0 ? _b : 0)).toFixed(2), ")") })] }), _jsx(Flex, { className: "column column-terms", children: "".concat(vestingTimeRemaining(bill).days, "d, ").concat(vestingTimeRemaining(bill).hours, "h, ").concat(vestingTimeRemaining(bill).minutes, "m") }), _jsx(Flex, { className: "column column-claimall", children: _jsx(Button, { disabled: !account && (claimableNumber(bill) === 0), onClick: function (event) {
                                                     event.stopPropagation();

package/dist/scss/YourBonds.scss

@@ -128,4 +128,27 @@
     justify-content: center;
     align-items: center;
     width: 100%;
+}
+
+.toast {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    background-color: #333;
+    color: #fff;
+    padding: 10px 20px;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    z-index: 1000;
+    animation: fadein 0.5s, fadeout 0.5s 4.5s;
+}
+
+@keyframes fadein {
+    from { bottom: 0; opacity: 0; }
+    to { bottom: 20px; opacity: 1; }
+}
+
+@keyframes fadeout {
+    from { bottom: 20px; opacity: 1; }
+    to { bottom: 0; opacity: 0; }
 }

package/package.json

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