@ape.swap/bonds-sdk 1.0.562 → 1.0.564

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

@@ -48,7 +48,7 @@ import { isNumber } from '../../../utils/numbers';
 import { TooltipBubble, Button, Svg, ListTag } from '../../uikit-sdk';
 import { TooltipText } from '../../../enum/tooltips';
 import { ethers } from 'ethers';
-import { adjustDecimals } from "../../../utils/convertToTokenValue";
+import convertToTokenValue 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';
@@ -64,58 +64,56 @@ var BondModal = function (_a) {
     var writeContract = useWriteContract().writeContract;
     //const { account, isActive } = useWeb3React();
     var _b = useState([]), bondData = _b[0], setBondData = _b[1];
-    var _c = useState(false), approvalStatus = _c[0], setApprovalStatus = _c[1];
     //This is a temp solution, but we will force approval each time, and then once set we will set status here and allow
     //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 provider, signer, bondContract, maxPrice, amount, tx, error_1;
+        var billAddress, decimals, maxPrice, amount, tx, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    console.log('handle buy clicked');
-                    if (!window.ethereum) {
-                        console.error('No Ethereum provider found');
-                        alert('No Ethereum provider found');
-                        return [2 /*return*/];
-                    }
-                    provider = new ethers.providers.Web3Provider(window.ethereum);
-                    signer = provider.getSigner();
-                    bondContract = new ethers.Contract(bondAddress !== null && bondAddress !== void 0 ? bondAddress : "", BOND_ABI, signer);
+                    billAddress = bondData[0].billAddress;
+                    decimals = 18;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
+                    _a.trys.push([1, 3, , 4]);
                     maxPrice = new BigNumber(bondData[0].trueBillPrice).times(102).div(100);
-                    amount = adjustDecimals(inputValue);
-                    return [4 /*yield*/, bondContract.deposit(amount, maxPrice, account)];
+                    amount = convertToTokenValue(inputValue, decimals);
+                    return [4 /*yield*/, writeContract({
+                            address: billAddress,
+                            abi: BOND_ABI,
+                            functionName: 'deposit',
+                            args: [amount, maxPrice, account],
+                        })];
                 case 2:
                     tx = _a.sent();
-                    return [4 /*yield*/, tx.wait()];
+                    console.log('Transaction:', tx);
+                    if (tx != null) {
+                        setBuyTx(tx);
+                    }
+                    return [3 /*break*/, 4];
                 case 3:
-                    _a.sent();
-                    alert('Buy Successful');
-                    return [3 /*break*/, 5];
-                case 4:
                     error_1 = _a.sent();
-                    console.error('Approval error', error_1);
-                    alert('Approval Failed');
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
+                    console.error('Buy error', error_1);
+                    alert('Buy Failed');
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); };
+    var _c = useState(null), buyTx = _c[0], setBuyTx = _c[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, amount, tx, error_2;
+        var tokenAddress, decimals, amount, tx, error_2;
         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]);
-                    console.log(adjustDecimals(inputValue));
-                    amount = ethers.BigNumber.from(inputValue);
+                    amount = convertToTokenValue(inputValue, decimals);
                     console.log('Amount:', amount);
                     return [4 /*yield*/, writeContract({
                             address: tokenAddress,
@@ -126,15 +124,20 @@ var BondModal = function (_a) {
                 case 2:
                     tx = _a.sent();
                     console.log('Transaction:', tx);
+                    if (tx != null) {
+                        setApproveTx(tx);
+                    }
                     return [3 /*break*/, 4];
                 case 3:
                     error_2 = _a.sent();
                     console.error('Approval failed:', error_2);
+                    alert('Approval Failed');
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
             }
         });
     }); };
+    var _d = useState(null), approveTx = _d[0], setApproveTx = _d[1];
     // Fetch data
     useEffect(function () {
         axios.get('https://realtime-api.ape.bond/bonds').then(function (response) {
@@ -167,17 +170,17 @@ var BondModal = function (_a) {
         var singlePurchaseLimit = new BigNumber((_c = bond === null || bond === void 0 ? void 0 : bond.maxPayout) !== null && _c !== void 0 ? _c : 0).div(new BigNumber(10).pow((_d = bond === null || bond === void 0 ? void 0 : bond.payoutTokenDecimals) !== null && _d !== void 0 ? _d : 18));
         return !available ? 0 : (singlePurchaseLimit.lt(safeAvailable) ? singlePurchaseLimit : safeAvailable);
     };
-    var _d = useState(''), inputValue = _d[0], setInputValue = _d[1];
+    var _e = useState(''), inputValue = _e[0], setInputValue = _e[1];
     var handleInputChange = function (event) {
         setInputValue(event.target.value);
     };
-    var _e = useState(null), selectedBond = _e[0], setSelectedBond = _e[1];
+    var _f = useState(null), selectedBond = _f[0], setSelectedBond = _f[1];
     var navigate = useNavigate();
     var projectInfo = function (bond) {
         setSelectedBond(bond);
         navigate("/bondsingle/".concat(bond.billAddress));
     };
-    var _f = useState(null), tokenBalance = _f[0], setTokenBalance = _f[1];
+    var _g = useState(null), tokenBalance = _g[0], setTokenBalance = _g[1];
     useEffect(function () {
         if (isActive && account && bondData.length > 0) {
             getTokenBalance(bondData[0].chainId, bondData[0].principalToken, account).then(function (balance) {
@@ -227,7 +230,7 @@ var BondModal = function (_a) {
                                                                     !!v.currentTarget.value && isNumber(v.currentTarget.value) && parseFloat(v.currentTarget.value) >= 0
                                                                         ? 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, { children: ["Get ", bond === null || bond === void 0 ? void 0 : bond.principalTokenName] }) }), _jsx(Flex, { className: "button-container buy", children: approvalStatus === true ?
+                                                            } }) }), _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, { 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] })
                                                     :
                                                         _jsx(Button, { 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.562",
+  "version": "1.0.564",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",