@huma-finance/widgets 0.0.61-beta.546 → 0.0.61-beta.548

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.61-beta.546+8550ae4",
+  "version": "0.0.61-beta.548+4ca040c",
   "publishConfig": {
     "access": "public"
   },
@@ -30,9 +30,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.60",
-    "@huma-finance/shared": "^0.0.60",
-    "@huma-finance/web-shared": "^0.0.60",
+    "@huma-finance/sdk": "^0.0.61-beta.548+4ca040c",
+    "@huma-finance/shared": "^0.0.61-beta.548+4ca040c",
+    "@huma-finance/web-shared": "^0.0.61-beta.548+4ca040c",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",
     "@mui/styles": "^5.0.2",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "8550ae42c179b2a84d0673184cc4971cd2d30c0d"
+  "gitHead": "4ca040c1942ff6df747871456b4103c84571fa7c"
 }

package/src/components/CreditLine/paymentV2/1-ChooseAmount.tsx

@@ -45,11 +45,6 @@ export function ChooseAmount({
     ethers.utils.formatUnits(payoffAmountBN, decimals),
   )
 
-  console.log('totalDueAmountBN', totalDueAmountBN.toString())
-  console.log('payoffAmountBN', payoffAmountBN.toString())
-  console.log('payoffAmount', payoffAmount)
-  console.log('currentAmount', currentAmount)
-
   useEffect(() => {
     setCurrentAmount(totalDueAmount)
   }, [totalDueAmount])

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

@@ -1,11 +1,17 @@
-import { checkIsDev, formatNumber, isEmpty } from '@huma-finance/shared'
-// import { useAuthErrorHandling } from '@huma-finance/web-shared'
+import {
+  CampaignService,
+  checkIsDev,
+  formatNumber,
+  isEmpty,
+} from '@huma-finance/shared'
+import { txAtom, useAuthErrorHandling } from '@huma-finance/web-shared'
 import { Box, css, useTheme } from '@mui/material'
 import { useWeb3React } from '@web3-react/core'
-import React, { useEffect, useState } from 'react'
+import { useResetAtom } from 'jotai/utils'
+import React, { useCallback, useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 
-// import { setError } from '../../../store/widgets.reducers'
+import { resetState, setError } from '../../../store/widgets.reducers'
 import { BottomButton } from '../../BottomButton'
 import { CongratulationsIcon, HumaPointsIcon, RibbonIcon } from '../../icons'
 import { LoadingModal } from '../../LoadingModal'
@@ -17,8 +23,8 @@ enum STATE {
   Congrats = 'Congrats',
 }
 
-// const ERROR_MESSAGE =
-//   'Failed to update wallet points. Be assured that your points will be added later.'
+const ERROR_MESSAGE =
+  'Failed to update wallet points. Be assured that your points will be added later.'
 
 type Props = {
   transactionHash: string
@@ -36,6 +42,7 @@ export function PointsEarned({
   const theme = useTheme()
   const isDev = checkIsDev()
   const dispatch = useDispatch()
+  const reset = useResetAtom(txAtom)
   const { account, chainId } = useWeb3React()
   const [pointsAccumulated, setPointsAccumulated] = useState<
     number | undefined
@@ -46,78 +53,77 @@ 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 {
+    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 () => {
-  //     const ownership = await CampaignService.checkWalletOwnership(
-  //       account!,
-  //       isDev,
-  //       pointsTestnetExperience,
-  //     )
-  //     setWalletOwnership(ownership)
-  //     if (!ownership) {
-  //       setAuthError('WalletNotSignInException')
-  //     }
-  //   }
-  //   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(() => {
+    if (isWalletOwnershipVerificationRequired) {
+      setState(STATE.Loading)
+    }
+  }, [isWalletOwnershipVerificationRequired])
+
+  useEffect(() => {
+    if (isWalletOwnershipVerified) {
+      setWalletOwnership(true)
+    }
+  }, [isWalletOwnershipVerified])
+
+  useEffect(() => {
+    const checkWalletOwnership = async () => {
+      const ownership = await CampaignService.checkWalletOwnership(
+        account!,
+        isDev,
+        pointsTestnetExperience,
+      )
+      setWalletOwnership(ownership)
+      if (!ownership) {
+        setAuthError('WalletNotSignInException')
+      }
+    }
+    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)
-        setPointsAccumulated(5000)
-        setState(STATE.Congrats)
-      } catch (error) {
-        console.error('Failed to update wallet points', error)
+      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)
+        }
       }
-      // }
     }
     updateWalletPoints()
   }, [
@@ -127,9 +133,15 @@ export function PointsEarned({
     isDev,
     pointsTestnetExperience,
     transactionHash,
-    // walletOwnership,
+    walletOwnership,
   ])
 
+  const handleCloseModal = useCallback(() => {
+    reset()
+    dispatch(resetState())
+    handleAction()
+  }, [dispatch, handleAction, reset])
+
   const styles = {
     wrapper: css`
       height: 518px;
@@ -218,7 +230,7 @@ export function PointsEarned({
           {monthText} straight. Plus, If you keep your investment till after{' '}
           {monthText}, you’ll gain extra points daily.
         </Box>
-        <BottomButton variant='contained' onClick={handleAction}>
+        <BottomButton variant='contained' onClick={handleCloseModal}>
           GREAT
         </BottomButton>
       </Box>

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

@@ -35,7 +35,7 @@ const LoadingCopiesByType: {
     description: `Checking your verification status...`,
   },
   startKYC: {
-    description: `Starting KYC...`,
+    description: `Starting KYC/KYB...`,
   },
   approveLender: {
     description: `Approving as lender...`,

package/src/components/ViewOnExplorer.tsx

@@ -1,7 +1,8 @@
-import { Box, Button } from '@mui/material'
+import { Box } from '@mui/material'
 import { useWeb3React } from '@web3-react/core'
 import { getExplorerUrl, openInNewTab } from '@huma-finance/shared'
 import React from 'react'
+import { BottomButton } from './BottomButton'
 
 type Props = {
   txHash: string
@@ -16,8 +17,8 @@ export function ViewOnExplorer({ txHash }: Props): React.ReactElement | null {
   }
 
   return (
-    <Button variant='outlined' onClick={() => openInNewTab(link)}>
+    <BottomButton variant='contained' onClick={() => openInNewTab(link)}>
       <Box component='span'>VIEW ON EXPLORER</Box>
-    </Button>
+    </BottomButton>
   )
 }