@huma-finance/widgets 0.0.65 → 0.0.66-beta.812

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.65",
+  "version": "0.0.66-beta.812+dc79163",
   "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.65",
-    "@huma-finance/shared": "^0.0.65",
-    "@huma-finance/web-shared": "^0.0.65",
+    "@huma-finance/sdk": "^0.0.66-beta.812+dc79163",
+    "@huma-finance/shared": "^0.0.66-beta.812+dc79163",
+    "@huma-finance/web-shared": "^0.0.66-beta.812+dc79163",
     "@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": "8c4de87f3cdd93b8f8b16e976faf71846af3b214"
+  "gitHead": "dc79163e3ea685e1ed7f79755c36761eb48bf913"
 }

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

@@ -3,6 +3,7 @@ import {
   CHAIN_TYPE,
   checkIsDev,
   IdentityServiceV2,
+  NETWORK_TYPE,
   timeUtil,
   TrancheType,
 } from '@huma-finance/shared'
@@ -18,6 +19,7 @@ type Props = {
   juniorTrancheVault: string
   seniorTrancheVault: string
   chainType: CHAIN_TYPE
+  networkType: NETWORK_TYPE
   isUniTranche: boolean
   chainSpecificData?: Record<string, unknown>
   changeTranche: (tranche: TrancheType) => void
@@ -28,6 +30,7 @@ export function ApproveLenderBase({
   seniorTrancheVault,
   isUniTranche,
   chainType,
+  networkType,
   chainSpecificData,
   changeTranche,
 }: Props): React.ReactElement | null {
@@ -43,6 +46,7 @@ export function ApproveLenderBase({
         try {
           tryAttempts -= 1
           await IdentityServiceV2.approveLender(
+            networkType,
             account!,
             chainId!,
             trancheVault,
@@ -64,7 +68,7 @@ export function ApproveLenderBase({
         }
       }
     },
-    [account, chainId, chainSpecificData, dispatch, isDev],
+    [account, chainId, chainSpecificData, dispatch, isDev, networkType],
   )
 
   useEffect(() => {

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

@@ -1,6 +1,4 @@
 import {
-  CAMPAIGN_REFERENCE_CODE,
-  CampaignService,
   CHAIN_TYPE,
   checkIsDev,
   CloseModalOptions,
@@ -8,9 +6,10 @@ import {
   IdentityVerificationStatusV2,
   KYCCopy,
   KYCType,
+  NETWORK_TYPE,
   VerificationStatusResultV2,
 } from '@huma-finance/shared'
-import { useAuthErrorHandling, useChainInfo } from '@huma-finance/web-shared'
+import { useAuthErrorHandling } from '@huma-finance/web-shared'
 import { Box, css, useTheme } from '@mui/material'
 import Persona, { Client } from 'persona'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
@@ -32,8 +31,8 @@ type Props = {
     juniorTrancheVault: string
     seniorTrancheVault: string
   }
+  networkType: NETWORK_TYPE
   chainType: CHAIN_TYPE
-  pointsTestnetExperience: boolean
   campaign?: Campaign
   handleClose: (options?: CloseModalOptions) => void
 }
@@ -41,14 +40,13 @@ type Props = {
 export function PersonaEvaluation({
   poolInfo,
   campaign,
-  pointsTestnetExperience,
+  networkType,
   chainType,
   handleClose,
 }: Props): React.ReactElement | null {
   const theme = useTheme()
   const isDev = checkIsDev()
   const dispatch = useAppDispatch()
-  const { account, chainId } = useChainInfo(isDev, chainType)
   const {
     errorType,
     setError: setAuthError,
@@ -68,143 +66,109 @@ export function PersonaEvaluation({
   const isActionOngoingRef = useRef<boolean>(false)
   const isKYCResumedRef = useRef<boolean>(false)
 
-  useEffect(() => {
-    const createNewWallet = async () => {
-      if (isWalletOwnershipVerified && campaign && account) {
-        await CampaignService.createNewWallet(
-          account,
-          localStorage.getItem(CAMPAIGN_REFERENCE_CODE) ?? undefined,
-          isDev,
-          pointsTestnetExperience,
-        )
-      }
-    }
-    createNewWallet()
-  }, [
-    account,
-    campaign,
-    isDev,
-    isWalletOwnershipVerified,
-    pointsTestnetExperience,
-  ])
-
   const checkVerificationStatus = useCallback(async () => {
     if (isActionOngoingRef.current || isKYCResumedRef.current) {
       return
     }
     try {
-      if (account && chainId) {
-        isActionOngoingRef.current = true
-        setLoadingType('verificationStatus')
-        const verificationStatus =
-          await IdentityServiceV2.getVerificationStatusV2(
-            account,
-            chainId,
-            isDev,
-          )
-        setVerificationStatus(verificationStatus)
-        setInquiryId(verificationStatus.personaInquiryId)
-
-        switch (verificationStatus.status) {
-          case IdentityVerificationStatusV2.ACCREDITED: {
-            const startVerificationResult =
-              await IdentityServiceV2.startVerification(account, chainId, isDev)
-            setInquiryId(startVerificationResult.personaInquiryId)
-            setKYCCopy(KYCCopies.verifyIdentity)
-            setLoadingType(undefined)
-            if (
-              startVerificationResult.status ===
-              IdentityVerificationStatusV2.BYPASSED
-            ) {
-              setVerificationStatus(startVerificationResult)
-              setKYCCopy(KYCCopies.verificationBypassed)
-            }
-
-            break
-          }
+      isActionOngoingRef.current = true
+      setLoadingType('verificationStatus')
+      const verificationStatus =
+        await IdentityServiceV2.getVerificationStatusV2(networkType, isDev)
+      setVerificationStatus(verificationStatus)
+      setInquiryId(verificationStatus.personaInquiryId)
 
-          case IdentityVerificationStatusV2.CREATED: {
-            setKYCCopy(KYCCopies.verifyIdentity)
-            setLoadingType(undefined)
-            break
+      switch (verificationStatus.status) {
+        case IdentityVerificationStatusV2.ACCREDITED: {
+          const startVerificationResult =
+            await IdentityServiceV2.startVerification(networkType, isDev)
+          setInquiryId(startVerificationResult.personaInquiryId)
+          setKYCCopy(KYCCopies.verifyIdentity)
+          setLoadingType(undefined)
+          if (
+            startVerificationResult.status ===
+            IdentityVerificationStatusV2.BYPASSED
+          ) {
+            setVerificationStatus(startVerificationResult)
+            setKYCCopy(KYCCopies.verificationBypassed)
           }
 
-          case IdentityVerificationStatusV2.PENDING: {
-            if (!isKYCCompletedRef.current) {
-              const resumeVerificationResult =
-                await IdentityServiceV2.resumeVerification(
-                  account,
-                  chainId,
-                  isDev,
-                )
-              verificationStatus.status = resumeVerificationResult.status
-              setVerificationStatus(verificationStatus)
-              setSessionToken(resumeVerificationResult.sessionToken)
-              setLoadingType(undefined)
-              isKYCResumedRef.current = true
-            } else {
-              setLoadingType('verificationStatus')
-            }
-            setKYCCopy(KYCCopies.verifyIdentity)
-            break
-          }
+          break
+        }
+
+        case IdentityVerificationStatusV2.CREATED: {
+          setKYCCopy(KYCCopies.verifyIdentity)
+          setLoadingType(undefined)
+          break
+        }
 
-          case IdentityVerificationStatusV2.EXPIRED: {
+        case IdentityVerificationStatusV2.PENDING: {
+          if (!isKYCCompletedRef.current) {
             const resumeVerificationResult =
-              await IdentityServiceV2.resumeVerification(
-                account,
-                chainId,
-                isDev,
-              )
+              await IdentityServiceV2.resumeVerification(networkType, isDev)
             verificationStatus.status = resumeVerificationResult.status
             setVerificationStatus(verificationStatus)
             setSessionToken(resumeVerificationResult.sessionToken)
-            setKYCCopy(KYCCopies.verifyIdentity)
             setLoadingType(undefined)
             isKYCResumedRef.current = true
-            break
+          } else {
+            setLoadingType('verificationStatus')
           }
+          setKYCCopy(KYCCopies.verifyIdentity)
+          break
+        }
 
-          case IdentityVerificationStatusV2.BYPASSED: {
-            setKYCCopy(KYCCopies.verificationBypassed)
-            setLoadingType(undefined)
+        case IdentityVerificationStatusV2.EXPIRED: {
+          const resumeVerificationResult =
+            await IdentityServiceV2.resumeVerification(networkType, isDev)
+          verificationStatus.status = resumeVerificationResult.status
+          setVerificationStatus(verificationStatus)
+          setSessionToken(resumeVerificationResult.sessionToken)
+          setKYCCopy(KYCCopies.verifyIdentity)
+          setLoadingType(undefined)
+          isKYCResumedRef.current = true
+          break
+        }
 
-            break
-          }
+        case IdentityVerificationStatusV2.BYPASSED: {
+          setKYCCopy(KYCCopies.verificationBypassed)
+          setLoadingType(undefined)
 
-          case IdentityVerificationStatusV2.APPROVED: {
-            setKYCCopy(KYCCopies.verificationApproved)
-            setLoadingType(undefined)
-            break
-          }
+          break
+        }
 
-          case IdentityVerificationStatusV2.DECLINED: {
-            setKYCCopy(KYCCopies.verificationDeclined)
-            setLoadingType(undefined)
-            break
-          }
+        case IdentityVerificationStatusV2.APPROVED: {
+          setKYCCopy(KYCCopies.verificationApproved)
+          setLoadingType(undefined)
+          break
+        }
 
-          case IdentityVerificationStatusV2.NEEDS_REVIEW: {
-            setKYCCopy(KYCCopies.verificationNeedsReview)
-            setLoadingType(undefined)
-            break
-          }
+        case IdentityVerificationStatusV2.DECLINED: {
+          setKYCCopy(KYCCopies.verificationDeclined)
+          setLoadingType(undefined)
+          break
+        }
 
-          case IdentityVerificationStatusV2.CONSENTED_TO_SUBSCRIPTION: {
-            dispatch(setStep(WIDGET_STEP.ApproveLender))
-            break
-          }
+        case IdentityVerificationStatusV2.NEEDS_REVIEW: {
+          setKYCCopy(KYCCopies.verificationNeedsReview)
+          setLoadingType(undefined)
+          break
+        }
 
-          default:
-            break
+        case IdentityVerificationStatusV2.CONSENTED_TO_SUBSCRIPTION: {
+          dispatch(setStep(WIDGET_STEP.ApproveLender))
+          break
         }
+
+        default:
+          break
       }
     } catch (e: unknown) {
       setAuthError(e)
     } finally {
       isActionOngoingRef.current = false
     }
-  }, [KYCCopies, account, chainId, dispatch, isDev, setAuthError])
+  }, [KYCCopies, dispatch, isDev, networkType, setAuthError])
 
   useEffect(() => {
     checkVerificationStatus()
@@ -316,7 +280,7 @@ export function PersonaEvaluation({
     }
   }, [KYCAutoStarted, startKYC, verificationStatus])
 
-  const handleAction = () => {
+  const handleAction = useCallback(() => {
     if (verificationStatus) {
       switch (verificationStatus.status) {
         case IdentityVerificationStatusV2.ACCREDITED:
@@ -340,7 +304,7 @@ export function PersonaEvaluation({
           break
       }
     }
-  }
+  }, [handleClose, startKYC, verificationStatus])
 
   const styles = {
     iconWrapper: css`

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

@@ -1,4 +1,4 @@
-import { CHAIN_TYPE, SolanaPoolInfo } from '@huma-finance/shared'
+import { CHAIN_TYPE, NETWORK_TYPE, SolanaPoolInfo } from '@huma-finance/shared'
 import React from 'react'
 
 import { PersonaEvaluation } from '../components/PersonaEvaluation'
@@ -6,14 +6,14 @@ import { Campaign } from '../supplyV2'
 
 type Props = {
   poolInfo: SolanaPoolInfo
-  pointsTestnetExperience: boolean
+  networkType: NETWORK_TYPE
   campaign?: Campaign
   handleClose: () => void
 }
 
 export function Evaluation({
   poolInfo,
-  pointsTestnetExperience,
+  networkType,
   campaign,
   handleClose,
 }: Props): React.ReactElement | null {
@@ -26,9 +26,9 @@ export function Evaluation({
           seniorTrancheVault: poolInfo.seniorTrancheMint,
         }}
         handleClose={handleClose}
-        pointsTestnetExperience={pointsTestnetExperience}
-        campaign={campaign}
+        networkType={networkType}
         chainType={CHAIN_TYPE.SOLANA}
+        campaign={campaign}
       />
     )
   }

package/src/components/Lend/solanaSupply/2-ApproveLender.tsx

@@ -1,5 +1,6 @@
 import {
   CHAIN_TYPE,
+  getSolanaNetworkType,
   SOLANA_CHAIN_INFO,
   SolanaPoolInfo,
   TrancheType,
@@ -27,6 +28,7 @@ export function ApproveLender({
       seniorTrancheVault={poolInfo.seniorTrancheMint}
       isUniTranche={isUniTranche}
       chainType={CHAIN_TYPE.SOLANA}
+      networkType={getSolanaNetworkType(poolInfo.chainId)}
       chainSpecificData={{
         huma_program_id: solanaChainInfo.poolProgram,
         pool_id: poolInfo.poolId,

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

@@ -3,12 +3,11 @@ import {
   checkIsDev,
   convertToShares,
   getTokenAccounts,
+  NETWORK_TYPE,
   SolanaPoolInfo,
   SolanaTokenUtils,
   TrancheType,
 } from '@huma-finance/shared'
-import React, { useCallback, useEffect, useState } from 'react'
-
 import {
   SolanaPoolState,
   useHumaProgram,
@@ -22,6 +21,7 @@ import {
 } from '@solana/spl-token'
 import { useWallet } from '@solana/wallet-adapter-react'
 import { PublicKey, Transaction } from '@solana/web3.js'
+import React, { useCallback, useEffect, useState } from 'react'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { setPointsAccumulated, setStep } from '../../../store/widgets.reducers'
 import { selectWidgetState } from '../../../store/widgets.selectors'
@@ -33,14 +33,14 @@ type Props = {
   poolInfo: SolanaPoolInfo
   poolState: SolanaPoolState
   selectedTranche: TrancheType
-  pointsTestnetExperience: boolean
+  networkType: NETWORK_TYPE
 }
 
 export function Transfer({
   poolInfo,
   poolState,
   selectedTranche,
-  pointsTestnetExperience,
+  networkType,
 }: Props): React.ReactElement | null {
   const isDev = checkIsDev()
   const dispatch = useAppDispatch()
@@ -72,12 +72,12 @@ export function Transfer({
     async (options?: { signature: string }) => {
       if (publicKey && poolState.campaign && options?.signature) {
         try {
-          const result = await CampaignService.updateWalletPoints(
+          const result = await CampaignService.updateHumaAccountPoints(
             publicKey.toString(),
             options.signature,
             poolInfo.chainId,
+            networkType,
             isDev,
-            pointsTestnetExperience,
           )
           dispatch(setPointsAccumulated(result.pointsAccumulated))
         } catch (error) {
@@ -89,7 +89,7 @@ export function Transfer({
     [
       dispatch,
       isDev,
-      pointsTestnetExperience,
+      networkType,
       poolInfo.chainId,
       poolState.campaign,
       publicKey,

package/src/components/Lend/solanaSupply/8-PointsEarned.tsx

@@ -5,19 +5,15 @@ import {
   CloseModalOptions,
   formatNumber,
   isEmpty,
+  NETWORK_TYPE,
 } from '@huma-finance/shared'
-import {
-  SolanaPoolState,
-  txAtom,
-  useAuthErrorHandling,
-  useChainInfo,
-} from '@huma-finance/web-shared'
+import { SolanaPoolState, txAtom, useChainInfo } from '@huma-finance/web-shared'
 import { Box, css, useTheme } from '@mui/material'
 import { useResetAtom } from 'jotai/utils'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 
-import { resetState, setError } from '../../../store/widgets.reducers'
+import { resetState } from '../../../store/widgets.reducers'
 import { BottomButton } from '../../BottomButton'
 import { CongratulationsIcon, HumaPointsIcon, RibbonIcon } from '../../icons'
 import { LoadingModal } from '../../LoadingModal'
@@ -29,20 +25,17 @@ enum STATE {
   Congrats = 'Congrats',
 }
 
-const ERROR_MESSAGE =
-  'Failed to update wallet points. Be assured that your points will be added later.'
-
 type Props = {
   transactionHash: string
   poolState: SolanaPoolState
-  pointsTestnetExperience: boolean
+  networkType: NETWORK_TYPE
   handleAction: (options?: CloseModalOptions) => void
 }
 
 export function PointsEarned({
   transactionHash,
   poolState,
-  pointsTestnetExperience,
+  networkType,
   handleAction,
 }: Props): React.ReactElement {
   const theme = useTheme()
@@ -60,91 +53,26 @@ export function PointsEarned({
   )
   const monthText =
     lockupMonths > 1 ? `${lockupMonths} months` : `${lockupMonths} month`
-
-  const {
-    errorType,
-    setError: setAuthError,
-    isWalletOwnershipVerified,
-    isWalletOwnershipVerificationRequired,
-  } = useAuthErrorHandling(isDev)
-  const [walletOwnership, setWalletOwnership] = useState<boolean | undefined>()
   const [state, setState] = useState<STATE>(STATE.Loading)
 
   useEffect(() => {
-    if (isWalletOwnershipVerificationRequired) {
-      setState(STATE.Loading)
-    }
-  }, [isWalletOwnershipVerificationRequired])
-
-  useEffect(() => {
-    if (isWalletOwnershipVerified) {
-      setWalletOwnership(true)
-    }
-  }, [isWalletOwnershipVerified])
-
-  useEffect(() => {
-    const checkWalletOwnership = async () => {
-      if (account) {
-        const ownership = await CampaignService.checkWalletOwnership(
-          account,
+    const updateWalletPoints = async () => {
+      try {
+        const result = await CampaignService.updateHumaAccountPoints(
+          account!,
+          transactionHash,
+          chainId!,
+          networkType,
           isDev,
-          pointsTestnetExperience,
         )
-        setWalletOwnership(ownership)
-        if (!ownership) {
-          setAuthError('WalletNotSignedInException')
-        }
-      }
-    }
-    checkWalletOwnership()
-  }, [account, isDev, pointsTestnetExperience, setAuthError])
-
-  useEffect(() => {
-    if (errorType === 'NotSignedIn') {
-      setState(STATE.SignIn)
-    } else if (errorType === 'UserRejected') {
-      dispatch(
-        setError({
-          errorMessage: 'User has rejected the transaction.',
-        }),
-      )
-    } else if (errorType === 'Other') {
-      dispatch(
-        setError({
-          errorMessage: ERROR_MESSAGE,
-        }),
-      )
-    }
-  }, [dispatch, errorType])
-
-  useEffect(() => {
-    const updateWalletPoints = async () => {
-      if (walletOwnership) {
-        try {
-          const result = await CampaignService.updateWalletPoints(
-            account!,
-            transactionHash,
-            chainId!,
-            isDev,
-            pointsTestnetExperience,
-          )
-          setPointsAccumulated(result.pointsAccumulated)
-          setState(STATE.Congrats)
-        } catch (error) {
-          console.error('Failed to update wallet points', error)
-        }
+        setPointsAccumulated(result.pointsAccumulated)
+        setState(STATE.Congrats)
+      } catch (error) {
+        console.error('Failed to update wallet points', error)
       }
     }
     updateWalletPoints()
-  }, [
-    account,
-    chainId,
-    dispatch,
-    isDev,
-    pointsTestnetExperience,
-    transactionHash,
-    walletOwnership,
-  ])
+  }, [account, chainId, isDev, networkType, transactionHash])
 
   const handleCloseModal = useCallback(() => {
     reset()

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

@@ -1,5 +1,6 @@
 import {
   CloseModalOptions,
+  getSolanaNetworkType,
   SolanaPoolInfo,
   TrancheType,
 } from '@huma-finance/shared'
@@ -36,14 +37,12 @@ export interface Campaign {
  * @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((CloseModalOptions|undefined)):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: (options?: CloseModalOptions) => void
   handleSuccess?: () => void
 }
@@ -51,7 +50,6 @@ export interface SolanaLendSupplyProps {
 export function SolanaLendSupply({
   poolInfo,
   poolState,
-  pointsTestnetExperience,
   handleClose,
   handleSuccess,
 }: SolanaLendSupplyProps): React.ReactElement | null {
@@ -128,8 +126,8 @@ export function SolanaLendSupply({
       {step === WIDGET_STEP.Evaluation && (
         <Evaluation
           poolInfo={poolInfo}
-          pointsTestnetExperience={pointsTestnetExperience}
           campaign={poolState.campaign}
+          networkType={getSolanaNetworkType(poolInfo.chainId)}
           handleClose={handleClose}
         />
       )}
@@ -164,7 +162,7 @@ export function SolanaLendSupply({
           poolInfo={poolInfo}
           poolState={poolState}
           selectedTranche={selectedTranche}
-          pointsTestnetExperience={pointsTestnetExperience}
+          networkType={getSolanaNetworkType(poolInfo.chainId)}
         />
       )}
       {step === WIDGET_STEP.Done && (