@huma-finance/widgets 0.0.48-beta.296 → 0.0.48-beta.297

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.48-beta.296+a50d41c",
+  "version": "0.0.48-beta.297+48b8509",
   "publishConfig": {
     "access": "public"
   },
@@ -30,8 +30,8 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.48-beta.296+a50d41c",
-    "@huma-finance/shared": "^0.0.48-beta.296+a50d41c",
+    "@huma-finance/sdk": "^0.0.48-beta.297+48b8509",
+    "@huma-finance/shared": "^0.0.48-beta.297+48b8509",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",
     "@mui/styles": "^5.0.2",
@@ -193,5 +193,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "a50d41ce9bafdb1b8894da5c38a139b4efcda676"
+  "gitHead": "48b8509c9aa8f1d267f77ab0982400b136e027d4"
 }

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

@@ -45,6 +45,11 @@ 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/InputAmountModal.tsx

@@ -10,6 +10,7 @@ type Props = {
   subTitle: string
   actionText: string
   tokenSymbol: string
+  suffix?: string
   currentAmount: number | string
   maxAmount: number | string
   maxAmountText?: string
@@ -23,6 +24,7 @@ export function InputAmountModal({
   subTitle,
   actionText,
   tokenSymbol,
+  suffix: defaultSuffix,
   currentAmount,
   maxAmount,
   maxAmountText = 'MAX',
@@ -32,7 +34,7 @@ export function InputAmountModal({
 }: Props): React.ReactElement | null {
   const theme = useTheme()
   const [inputTouched, setInputTouched] = useState(false)
-  const suffix = ` ${tokenSymbol}`
+  const suffix = ` ${defaultSuffix ?? tokenSymbol}`
 
   const styles = {
     inputAmountWrapper: css`

package/src/components/Lend/{withdrawV2 → addRedemptionV2}/1-ChooseTranche.tsx

@@ -1,4 +1,4 @@
-import { UnderlyingTokenInfo } from '@huma-finance/shared'
+import { TrancheType } from '@huma-finance/shared'
 import {
   css,
   FormControl,
@@ -10,7 +10,6 @@ import {
 } from '@mui/material'
 import React from 'react'
 
-import { WithdrawType } from '.'
 import { useAppDispatch } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'
 import { WIDGET_STEP } from '../../../store/widgets.store'
@@ -18,21 +17,16 @@ import { BottomButton } from '../../BottomButton'
 import { WrapperModal } from '../../WrapperModal'
 
 type Props = {
-  poolUnderlyingToken: UnderlyingTokenInfo
-  selectedWithdrawType: WithdrawType | undefined
-  withdrawTypes: WithdrawType[]
-  changeWithdrawType: (WithdrawType: WithdrawType) => void
+  selectedTranche: TrancheType | undefined
+  changeTranche: (tranche: TrancheType) => void
 }
 
 export function ChooseTranche({
-  poolUnderlyingToken,
-  selectedWithdrawType,
-  withdrawTypes,
-  changeWithdrawType,
+  selectedTranche,
+  changeTranche,
 }: Props): React.ReactElement | null {
   const theme = useTheme()
   const dispatch = useAppDispatch()
-  const { symbol } = poolUnderlyingToken
 
   const styles = {
     subTitle: css`
@@ -61,34 +55,35 @@ export function ChooseTranche({
     `,
   }
 
-  const handleChangeWithdrawType = (withdrawTypeValue: string | number) => {
-    const withdrawType = withdrawTypes.find(
-      (item) => item.value === withdrawTypeValue,
-    )
-    if (withdrawType) {
-      changeWithdrawType(withdrawType)
-    }
-  }
-
   const handleNext = () => {
-    if (selectedWithdrawType?.type === 'firstLossCover') {
-      dispatch(setStep(WIDGET_STEP.ChooseAmount))
-    } else {
-      dispatch(setStep(WIDGET_STEP.Transfer))
-    }
+    dispatch(setStep(WIDGET_STEP.ChooseAmount))
   }
 
+  const items: {
+    label: string
+    value: TrancheType
+  }[] = [
+    {
+      label: 'Senior',
+      value: 'senior',
+    },
+    {
+      label: 'Junior',
+      value: 'junior',
+    },
+  ]
+
   return (
-    <WrapperModal title={`Withdraw ${symbol}`}>
+    <WrapperModal title='Redemption'>
       <FormControl>
-        <FormLabel css={styles.subTitle}>Select Withdraw Type</FormLabel>
+        <FormLabel css={styles.subTitle}>Select Tranche Type</FormLabel>
         <RadioGroup
           aria-labelledby='buttons-group-label'
           name='radio-buttons-group'
           css={styles.radioGroup}
-          onChange={(e) => handleChangeWithdrawType(e.target.value)}
+          onChange={(e) => changeTranche(e.target.value as TrancheType)}
         >
-          {withdrawTypes.map((item) => (
+          {items.map((item) => (
             <FormControlLabel
               key={item.label}
               value={item.value}
@@ -109,7 +104,7 @@ export function ChooseTranche({
       </FormControl>
       <BottomButton
         variant='contained'
-        disabled={!selectedWithdrawType}
+        disabled={!selectedTranche}
         onClick={handleNext}
       >
         NEXT

package/src/components/Lend/addRedemptionV2/2-ChooseAmount.tsx

@@ -0,0 +1,61 @@
+import { formatNumber, UnderlyingTokenInfo } from '@huma-finance/shared'
+import { ethers } from 'ethers'
+import React, { useState } from 'react'
+
+import { TrancheInfo } from '.'
+import { useAppDispatch } from '../../../hooks/useRedux'
+import {
+  setRedeemAmount,
+  setRedeemShares,
+  setStep,
+} from '../../../store/widgets.reducers'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { InputAmountModal } from '../../InputAmountModal'
+
+type Props = {
+  poolUnderlyingToken: UnderlyingTokenInfo
+  trancheInfo: TrancheInfo
+}
+
+export function ChooseAmount({
+  poolUnderlyingToken,
+  trancheInfo,
+}: Props): React.ReactElement | null {
+  const dispatch = useAppDispatch()
+  const { symbol } = poolUnderlyingToken
+  const [currentAmount, setCurrentAmount] = useState<number>(0)
+  const [currentShares, setCurrentShares] = useState<number>(0)
+  const maxSharesFormatted = ethers.utils.formatUnits(
+    trancheInfo.shares,
+    poolUnderlyingToken.decimals,
+  )
+  const sharePrice =
+    trancheInfo.assets.toNumber() / trancheInfo.shares.toNumber()
+
+  const handleChangeShares = (newShares: number) => {
+    const amount = Number(newShares) * sharePrice
+    setCurrentShares(Number(newShares))
+    setCurrentAmount(amount)
+    dispatch(setRedeemShares(Number(newShares)))
+    dispatch(setRedeemAmount(amount))
+  }
+
+  const handleAction = () => {
+    dispatch(setStep(WIDGET_STEP.Transfer))
+  }
+
+  return (
+    <InputAmountModal
+      title='Redemption'
+      subTitle={`Enter number of shares to redeem from ${trancheInfo.tranche} tranche`}
+      tokenSymbol={symbol}
+      currentAmount={currentShares}
+      handleChangeAmount={handleChangeShares}
+      maxAmount={maxSharesFormatted}
+      info={`${String(formatNumber(currentAmount))} ${symbol}`}
+      suffix='Shares'
+      handleAction={handleAction}
+      actionText='REQUEST'
+    />
+  )
+}

package/src/components/Lend/{redeemV2 → addRedemptionV2}/3-Transfer.tsx

@@ -4,10 +4,10 @@ import {
   useTrancheVaultContractV2,
 } from '@huma-finance/shared'
 import { useWeb3React } from '@web3-react/core'
+import { ethers } from 'ethers'
 import React, { useCallback } from 'react'
 
-import { ethers } from 'ethers'
-import { REDEMPTION_TYPE, RedemptionActionInfo } from '.'
+import { TrancheInfo } from '.'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'
 import { selectWidgetState } from '../../../store/widgets.selectors'
@@ -17,43 +17,38 @@ import { TxSendModalV2 } from '../../TxSendModalV2'
 type Props = {
   poolInfo: PoolInfoV2
   poolUnderlyingToken: UnderlyingTokenInfo
-  redemptionType: REDEMPTION_TYPE
+  trancheInfo: TrancheInfo
 }
 
 export function Transfer({
   poolInfo,
   poolUnderlyingToken,
-  redemptionType,
+  trancheInfo,
 }: Props): React.ReactElement | null {
   const dispatch = useAppDispatch()
   const { decimals } = poolUnderlyingToken
   const { account, provider } = useWeb3React()
   const { redeemShares } = useAppSelector(selectWidgetState)
-  const redemptionActionInfo = RedemptionActionInfo[redemptionType]
   const trancheVaultContract = useTrancheVaultContractV2(
     poolInfo.poolName,
-    redemptionActionInfo.tranche,
+    trancheInfo.tranche,
     provider,
     account,
   )
   const redeemSharesBN = ethers.utils.parseUnits(String(redeemShares), decimals)
-  const method =
-    redemptionActionInfo.action === 'Create'
-      ? 'addRedemptionRequest'
-      : 'cancelRedemptionRequest'
 
   const handleSuccess = useCallback(() => {
     dispatch(setStep(WIDGET_STEP.Done))
   }, [dispatch])
 
-  if (!trancheVaultContract || !account) {
+  if (!trancheVaultContract) {
     return null
   }
 
   return (
     <TxSendModalV2
       contract={trancheVaultContract}
-      method={method}
+      method='addRedemptionRequest'
       params={[redeemSharesBN]}
       handleSuccess={handleSuccess}
     />

package/src/components/Lend/addRedemptionV2/4-Done.tsx

@@ -0,0 +1,20 @@
+import { formatNumber } from '@huma-finance/shared'
+import React from 'react'
+
+import { useAppSelector } from '../../../hooks/useRedux'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { TxDoneModal } from '../../TxDoneModal'
+
+type Props = {
+  handleAction: () => void
+}
+
+export function Done({ handleAction }: Props): React.ReactElement {
+  const { redeemShares } = useAppSelector(selectWidgetState)
+
+  const content = [
+    `${formatNumber(redeemShares)} shares requested for redemption`,
+  ]
+
+  return <TxDoneModal handleAction={handleAction} content={content} />
+}

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

@@ -0,0 +1,172 @@
+import {
+  getTrancheAssetsAndShares,
+  POOL_NAME,
+  TrancheType,
+  usePoolInfoV2,
+  usePoolUnderlyingTokenInfoV2,
+} from '@huma-finance/shared'
+import { useWeb3React } from '@web3-react/core'
+import { BigNumber } from 'ethers'
+import React, { useCallback, useEffect, useState } from 'react'
+import { useDispatch } from 'react-redux'
+
+import { useAppSelector } from '../../../hooks/useRedux'
+import { setStep } from '../../../store/widgets.reducers'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { ErrorModal } from '../../ErrorModal'
+import { WidgetWrapper } from '../../WidgetWrapper'
+import { ChooseTranche } from './1-ChooseTranche'
+import { ChooseAmount } from './2-ChooseAmount'
+import { Transfer } from './3-Transfer'
+import { Done } from './4-Done'
+
+export type TrancheInfo = {
+  tranche: TrancheType
+  assets: BigNumber
+  shares: BigNumber
+}
+
+/**
+ * Lend pool add redemption props
+ * @typedef {Object} AddRedemptionPropsV2
+ * @property {POOL_NAME} poolName The name of the pool.
+ * @property {function():void} handleClose Function to notify to close the widget modal when user clicks the 'x' close button.
+ * @property {function((number|undefined)):void|undefined} handleSuccess Optional function to notify that the lending pool withdraw action is successful.
+ */
+export type AddRedemptionPropsV2 = {
+  poolName: keyof typeof POOL_NAME
+  handleClose: () => void
+  handleSuccess?: (blockNumber?: number) => void
+}
+
+export function AddRedemptionV2({
+  poolName: poolNameStr,
+  handleClose,
+  handleSuccess,
+}: AddRedemptionPropsV2): React.ReactElement | null {
+  const title = 'Redemption'
+  const dispatch = useDispatch()
+  const { account, chainId, provider } = useWeb3React()
+  const poolName = POOL_NAME[poolNameStr]
+  const poolInfo = usePoolInfoV2(poolName, chainId)
+  const { step, errorMessage, errorReason } = useAppSelector(selectWidgetState)
+  const poolUnderlyingToken = usePoolUnderlyingTokenInfoV2(poolName, provider)
+  const [seniorTrancheInfo, setSeniorTrancheInfo] = useState<TrancheInfo>()
+  const [juniorTrancheInfo, setJuniorTrancheInfo] = useState<TrancheInfo>()
+  const [trancheInfo, setTrancheInfo] = useState<TrancheInfo>()
+  const trancheInfoFetched = seniorTrancheInfo && juniorTrancheInfo
+
+  useEffect(() => {
+    if (account) {
+      getTrancheAssetsAndShares(poolName, 'senior', account, provider).then(
+        (info) => {
+          if (info) {
+            setSeniorTrancheInfo({ ...info, tranche: 'senior' })
+          }
+        },
+      )
+      getTrancheAssetsAndShares(poolName, 'junior', account, provider).then(
+        (info) => {
+          if (info) {
+            setJuniorTrancheInfo({ ...info, tranche: 'junior' })
+          }
+        },
+      )
+    }
+  }, [account, poolName, provider])
+
+  useEffect(() => {
+    if (!step && trancheInfoFetched) {
+      if (juniorTrancheInfo.assets.gt(0) && seniorTrancheInfo.assets.lte(0)) {
+        setTrancheInfo(juniorTrancheInfo)
+        dispatch(setStep(WIDGET_STEP.ChooseAmount))
+        return
+      }
+
+      if (seniorTrancheInfo.assets.gt(0) && juniorTrancheInfo.assets.lte(0)) {
+        setTrancheInfo(seniorTrancheInfo)
+        dispatch(setStep(WIDGET_STEP.ChooseAmount))
+        return
+      }
+
+      if (juniorTrancheInfo.assets.gt(0) && seniorTrancheInfo.assets.gt(0)) {
+        dispatch(setStep(WIDGET_STEP.ChooseTranche))
+      }
+    }
+  }, [dispatch, juniorTrancheInfo, seniorTrancheInfo, step, trancheInfoFetched])
+
+  const handleRedeemSuccess = useCallback(
+    (blockNumber: number) => {
+      if (handleSuccess) {
+        handleSuccess(blockNumber)
+      }
+    },
+    [handleSuccess],
+  )
+
+  const handleChangeTranche = useCallback(
+    (tranche: TrancheType) => {
+      if (tranche === 'senior') {
+        setTrancheInfo(seniorTrancheInfo)
+      } else if (tranche === 'junior') {
+        setTrancheInfo(juniorTrancheInfo)
+      } else {
+        setTrancheInfo(undefined)
+      }
+    },
+    [juniorTrancheInfo, seniorTrancheInfo],
+  )
+
+  if (!poolInfo || !poolUnderlyingToken || !trancheInfoFetched) {
+    return (
+      <WidgetWrapper
+        isOpen
+        isLoading
+        loadingTitle={title}
+        handleClose={handleClose}
+        handleSuccess={handleSuccess}
+      />
+    )
+  }
+
+  return (
+    <WidgetWrapper
+      isOpen
+      loadingTitle={title}
+      handleClose={handleClose}
+      handleSuccess={handleRedeemSuccess}
+    >
+      {step === WIDGET_STEP.ChooseTranche && (
+        <ChooseTranche
+          selectedTranche={trancheInfo?.tranche}
+          changeTranche={handleChangeTranche}
+        />
+      )}
+      {step === WIDGET_STEP.ChooseAmount && trancheInfo && (
+        <ChooseAmount
+          poolUnderlyingToken={poolUnderlyingToken}
+          trancheInfo={trancheInfo}
+        />
+      )}
+      {step === WIDGET_STEP.Transfer && trancheInfo && (
+        <Transfer
+          poolInfo={poolInfo}
+          poolUnderlyingToken={poolUnderlyingToken}
+          trancheInfo={trancheInfo}
+        />
+      )}
+      {step === WIDGET_STEP.Done && trancheInfo && (
+        <Done handleAction={handleClose} />
+      )}
+      {step === WIDGET_STEP.Error && (
+        <ErrorModal
+          title={title}
+          errorReason={errorReason}
+          errorMessage={errorMessage}
+          handleOk={handleClose}
+        />
+      )}
+    </WidgetWrapper>
+  )
+}

package/src/components/Lend/cancelRedemptionV2 /1-Transfer.tsx

@@ -0,0 +1,51 @@
+import {
+  PoolInfoV2,
+  TrancheType,
+  useTrancheVaultContractV2,
+} from '@huma-finance/shared'
+import { useWeb3React } from '@web3-react/core'
+import React, { useCallback } from 'react'
+
+import { RedemptionInfo } from '.'
+import { useAppDispatch } from '../../../hooks/useRedux'
+import { setStep } from '../../../store/widgets.reducers'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { TxSendModalV2 } from '../../TxSendModalV2'
+
+type Props = {
+  poolInfo: PoolInfoV2
+  trancheType: TrancheType
+  redemptionInfo: RedemptionInfo
+}
+
+export function Transfer({
+  poolInfo,
+  trancheType,
+  redemptionInfo,
+}: Props): React.ReactElement | null {
+  const dispatch = useAppDispatch()
+  const { account, provider } = useWeb3React()
+  const trancheVaultContract = useTrancheVaultContractV2(
+    poolInfo.poolName,
+    trancheType,
+    provider,
+    account,
+  )
+
+  const handleSuccess = useCallback(() => {
+    dispatch(setStep(WIDGET_STEP.Done))
+  }, [dispatch])
+
+  if (!trancheVaultContract) {
+    return null
+  }
+
+  return (
+    <TxSendModalV2
+      contract={trancheVaultContract}
+      method='cancelRedemptionRequest'
+      params={[redemptionInfo.shares]}
+      handleSuccess={handleSuccess}
+    />
+  )
+}

package/src/components/Lend/cancelRedemptionV2 /2-Done.tsx

@@ -0,0 +1,29 @@
+import { UnderlyingTokenInfo } from '@huma-finance/shared'
+import { ethers } from 'ethers'
+import React from 'react'
+
+import { RedemptionInfo } from '.'
+import { TxDoneModal } from '../../TxDoneModal'
+
+type Props = {
+  poolUnderlyingToken: UnderlyingTokenInfo
+  redemptionInfo: RedemptionInfo
+  handleAction: () => void
+}
+
+export function Done({
+  poolUnderlyingToken,
+  redemptionInfo,
+  handleAction,
+}: Props): React.ReactElement {
+  const shares = ethers.utils.formatUnits(
+    redemptionInfo.shares,
+    poolUnderlyingToken.decimals,
+  )
+
+  const content = [
+    `You successfully canceled ${shares} shares redemption request.`,
+  ]
+
+  return <TxDoneModal handleAction={handleAction} content={content} />
+}

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

@@ -0,0 +1,120 @@
+import {
+  POOL_NAME,
+  TrancheType,
+  useCancellableRedemptionInfoV2,
+  usePoolInfoV2,
+  usePoolUnderlyingTokenInfoV2,
+} from '@huma-finance/shared'
+import { useWeb3React } from '@web3-react/core'
+import { BigNumber } from 'ethers'
+import React, { useCallback, useEffect } from 'react'
+import { useDispatch } from 'react-redux'
+
+import { useAppSelector } from '../../../hooks/useRedux'
+import { setStep } from '../../../store/widgets.reducers'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { ErrorModal } from '../../ErrorModal'
+import { WidgetWrapper } from '../../WidgetWrapper'
+import { Transfer } from './1-Transfer'
+import { Done } from './2-Done'
+
+export type RedemptionInfo = {
+  shares: BigNumber
+  amount: BigNumber
+}
+
+/**
+ * Lend pool cancel redemption request props
+ * @typedef {Object} CancelRedemptionPropsV2
+ * @property {POOL_NAME} poolName The name of the pool.
+ * @property {TrancheType} trancheType The type of the tranche.
+ * @property {function():void} handleClose Function to notify to close the widget modal when user clicks the 'x' close button.
+ * @property {function((number|undefined)):void|undefined} handleSuccess Optional function to notify that the lending pool withdraw action is successful.
+ */
+export type CancelRedemptionPropsV2 = {
+  poolName: keyof typeof POOL_NAME
+  trancheType: TrancheType
+  handleClose: () => void
+  handleSuccess?: (blockNumber?: number) => void
+}
+
+export function CancelRedemptionV2({
+  poolName: poolNameStr,
+  trancheType,
+  handleClose,
+  handleSuccess,
+}: CancelRedemptionPropsV2): React.ReactElement | null {
+  const title = 'Cancel redemption'
+  const dispatch = useDispatch()
+  const { account, chainId, provider } = useWeb3React()
+  const poolName = POOL_NAME[poolNameStr]
+  const poolInfo = usePoolInfoV2(poolName, chainId)
+  const { step, errorMessage, errorReason } = useAppSelector(selectWidgetState)
+  const poolUnderlyingToken = usePoolUnderlyingTokenInfoV2(poolName, provider)
+  const [redemptionInfo] = useCancellableRedemptionInfoV2(
+    poolName,
+    trancheType,
+    account,
+    provider,
+  )
+
+  useEffect(() => {
+    if (!step) {
+      dispatch(setStep(WIDGET_STEP.Transfer))
+    }
+  }, [dispatch, step])
+
+  const handleRedeemSuccess = useCallback(
+    (blockNumber: number) => {
+      if (handleSuccess) {
+        handleSuccess(blockNumber)
+      }
+    },
+    [handleSuccess],
+  )
+
+  if (!poolInfo || !poolUnderlyingToken || !redemptionInfo) {
+    return (
+      <WidgetWrapper
+        isOpen
+        isLoading
+        loadingTitle={title}
+        handleClose={handleClose}
+        handleSuccess={handleSuccess}
+      />
+    )
+  }
+
+  return (
+    <WidgetWrapper
+      isOpen
+      loadingTitle={title}
+      handleClose={handleClose}
+      handleSuccess={handleRedeemSuccess}
+    >
+      {step === WIDGET_STEP.Transfer && (
+        <Transfer
+          poolInfo={poolInfo}
+          trancheType={trancheType}
+          redemptionInfo={redemptionInfo}
+        />
+      )}
+      {step === WIDGET_STEP.Done && (
+        <Done
+          poolUnderlyingToken={poolUnderlyingToken}
+          handleAction={handleClose}
+          redemptionInfo={redemptionInfo}
+        />
+      )}
+      {step === WIDGET_STEP.Error && (
+        <ErrorModal
+          title={title}
+          errorReason={errorReason}
+          errorMessage={errorMessage}
+          handleOk={handleClose}
+        />
+      )}
+    </WidgetWrapper>
+  )
+}