@ape.swap/bonds-sdk 1.0.600 → 1.0.602

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

@@ -60,50 +60,57 @@ var BondModal = function (_a) {
     var account = _a.account, isActive = _a.isActive, isOpen = _a.isOpen, accountChainId = _a.accountChainId, onClose = _a.onClose, bondAddress = _a.bondAddress;
     if (!isOpen)
         return null;
-    var _b = useWriteContract(), hash = _b.data, isPending = _b.isPending, writeContract = _b.writeContract;
+    var _b = useWriteContract(), hash = _b.data, isPending = _b.isPending, writeContract = _b.writeContract, writeContractAsync = _b.writeContractAsync;
     var _c = useWaitForTransactionReceipt({
         hash: hash,
     }), isConfirming = _c.isLoading, isConfirmed = _c.isSuccess;
-    //const { account, isActive } = useWeb3React();
     var _d = useState([]), bondData = _d[0], setBondData = _d[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 billAddress, decimals, maxPrice, amount;
+        var billAddress, decimals, maxPrice, amount, tx, error_1;
         return __generator(this, function (_a) {
-            billAddress = bondData[0].billAddress;
-            decimals = 18;
-            try {
-                console.log('HANDLEBUY CLICKED!_!!');
-                maxPrice = new BigNumber(bondData[0].trueBillPrice).times(103).div(100);
-                amount = convertToTokenValue(inputValue, decimals);
-                console.log('BillAddress:', billAddress);
-                console.log('Amount:', amount);
-                console.log('MaxPrice:', maxPrice.toFixed(0));
-                writeContract({
-                    address: billAddress,
-                    abi: BOND_ABI,
-                    functionName: 'deposit',
-                    args: [amount, maxPrice.toFixed(0), account],
-                });
-                console.log('BuyTransaction:', hash);
-                if (hash) {
-                    setBuyTx(hash);
-                    console.log('setBuyTx:', hash);
-                }
-            }
-            catch (error) {
-                console.error('Buy error', error);
-                alert('Buy Failed');
+            switch (_a.label) {
+                case 0:
+                    billAddress = bondData[0].billAddress;
+                    decimals = 18;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    console.log('HANDLEBUY CLICKED');
+                    maxPrice = new BigNumber(bondData[0].trueBillPrice).times(102).div(100);
+                    amount = convertToTokenValue(inputValue, decimals);
+                    console.log('BillAddress:', billAddress);
+                    console.log('Amount:', amount);
+                    console.log('MaxPrice:', maxPrice);
+                    return [4 /*yield*/, writeContractAsync({
+                            address: billAddress,
+                            abi: BOND_ABI,
+                            functionName: 'deposit',
+                            args: [amount, maxPrice.toFixed(0), account],
+                        })];
+                case 2:
+                    tx = _a.sent();
+                    console.log('BuyTransaction:', hash);
+                    if (tx) {
+                        setBuyTx(tx);
+                        console.log('setBuyTx:', hash);
+                    }
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_1 = _a.sent();
+                    console.error('Buy error', error_1);
+                    alert('Buy Failed');
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
-            return [2 /*return*/];
         });
     }); };
     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, hash_1, error_1;
+        var tokenAddress, decimals, amount, tx, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -113,25 +120,24 @@ var BondModal = function (_a) {
                 case 1:
                     _a.trys.push([1, 3, , 4]);
                     amount = convertToTokenValue(inputValue, decimals);
-                    return [4 /*yield*/, writeContract({
+                    console.log('Amount:', amount);
+                    return [4 /*yield*/, writeContractAsync({
                             address: tokenAddress,
                             abi: ERC_20_ABI,
                             functionName: 'approve',
                             args: [account, amount]
                         })];
                 case 2:
-                    hash_1 = _a.sent();
-                    alert(hash_1);
-                    console.log(hash_1);
-                    console.log('ApproveTransaction Hash__!:', hash_1);
-                    if (hash_1 != null) {
-                        setApproveTx(hash_1);
-                        console.log('setApproveTx:', hash_1);
+                    tx = _a.sent();
+                    console.log('ApproveTransaction:', tx);
+                    if (tx) {
+                        setApproveTx(tx);
+                        console.log('setApproveTx:', tx);
                     }
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _a.sent();
-                    console.error('Approval failed:', error_1);
+                    error_2 = _a.sent();
+                    console.error('Approval failed:', error_2);
                     alert('Approval Failed');
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
@@ -176,36 +182,46 @@ var BondModal = function (_a) {
         setInputValue(event.target.value);
     };
     var _h = useState(null), tokenBalance = _h[0], setTokenBalance = _h[1];
+    var _j = useState(null), tokenDecimals = _j[0], setTokenDecimals = _j[1];
     useEffect(function () {
         if (isActive && account && bondData.length > 0) {
-            getTokenBalance(bondData[0].chainId, bondData[0].principalToken, account).then(function (balance) {
-                setTokenBalance(balance);
+            getTokenBalance(bondData[0].chainId, bondData[0].principalToken, account).then(function (_a) {
+                var balanceInEther = _a.balanceInEther, decimals = _a.decimals;
+                setTokenBalance(balanceInEther);
+                setTokenDecimals(decimals);
+            }).catch(function (error) {
+                console.error('Error fetching token balance', error);
             });
         }
     }, [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, decimals, balance, balanceInEther, error_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
+                    _a.trys.push([0, 3, , 4]);
                     urls = PUBLIC_RPC_URLS;
                     provider = new ethers.providers.JsonRpcProvider(urls[chainId][0]);
                     if (!provider) {
                         throw new Error("No provider found for chainId: ".concat(chainId));
                     }
                     contract = new ethers.Contract(tokenAddress, ERC_20_ABI, provider);
-                    return [4 /*yield*/, contract.balanceOf(walletAddress)];
+                    return [4 /*yield*/, contract.decimals()];
                 case 1:
+                    decimals = _a.sent();
+                    console.log('Decimals:', decimals);
+                    console.log(decimals);
+                    return [4 /*yield*/, contract.balanceOf(walletAddress)];
+                case 2:
                     balance = _a.sent();
-                    balanceInEther = ethers.utils.formatUnits(balance, 18);
+                    balanceInEther = ethers.utils.formatUnits(balance, decimals);
                     console.log("Token Balance: ".concat(balanceInEther));
-                    return [2 /*return*/, balanceInEther];
-                case 2:
-                    error_2 = _a.sent();
-                    console.error('Error fetching token balance', error_2);
-                    return [2 /*return*/, 'Error fetching token balance'];
-                case 3: return [2 /*return*/];
+                    return [2 /*return*/, { balanceInEther: balanceInEther, decimals: decimals }];
+                case 3:
+                    error_3 = _a.sent();
+                    console.error('Error fetching token balance', error_3);
+                    return [2 /*return*/, { balanceInEther: '0', decimals: 0 }]; // Return a default object
+                case 4: return [2 /*return*/];
             }
         });
     }); };

package/package.json

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