@huma-finance/widgets 0.0.62-beta.612 → 0.0.62-beta.617

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.62-beta.612+99e0987",
+  "version": "0.0.62-beta.617+10ec4cd",
   "publishConfig": {
     "access": "public"
   },
@@ -21,8 +21,6 @@
   "dependencies": {
     "@apollo/client": "^3.7.2",
     "@coinbase/wallet-sdk": "^3.5.3",
-    "@emotion/react": "^11.5.0",
-    "@emotion/styled": "^11.3.0",
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/bignumber": "^5.6.0",
     "@ethersproject/constants": "^5.7.0",
@@ -30,14 +28,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.62-beta.612+99e0987",
-    "@huma-finance/shared": "^0.0.62-beta.612+99e0987",
-    "@huma-finance/web-shared": "^0.0.62-beta.612+99e0987",
-    "@mui/icons-material": "^5.3.0",
-    "@mui/material": "^5.0.6",
-    "@mui/styles": "^5.0.2",
-    "@mui/system": "^5.0.6",
-    "@mui/x-date-pickers": "^5.0.7",
+    "@huma-finance/sdk": "^0.0.61",
+    "@huma-finance/shared": "^0.0.61",
+    "@huma-finance/web-shared": "^0.0.62-beta.617+10ec4cd",
     "@notifi-network/notifi-frontend-client": "^0.91.1",
     "@reduxjs/toolkit": "^1.8.6",
     "@types/utf8": "^3.0.1",
@@ -187,6 +180,13 @@
   },
   "peerDependencies": {
     "@coral-xyz/anchor": "^0.30.1",
+    "@emotion/react": "^11.5.0",
+    "@emotion/styled": "^11.3.0",
+    "@mui/icons-material": "^5.3.0",
+    "@mui/material": "^5.0.6",
+    "@mui/styles": "^5.0.2",
+    "@mui/system": "^5.0.6",
+    "@mui/x-date-pickers": "^5.0.7",
     "@solana/spl-token": "^0.4.8",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
@@ -200,5 +200,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "99e0987b7a460f47f40d91836af7d44c9744142b"
+  "gitHead": "10ec4cd7144139bbec751768015e41a0bc79a1d7"
 }

package/src/components/Lend/solanaSupply/4-Transfer.tsx

@@ -8,13 +8,14 @@ import React, { useCallback, useEffect, useState } from 'react'
 
 import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
 import { useWallet } from '@solana/wallet-adapter-react'
-import { useHumaProgram } from '@huma-finance/web-shared'
+import { useHumaProgram, useLenderAccounts } from '@huma-finance/web-shared'
 import { Transaction } from '@solana/web3.js'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'
 import { WIDGET_STEP } from '../../../store/widgets.store'
 import { selectWidgetState } from '../../../store/widgets.selectors'
 import { SolanaTxSendModal } from '../../SolanaTxSendModal'
+import { LoadingModal } from '../../LoadingModal'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -34,6 +35,13 @@ export function Transfer({
     decimals,
   )
   const [transaction, setTransaction] = useState<Transaction>()
+  const {
+    juniorLenderApprovedAccountPDA,
+    seniorLenderApprovedAccountPDA,
+    seniorLenderStateAccount,
+    juniorLenderStateAccount,
+    loading: isLoadingLenderAccounts,
+  } = useLenderAccounts(poolInfo.chainId, poolInfo.poolName)
   const program = useHumaProgram(poolInfo.chainId)
 
   const handleSuccess = useCallback(() => {
@@ -42,13 +50,43 @@ export function Transfer({
 
   useEffect(() => {
     async function getTx() {
-      if (!publicKey || transaction) {
+      if (!publicKey || transaction || isLoadingLenderAccounts) {
         return
       }
 
+      const tx = new Transaction()
+
       const { underlyingTokenATA, seniorTrancheATA, juniorTrancheATA } =
         getTokenAccounts(poolInfo, publicKey)
-      const tx = await program.methods
+      if (
+        (selectedTranche === 'senior' && !seniorLenderStateAccount) ||
+        (selectedTranche === 'junior' && !juniorLenderStateAccount)
+      ) {
+        const createLenderAccountsTx = await program.methods
+          .createLenderAccounts()
+          .accountsPartial({
+            lender: publicKey,
+            humaConfig: poolInfo.humaConfig,
+            poolConfig: poolInfo.poolConfig,
+            approvedLender:
+              selectedTranche === 'senior'
+                ? seniorLenderApprovedAccountPDA!
+                : juniorLenderApprovedAccountPDA!,
+            trancheMint:
+              selectedTranche === 'senior'
+                ? poolInfo.seniorTrancheMint
+                : poolInfo.juniorTrancheMint,
+            lenderTrancheToken:
+              selectedTranche === 'senior'
+                ? seniorTrancheATA
+                : juniorTrancheATA,
+            tokenProgram: TOKEN_2022_PROGRAM_ID,
+          })
+          .transaction()
+        tx.add(createLenderAccountsTx)
+      }
+
+      const depositTx = await program.methods
         .deposit(supplyBigNumber)
         .accountsPartial({
           depositor: publicKey,
@@ -66,19 +104,29 @@ export function Transfer({
           tokenProgram: TOKEN_2022_PROGRAM_ID,
         })
         .transaction()
+      tx.add(depositTx)
 
       setTransaction(tx)
     }
     getTx()
   }, [
+    isLoadingLenderAccounts,
+    juniorLenderApprovedAccountPDA,
+    juniorLenderStateAccount,
     poolInfo,
     program.methods,
     publicKey,
     selectedTranche,
+    seniorLenderApprovedAccountPDA,
+    seniorLenderStateAccount,
     supplyBigNumber,
     transaction,
   ])
 
+  if (isLoadingLenderAccounts) {
+    return <LoadingModal title='Supply' />
+  }
+
   return (
     <SolanaTxSendModal
       tx={transaction}