@huma-finance/widgets 0.0.62-beta.636 → 0.0.62-beta.637

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.62-beta.636+9afaa1d",
+  "version": "0.0.62-beta.637+9f3e124",
   "publishConfig": {
     "access": "public"
   },
@@ -29,9 +29,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.62-beta.636+9afaa1d",
-    "@huma-finance/shared": "^0.0.62-beta.636+9afaa1d",
-    "@huma-finance/web-shared": "^0.0.62-beta.636+9afaa1d",
+    "@huma-finance/sdk": "^0.0.62-beta.637+9f3e124",
+    "@huma-finance/shared": "^0.0.62-beta.637+9f3e124",
+    "@huma-finance/web-shared": "^0.0.62-beta.637+9f3e124",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",
     "@mui/styles": "^5.0.2",
@@ -207,5 +207,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "9afaa1d673baaa4ce656cbc6fba229e446d3d927"
+  "gitHead": "9f3e124976998f1d4f21c4db656acbe747756c17"
 }

package/src/components/CreditLine/solanaBorrow/2-Transfer.tsx

@@ -7,24 +7,24 @@ import {
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect, useState } from 'react'
 
+import { BN } from '@coral-xyz/anchor'
+import { useHumaProgram } from '@huma-finance/web-shared'
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   createApproveCheckedInstruction,
   createAssociatedTokenAccountInstruction,
   getAccount,
-  TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
   TokenAccountNotFoundError,
   TokenInvalidAccountOwnerError,
 } from '@solana/spl-token'
 import { useConnection, useWallet } from '@solana/wallet-adapter-react'
 import { PublicKey, Transaction } from '@solana/web3.js'
-import { useHumaProgram } from '@huma-finance/web-shared'
-import { BN } from '@coral-xyz/anchor'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
-import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 import { setStep } from '../../../store/widgets.reducers'
-import { WIDGET_STEP } from '../../../store/widgets.store'
 import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -60,7 +60,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement | null {
           connection,
           underlyingTokenATA,
           undefined,
-          TOKEN_2022_PROGRAM_ID,
+          TOKEN_PROGRAM_ID,
         )
       } catch (error: unknown) {
         // TokenAccountNotFoundError can be possible if the associated address has already received some lamports,
@@ -77,7 +77,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement | null {
               underlyingTokenATA,
               publicKey,
               new PublicKey(poolInfo.underlyingMint.address),
-              TOKEN_2022_PROGRAM_ID,
+              TOKEN_PROGRAM_ID,
               ASSOCIATED_TOKEN_PROGRAM_ID,
             ),
           )
@@ -105,7 +105,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement | null {
             ), // amount
             poolInfo.underlyingMint.decimals,
             undefined, // multiSigners
-            TOKEN_2022_PROGRAM_ID,
+            TOKEN_PROGRAM_ID,
           ),
         )
       }
@@ -128,7 +128,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement | null {
           underlyingMint: poolInfo.underlyingMint.address,
           poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
           borrowerUnderlyingToken: underlyingTokenATA,
-          tokenProgram: TOKEN_2022_PROGRAM_ID,
+          tokenProgram: TOKEN_PROGRAM_ID,
         })
         .transaction()
       tx.add(programTx)

package/src/components/CreditLine/solanaPayment/2-Transfer.tsx

@@ -6,15 +6,15 @@ import {
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect, useState } from 'react'
 
-import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
+import { useHumaProgram } from '@huma-finance/web-shared'
+import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { useConnection, useWallet } from '@solana/wallet-adapter-react'
 import { Transaction } from '@solana/web3.js'
-import { useHumaProgram } from '@huma-finance/web-shared'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
-import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 import { setStep } from '../../../store/widgets.reducers'
-import { WIDGET_STEP } from '../../../store/widgets.store'
 import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -62,7 +62,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement | null {
           underlyingMint: poolInfo.underlyingMint.address,
           poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
           borrowerUnderlyingToken: underlyingTokenATA,
-          tokenProgram: TOKEN_2022_PROGRAM_ID,
+          tokenProgram: TOKEN_PROGRAM_ID,
         })
         .transaction()
 

package/src/components/Lend/components/PersonaEvaluation.tsx

@@ -36,6 +36,7 @@ type Props = {
   isUniTranche: boolean
   pointsTestnetExperience: boolean
   campaign?: Campaign
+  chainSpecificData?: Record<string, unknown>
   changeTranche: (tranche: TrancheType) => void
   handleClose: (identityStatus?: IdentityVerificationStatusV2) => void
 }
