@huma-finance/widgets 0.0.62-beta.632 → 0.0.62-beta.634

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.62-beta.632+7821904",
+  "version": "0.0.62-beta.634+3b6186e",
   "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.632+7821904",
-    "@huma-finance/shared": "^0.0.62-beta.632+7821904",
-    "@huma-finance/web-shared": "^0.0.62-beta.632+7821904",
+    "@huma-finance/sdk": "^0.0.62-beta.634+3b6186e",
+    "@huma-finance/shared": "^0.0.62-beta.634+3b6186e",
+    "@huma-finance/web-shared": "^0.0.62-beta.634+3b6186e",
     "@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": "7821904f16b9e15eede83b80acf1432f4554550c"
+  "gitHead": "3b6186e9343a513451443b20e2b76f96dddefdb0"
 }

package/src/components/Lend/{supplyV2/components → components}/PersonaEvaluation.tsx

@@ -1,33 +1,38 @@
 import {
   CAMPAIGN_REFERENCE_CODE,
   CampaignService,
+  CHAIN_TYPE,
   checkIsDev,
   IdentityServiceV2,
   IdentityVerificationStatusV2,
   KYCCopy,
-  PoolInfoV2,
+  KYCType,
   TrancheType,
   VerificationStatusResultV2,
 } from '@huma-finance/shared'
-import { useAuthErrorHandling } from '@huma-finance/web-shared'
+import { useAuthErrorHandling, useChainInfo } from '@huma-finance/web-shared'
 import { Box, css, useTheme } from '@mui/material'
-import { useWeb3React } from '@web3-react/core'
 import Persona, { Client } from 'persona'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 
