@ape.swap/bonds-sdk 1.0.575 → 1.0.577

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

@@ -43,12 +43,11 @@ import getTimePeriods from '../../../utils/getTimePeriods';
 import axios from 'axios';
 import { BigNumber } from 'bignumber.js';
 import { getFirstNonZeroDigits } from '../../../utils/roundNumber';
-import { useNavigate } from 'react-router-dom';
 import { isNumber } from '../../../utils/numbers';
 import { TooltipBubble, Button, Svg, ListTag } from '../../uikit-sdk';
 import { TooltipText } from '../../../enum/tooltips';
 import { ethers } from 'ethers';
-import convertToTokenValue from "../../../utils/convertToTokenValue";
+import convertToTokenValue, { adjustDecimals } from "../../../utils/convertToTokenValue";
 import TokenImage from '../../uikit-sdk/TokenImage';
 import BOND_ABI from '../../../config/abi/bond.json';
 import ERC_20_ABI from '../../../config/abi/erc20.json';
@@ -71,19 +70,25 @@ 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;
-        return __generator(this, function (_a) {
+        var billAddress, decimals, maxPrice, amount, amountAlt, amountAlt2;
+        var _a;
+        return __generator(this, function (_b) {
             billAddress = bondData[0].billAddress;
             decimals = 18;
             try {
+                console.log('HANDLEBUY CLICKED');
                 maxPrice = new BigNumber(bondData[0].trueBillPrice).times(102).div(100);
                 amount = convertToTokenValue(inputValue, decimals);
+                amountAlt = adjustDecimals(inputValue);
+                amountAlt2 = new BigNumber(amountAlt).times(new BigNumber(10).pow((_a = bondData[0].principalTokenDecimals) !== null && _a !== void 0 ? _a : 18)).toString();
+                console.log('Amount:', amount);
+                console.log('MaxPrice:', maxPrice);
                 // @ts-ignore
                 writeContract({
                     address: billAddress,
                     abi: BOND_ABI,
                     functionName: 'deposit',
-                    args: [amount, maxPrice, account],
+                    args: [amount, maxPrice.toFixed(0), account],
                 });
                 console.log('BuyTransaction:', hash);
                 if (hash) {
@@ -101,39 +106,30 @@ var BondModal = function (_a) {
     var _e = useState(null), buyTx = _e[0], setBuyTx = _e[1];
     //You approve the token, not the contract (this code will have to be updated for zap)
     var handleApprove = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var tokenAddress, decimals, amount, result, error_1;
+        var tokenAddress, decimals, amount;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    tokenAddress = bondData[0].principalToken;
-                    decimals = 18;
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    amount = convertToTokenValue(inputValue, decimals);
-                    console.log('Amount:', amount);
-                    return [4 /*yield*/, writeContract({
-                            address: tokenAddress,
-                            abi: ERC_20_ABI,
-                            functionName: 'approve',
-                            args: [account, amount]
-                        })];
-                case 2:
-                    result = _a.sent();
-                    console.log('Result:', result);
-                    console.log('ApproveTransaction:', hash);
-                    if (hash) {
-                        setApproveTx(hash);
-                        console.log('setApproveTx:', hash);
-                    }
-                    return [3 /*break*/, 4];
-                case 3:
-                    error_1 = _a.sent();
-                    console.error('Approval failed:', error_1);
-                    alert('Approval Failed');
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+            tokenAddress = bondData[0].principalToken;
+            decimals = 18;
+            try {
+                amount = convertToTokenValue(inputValue, decimals);
+                console.log('Amount:', amount);
+                writeContract({
+                    address: tokenAddress,
+                    abi: ERC_20_ABI,
+                    functionName: 'approve',
+                    args: [account, amount]
+                });
+                console.log('ApproveTransaction:', hash);
+                if (hash) {
+                    setApproveTx(hash);
+                    console.log('setApproveTx:', hash);
+                }
             }
+            catch (error) {
+                console.error('Approval failed:', error);
+                alert('Approval Failed');
+            }
+            return [2 /*return*/];
         });
     }); };
     var _f = useState(null), approveTx = _f[0], setApproveTx = _f[1];
@@ -173,13 +169,7 @@ var BondModal = function (_a) {
     var handleInputChange = function (event) {
         setInputValue(event.target.value);
     };
-    var _h = useState(null), selectedBond = _h[0], setSelectedBond = _h[1];
-    var navigate = useNavigate();
-    var projectInfo = function (bond) {
-        setSelectedBond(bond);
-        navigate("/bondsingle/".concat(bond.billAddress));
-    };
-    var _j = useState(null), tokenBalance = _j[0], setTokenBalance = _j[1];
+    var _h = useState(null), tokenBalance = _h[0], setTokenBalance = _h[1];
     useEffect(function () {
         if (isActive && account && bondData.length > 0) {
             getTokenBalance(bondData[0].chainId, bondData[0].principalToken, account).then(function (balance) {
@@ -188,7 +178,7 @@ var BondModal = function (_a) {
         }
     }, [isActive, account, bondData]);
     var getTokenBalance = function (chainId, tokenAddress, walletAddress) { return __awaiter(void 0, void 0, void 0, function () {
-        var urls, provider, contract, balance, balanceInEther, error_2;
+        var urls, provider, contract, balance, balanceInEther, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -206,8 +196,8 @@ var BondModal = function (_a) {
                     console.log("Token Balance: ".concat(balanceInEther));
                     return [2 /*return*/, balanceInEther];
                 case 2:
-                    error_2 = _a.sent();
-                    console.error('Error fetching token balance', error_2);
+                    error_1 = _a.sent();
+                    console.error('Error fetching token balance', error_1);
                     return [2 /*return*/, 'Error fetching token balance'];
                 case 3: return [2 /*return*/];
             }
@@ -230,7 +220,7 @@ var BondModal = function (_a) {
                                                                         ? v.currentTarget.value
                                                                         : v.currentTarget.value.slice(0, v.currentTarget.value.length - 1);
                                                             } }) }), _jsxs(Flex, { className: "input-container token", children: [_jsx(Flex, { className: "input-container bondicon", children: _jsxs("div", { className: "icon-container-small", children: [_jsx(Svg, { width: 12, height: 12, icon: (_m = NETWORK_ICONS === null || NETWORK_ICONS === void 0 ? void 0 : NETWORK_ICONS[bond.chainId]) !== null && _m !== void 0 ? _m : 'question' }), _jsx(TokenImage, { symbol: (_o = bond.principalTokenName) !== null && _o !== void 0 ? _o : bond.payoutTokenName, size: 30 })] }) }), _jsx(Flex, { className: "title-container tokenname-small", children: bond === null || bond === void 0 ? void 0 : bond.principalTokenName })] })] }), isActive && account && (_jsxs(Flex, { className: "input-container balancerow", children: [_jsxs(Flex, { className: "balancerow text", children: ["Balance: ", tokenBalance] }), _jsx(Flex, { className: "balancerow max", children: _jsx(Button, { onClick: function () { setInputValue(tokenBalance !== null && tokenBalance !== void 0 ? tokenBalance : '0'); }, children: "Max" }) })] }))] }), _jsxs(Flex, { className: "modal-container button-container", children: [_jsx(Flex, { className: "button-container get", children: _jsxs(Button, { onClick: function () { window.open('https://ape.bond/swap', '_blank'); }, children: ["Get ", bond === null || bond === void 0 ? void 0 : bond.principalTokenName] }) }), _jsx(Flex, { className: "button-container buy", children: approveTx != null ?
-                                                    _jsxs(Button, { onClick: handleBuy, children: ["Buy ", bond === null || bond === void 0 ? void 0 : bond.showcaseTokenName] })
+                                                    _jsxs(Button, { disabled: isPending, onClick: handleBuy, children: ["Buy ", bond === null || bond === void 0 ? void 0 : bond.showcaseTokenName] })
                                                     :
                                                         _jsx(Button, { disabled: isPending, onClick: handleApprove, children: "Approve" }) })] })] })] }) }) }, bond.billAddress));
         }) }));

package/package.json

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