@huma-finance/widgets 0.0.62-beta.622 → 0.0.62-beta.627

package/dist/index.js

@@ -1,11 +1,11 @@
 import { JsonRpcProvider } from '@ethersproject/providers';
-import { txAtom, useMQ, sendTxAtom, usePoolUnderlyingTokenContract, useMount, usePoolInfo, useAccountStats, usePoolInfoV2, usePoolUnderlyingTokenInfoV2, usePoolSafeAllowanceV2, useAuthErrorHandling, useCLFeeManager, useCLPoolAllowance, usePoolContract, useCreditContractV2, useCreditStatsV2, useFirstLossCoverContractV2, useFirstLossCoverRequirementV2, useFirstLossCoverAllowanceV2, useFeeManager, useInvoiceNFTContract, useRFPoolAllowance, useLenderDepositRecordV2, useLPConfigV2, useNextEpochStartTimeV2, useTrancheVaultContractV2, useCancellableRedemptionInfoV2, useParamsSearch, usePoolAllowance, useLenderApproved, useLenderPosition, useWithdrawlLockoutInSeconds, usePoolUnderlyingTokenBalance, usePoolUnderlyingTokenBalanceV2, useLenderApprovedV2, useTrancheVaultAssetsV2, useLastDepositTime, usePoolBalance, useReceivableInfoV2, useReceivableContractV2, useERC2612Permit, useMultiSendContract, usePoolUnderlyingToken, useFactoring, useLenderAccounts, useHumaProgram, useTokenAccount, useTrancheMintAccounts, useTrancheTokenAccounts, useBorrowerAccounts, usePoolUnderlyingTokenAccount, Provider as Provider$1 } from '@huma-finance/web-shared';
+import { txAtom, useMQ, sendTxAtom, usePoolUnderlyingTokenContract, useMount, usePoolInfo, useAccountStats, usePoolInfoV2, usePoolUnderlyingTokenInfoV2, usePoolSafeAllowanceV2, useAuthErrorHandling, useCLFeeManager, useCLPoolAllowance, usePoolContract, useCreditContractV2, useCreditStatsV2, useFirstLossCoverContractV2, useFirstLossCoverRequirementV2, useFirstLossCoverAllowanceV2, useFeeManager, useInvoiceNFTContract, useRFPoolAllowance, useLenderDepositRecordV2, useLPConfigV2, useNextEpochStartTimeV2, useTrancheVaultContractV2, useCancellableRedemptionInfoV2, useParamsSearch, usePoolAllowance, useLenderApproved, useLenderPosition, useWithdrawlLockoutInSeconds, usePoolUnderlyingTokenBalance, usePoolUnderlyingTokenBalanceV2, useLenderApprovedV2, useTrancheVaultAssetsV2, useLastDepositTime, usePoolBalance, useReceivableInfoV2, useReceivableContractV2, useERC2612Permit, useMultiSendContract, usePoolUnderlyingToken, useFactoring, useLenderAccounts, useHumaProgram, useTokenAccount, useTrancheMintAccounts, useTrancheTokenAccounts, useBorrowerAccounts, Provider as Provider$1 } from '@huma-finance/web-shared';
 import { useTheme, css, Box, Typography, Tooltip, Button, Dialog, Slider, Input, Divider, TextField, FormControl, FormLabel, RadioGroup, FormControlLabel, Radio, Snackbar, Alert, Link, Skeleton, TablePagination, LinearProgress, createTheme, ThemeProvider } from '@mui/material';
 import { useAtom, Provider as Provider$2 } from 'jotai';
 import * as React from 'react';
 import React__default, { useCallback, useState, useEffect, useMemo, useRef } from 'react';
 import { useSelector, useDispatch, Provider } from 'react-redux';
-import { supportedChainId, isTxFailed, getExplorerUrl, openInNewTab, TxStateType, decodeLogs, ERC20_ABI, downScale, formatMoney, POOL_NAME, POOL_TYPE, getERC20Contract, checkIsDev, EAService, EARejectionError, EARejectMessage, EARejectReason, timeUtil, formatNumber, doesChainSupportNotifi, getBlockchainConfigFromChain, CreditState, isEmpty, CreditStateV2, upScale, toBigNumber, TRANSFER_ABI, FirstLossCoverIndex, combineStyles, timestampToLL, getTrancheAssetsAndShares, IdentityService, CHAINS, configUtil, IdentityServiceV2, IdentityVerificationStatusV2, CampaignService, CAMPAIGN_REFERENCE_CODE, KYC_PROVIDER, formatAmount, getTrancheVaultContractV2, getTrancheRedemptionStatusV2, getPoolContractV2, CURRENCY_CODE, CreditEventText, SuperfluidPoolProcessor_ABI, hasRFActiveLoan, getWalletAddressAbbr, PoolMap, CreditEvent, SolanaTokenUtils, getSolanaExplorerUrl, getTokenAccounts, getSentinelAddress } from '@huma-finance/shared';
+import { supportedChainId, isTxFailed, getExplorerUrl, openInNewTab, TxStateType, decodeLogs, ERC20_ABI, downScale, formatMoney, POOL_NAME, POOL_TYPE, getERC20Contract, checkIsDev, EAService, EARejectionError, EARejectMessage, EARejectReason, timeUtil, formatNumber, doesChainSupportNotifi, getBlockchainConfigFromChain, CreditState, isEmpty, CreditStateV2, upScale, toBigNumber, TRANSFER_ABI, FirstLossCoverIndex, combineStyles, timestampToLL, getTrancheAssetsAndShares, IdentityService, CHAINS, configUtil, IdentityServiceV2, IdentityVerificationStatusV2, CampaignService, CAMPAIGN_REFERENCE_CODE, KYC_PROVIDER, formatAmount, getTrancheVaultContractV2, getTrancheRedemptionStatusV2, getPoolContractV2, CURRENCY_CODE, CreditEventText, SuperfluidPoolProcessor_ABI, hasRFActiveLoan, getWalletAddressAbbr, PoolMap, CreditEvent, SolanaTokenUtils, getSolanaExplorerUrl, getTokenAccounts, getSentinelAddress, getCreditAccounts } from '@huma-finance/shared';
 import { useWeb3React } from '@web3-react/core';
 import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
 import { useResetAtom } from 'jotai/utils';
@@ -35,7 +35,7 @@ import TableRow from '@mui/material/TableRow';
 import { getAddress } from '@ethersproject/address';
 import { useWallet, useConnection } from '@solana/wallet-adapter-react';
 import { BN } from '@coral-xyz/anchor';
-import { TOKEN_2022_PROGRAM_ID, createApproveCheckedInstruction } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID, getAccount, TokenAccountNotFoundError, TokenInvalidAccountOwnerError, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID, createApproveCheckedInstruction } from '@solana/spl-token';
 import { Transaction, PublicKey } from '@solana/web3.js';
 
 function _taggedTemplateLiteral(strings, raw) {
@@ -1891,7 +1891,7 @@ function ApproveAllowanceModal(_ref) {
   });
 }
 