-import { Campaign } from '..'
-import { useAppDispatch } from '../../../../hooks/useRedux'
-import { setError, setStep } from '../../../../store/widgets.reducers'
-import { WIDGET_STEP } from '../../../../store/widgets.store'
-import { BottomButton } from '../../../BottomButton'
-import { ApproveLenderImg } from '../../../images'
-import { LoadingModal } from '../../../LoadingModal'
-import { WrapperModal } from '../../../WrapperModal'
+import { useAppDispatch } from '../../../hooks/useRedux'
+import { setError, setStep } from '../../../store/widgets.reducers'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { BottomButton } from '../../BottomButton'
+import { ApproveLenderImg } from '../../images'
+import { LoadingModal } from '../../LoadingModal'
+import { WrapperModal } from '../../WrapperModal'
+import { Campaign } from '../supplyV2'
 
 type LoadingType = 'verificationStatus' | 'startKYC' | 'approveLender'
 
 type Props = {
-  poolInfo: PoolInfoV2
+  poolInfo: {
+    KYC?: KYCType
+    juniorTrancheVault: string
+    seniorTrancheVault: string
+  }
+  chainType: CHAIN_TYPE
   isUniTranche: boolean
   pointsTestnetExperience: boolean
   campaign?: Campaign
@@ -40,13 +45,14 @@ export function PersonaEvaluation({
   isUniTranche,
   campaign,
   pointsTestnetExperience,
+  chainType,
   changeTranche,
   handleClose,
 }: Props): React.ReactElement | null {
   const theme = useTheme()
   const isDev = checkIsDev()
   const dispatch = useAppDispatch()
-  const { account, chainId } = useWeb3React()
+  const { account, chainId } = useChainInfo(isDev, chainType)
   const {
     errorType,
     setError: setAuthError,

package/src/components/Lend/{supplyV2/components → components}/SecuritizeEvaluation.tsx

@@ -14,14 +14,13 @@ import { useAuthErrorHandling, useParamsSearch } from '@huma-finance/web-shared'
 import { Box, css, useTheme } from '@mui/material'
 import { useWeb3React } from '@web3-react/core'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
-
-import { useAppDispatch } from '../../../../hooks/useRedux'
-import { setError } from '../../../../store/widgets.reducers'
-import { BottomButton } from '../../../BottomButton'
-import { HumaSnackBar } from '../../../HumaSnackBar'
-import { ApproveLenderImg } from '../../../images'
-import { LoadingModal } from '../../../LoadingModal'
-import { WrapperModal } from '../../../WrapperModal'
+import { useAppDispatch } from '../../../hooks/useRedux'
+import { setError } from '../../../store/widgets.reducers'
+import { HumaSnackBar } from '../../HumaSnackBar'
+import { WrapperModal } from '../../WrapperModal'
+import { ApproveLenderImg } from '../../images'
+import { BottomButton } from '../../BottomButton'
+import { LoadingModal } from '../../LoadingModal'
 
 const LoadingCopiesByType: {
   [key: string]: {

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

@@ -1,106 +1,43 @@
-import {
-  checkIsDev,
-  IdentityServiceV2,
-  SolanaPoolInfo,
-} from '@huma-finance/shared'
-import { Box, css, useTheme } from '@mui/material'
-import { useWallet } from '@solana/wallet-adapter-react'
-import React, { useState } from 'react'
+import { CHAIN_TYPE, SolanaPoolInfo, TrancheType } from '@huma-finance/shared'
+import React from 'react'
 
-import { useAppDispatch } from '../../../hooks/useRedux'
-import { setError, setStep } from '../../../store/widgets.reducers'
-import { WIDGET_STEP } from '../../../store/widgets.store'
-import { CustomError } from '../../../utilTypes'
-import { BottomButton } from '../../BottomButton'
-import { ApproveLenderImg } from '../../images'
-import { LoadingModal } from '../../LoadingModal'
-import { WrapperModal } from '../../WrapperModal'
+import { PersonaEvaluation } from '../components/PersonaEvaluation'
+import { Campaign } from '../supplyV2'
 
 type Props = {
   poolInfo: SolanaPoolInfo
-  isUniTranche?: boolean
-  handleApproveSuccess: () => void
+  isUniTranche: boolean
+  pointsTestnetExperience: boolean
+  campaign?: Campaign
+  changeTranche: (tranche: TrancheType) => void
+  handleClose: () => void
 }
 
 export function Evaluation({
   poolInfo,
   isUniTranche,
-  handleApproveSuccess,
+  pointsTestnetExperience,
+  campaign,
+  changeTranche,
+  handleClose,
 }: Props): React.ReactElement | null {
-  const theme = useTheme()
-  const isDev = checkIsDev()
-  const dispatch = useAppDispatch()
-  const { publicKey } = useWallet()
-  const [loading, setLoading] = useState(false)
-
-  const styles = {
-    iconWrapper: css`
-      ${theme.cssMixins.rowCentered};
-      margin-top: ${theme.spacing(8)};
-      & > img {
-        width: 144px;
-      }
-    `,
-    description: css`
-      ${theme.cssMixins.rowCentered};
-      margin-top: ${theme.spacing(10)};
-      padding: ${theme.spacing(0, 2)};
-      font-weight: 400;
-      font-size: 16px;
-      color: ${theme.palette.text.secondary};
-    `,
-  }
-
-  const approveLender = async () => {
-    if (publicKey) {
-      try {
-        setLoading(true)
-        await IdentityServiceV2.approveSolanaLender(
-          publicKey.toString(),
-          poolInfo.chainId,
-          poolInfo.juniorTrancheMint,
-          isDev,
-        )
-        if (!isUniTranche) {
-          await IdentityServiceV2.approveSolanaLender(
-            publicKey.toString(),
-            poolInfo.chainId,
-            poolInfo.seniorTrancheMint,
-            isDev,
-          )
-        }
-        handleApproveSuccess()
-        setLoading(false)
-        dispatch(setStep(WIDGET_STEP.ChooseTranche))
-      } catch (e: unknown) {
-        const error = e as CustomError
-        setLoading(false)
-        dispatch(setError({ errorMessage: error.message }))
-      }
-    }
-  }
-
-  if (!loading) {
+  if (poolInfo.KYC?.Persona) {
     return (
-      <WrapperModal
-        title='Lender Approval'
-        subTitle='This pool requires lender approval'
-      >
-        <Box css={styles.iconWrapper}>
-          <img src={ApproveLenderImg} alt='approve-lender' />
-        </Box>
-        <Box css={styles.description} />
-        <BottomButton variant='contained' onClick={approveLender}>
-          GET APPROVED
-        </BottomButton>
-      </WrapperModal>
+      <PersonaEvaluation
+        poolInfo={{
+          KYC: poolInfo.KYC,
+          juniorTrancheVault: poolInfo.juniorTrancheMint,
+          seniorTrancheVault: poolInfo.seniorTrancheMint,
+        }}
+        handleClose={handleClose}
+        isUniTranche={isUniTranche}
+        pointsTestnetExperience={pointsTestnetExperience}
+        campaign={campaign}
+        chainType={CHAIN_TYPE.SOLANA}
+        changeTranche={changeTranche}
+      />
     )
   }
 
-  return (
-    <LoadingModal
-      title='Approval Pending'
-      description='Waiting for approval confirmation...'
-    />
-  )
+  return null
 }

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

@@ -4,7 +4,7 @@ import {
   useLenderAccounts,
   useTokenAccount,
 } from '@huma-finance/web-shared'
-import React, { useCallback, useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 
 import { useAppSelector } from '../../../hooks/useRedux'
@@ -24,12 +24,14 @@ import { Success } from './5-Success'
  * @typedef {Object} SolanaLendSupplyProps
  * @property {SolanaPoolInfo} poolInfo The metadata of the pool.
  * @property {SolanaPoolState} poolState The current state config of the pool.
+ * @property {boolean} pointsTestnetExperience If the user is in the testnet experience.
  * @property {function():void} handleClose Function to notify to close the widget modal when user clicks the 'x' close button.
  * @property {function():void|undefined} handleSuccess Optional function to notify that the lending pool supply action is successful.
  */
 export interface SolanaLendSupplyProps {
   poolInfo: SolanaPoolInfo
   poolState: SolanaPoolState
+  pointsTestnetExperience: boolean
   handleClose: () => void
   handleSuccess?: () => void
 }
@@ -37,6 +39,7 @@ export interface SolanaLendSupplyProps {
 export function SolanaLendSupply({
   poolInfo,
   poolState,
+  pointsTestnetExperience,
   handleClose,
   handleSuccess,
 }: SolanaLendSupplyProps): React.ReactElement | null {
@@ -46,7 +49,6 @@ export function SolanaLendSupply({
     seniorLenderApproved,
     juniorLenderApproved,
     loading: isLoadingLenderAccounts,
-    refresh: refreshLenderAccounts,
   } = useLenderAccounts(poolInfo.chainId, poolInfo.poolName)
   const [tokenAccount, isLoadingTokenAccount] = useTokenAccount(poolInfo)
   const { step, errorMessage } = useAppSelector(selectWidgetState)
@@ -86,10 +88,6 @@ export function SolanaLendSupply({
     isLoadingTokenAccount,
   ])
 
-  const handleApproveSuccess = useCallback(() => {
-    refreshLenderAccounts()
-  }, [refreshLenderAccounts])
-
   if (isLoadingLenderAccounts || isLoadingTokenAccount) {
     return (
       <WidgetWrapper
@@ -112,8 +110,10 @@ export function SolanaLendSupply({
       {step === WIDGET_STEP.Evaluation && (
         <Evaluation
           poolInfo={poolInfo}
-          isUniTranche={isUniTranche}
-          handleApproveSuccess={handleApproveSuccess}
+          isUniTranche={!!isUniTranche}
+          pointsTestnetExperience={pointsTestnetExperience}
+          handleClose={handleClose}
+          changeTranche={setSelectedTranche}
         />
       )}
       {step === WIDGET_STEP.ChooseTranche && (

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

@@ -1,9 +1,9 @@
-import { PoolInfoV2, TrancheType } from '@huma-finance/shared'
+import { CHAIN_TYPE, PoolInfoV2, TrancheType } from '@huma-finance/shared'
 import React from 'react'
 
 import { Campaign } from '.'
-import { PersonaEvaluation } from './components/PersonaEvaluation'
-import { SecuritizeEvaluation } from './components/SecuritizeEvaluation'
+import { PersonaEvaluation } from '../components/PersonaEvaluation'
+import { SecuritizeEvaluation } from '../components/SecuritizeEvaluation'
 
 type Props = {
   poolInfo: PoolInfoV2
@@ -35,6 +35,7 @@ export function Evaluation({
         isUniTranche={isUniTranche}
         pointsTestnetExperience={pointsTestnetExperience}
         campaign={campaign}
+        chainType={CHAIN_TYPE.EVM}
         changeTranche={changeTranche}
       />
     )