@@ -46,6 +47,7 @@ export function PersonaEvaluation({
   campaign,
   pointsTestnetExperience,
   chainType,
+  chainSpecificData,
   changeTranche,
   handleClose,
 }: Props): React.ReactElement | null {
@@ -101,6 +103,7 @@ export function PersonaEvaluation({
         chainId!,
         poolInfo.juniorTrancheVault,
         isDev,
+        chainSpecificData,
       )
       if (!isUniTranche) {
         await IdentityServiceV2.approveLender(
@@ -108,6 +111,7 @@ export function PersonaEvaluation({
           chainId!,
           poolInfo.seniorTrancheVault,
           isDev,
+          chainSpecificData,
         )
       }
       if (isUniTranche) {
@@ -123,6 +127,7 @@ export function PersonaEvaluation({
   }, [
     account,
     chainId,
+    chainSpecificData,
     changeTranche,
     dispatch,
     isDev,

package/src/components/Lend/solanaAddRedemption/3-Transfer.tsx

@@ -6,17 +6,17 @@ import {
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
-import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
-import { useWallet } from '@solana/wallet-adapter-react'
 import {
   useHumaProgram,
   useTrancheMintAccounts,
 } from '@huma-finance/web-shared'
+import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
+import { useWallet } from '@solana/wallet-adapter-react'
 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 { WIDGET_STEP } from '../../../store/widgets.store'
 import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 
 type Props = {

package/src/components/Lend/solanaCancelRedemption/2-Transfer.tsx

@@ -5,9 +5,9 @@ import {
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect, useState } from 'react'
 
+import { LenderStateAccount, useHumaProgram } from '@huma-finance/web-shared'
 import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
 import { useWallet } from '@solana/wallet-adapter-react'
-import { LenderStateAccount, useHumaProgram } from '@huma-finance/web-shared'
 import { Transaction } from '@solana/web3.js'
 import { useAppDispatch } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'

package/src/components/Lend/solanaSupply/1-Evaluation.tsx

@@ -1,4 +1,9 @@
-import { CHAIN_TYPE, SolanaPoolInfo, TrancheType } from '@huma-finance/shared'
+import {
+  CHAIN_TYPE,
+  SOLANA_CHAIN_INFO,
+  SolanaPoolInfo,
+  TrancheType,
+} from '@huma-finance/shared'
 import React from 'react'
 
 import { PersonaEvaluation } from '../components/PersonaEvaluation'
@@ -22,6 +27,8 @@ export function Evaluation({
   handleClose,
 }: Props): React.ReactElement | null {
   if (poolInfo.KYC?.Persona) {
+    const solanChainInfo = SOLANA_CHAIN_INFO[poolInfo.chainId]
+
     return (
       <PersonaEvaluation
         poolInfo={{
@@ -33,6 +40,10 @@ export function Evaluation({
         isUniTranche={isUniTranche}
         pointsTestnetExperience={pointsTestnetExperience}
         campaign={campaign}
+        chainSpecificData={{
+          huma_program_id: solanChainInfo.poolProgram,
+          pool_id: poolInfo.poolId,
+        }}
         chainType={CHAIN_TYPE.SOLANA}
         changeTranche={changeTranche}
       />

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

@@ -6,16 +6,16 @@ import {
 } from '@huma-finance/shared'
 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, useLenderAccounts } from '@huma-finance/web-shared'
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { useWallet } from '@solana/wallet-adapter-react'
 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 { WIDGET_STEP } from '../../../store/widgets.store'
 import { LoadingModal } from '../../LoadingModal'
+import { SolanaTxSendModal } from '../../SolanaTxSendModal'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -58,6 +58,12 @@ export function Transfer({
 
       const { underlyingTokenATA, seniorTrancheATA, juniorTrancheATA } =
         getTokenAccounts(poolInfo, publicKey)
+
+      const approvedLender =
+        selectedTranche === 'senior'
+          ? seniorLenderApprovedAccountPDA!
+          : juniorLenderApprovedAccountPDA!
+
       if (
         (selectedTranche === 'senior' && !seniorLenderStateAccount) ||
         (selectedTranche === 'junior' && !juniorLenderStateAccount)
@@ -68,10 +74,7 @@ export function Transfer({
             lender: publicKey,
             humaConfig: poolInfo.humaConfig,
             poolConfig: poolInfo.poolConfig,
-            approvedLender:
-              selectedTranche === 'senior'
-                ? seniorLenderApprovedAccountPDA!
-                : juniorLenderApprovedAccountPDA!,
+            approvedLender,
             trancheMint:
               selectedTranche === 'senior'
                 ? poolInfo.seniorTrancheMint
@@ -89,6 +92,7 @@ export function Transfer({
       const depositTx = await program.methods
         .deposit(supplyBigNumber)
         .accountsPartial({
+          approvedLender,
           depositor: publicKey,
           poolConfig: poolInfo.poolConfig,
           underlyingMint: poolInfo.underlyingMint.address,
@@ -101,7 +105,7 @@ export function Transfer({
           depositorTrancheToken:
             selectedTranche === 'senior' ? seniorTrancheATA : juniorTrancheATA,
           humaConfig: poolInfo.humaConfig,
-          tokenProgram: TOKEN_2022_PROGRAM_ID,
+          underlyingTokenProgram: TOKEN_PROGRAM_ID,
         })
         .transaction()
       tx.add(depositTx)