-function ApproveAllowance$d(_ref) {
+function ApproveAllowance$c(_ref) {
   let {
     poolInfo,
     amount
@@ -2033,7 +2033,7 @@ function CreditLineApprove(_ref) {
     loadingTitle: "Approve Allowance",
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$d, {
+    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$c, {
       poolInfo: poolInfo,
       amount: amount
     }), step === WIDGET_STEP.Done && jsx(Success$f, {
@@ -2132,7 +2132,7 @@ function ApproveAllowanceModalV2(_ref) {
   });
 }
 
-function ApproveAllowance$c(_ref) {
+function ApproveAllowance$b(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken
@@ -2202,7 +2202,7 @@ function AutoPaybackV2(_ref) {
     loadingTitle: "Auto Payback",
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$c, {
+    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$b, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken
     }), step === WIDGET_STEP.Done && jsx(Success$e, {
@@ -2575,7 +2575,7 @@ function ChooseAmountModal(_ref) {
   });
 }
 
-function ChooseAmount$f(_ref) {
+function ChooseAmount$g(_ref) {
   let {
     poolInfo,
     accountStats
@@ -2635,7 +2635,7 @@ function ChooseAmount$f(_ref) {
   });
 }
 
-function ApproveAllowance$b(_ref) {
+function ApproveAllowance$a(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -2694,7 +2694,7 @@ function TxSendModal(_ref) {
   });
 }
 
-function Transfer$i(_ref) {
+function Transfer$k(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -3052,12 +3052,12 @@ function CreditLineBorrow(_ref) {
     children: [step === WIDGET_STEP.Evaluation && jsx(Evaluation$5, {
       poolInfo: poolInfo,
       handleApprove: approveCallback
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$f, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$g, {
       poolInfo: poolInfo,
       accountStats: accountStats
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$b, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$a, {
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$i, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$k, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$d, {
       poolInfo: poolInfo,
@@ -3100,7 +3100,7 @@ function InputAmountModal(_ref) {
     inputField: css(_templateObject3$f || (_templateObject3$f = _taggedTemplateLiteral(["\n      input {\n        width: 100%;\n        color: ", ";\n        font-weight: 800;\n        font-size: 40px;\n        line-height: 133.4%;\n      }\n    "])), theme.palette.text.primary),
     maxWrapper: css(_templateObject4$7 || (_templateObject4$7 = _taggedTemplateLiteral(["\n      position: relative;\n      display: flex;\n      justify-content: flex-end;\n    "]))),
     maxTitle: css(_templateObject5$3 || (_templateObject5$3 = _taggedTemplateLiteral(["\n      position: absolute;\n      color: ", ";\n      font-weight: 400;\n      font-size: 12px;\n      line-height: 166%;\n      letter-spacing: 0.4px;\n      top: ", ";\n      width: 200px;\n      text-align: right;\n    "])), theme.palette.text.primary, theme.spacing(-3)),
-    max: css(_templateObject6$3 || (_templateObject6$3 = _taggedTemplateLiteral(["\n      display: flex;\n      min-width: fit-content;\n      justify-content: center;\n      align-items: center;\n      border-radius: 32px;\n      padding: 4px 10px;\n      gap: 8px;\n      font-weight: 700;\n      font-size: 13px;\n      line-height: 22px;\n      letter-spacing: 0.46px;\n    "]))),
+    max: css(_templateObject6$3 || (_templateObject6$3 = _taggedTemplateLiteral(["\n      display: flex;\n      min-width: fit-content;\n      justify-content: center;\n      align-items: center;\n      border-radius: 32px;\n      padding: 4px 10px;\n      gap: 8px;\n      font-weight: 700;\n      font-size: 13px;\n      line-height: 22px;\n      letter-spacing: 0.46px;\n      white-space: nowrap;\n    "]))),
     info: css(_templateObject7$2 || (_templateObject7$2 = _taggedTemplateLiteral(["\n      color: ", ";\n      font-weight: 400;\n      font-size: 16px;\n      line-height: 160%;\n      letter-spacing: 0.15px;\n    "])), theme.palette.text.secondary),
     subInfo: css(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteral(["\n      position: absolute;\n      bottom: ", ";\n    "])), theme.spacing(6))
   };
@@ -3176,7 +3176,7 @@ function InputAmountModal(_ref) {
   });
 }
 
-function ChooseAmount$e(_ref) {
+function ChooseAmount$f(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -3229,7 +3229,7 @@ function ChooseAmount$e(_ref) {
   });
 }
 
-function ApproveAllowance$a(_ref) {
+function ApproveAllowance$9(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken
@@ -3287,7 +3287,7 @@ function TxSendModalV2(_ref) {
   });
 }
 
-function Transfer$h(_ref) {
+function Transfer$j(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -3418,14 +3418,14 @@ function CreditLineBorrowV2(_ref) {
     handleSuccess: handleSuccessCallback,
     children: [!step && jsx(LoadingModal, {
       title: "Borrow"
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$e, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$f, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       accountStats: accountStats
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$a, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$9, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$h, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$j, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$c, {
       poolUnderlyingToken: poolUnderlyingToken,
@@ -3442,7 +3442,7 @@ function CreditLineBorrowV2(_ref) {
   });
 }
 
-function ChooseAmount$d(_ref) {
+function ChooseAmount$e(_ref) {
   let {
     payoffAmount,
     totalDueAmount,
@@ -3493,7 +3493,7 @@ function ChooseAmount$d(_ref) {
   });
 }
 
-function ApproveAllowance$9(_ref) {
+function ApproveAllowance$8(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -3507,7 +3507,7 @@ function ApproveAllowance$9(_ref) {
   });
 }
 
-function Transfer$g(_ref) {
+function Transfer$i(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -3599,13 +3599,13 @@ function CreditLinePayment(_ref) {
     loadingTitle: "Make Payment",
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$d, {
+    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$e, {
       poolInfo: poolInfo,
       payoffAmount: payoffAmount,
       totalDueAmount: totalDueAmount
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$9, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$8, {
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$g, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$i, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$b, {
       poolInfo: poolInfo,
@@ -3618,7 +3618,7 @@ function CreditLinePayment(_ref) {
   });
 }
 
-function ChooseAmount$c(_ref) {
+function ChooseAmount$d(_ref) {
   let {
     payoffAmount: payoffAmountBN,
     totalDueAmount: totalDueAmountBN,
@@ -3640,6 +3640,8 @@ function ChooseAmount$c(_ref) {
   } = usePoolSafeAllowanceV2(poolInfo.poolName, account, provider);
   const totalDueAmount = Number(ethers.utils.formatUnits(totalDueAmountBN, decimals));
   const payoffAmount = Number(ethers.utils.formatUnits(payoffAmountBN, decimals));
+
+  // TODO: Remove redundant useEffect
   useEffect(() => {
     setCurrentAmount(totalDueAmount);
   }, [totalDueAmount]);
@@ -3679,7 +3681,7 @@ function ChooseAmount$c(_ref) {
   });
 }
 
-function ApproveAllowance$8(_ref) {
+function ApproveAllowance$7(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken
@@ -3697,7 +3699,7 @@ function ApproveAllowance$8(_ref) {
   });
 }
 
-function Transfer$f(_ref) {
+function Transfer$h(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken
@@ -3803,15 +3805,15 @@ function CreditLinePaymentV2(_ref) {
     loadingTitle: "Pay",
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$c, {
+    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$d, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       payoffAmount: payoffAmount,
       totalDueAmount: totalDueAmount
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$8, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$7, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$f, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$h, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken
     }), step === WIDGET_STEP.Done && jsx(Success$a, {
@@ -3825,7 +3827,7 @@ function CreditLinePaymentV2(_ref) {
   });
 }
 
-function ApproveAllowance$7(_ref) {
+function ApproveAllowance$6(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -3862,7 +3864,7 @@ function Success$9(_ref) {
   });
 }
 
-function Transfer$e(_ref) {
+function Transfer$g(_ref) {
   let {
     poolInfo,
     amountToDeposit,
@@ -3939,11 +3941,11 @@ function SupplyFirstLossCover(_ref) {
     loadingTitle: title,
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$7, {
+    children: [step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$6, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       amountToDeposit: minAmountToDeposit
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$e, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$g, {
       poolInfo: poolInfo,
       amountToDeposit: minAmountToDeposit,
       title: title
@@ -3996,7 +3998,7 @@ function Evaluation$4(_ref) {
   });
 }
 
-function ChooseAmount$b(_ref) {
+function ChooseAmount$c(_ref) {
   var _receivable;
   let {
     poolInfo,
@@ -4201,7 +4203,7 @@ function ApproveNFT(_ref) {
   });
 }
 
-function Transfer$d(_ref) {
+function Transfer$f(_ref) {
   let {
     poolInfo,
     tokenId
@@ -4277,13 +4279,13 @@ function InvoiceFactoringBorrow(_ref) {
     children: [step === WIDGET_STEP.Evaluation && jsx(Evaluation$4, {
       poolInfo: poolInfo,
       tokenId: tokenId.toString()
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$b, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$c, {
       poolInfo: poolInfo,
       accountStats: accountStats
     }), step === WIDGET_STEP.ConfirmTransfer && jsx(ConfirmTransfer$2, {}), step === WIDGET_STEP.ApproveNFT && jsx(ApproveNFT, {
       poolInfo: poolInfo,
       tokenId: tokenId.toString()
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$d, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$f, {
       poolInfo: poolInfo,
       tokenId: tokenId.toString()
     }), step === WIDGET_STEP.Done && jsx(Success$8, {
@@ -4296,7 +4298,7 @@ function InvoiceFactoringBorrow(_ref) {
   });
 }
 
-function ChooseAmount$a(_ref) {
+function ChooseAmount$b(_ref) {
   let {
     creditRecord,
     poolInfo
@@ -4347,7 +4349,7 @@ function ChooseAmount$a(_ref) {
   });
 }
 
-function ApproveAllowance$6(_ref) {
+function ApproveAllowance$5(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -4361,7 +4363,7 @@ function ApproveAllowance$6(_ref) {
   });
 }
 
-function Transfer$c(_ref) {
+function Transfer$e(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -4441,12 +4443,12 @@ function InvoiceFactoringPayment(_ref) {
     loadingTitle: "Make Payment",
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$a, {
+    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$b, {
       creditRecord: creditRecord,
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$6, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$5, {
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$c, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$e, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$7, {
       poolInfo: poolInfo,
@@ -4515,7 +4517,7 @@ function ChooseTranche$4(_ref) {
   });
 }
 
-function ChooseAmount$9(_ref) {
+function ChooseAmount$a(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -4580,7 +4582,7 @@ function ChooseAmount$9(_ref) {
   });
 }
 
-function Transfer$b(_ref) {
+function Transfer$d(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -4613,7 +4615,7 @@ function Transfer$b(_ref) {
   });
 }
 
-function Done$4(_ref) {
+function Done$6(_ref) {
   let {
     handleAction
   } = _ref;
@@ -4726,15 +4728,15 @@ function AddRedemptionV2(_ref) {
     children: [step === WIDGET_STEP.ChooseTranche && jsx(ChooseTranche$4, {
       selectedTranche: trancheInfo === null || trancheInfo === void 0 ? void 0 : trancheInfo.tranche,
       changeTranche: handleChangeTranche
-    }), step === WIDGET_STEP.ChooseAmount && trancheInfo && jsx(ChooseAmount$9, {
+    }), step === WIDGET_STEP.ChooseAmount && trancheInfo && jsx(ChooseAmount$a, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       trancheInfo: trancheInfo
-    }), step === WIDGET_STEP.Transfer && trancheInfo && jsx(Transfer$b, {
+    }), step === WIDGET_STEP.Transfer && trancheInfo && jsx(Transfer$d, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       trancheInfo: trancheInfo
-    }), step === WIDGET_STEP.Done && trancheInfo && jsx(Done$4, {
+    }), step === WIDGET_STEP.Done && trancheInfo && jsx(Done$6, {
       handleAction: handleClose
     }), step === WIDGET_STEP.Error && jsx(ErrorModal, {
       title: title,
@@ -4745,7 +4747,7 @@ function AddRedemptionV2(_ref) {
   });
 }
 
-function Transfer$a(_ref) {
+function Transfer$c(_ref) {
   let {
     poolInfo,
     trancheType,
@@ -4771,7 +4773,7 @@ function Transfer$a(_ref) {
   });
 }
 
-function Done$3(_ref) {
+function Done$5(_ref) {
   let {
     poolUnderlyingToken,
     redemptionInfo,
@@ -4832,11 +4834,11 @@ function CancelRedemptionV2(_ref) {
     loadingTitle: title,
     handleClose: handleClose,
     handleSuccess: handleRedeemSuccess,
-    children: [step === WIDGET_STEP.Transfer && jsx(Transfer$a, {
+    children: [step === WIDGET_STEP.Transfer && jsx(Transfer$c, {
       poolInfo: poolInfo,
       trancheType: trancheType,
       redemptionInfo: redemptionInfo
-    }), step === WIDGET_STEP.Done && jsx(Done$3, {
+    }), step === WIDGET_STEP.Done && jsx(Done$5, {
       poolUnderlyingToken: poolUnderlyingToken,
       handleAction: handleClose,
       redemptionInfo: redemptionInfo
@@ -5238,7 +5240,7 @@ function Evaluation$3(_ref) {
   });
 }
 
-function ChooseAmount$8(_ref) {
+function ChooseAmount$9(_ref) {
   let {
     allowance,
     withdrawlLockoutSeconds,
@@ -5281,7 +5283,7 @@ function ChooseAmount$8(_ref) {
   });
 }
 
-function ApproveAllowance$5(_ref) {
+function ApproveAllowance$4(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -5295,7 +5297,7 @@ function ApproveAllowance$5(_ref) {
   });
 }
 
-function Transfer$9(_ref) {
+function Transfer$b(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -5445,14 +5447,14 @@ function LendSupply(_ref) {
       poolInfo: poolInfo,
       handleClose: handleClose,
       handleApproveSuccess: handleApproveSuccess
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$8, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$9, {
       poolInfo: poolInfo,
       allowance: allowance,
       underlyingTokenBalance: balanceWithoutDecimals,
       withdrawlLockoutSeconds: withdrawlLockoutSeconds
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$5, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$4, {
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$9, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$b, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$6, {
       poolInfo: poolInfo,
@@ -6093,7 +6095,7 @@ function Evaluation$2(_ref) {
   return null;
 }
 
-function ChooseAmount$7(_ref) {
+function ChooseAmount$8(_ref) {
   let {
     poolInfo,
     lpConfig,
@@ -6176,7 +6178,7 @@ function ChooseAmount$7(_ref) {
   });
 }
 
-function ApproveAllowance$4(_ref) {
+function ApproveAllowance$3(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -6193,7 +6195,7 @@ function ApproveAllowance$4(_ref) {
   });
 }
 
-function Transfer$8(_ref) {
+function Transfer$a(_ref) {
   let {
     poolInfo,
     trancheType
@@ -6559,16 +6561,16 @@ function LendSupplyV2(_ref) {
       changeTranche: setSelectedTranche,
       pointsTestnetExperience: pointsTestnetExperience,
       campaign: campaign
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$7, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$8, {
       poolInfo: poolInfo,
       lpConfig: lpConfig,
       juniorAssets: juniorAssets,
       seniorAssets: seniorAssets,
       selectedTranche: selectedTranche,
       isUniTranche: isUniTranche
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$4, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$3, {
       poolInfo: poolInfo
-    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$8, {
+    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$a, {
       poolInfo: poolInfo,
       trancheType: selectedTranche
     }), step === WIDGET_STEP.Done && jsx(Success$5, {
@@ -6636,7 +6638,7 @@ function CheckWithdrawable(_ref) {
   });
 }
 
-function ChooseAmount$6(_ref) {
+function ChooseAmount$7(_ref) {
   let {
     lenderPosition,
     poolBalance,
@@ -6674,7 +6676,7 @@ function ChooseAmount$6(_ref) {
   });
 }
 
-function Transfer$7(_ref) {
+function Transfer$9(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -6787,11 +6789,11 @@ function LendWithdraw(_ref) {
     children: [step === WIDGET_STEP.CheckWithdrawable && jsx(CheckWithdrawable, {
       poolInfo: poolInfo,
       handleClose: handleClose
-    }), step === WIDGET_STEP.ChooseAmount && lenderPosition && poolBalance && jsx(ChooseAmount$6, {
+    }), step === WIDGET_STEP.ChooseAmount && lenderPosition && poolBalance && jsx(ChooseAmount$7, {
       poolInfo: poolInfo,
       lenderPosition: lenderPosition,
       poolBalance: poolBalance
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$7, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$9, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$4, {
       poolInfo: poolInfo,
@@ -6894,7 +6896,7 @@ function ConfirmTransfer$1(_ref) {
   });
 }
 
-function Transfer$6(_ref) {
+function Transfer$8(_ref) {
   let {
     poolInfo,
     tranche,
@@ -6920,7 +6922,7 @@ function Transfer$6(_ref) {
   });
 }
 
-function Done$2(_ref) {
+function Done$4(_ref) {
   let {
     poolUnderlyingToken,
     withdrawAmount,
@@ -7020,11 +7022,11 @@ function LendWithdrawV2(_ref) {
       redemptionStatus: redemptionStatus,
       poolUnderlyingToken: poolUnderlyingToken,
       poolIsClosed: poolIsClosed
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$6, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$8, {
       poolInfo: poolInfo,
       tranche: trancheType,
       poolIsClosed: poolIsClosed
-    }), step === WIDGET_STEP.Done && jsx(Done$2, {
+    }), step === WIDGET_STEP.Done && jsx(Done$4, {
       poolUnderlyingToken: poolUnderlyingToken,
       withdrawAmount: redemptionStatus.withdrawableAssets,
       handleAction: handleClose
@@ -7037,7 +7039,7 @@ function LendWithdrawV2(_ref) {
   });
 }
 
-function ChooseAmount$5(_ref) {
+function ChooseAmount$6(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -7101,7 +7103,7 @@ function ChooseAmount$5(_ref) {
   });
 }
 
-function ApproveAllowance$3(_ref) {
+function ApproveAllowance$2(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken
@@ -7160,7 +7162,7 @@ function ApproveReceivable$1(_ref) {
   });
 }
 
-function Transfer$5(_ref) {
+function Transfer$7(_ref) {
   let {
     poolInfo,
     tokenId
@@ -7301,18 +7303,18 @@ function ReceivableBackedCreditLineBorrowV2(_ref) {
     loadingTitle: "Borrow",
     handleClose: handleClose,
     handleSuccess: handleSuccessCallback,
-    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$5, {
+    children: [step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$6, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       accountStats: accountStats,
       tokenId: tokenId
-    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$3, {
+    }), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$2, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken
     }), step === WIDGET_STEP.ApproveNFT && tokenId && jsx(ApproveReceivable$1, {
       poolInfo: poolInfo,
       tokenId: tokenId
-    }), step === WIDGET_STEP.Transfer && tokenId && jsx(Transfer$5, {
+    }), step === WIDGET_STEP.Transfer && tokenId && jsx(Transfer$7, {
       poolInfo: poolInfo,
       tokenId: tokenId
     }), step === WIDGET_STEP.Done && jsx(Success$3, {
@@ -7386,7 +7388,7 @@ function ChoosePaymentType(_ref) {
   });
 }
 
-function ChooseAmount$4(_ref) {
+function ChooseAmount$5(_ref) {
   let {
     payoffAmount: payoffAmountBN,
     poolInfo,
@@ -7440,7 +7442,7 @@ function ChooseAmount$4(_ref) {
   });
 }
 
-function ApproveAllowance$2(_ref) {
+function ApproveAllowance$1(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -7568,7 +7570,7 @@ function ApproveReceivable(_ref) {
   });
 }
 
-function Transfer$4(_ref) {
+function Transfer$6(_ref) {
   let {
     poolInfo,
     poolUnderlyingToken,
@@ -7719,12 +7721,12 @@ function ReceivableBackedCreditLinePaymentV2(_ref) {
     children: [step === WIDGET_STEP.ChoosePaymentType && jsx(ChoosePaymentType, {
       paymentType: paymentType,
       changePaymentType: setPaymentType
-    }), step === WIDGET_STEP.ChooseAmount && paymentType && jsx(ChooseAmount$4, {
+    }), step === WIDGET_STEP.ChooseAmount && paymentType && jsx(ChooseAmount$5, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       payoffAmount: payoffAmount,
       paymentType: paymentType
-    }), step === WIDGET_STEP.ApproveAllowance && paymentType && jsx(ApproveAllowance$2, {
+    }), step === WIDGET_STEP.ApproveAllowance && paymentType && jsx(ApproveAllowance$1, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       paymentType: paymentType
@@ -7735,7 +7737,7 @@ function ReceivableBackedCreditLinePaymentV2(_ref) {
     }), step === WIDGET_STEP.ApproveNFT && borrowTokenId && jsx(ApproveReceivable, {
       poolInfo: poolInfo,
       tokenId: borrowTokenId
-    }), step === WIDGET_STEP.Transfer && paymentType && jsx(Transfer$4, {
+    }), step === WIDGET_STEP.Transfer && paymentType && jsx(Transfer$6, {
       poolInfo: poolInfo,
       poolUnderlyingToken: poolUnderlyingToken,
       paymentType: paymentType,
@@ -8065,7 +8067,7 @@ function Evaluation$1(_ref) {
   });
 }
 
-function ChooseAmount$3(_ref) {
+function ChooseAmount$4(_ref) {
   var _poolInfo$extra;
   let {
     poolInfo,
@@ -8179,7 +8181,7 @@ function ConfirmTransfer() {
   });
 }
 
-function ApproveAllowance$1(_ref) {
+function ApproveAllowance(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -8251,7 +8253,7 @@ function Permit(_ref) {
   });
 }
 
-function Transfer$3(_ref) {
+function Transfer$5(_ref) {
   let {
     poolInfo
   } = _ref;
@@ -8330,17 +8332,17 @@ function StreamFactoringBorrow(_ref) {
       poolInfo: poolInfo,
       payerAddress: payerAddress,
       superToken: superToken
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$3, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$4, {
       poolInfo: poolInfo,
       currentFlowRate: currentFlowRate
-    }), step === WIDGET_STEP.ConfirmTransfer && jsx(ConfirmTransfer, {}), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance$1, {
+    }), step === WIDGET_STEP.ConfirmTransfer && jsx(ConfirmTransfer, {}), step === WIDGET_STEP.ApproveAllowance && jsx(ApproveAllowance, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Permit && account && jsx(Permit, {
       poolInfo: poolInfo,
       payerAddress: payerAddress,
       borrower: account,
       superToken: superToken
-    }), step === WIDGET_STEP.Transfer && jsx(Transfer$3, {
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$5, {
       poolInfo: poolInfo
     }), step === WIDGET_STEP.Done && jsx(Success$1, {
       handleAction: handleClose
@@ -9358,7 +9360,7 @@ function ChooseTranche$2(_ref) {
   });
 }
 
-function ChooseAmount$2(_ref) {
+function ChooseAmount$3(_ref) {
   let {
     poolInfo,
     poolState,
@@ -9509,7 +9511,7 @@ function SolanaTxSendModal(_ref) {
   });
 }
 
-function Transfer$2(_ref) {
+function Transfer$4(_ref) {
   let {
     poolInfo,
     selectedTranche
@@ -9750,13 +9752,13 @@ function SolanaLendSupply(_ref) {
       poolUnderlyingToken: poolInfo.underlyingMint,
       selectedTranche: selectedTranche,
       changeTranche: setSelectedTranche
-    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$2, {
+    }), step === WIDGET_STEP.ChooseAmount && jsx(ChooseAmount$3, {
       poolInfo: poolInfo,
       poolState: poolState,
       tokenAccount: tokenAccount,
       selectedTranche: selectedTranche,
       isUniTranche: isUniTranche
-    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$2, {
+    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$4, {
       poolInfo: poolInfo,
       selectedTranche: selectedTranche
     }), step === WIDGET_STEP.Done && jsx(Success, {
@@ -9772,7 +9774,7 @@ function SolanaLendSupply(_ref) {
   });
 }
 
-function ChooseAmount$1(_ref) {
+function ChooseAmount$2(_ref) {
   let {
     poolInfo,
     poolState,
@@ -9920,7 +9922,7 @@ function ChooseTranche$1(_ref) {
   });
 }
 
-function Done$1(_ref) {
+function Done$3(_ref) {
   let {
     poolInfo,
     handleAction
@@ -9939,7 +9941,7 @@ function Done$1(_ref) {
   });
 }
 
-function Transfer$1(_ref) {
+function Transfer$3(_ref) {
   let {
     poolInfo,
     selectedTranche
@@ -10062,15 +10064,15 @@ function SolanaLendAddRedemption(_ref) {
     children: [step === WIDGET_STEP.ChooseTranche && jsx(ChooseTranche$1, {
       selectedTranche: selectedTranche,
       changeTranche: setSelectedTranche
-    }), step === WIDGET_STEP.ChooseAmount && selectedTranche && jsx(ChooseAmount$1, {
+    }), step === WIDGET_STEP.ChooseAmount && selectedTranche && jsx(ChooseAmount$2, {
       poolInfo: poolInfo,
       poolState: poolState,
       lenderState: selectedTranche === 'senior' ? seniorLenderStateAccount : juniorLenderStateAccount,
       selectedTranche: selectedTranche
-    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$1, {
+    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$3, {
       poolInfo: poolInfo,
       selectedTranche: selectedTranche
-    }), step === WIDGET_STEP.Done && jsx(Done$1, {
+    }), step === WIDGET_STEP.Done && jsx(Done$3, {
       poolInfo: poolInfo,
       handleAction: handleClose
     }), step === WIDGET_STEP.Error && jsx(ErrorModal, {
@@ -10082,7 +10084,7 @@ function SolanaLendAddRedemption(_ref) {
   });
 }
 
-function Transfer(_ref) {
+function Transfer$2(_ref) {
   let {
     poolInfo,
     lenderState,
@@ -10188,7 +10190,7 @@ function ChooseTranche(_ref) {
   });
 }
 
-function Done(_ref) {
+function Done$2(_ref) {
   let {
     poolInfo,
     lenderState,
@@ -10269,12 +10271,12 @@ function SolanaLendCancelRedemption(_ref) {
     children: [step === WIDGET_STEP.ChooseTranche && jsx(ChooseTranche, {
       selectedTranche: selectedTranche,
       changeTranche: setSelectedTranche
-    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer, {
+    }), step === WIDGET_STEP.Transfer && selectedTranche && jsx(Transfer$2, {
       poolInfo: poolInfo,
       lenderState: selectedTranche === 'senior' ? seniorLenderStateAccount : juniorLenderStateAccount,
       lenderStatePDA: selectedTranche === 'senior' ? seniorLenderStateAccountPDA : juniorLenderStateAccountPDA,
       selectedTranche: selectedTranche
-    }), step === WIDGET_STEP.Done && selectedTranche && jsx(Done, {
+    }), step === WIDGET_STEP.Done && selectedTranche && jsx(Done$2, {
       poolInfo: poolInfo,
       lenderState: selectedTranche === 'senior' ? seniorLenderStateAccount : juniorLenderStateAccount,
       selectedTranche: selectedTranche,
@@ -10288,37 +10290,30 @@ function SolanaLendCancelRedemption(_ref) {
   });
 }
 
-function ChooseAmount(_ref) {
+function ChooseAmount$1(_ref) {
   let {
     poolInfo,
-    creditConfigAccount,
-    tokenAccount
+    creditConfigAccount
   } = _ref;
   const dispatch = useAppDispatch();
   const {
     symbol,
     decimals
   } = poolInfo.underlyingMint;
-  const sentinel = useMemo(() => getSentinelAddress(poolInfo.chainId), [poolInfo.chainId]);
   const [currentAmount, setCurrentAmount] = useState(0);
   const creditAvailable = useMemo(() => SolanaTokenUtils.formatUnits(creditConfigAccount.creditAvailable, decimals), [creditConfigAccount.creditAvailable, decimals]);
   const handleChangeAmount = newAmount => {
     setCurrentAmount(newAmount);
   };
   const handleAction = useCallback(() => {
-    var _tokenAccount$delegat;
-    if (!tokenAccount) {
-      return;
-    }
     const borrowAmountBN = SolanaTokenUtils.parseUnits(String(currentAmount), decimals);
-    const nextStep = borrowAmountBN.gt(new BN(tokenAccount.delegatedAmount.toString())) || ((_tokenAccount$delegat = tokenAccount.delegate) === null || _tokenAccount$delegat === void 0 ? void 0 : _tokenAccount$delegat.toString()) !== sentinel ? WIDGET_STEP.ApproveAllowance : WIDGET_STEP.Transfer;
     dispatch(setBorrowInfo({
       borrowAmount: currentAmount,
       borrowAmountBN: JSON.parse(borrowAmountBN.toString()),
       chargedFees: 0,
-      nextStep
+      nextStep: WIDGET_STEP.Transfer
     }));
-  }, [currentAmount, decimals, dispatch, sentinel, tokenAccount]);
+  }, [currentAmount, decimals, dispatch]);
   return jsx(InputAmountModal, {
     title: "Borrow",
     subTitle: "Choose Amount",
@@ -10332,46 +10327,90 @@ function ChooseAmount(_ref) {
   });
 }
 
-function ApproveAllowance(_ref) {
+function Transfer$1(_ref) {
   let {
-    poolInfo,
-    tokenAccount
+    poolInfo
   } = _ref;
   const dispatch = useAppDispatch();
   const {
     wallet,
-    publicKey,
-    sendTransaction,
-    signTransaction
+    publicKey
   } = useWallet();
-  const sentinel = useMemo(() => getSentinelAddress(poolInfo.chainId), [poolInfo.chainId]);
+  const sentinel = getSentinelAddress(poolInfo.chainId);
   const {
     connection
   } = useConnection();
   const [transaction, setTransaction] = useState();
+  const program = useHumaProgram(poolInfo.chainId);
+  const {
+    borrowAmountBN: borrowAmountBNJson
+  } = useAppSelector(selectWidgetState);
   const handleSuccess = useCallback(() => {
-    dispatch(setStep(WIDGET_STEP.Transfer));
+    dispatch(setStep(WIDGET_STEP.Done));
   }, [dispatch]);
   useEffect(() => {
     async function getTx() {
-      if (!wallet || !publicKey || !connection || !signTransaction) {
+      var _borrowAmountBNJson$t, _tokenAccount$delegat;
+      if (!wallet || !publicKey || !connection) {
         return;
       }
-      const tx = new Transaction().add(createApproveCheckedInstruction(tokenAccount.address, new PublicKey(poolInfo.underlyingMint.address), new PublicKey(sentinel),
-      // delegate
-      publicKey,
-      // owner of the wallet
-      BigInt(SolanaTokenUtils.parseUnits('100000000000',
-      // 100 billion
-      poolInfo.underlyingMint.decimals).toString()),
-      // amount
-      poolInfo.underlyingMint.decimals, undefined,
-      // multiSigners
-      TOKEN_2022_PROGRAM_ID));
+      const {
+        underlyingTokenATA
+      } = getTokenAccounts(poolInfo, publicKey);
+      const tx = new Transaction();
+
+      // Create user token account if it doesn't exist
+      let tokenAccount;
+      try {
+        tokenAccount = await getAccount(connection, underlyingTokenATA, undefined, TOKEN_2022_PROGRAM_ID);
+      } catch (error) {
+        // TokenAccountNotFoundError can be possible if the associated address has already received some lamports,
+        // becoming a system account. Assuming program derived addressing is safe, this is the only case for the
+        // TokenInvalidAccountOwnerError in this code path.
+        if (error instanceof TokenAccountNotFoundError || error instanceof TokenInvalidAccountOwnerError) {
+          // As this isn't atomic, it's possible others can create associated accounts meanwhile.
+          tx.add(createAssociatedTokenAccountInstruction(publicKey, underlyingTokenATA, publicKey, new PublicKey(poolInfo.underlyingMint.address), TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID));
+        }
+      }
+
+      // Approve allowance to the sentinel if the account is new or delegated amount is not enough
+      const borrowAmountBN = new BN((_borrowAmountBNJson$t = borrowAmountBNJson === null || borrowAmountBNJson === void 0 ? void 0 : borrowAmountBNJson.toString()) !== null && _borrowAmountBNJson$t !== void 0 ? _borrowAmountBNJson$t : '0');
+      if (!tokenAccount || borrowAmountBN.gt(new BN(tokenAccount.delegatedAmount.toString())) || ((_tokenAccount$delegat = tokenAccount.delegate) === null || _tokenAccount$delegat === void 0 ? void 0 : _tokenAccount$delegat.toString()) !== sentinel) {
+        tx.add(createApproveCheckedInstruction(underlyingTokenATA, new PublicKey(poolInfo.underlyingMint.address), new PublicKey(sentinel),
+        // delegate
+        publicKey,
+        // owner of the wallet
+        BigInt(SolanaTokenUtils.parseUnits('100000000000',
+        // 100 billion
+        poolInfo.underlyingMint.decimals).toString()),
+        // amount
+        poolInfo.underlyingMint.decimals, undefined,
+        // multiSigners
+        TOKEN_2022_PROGRAM_ID));
+      }
+      const {
+        creditConfigAccount,
+        creditStateAccount
+      } = getCreditAccounts(poolInfo, publicKey);
+      // borrowAmountBNJson is stored as a raw number string in this flow
+      const programTx = await program.methods.drawdown(borrowAmountBN).accountsPartial({
+        borrower: publicKey,
+        humaConfig: poolInfo.humaConfig,
+        poolConfig: poolInfo.poolConfig,
+        poolState: poolInfo.poolState,
+        creditConfig: creditConfigAccount,
+        creditState: creditStateAccount,
+        poolAuthority: poolInfo.poolAuthority,
+        underlyingMint: poolInfo.underlyingMint.address,
+        poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
+        borrowerUnderlyingToken: underlyingTokenATA,
+        tokenProgram: TOKEN_2022_PROGRAM_ID
+      }).transaction();
+      tx.add(programTx);
       setTransaction(tx);
     }
     getTx();
-  }, [connection, dispatch, poolInfo.underlyingMint.address, poolInfo.underlyingMint.decimals, publicKey, sendTransaction, sentinel, signTransaction, tokenAccount.address, wallet]);
+  }, [borrowAmountBNJson, connection, dispatch, poolInfo, poolInfo.underlyingMint.address, poolInfo.underlyingMint.decimals, program.methods, publicKey, sentinel, wallet]);
   return jsx(SolanaTxSendModal, {
     tx: transaction,
     chainId: poolInfo.chainId,
@@ -10379,9 +10418,34 @@ function ApproveAllowance(_ref) {
   });
 }
 
+function Done$1(_ref) {
+  let {
+    poolInfo,
+    poolState,
+    handleAction
+  } = _ref;
+  const {
+    borrowAmount,
+    solanaSignature
+  } = useAppSelector(selectWidgetState);
+  const {
+    symbol
+  } = poolInfo.underlyingMint;
+  const dueDate = timeUtil.timestampToLL(poolState.epochEndTime);
+  const content = ["".concat(formatNumber(borrowAmount), " ").concat(symbol, " is now in your wallet."), "Note: your first automatic payment will occur after ".concat(dueDate, ".")];
+  return jsx(SolanaTxDoneModal, {
+    handleAction: handleAction,
+    content: content,
+    chainId: poolInfo.chainId,
+    solanaSignature: solanaSignature,
+    buttonText: "DONE"
+  });
+}
+
 function SolanaBorrow(_ref) {
   let {
     poolInfo,
+    poolState,
     handleClose,
     handleSuccess
   } = _ref;
@@ -10391,9 +10455,207 @@ function SolanaBorrow(_ref) {
     loading: isLoadingBorrowerAccounts
   } = useBorrowerAccounts(poolInfo.chainId, poolInfo.poolName);
   const {
-    account: tokenAccount,
-    loading: isLoadingTokenAccounts
-  } = usePoolUnderlyingTokenAccount(poolInfo);
+    step,
+    errorMessage
+  } = useAppSelector(selectWidgetState);
+  useEffect(() => {
+    if (!step) {
+      dispatch(setStep(WIDGET_STEP.ChooseAmount));
+    }
+  }, [dispatch, step]);
+  const title = 'Borrow';
+  if (isLoadingBorrowerAccounts) {
+    return jsx(WidgetWrapper, {
+      isOpen: true,
+      isLoading: true,
+      loadingTitle: title,
+      handleClose: handleClose,
+      handleSuccess: handleSuccess
+    });
+  }
+  return jsxs(WidgetWrapper, {
+    isOpen: true,
+    loadingTitle: title,
+    handleClose: handleClose,
+    handleSuccess: handleSuccess,
+    children: [step === WIDGET_STEP.ChooseAmount && creditConfigAccount && jsx(ChooseAmount$1, {
+      poolInfo: poolInfo,
+      creditConfigAccount: creditConfigAccount
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer$1, {
+      poolInfo: poolInfo
+    }), step === WIDGET_STEP.Done && jsx(Done$1, {
+      poolInfo: poolInfo,
+      poolState: poolState,
+      handleAction: handleClose
+    }), step === WIDGET_STEP.Error && jsx(ErrorModal, {
+      title: title,
+      errorReason: "Sorry there was an error",
+      errorMessage: errorMessage,
+      handleOk: handleClose
+    })]
+  });
+}
+
+function ChooseAmount(_ref) {
+  let {
+    poolInfo,
+    creditStateAccount
+  } = _ref;
+  const dispatch = useAppDispatch();
+  const {
+    symbol,
+    decimals
+  } = poolInfo.underlyingMint;
+  const [currentAmount, setCurrentAmount] = useState(0);
+  const totalDueAmount = useMemo(() => Number(SolanaTokenUtils.formatUnits(creditStateAccount.creditRecord.totalDueAmount, decimals)), [creditStateAccount.creditRecord.totalDueAmount, decimals]);
+  const payoffAmount = useMemo(() => Number(SolanaTokenUtils.formatUnits(creditStateAccount.creditRecord.payoffAmount, decimals)), [creditStateAccount.creditRecord.payoffAmount, decimals]);
+  useEffect(() => {
+    setCurrentAmount(totalDueAmount);
+    dispatch(setPaymentAmount({
+      paymentAmount: totalDueAmount
+    }));
+  }, [dispatch, totalDueAmount]);
+  const handleChangeAmount = newAmount => {
+    setCurrentAmount(newAmount);
+    dispatch(setPaymentAmount({
+      paymentAmount: newAmount
+    }));
+  };
+  const handleAction = useCallback(() => {
+    dispatch(setStep(WIDGET_STEP.Transfer));
+  }, [dispatch]);
+  return jsx(InputAmountModal, {
+    title: "Make Payment",
+    subTitle: "Choose Amount",
+    tokenSymbol: symbol,
+    currentAmount: currentAmount,
+    handleChangeAmount: handleChangeAmount,
+    maxAmount: payoffAmount,
+    maxAmountText: "Pay Off",
+    infos: ["".concat(formatNumber(totalDueAmount.toFixed(0)), " Due")],
+    handleAction: handleAction,
+    actionText: "PAY"
+  });
+}
+
+function Transfer(_ref) {
+  let {
+    poolInfo
+  } = _ref;
+  const dispatch = useAppDispatch();
+  const {
+    wallet,
+    publicKey
+  } = useWallet();
+  const {
+    connection
+  } = useConnection();
+  const [transaction, setTransaction] = useState();
+  const program = useHumaProgram(poolInfo.chainId);
+  const {
+    paymentAmount
+  } = useAppSelector(selectWidgetState);
+  const {
+    decimals
+  } = poolInfo.underlyingMint;
+  const handleSuccess = useCallback(() => {
+    dispatch(setStep(WIDGET_STEP.Done));
+  }, [dispatch]);
+  useEffect(() => {
+    async function getTx() {
+      if (!wallet || !publicKey || !connection || !paymentAmount) {
+        return;
+      }
+      const {
+        underlyingTokenATA
+      } = getTokenAccounts(poolInfo, publicKey);
+      const {
+        creditConfigAccount,
+        creditStateAccount
+      } = getCreditAccounts(poolInfo, publicKey);
+      const paymentAmountBN = SolanaTokenUtils.parseUnits(paymentAmount.toString(), decimals);
+      const tx = await program.methods.makePayment(paymentAmountBN).accountsPartial({
+        signer: publicKey,
+        humaConfig: poolInfo.humaConfig,
+        poolConfig: poolInfo.poolConfig,
+        poolState: poolInfo.poolState,
+        creditConfig: creditConfigAccount,
+        creditState: creditStateAccount,
+        poolAuthority: poolInfo.poolAuthority,
+        underlyingMint: poolInfo.underlyingMint.address,
+        poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
+        borrowerUnderlyingToken: underlyingTokenATA,
+        tokenProgram: TOKEN_2022_PROGRAM_ID
+      }).transaction();
+      setTransaction(tx);
+    }
+    getTx();
+  }, [connection, decimals, dispatch, paymentAmount, poolInfo, poolInfo.underlyingMint.address, poolInfo.underlyingMint.decimals, program.methods, publicKey, wallet]);
+  return jsx(SolanaTxSendModal, {
+    tx: transaction,
+    chainId: poolInfo.chainId,
+    handleSuccess: handleSuccess
+  });
+}
+
+function Done(_ref) {
+  let {
+    poolInfo,
+    handleAction
+  } = _ref;
+  const {
+    solanaSignature
+  } = useAppSelector(selectWidgetState);
+  const {
+    symbol
+  } = poolInfo.underlyingMint;
+  const {
+    connection
+  } = useConnection();
+  const [tokensPaid, setTokensPaid] = useState(null);
+  useEffect(() => {
+    const fetchTokensPaid = async () => {
+      var _txData$meta, _txData$meta2;
+      if (!solanaSignature) {
+        return;
+      }
+      const txData = await connection.getTransaction(solanaSignature, {
+        maxSupportedTransactionVersion: 2
+      });
+      const preTokenBalance = txData === null || txData === void 0 || (_txData$meta = txData.meta) === null || _txData$meta === void 0 || (_txData$meta = _txData$meta.preTokenBalances) === null || _txData$meta === void 0 || (_txData$meta = _txData$meta[1]) === null || _txData$meta === void 0 || (_txData$meta = _txData$meta.uiTokenAmount) === null || _txData$meta === void 0 ? void 0 : _txData$meta.uiAmount;
+      const postTokenBalance = txData === null || txData === void 0 || (_txData$meta2 = txData.meta) === null || _txData$meta2 === void 0 || (_txData$meta2 = _txData$meta2.postTokenBalances) === null || _txData$meta2 === void 0 || (_txData$meta2 = _txData$meta2[1]) === null || _txData$meta2 === void 0 || (_txData$meta2 = _txData$meta2.uiTokenAmount) === null || _txData$meta2 === void 0 ? void 0 : _txData$meta2.uiAmount;
+      if (preTokenBalance && postTokenBalance) {
+        setTokensPaid(preTokenBalance - postTokenBalance);
+      }
+    };
+    fetchTokensPaid();
+  }, [connection, solanaSignature]);
+  const content = useMemo(() => {
+    if (tokensPaid !== null) {
+      return ["You successfully paid ".concat(formatNumber(tokensPaid), " ").concat(symbol, ".")];
+    }
+    return ['Your payment to the pool was successful'];
+  }, [tokensPaid, symbol]);
+  return jsx(SolanaTxDoneModal, {
+    handleAction: handleAction,
+    content: content,
+    chainId: poolInfo.chainId,
+    solanaSignature: solanaSignature,
+    buttonText: "DONE"
+  });
+}
+
+function SolanaPayment(_ref) {
+  let {
+    poolInfo,
+    handleClose,
+    handleSuccess
+  } = _ref;
+  const dispatch = useDispatch();
+  const {
+    creditStateAccount,
+    loading: isLoadingBorrowerAccounts
+  } = useBorrowerAccounts(poolInfo.chainId, poolInfo.poolName);
   const {
     step,
     errorMessage
@@ -10403,8 +10665,8 @@ function SolanaBorrow(_ref) {
       dispatch(setStep(WIDGET_STEP.ChooseAmount));
     }
   }, [dispatch, step]);
-  const title = 'Redemption';
-  if (isLoadingBorrowerAccounts || isLoadingTokenAccounts) {
+  const title = 'Make Payment';
+  if (isLoadingBorrowerAccounts) {
     return jsx(WidgetWrapper, {
       isOpen: true,
       isLoading: true,
@@ -10418,13 +10680,14 @@ function SolanaBorrow(_ref) {
     loadingTitle: title,
     handleClose: handleClose,
     handleSuccess: handleSuccess,
-    children: [step === WIDGET_STEP.ChooseAmount && creditConfigAccount && tokenAccount && jsx(ChooseAmount, {
+    children: [step === WIDGET_STEP.ChooseAmount && creditStateAccount && jsx(ChooseAmount, {
       poolInfo: poolInfo,
-      creditConfigAccount: creditConfigAccount,
-      tokenAccount: tokenAccount
-    }), step === WIDGET_STEP.ApproveAllowance && tokenAccount && jsx(ApproveAllowance, {
+      creditStateAccount: creditStateAccount
+    }), step === WIDGET_STEP.Transfer && jsx(Transfer, {
+      poolInfo: poolInfo
+    }), step === WIDGET_STEP.Done && jsx(Done, {
       poolInfo: poolInfo,
-      tokenAccount: tokenAccount
+      handleAction: handleClose
     }), step === WIDGET_STEP.Error && jsx(ErrorModal, {
       title: title,
       errorReason: "Sorry there was an error",
@@ -10875,8 +11138,6 @@ function SolanaWidget(props) {
 /**
  * Lend pool supply widget props for Solana pools
  * @typedef {Object} SolanaLendSupplyWidgetProps
- * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
- * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
  */
 
 /**
@@ -10896,8 +11157,6 @@ function SolanaLendSupplyWidget(props) {
 /**
  * Lend pool supply widget props for Solana pools
  * @typedef {Object} SolanaLendAddRedemptionWidgetProps
- * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
- * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
  */
 
 /**
@@ -10917,8 +11176,6 @@ function SolanaLendAddRedemptionWidget(props) {
 /**
  * Lend pool supply widget props for Solana pools
  * @typedef {Object} SolanaLendCancelRedemptionWidgetProps
- * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
- * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
  */
 
 /**
@@ -10938,8 +11195,6 @@ function SolanaLendCancelRedemptionWidget(props) {
 /**
  * Lend pool supply widget props for Solana pools
  * @typedef {Object} SolanaBorrowWidgetProps
- * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
- * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
  */
 
 /**
@@ -10956,5 +11211,24 @@ function SolanaBorrowWidget(props) {
   });
 }
 
-export { AddRedemptionWidgetV2, AutoPaybackWidgetV2, CancelRedemptionWidgetV2, CreditLineApproveWidget, CreditLineBorrowWidget, CreditLineBorrowWidgetV2, CreditLinePaymentWidget, CreditLinePaymentWidgetV2, InvoiceFactoringBorrowWidget, InvoiceFactoringPaymentWidget, LendSupplyWidget, LendSupplyWidgetV2, LendWithdrawWidget, LendWithdrawWidgetV2, ReceivableBackedCreditLineBorrowWidgetV2, ReceivableBackedCreditLinePaymentWidgetV2, SolanaBorrowWidget, SolanaLendAddRedemptionWidget, SolanaLendCancelRedemptionWidget, SolanaLendSupplyWidget, SuperfluidFactoringWidget, SupplyFirstLossCoverWidget };
+/**
+ * Lend pool supply widget props for Solana pools
+ * @typedef {Object} SolanaPaymentWidgetProps
+ */
+
+/**
+ * Lend pool supply widget for Solana pools
+ *
+ * @param {SolanaPaymentWidgetProps} props - Widget props
+ */
+function SolanaPaymentWidget(props) {
+  return jsx(SolanaWidget, {
+    ...props,
+    children: jsx(SolanaPayment, {
+      ...props
+    })
+  });
+}
+
+export { AddRedemptionWidgetV2, AutoPaybackWidgetV2, CancelRedemptionWidgetV2, CreditLineApproveWidget, CreditLineBorrowWidget, CreditLineBorrowWidgetV2, CreditLinePaymentWidget, CreditLinePaymentWidgetV2, InvoiceFactoringBorrowWidget, InvoiceFactoringPaymentWidget, LendSupplyWidget, LendSupplyWidgetV2, LendWithdrawWidget, LendWithdrawWidgetV2, ReceivableBackedCreditLineBorrowWidgetV2, ReceivableBackedCreditLinePaymentWidgetV2, SolanaBorrowWidget, SolanaLendAddRedemptionWidget, SolanaLendCancelRedemptionWidget, SolanaLendSupplyWidget, SolanaPaymentWidget, SuperfluidFactoringWidget, SupplyFirstLossCoverWidget };
 //# sourceMappingURL=index.js.map