@huma-finance/widgets 0.0.62-beta.726 → 0.0.62-beta.729

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.62-beta.726+7ccc4bb",
+  "version": "0.0.62-beta.729+5102a4a",
   "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.726+7ccc4bb",
-    "@huma-finance/shared": "^0.0.61",
-    "@huma-finance/web-shared": "^0.0.61",
+    "@huma-finance/sdk": "^0.0.62-beta.729+5102a4a",
+    "@huma-finance/shared": "^0.0.62-beta.729+5102a4a",
+    "@huma-finance/web-shared": "^0.0.62-beta.729+5102a4a",
     "@mui/x-date-pickers": "^5.0.7",
     "@notifi-network/notifi-frontend-client": "^1.1.2",
     "@notifi-network/notifi-react": "^1.1.2",
@@ -201,5 +201,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "7ccc4bb31550d5a3e98a106477ec9b09089f747c"
+  "gitHead": "5102a4acd220077fb8627be88ea87ca530467f43"
 }

package/src/components/Lend/components/ApproveLenderBase.tsx

@@ -0,0 +1,103 @@
+/* eslint-disable no-await-in-loop */
+import {
+  CHAIN_TYPE,
+  checkIsDev,
+  IdentityServiceV2,
+  timeUtil,
+  TrancheType,
+} from '@huma-finance/shared'
+import { useChainInfo } from '@huma-finance/web-shared'
+import React, { useCallback, useEffect } from 'react'
+
+import { useAppDispatch } from '../../../hooks/useRedux'
+import { setError, setStep } from '../../../store/widgets.reducers'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { LoadingModal } from '../../LoadingModal'
+
+type Props = {
+  juniorTrancheVault: string
+  seniorTrancheVault: string
+  chainType: CHAIN_TYPE
+  isUniTranche: boolean
+  chainSpecificData?: Record<string, unknown>
+  changeTranche: (tranche: TrancheType) => void
+}
+
+export function ApproveLenderBase({
+  juniorTrancheVault,
+  seniorTrancheVault,
+  isUniTranche,
+  chainType,
+  chainSpecificData,
+  changeTranche,
+}: Props): React.ReactElement | null {
+  const isDev = checkIsDev()
+  const dispatch = useAppDispatch()
+  const { account, chainId } = useChainInfo(isDev, chainType)
+
+  const approveLender = useCallback(
+    async (trancheVault: string) => {
+      let tryAttempts = 2
+
+      while (tryAttempts > 0) {
+        try {
+          tryAttempts -= 1
+          await IdentityServiceV2.approveLender(
+            account!,
+            chainId!,
+            trancheVault,
+            isDev,
+            chainSpecificData,
+          )
+          tryAttempts = 0
+        } catch (e: unknown) {
+          if (tryAttempts === 0) {
+            dispatch(
+              setError({
+                errorMessage: 'Something went wrong, please try again later.',
+              }),
+            )
+          } else {
+            await timeUtil.sleep(3000)
+            console.error(e)
+          }
+        }
+      }
+    },
+    [account, chainId, chainSpecificData, dispatch, isDev],
+  )
+
+  useEffect(() => {
+    const approveLenderAsync = async () => {
+      if (account && chainId) {
+        if (isUniTranche) {
+          await approveLender(juniorTrancheVault)
+          changeTranche('junior')
+          dispatch(setStep(WIDGET_STEP.ChooseAmount))
+        } else {
+          await approveLender(juniorTrancheVault)
+          await approveLender(seniorTrancheVault)
+          dispatch(setStep(WIDGET_STEP.ChooseTranche))
+        }
+      }
+    }
+
+    approveLenderAsync()
+  }, [
+    account,
+    approveLender,
+    chainId,
+    changeTranche,
+    dispatch,
+    isUniTranche,
+    juniorTrancheVault,
+    seniorTrancheVault,
+  ])
+
+  return (
+    <LoadingModal
+      title='Lender Approval'
+      description='Checking your verification status...'
+    />
+  )
+}

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

@@ -8,7 +8,6 @@ import {
   IdentityVerificationStatusV2,
   KYCCopy,
   KYCType,
-  TrancheType,
   VerificationStatusResultV2,
 } from '@huma-finance/shared'
 import { useAuthErrorHandling, useChainInfo } from '@huma-finance/web-shared'
@@ -34,22 +33,16 @@ type Props = {
     seniorTrancheVault: string
   }
   chainType: CHAIN_TYPE
-  isUniTranche: boolean
   pointsTestnetExperience: boolean
   campaign?: Campaign
