@huma-finance/widgets 0.0.62-beta.713 → 0.0.62-beta.715

package/dist/cjs/index.cjs

@@ -8726,7 +8726,6 @@ function SolanaViewOnExplorer(_ref) {
   });
 }
 
-/* eslint-disable no-await-in-loop */
 function SolanaTxSendModal(_ref) {
   let {
     chainId,
@@ -8747,28 +8746,18 @@ function SolanaTxSendModal(_ref) {
         return;
       }
       try {
+        const latestBlockHash = await connection.getLatestBlockhash();
         const signature = await sendTransaction(tx, connection);
         setSignature(signature);
         dispatch(setSolanaSignature(signature));
-        let transactionConfirmed = false;
-        for (let i = 0; i < 30; i += 1) {
-          var _result$value;
-          shared.timeUtil.sleep(1000);
-          const result = await connection.getSignatureStatus(signature);
-          if (result !== null && result !== void 0 && (_result$value = result.value) !== null && _result$value !== void 0 && _result$value.confirmations) {
-            transactionConfirmed = true;
-            break;
-          }
-        }
-        if (transactionConfirmed) {
-          handleSuccess({
-            signature
-          });
-        } else {
-          dispatch(setError({
-            errorMessage: 'Transaction failed to confirm in time'
-          }));
-        }
+        await connection.confirmTransaction({
+          blockhash: latestBlockHash.blockhash,
+          lastValidBlockHeight: latestBlockHash.lastValidBlockHeight,
+          signature
+        });
+        handleSuccess({
+          signature
+        });
       } catch (error) {
         const err = error;
         dispatch(setError({
@@ -8800,6 +8789,7 @@ function Transfer$4(_ref) {
   const {
     publicKey
   } = walletAdapterReact.useWallet();
+  const sentinel = shared.getSentinelAddress(poolInfo.chainId);
   const {
     supplyAmount
   } = useAppSelector(selectWidgetState);
@@ -8813,6 +8803,8 @@ function Transfer$4(_ref) {
     seniorLenderApprovedAccountPDA,
     seniorLenderStateAccount,
     juniorLenderStateAccount,
+    seniorTrancheMintSupply,
+    juniorTrancheMintSupply,
     loading: isLoadingLenderAccounts
   } = webShared.useLenderAccounts(poolInfo.chainId, poolInfo.poolName);
   const program = webShared.useHumaProgram(poolInfo.chainId);
@@ -8829,6 +8821,7 @@ function Transfer$4(_ref) {
   }, [dispatch, isDev, pointsTestnetExperience, poolInfo.chainId, poolState.campaign, publicKey]);
   React.useEffect(() => {
     async function getTx() {
+      var _poolState$seniorTran, _poolState$juniorTran;
       if (!publicKey || transaction || isLoadingLenderAccounts) {
         return;
       }
@@ -8864,10 +8857,22 @@ function Transfer$4(_ref) {
         underlyingTokenProgram: splToken.TOKEN_PROGRAM_ID
       }).transaction();
       tx.add(depositTx);
+
+      // Approve automatic redemptions
+      const sharesAmount = shared.convertToShares(selectedTranche === 'senior' ? new anchor.BN((_poolState$seniorTran = poolState.seniorTrancheAssets) !== null && _poolState$seniorTran !== void 0 ? _poolState$seniorTran : 0) : new anchor.BN((_poolState$juniorTran = poolState.juniorTrancheAssets) !== null && _poolState$juniorTran !== void 0 ? _poolState$juniorTran : 0), selectedTranche === 'senior' ? seniorTrancheMintSupply !== null && seniorTrancheMintSupply !== void 0 ? seniorTrancheMintSupply : new anchor.BN(0) : juniorTrancheMintSupply !== null && juniorTrancheMintSupply !== void 0 ? juniorTrancheMintSupply : new anchor.BN(0), supplyBigNumber);
+      tx.add(splToken.createApproveCheckedInstruction(selectedTranche === 'senior' ? seniorTrancheATA : juniorTrancheATA, new web3_js.PublicKey(selectedTranche === 'senior' ? poolInfo.seniorTrancheMint : poolInfo.juniorTrancheMint), new web3_js.PublicKey(sentinel),
+      // delegate
+      publicKey,
+      // owner of the wallet
+      BigInt(sharesAmount.muln(1.1).toString()),
+      // amount
+      poolInfo.trancheDecimals, undefined,
+      // multiSigners
+      splToken.TOKEN_2022_PROGRAM_ID));
       setTransaction(tx);
     }
     getTx();
-  }, [isLoadingLenderAccounts, juniorLenderApprovedAccountPDA, juniorLenderStateAccount, poolInfo, program.methods, publicKey, selectedTranche, seniorLenderApprovedAccountPDA, seniorLenderStateAccount, supplyBigNumber, transaction]);
+  }, [isLoadingLenderAccounts, juniorLenderApprovedAccountPDA, juniorLenderStateAccount, juniorTrancheMintSupply, poolInfo, poolState.juniorTrancheAssets, poolState.seniorTrancheAssets, program.methods, publicKey, selectedTranche, seniorLenderApprovedAccountPDA, seniorLenderStateAccount, seniorTrancheMintSupply, sentinel, supplyBigNumber, transaction]);
   if (isLoadingLenderAccounts) {
     return jsxRuntime.jsx(LoadingModal, {
       title: "Supply"
@@ -8965,7 +8970,7 @@ function Success(_ref) {
     var _poolState$withdrawal;
     const lockupEndTime = dayjs__default["default"]().add((_poolState$withdrawal = poolState.withdrawalLockupPeriodDays) !== null && _poolState$withdrawal !== void 0 ? _poolState$withdrawal : 0, 'day').date(1);
     const withdrawTime = lockupEndTime.add(1, 'month');
-    return ["You can begin submitting redemption requests on ".concat(shared.timeUtil.timestampToLL(lockupEndTime.unix()), ", which can be redeemed starting ").concat(shared.timeUtil.timestampToLL(withdrawTime.unix()), ".")];
+    return ["You can begin submitting redemption requests on ".concat(shared.timeUtil.timestampToLL(lockupEndTime.unix()), ". Your deposit will be automatically redeemed and your yield rewards will stop on ").concat(shared.timeUtil.timestampToLL(withdrawTime.unix()), ".")];
   };
   const handleUserAction = React.useCallback(() => {
     if (campaign) {