-  chainSpecificData?: Record<string, unknown>
-  changeTranche: (tranche: TrancheType) => void
   handleClose: (options?: CloseModalOptions) => void
 }
 
 export function PersonaEvaluation({
   poolInfo,
-  isUniTranche,
   campaign,
   pointsTestnetExperience,
   chainType,
-  chainSpecificData,
-  changeTranche,
   handleClose,
 }: Props): React.ReactElement | null {
   const theme = useTheme()
@@ -95,55 +88,6 @@ export function PersonaEvaluation({
     pointsTestnetExperience,
   ])
 
-  const approveLender = useCallback(async () => {
-    isActionOngoingRef.current = true
-    setLoadingType('approveLender')
-    try {
-      await IdentityServiceV2.approveLender(
-        account!,
-        chainId!,
-        poolInfo.juniorTrancheVault,
-        isDev,
-        chainSpecificData,
-      )
-    } catch (e: unknown) {
-      console.error(e)
-    }
-
-    if (!isUniTranche) {
-      try {
-        await IdentityServiceV2.approveLender(
-          account!,
-          chainId!,
-          poolInfo.seniorTrancheVault,
-          isDev,
-          chainSpecificData,
-        )
-      } catch (e: unknown) {
-        console.error(e)
-      }
-    }
-    if (isUniTranche) {
-      changeTranche('junior')
-      dispatch(setStep(WIDGET_STEP.ChooseAmount))
-    } else {
-      dispatch(setStep(WIDGET_STEP.ChooseTranche))
-    }
-
-    isActionOngoingRef.current = false
-    setLoadingType(undefined)
-  }, [
-    account,
-    chainId,
-    chainSpecificData,
-    changeTranche,
-    dispatch,
-    isDev,
-    isUniTranche,
-    poolInfo.juniorTrancheVault,
-    poolInfo.seniorTrancheVault,
-  ])
-
   const checkVerificationStatus = useCallback(async () => {
     if (isActionOngoingRef.current || isKYCResumedRef.current) {
       return
@@ -247,7 +191,7 @@ export function PersonaEvaluation({
           }
 
           case IdentityVerificationStatusV2.CONSENTED_TO_SUBSCRIPTION: {
-            await approveLender()
+            dispatch(setStep(WIDGET_STEP.ApproveLender))
             break
           }
 
@@ -260,7 +204,7 @@ export function PersonaEvaluation({
     } finally {
       isActionOngoingRef.current = false
     }
-  }, [KYCCopies, account, approveLender, chainId, isDev, setAuthError])
+  }, [KYCCopies, account, chainId, dispatch, isDev, setAuthError])
 
   useEffect(() => {
     checkVerificationStatus()

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

@@ -1,9 +1,4 @@
-import {
-  CHAIN_TYPE,
-  SOLANA_CHAIN_INFO,
-  SolanaPoolInfo,
-  TrancheType,
-} from '@huma-finance/shared'
+import { CHAIN_TYPE, SolanaPoolInfo } from '@huma-finance/shared'
 import React from 'react'
 
 import { PersonaEvaluation } from '../components/PersonaEvaluation'
@@ -11,24 +6,18 @@ import { Campaign } from '../supplyV2'
 
 type Props = {
   poolInfo: SolanaPoolInfo
-  isUniTranche: boolean
   pointsTestnetExperience: boolean
   campaign?: Campaign
-  changeTranche: (tranche: TrancheType) => void
   handleClose: () => void
 }
 
 export function Evaluation({
   poolInfo,
-  isUniTranche,
   pointsTestnetExperience,
   campaign,
-  changeTranche,
   handleClose,
 }: Props): React.ReactElement | null {
   if (poolInfo.KYC?.Persona) {
-    const solanChainInfo = SOLANA_CHAIN_INFO[poolInfo.chainId]
-
     return (
       <PersonaEvaluation
         poolInfo={{
@@ -37,15 +26,9 @@ export function Evaluation({
           seniorTrancheVault: poolInfo.seniorTrancheMint,
         }}
         handleClose={handleClose}
-        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/2-ApproveLender.tsx

@@ -0,0 +1,37 @@
+import {
+  CHAIN_TYPE,
+  SOLANA_CHAIN_INFO,
+  SolanaPoolInfo,
+  TrancheType,
+} from '@huma-finance/shared'
+import React from 'react'
+
+import { ApproveLenderBase } from '../components/ApproveLenderBase'
+
+type Props = {
+  poolInfo: SolanaPoolInfo
+  isUniTranche: boolean
+  changeTranche: (tranche: TrancheType) => void
+}
+
+export function ApproveLender({
+  poolInfo,
+  isUniTranche,
+  changeTranche,
+}: Props): React.ReactElement | null {
+  const solanaChainInfo = SOLANA_CHAIN_INFO[poolInfo.chainId]
+
+  return (
+    <ApproveLenderBase
+      juniorTrancheVault={poolInfo.juniorTrancheMint}
+      seniorTrancheVault={poolInfo.seniorTrancheMint}
+      isUniTranche={isUniTranche}
+      chainType={CHAIN_TYPE.SOLANA}
+      chainSpecificData={{
+        huma_program_id: solanaChainInfo.poolProgram,
+        pool_id: poolInfo.poolId,
+      }}
+      changeTranche={changeTranche}
+    />
+  )
+}

package/src/components/Lend/solanaSupply/index.tsx

@@ -19,11 +19,12 @@ import { ErrorModal } from '../../ErrorModal'
 import { PointsEarned } from '../../PointsEarned'
 import { WidgetWrapper } from '../../WidgetWrapper'
 import { Evaluation } from './1-Evaluation'
-import { ChooseTranche } from './2-ChooseTranche'
-import { ChooseAmount } from './3-ChooseAmount'
-import { Transfer } from './4-Transfer'
-import { Success } from './5-Success'
-import { ApproveAllowance } from './4-ApproveAllowance'
+import { ApproveLender } from './2-ApproveLender'
+import { ChooseTranche } from './3-ChooseTranche'
+import { ChooseAmount } from './4-ChooseAmount'
+import { ApproveAllowance } from './5-ApproveAllowance'
+import { Transfer } from './6-Transfer'
+import { Success } from './7-Success'
 
 export interface Campaign {
   id: string
@@ -72,6 +73,11 @@ export function SolanaLendSupply({
         return
       }
 
+      if (!isUniTranche && (!juniorLenderApproved || !seniorLenderApproved)) {
+        dispatch(setStep(WIDGET_STEP.ApproveLender))
+        return
+      }
+
       if (juniorLenderApproved && !seniorLenderApproved) {
         setSelectedTranche('junior')
         dispatch(setStep(WIDGET_STEP.ChooseAmount))
@@ -97,6 +103,7 @@ export function SolanaLendSupply({
     juniorLenderApproved,
     seniorLenderApproved,
     isLoadingTokenAccount,
+    isUniTranche,
   ])
 
   if (isLoadingLenderAccounts || isLoadingTokenAccount) {
@@ -121,10 +128,15 @@ export function SolanaLendSupply({
       {step === WIDGET_STEP.Evaluation && (
         <Evaluation
           poolInfo={poolInfo}
-          isUniTranche={!!isUniTranche}
           pointsTestnetExperience={pointsTestnetExperience}
           campaign={poolState.campaign}
           handleClose={handleClose}
+        />
+      )}
+      {step === WIDGET_STEP.ApproveLender && (
+        <ApproveLender
+          poolInfo={poolInfo}
+          isUniTranche={!!isUniTranche}
           changeTranche={setSelectedTranche}
         />
       )}

package/src/components/Lend/supplyV2/2-Evaluation.tsx

@@ -1,9 +1,4 @@
-import {
-  CHAIN_TYPE,
-  CloseModalOptions,
-  PoolInfoV2,
-  TrancheType,
-} from '@huma-finance/shared'
+import { CHAIN_TYPE, CloseModalOptions, PoolInfoV2 } from '@huma-finance/shared'
 import React from 'react'
 
 import { Campaign } from '.'
@@ -12,19 +7,15 @@ import { SecuritizeEvaluation } from '../components/SecuritizeEvaluation'
 
 type Props = {
   poolInfo: PoolInfoV2
-  isUniTranche: boolean
   pointsTestnetExperience: boolean
   campaign?: Campaign
-  changeTranche: (tranche: TrancheType) => void
   handleClose: (options?: CloseModalOptions) => void
 }
 
 export function Evaluation({
   poolInfo,
-  isUniTranche,
   campaign,
   pointsTestnetExperience,
-  changeTranche,
   handleClose,
 }: Props): React.ReactElement | null {
   if (poolInfo.KYC?.Securitize) {
@@ -37,11 +28,9 @@ export function Evaluation({
       <PersonaEvaluation
         poolInfo={poolInfo}
         handleClose={handleClose}
-        isUniTranche={isUniTranche}
         pointsTestnetExperience={pointsTestnetExperience}
         campaign={campaign}
         chainType={CHAIN_TYPE.EVM}
-        changeTranche={changeTranche}
       />
     )
   }

package/src/components/Lend/supplyV2/3-ApproveLender.tsx

@@ -0,0 +1,26 @@
+import { CHAIN_TYPE, PoolInfoV2, TrancheType } from '@huma-finance/shared'
+import React from 'react'
+
+import { ApproveLenderBase } from '../components/ApproveLenderBase'
+
+type Props = {
+  poolInfo: PoolInfoV2
+  isUniTranche: boolean
+  changeTranche: (tranche: TrancheType) => void
+}
+
+export function ApproveLender({
+  poolInfo,
+  isUniTranche,
+  changeTranche,
+}: Props): React.ReactElement {
+  return (
+    <ApproveLenderBase
+      juniorTrancheVault={poolInfo.juniorTrancheVault}
+      seniorTrancheVault={poolInfo.seniorTrancheVault}
+      isUniTranche={isUniTranche}
+      chainType={CHAIN_TYPE.EVM}
+      changeTranche={changeTranche}
+    />
+  )
+}

package/src/components/Lend/supplyV2/index.tsx

@@ -23,11 +23,12 @@ import { PointsEarned } from '../../PointsEarned'
 import { WidgetWrapper } from '../../WidgetWrapper'
 import { ChooseTranche } from './1-ChooseTranche'
 import { Evaluation } from './2-Evaluation'
-import { ChooseAmount } from './3-ChooseAmount'
-import { ApproveAllowance } from './4-ApproveAllowance'
-import { Transfer } from './5-Transfer'
-import { Success } from './6-Success'
-import { Notifications } from './7-Notifications'
+import { ApproveLender } from './3-ApproveLender'
+import { ChooseAmount } from './4-ChooseAmount'
+import { ApproveAllowance } from './5-ApproveAllowance'
+import { Transfer } from './6-Transfer'
+import { Success } from './7-Success'
+import { Notifications } from './8-Notifications'
 
 export interface Campaign {
   id: string
@@ -87,11 +88,11 @@ export function LendSupplyV2({
 
   useEffect(() => {
     if (!step && poolInfo && lenderApproveStatusFetched && lpConfig) {
-      if (
-        campaign &&
-        !isUniTranche &&
-        (!lenderApprovedJunior || !lenderApprovedSenior)
-      ) {
+      const uniTrancheNotEvaluated = isUniTranche && !lenderApprovedJunior
+      const tranchesNotEvaluated =
+        !isUniTranche && !lenderApprovedJunior && !lenderApprovedSenior
+
+      if (uniTrancheNotEvaluated || tranchesNotEvaluated) {
         if (poolInfo.KYC) {
           dispatch(setStep(WIDGET_STEP.Evaluation))
         } else if (poolInfo.supplyLink) {
@@ -101,15 +102,8 @@ export function LendSupplyV2({
         return
       }
 
-      if (lenderApprovedJunior && !lenderApprovedSenior) {
-        setSelectedTranche('junior')
-        dispatch(setStep(WIDGET_STEP.ChooseAmount))
-        return
-      }
-
-      if (lenderApprovedSenior && !lenderApprovedJunior) {
-        setSelectedTranche('senior')
-        dispatch(setStep(WIDGET_STEP.ChooseAmount))
+      if (!isUniTranche && (!lenderApprovedJunior || !lenderApprovedSenior)) {
+        dispatch(setStep(WIDGET_STEP.ApproveLender))
         return
       }
 
@@ -137,7 +131,6 @@ export function LendSupplyV2({
     lenderApprovedSenior,
     lpConfig,
     poolInfo,
-    campaign,
     step,
   ])
 
@@ -178,12 +171,17 @@ export function LendSupplyV2({
         <Evaluation
           poolInfo={poolInfo}
           handleClose={handleClose}
-          isUniTranche={isUniTranche}
-          changeTranche={setSelectedTranche}
           pointsTestnetExperience={pointsTestnetExperience}
           campaign={campaign}
         />
       )}
+      {step === WIDGET_STEP.ApproveLender && (
+        <ApproveLender
+          poolInfo={poolInfo}
+          isUniTranche={isUniTranche}
+          changeTranche={setSelectedTranche}
+        />
+      )}
       {step === WIDGET_STEP.ChooseAmount && (
         <ChooseAmount
           poolInfo={poolInfo}

package/src/store/widgets.store.ts

@@ -12,6 +12,7 @@ export enum WIDGET_STEP {
   Evaluation = 'Evaluation',
   FirstLossCover = 'FirstLossCover',
   ChooseAmount = 'ChooseAmount',
+  ApproveLender = 'ApproveLender',
   Permit = 'Permit',
   ApproveAllowance = 'ApproveAllowance',
   MintNFT = 'MintNFT',