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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.48-beta.297+48b8509",
+  "version": "0.0.48-beta.299+e4d1a9c",
   "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.297+48b8509",
-    "@huma-finance/shared": "^0.0.48-beta.297+48b8509",
+    "@huma-finance/sdk": "^0.0.48-beta.299+e4d1a9c",
+    "@huma-finance/shared": "^0.0.47",
     "@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": "48b8509c9aa8f1d267f77ab0982400b136e027d4"
+  "gitHead": "e4d1a9c194f7e439f6b11cfa2750abca11af8e33"
 }

package/src/components/CreditLine/borrowV2/3-Transfer.tsx

@@ -43,7 +43,7 @@ export function Transfer({ poolInfo }: Props): React.ReactElement {
       title='Borrow'
       contract={creditContract}
       method='drawdown'
-      params={[account, borrowAmountBN]}
+      params={[borrowAmountBN]}
       handleSuccess={handleSuccess}
     />
   )

package/src/components/InputAmountModal.tsx

@@ -14,6 +14,7 @@ type Props = {
   currentAmount: number | string
   maxAmount: number | string
   maxAmountText?: string
+  maxAmountTitle?: string
   info?: string
   handleChangeAmount: (amount: number) => void
   handleAction: () => void
@@ -28,6 +29,7 @@ export function InputAmountModal({
   currentAmount,
   maxAmount,
   maxAmountText = 'MAX',
+  maxAmountTitle,
   info,
   handleChangeAmount,
   handleAction,
@@ -53,23 +55,39 @@ export function InputAmountModal({
         line-height: 133.4%;
       }
     `,
+    maxWrapper: css`
+      position: relative;
+      display: flex;
+      justify-content: flex-end;
+    `,
+    maxTitle: css`
+      position: absolute;
+      color: ${theme.palette.text.primary};
+      font-family: 'Uni-Neue-Regular';
+      font-size: 12px;
+      line-height: 166%;
+      letter-spacing: 0.4px;
+      top: ${theme.spacing(-3)};
+      width: 200px;
+      text-align: right;
+    `,
     max: css`
       display: flex;
       min-width: fit-content;
       justify-content: center;
       align-items: center;
       border-radius: 32px;
-      background: var(--Purple-3, #f7f1ff);
+      background: #f7f1ff;
       padding: 4px 10px;
       gap: 8px;
-      color: var(--Purple-1, #b246ff);
+      color: #b246ff;
       font-family: 'Uni-Neue-Bold';
       font-size: 13px;
       line-height: 22px;
       letter-spacing: 0.46px;
     `,
     info: css`
-      color: var(--Black-5, #6b6572);
+      color: ${theme.palette.text.primary};
       font-family: 'Uni-Neue-Bold';
       font-size: 20px;
       line-height: 160%;
@@ -107,7 +125,14 @@ export function InputAmountModal({
             placeholder={`0${suffix}`}
             variant='standard'
             InputProps={{
-              endAdornment: (
+              endAdornment: maxAmountTitle ? (
+                <Box css={styles.maxWrapper}>
+                  <Box css={styles.maxTitle}>{maxAmountTitle}</Box>
+                  <Button css={styles.max} onClick={setMaxAmount}>
+                    {maxAmountText}
+                  </Button>
+                </Box>
+              ) : (
                 <Button css={styles.max} onClick={setMaxAmount}>
                   {maxAmountText}
                 </Button>

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

@@ -53,6 +53,7 @@ export function ChooseAmount({
       handleChangeAmount={handleChangeShares}
       maxAmount={maxSharesFormatted}
       info={`${String(formatNumber(currentAmount))} ${symbol}`}
+      maxAmountTitle={`${formatNumber(maxSharesFormatted)} Shares`}
       suffix='Shares'
       handleAction={handleAction}
       actionText='REQUEST'

package/src/components/Lend/supplyV2/5-Transfer.tsx

@@ -52,7 +52,7 @@ export function Transfer({
     <TxSendModalV2
       contract={trancheVaultContract}
       method='deposit'
-      params={[supplyBigNumber, account]}
+      params={[supplyBigNumber]}
       handleSuccess={handleSuccess}
     />
   )

package/src/components/Lend/withdrawV2/1-ConfirmTransfer.tsx

@@ -21,6 +21,7 @@ type Props = {
   tranche: TrancheType
   poolUnderlyingToken: UnderlyingTokenInfo
   redemptionStatus: TrancheRedemptionStatus
+  poolIsClosed: boolean
 }
 
 export function ConfirmTransfer({
@@ -28,6 +29,7 @@ export function ConfirmTransfer({
   tranche,
   poolUnderlyingToken,
   redemptionStatus,
+  poolIsClosed,
 }: Props): React.ReactElement {
   const theme = useTheme()
   const dispatch = useDispatch()
@@ -105,10 +107,12 @@ export function ConfirmTransfer({
       subTitle='Withdraw all the available amount'
     >
       <Box css={styles.itemWrapper}>
-        <Box css={styles.item}>
-          <Box>Shares processed</Box>
-          <Box css={styles.itemValue}>{sharesProcessed}</Box>
-        </Box>
+        {!poolIsClosed && (
+          <Box css={styles.item}>
+            <Box>Shares processed</Box>
+            <Box css={styles.itemValue}>{sharesProcessed}</Box>
+          </Box>
+        )}
         <Box css={styles.item}>
           <Box>Price Per Share</Box>
           <Box css={styles.itemValue}>

package/src/components/Lend/withdrawV2/2-Transfer.tsx

@@ -14,11 +14,13 @@ import { TxSendModalV2 } from '../../TxSendModalV2'
 type Props = {
   poolInfo: PoolInfoV2
   tranche: TrancheType
+  poolIsClosed: boolean
 }
 
 export function Transfer({
   poolInfo,
   tranche,
+  poolIsClosed,
 }: Props): React.ReactElement | null {
   const dispatch = useAppDispatch()
   const { account, provider } = useWeb3React()
@@ -40,7 +42,7 @@ export function Transfer({
   return (
     <TxSendModalV2
       contract={trancheVaultContract}
-      method='disburse'
+      method={poolIsClosed ? 'withdrawAfterPoolClosure' : 'disburse'}
       params={[]}
       handleSuccess={handleSuccess}
     />

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

@@ -1,4 +1,5 @@
 import {
+  getPoolContractV2,
   getTrancheRedemptionStatusV2,
   POOL_NAME,
   TrancheRedemptionStatus,
@@ -7,7 +8,7 @@ import {
   usePoolUnderlyingTokenInfoV2,
 } from '@huma-finance/shared'
 import { useWeb3React } from '@web3-react/core'
-import React, { useCallback, useEffect } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 
 import { useAppSelector } from '../../../hooks/useRedux'
@@ -54,6 +55,24 @@ export function LendWithdrawV2({
   const [redemptionStatus, setRedemptionStatus] = React.useState<
     TrancheRedemptionStatus | undefined
   >()
+  const [poolIsClosed, setPoolIsClosed] = useState<boolean | undefined>(
+    undefined,
+  )
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (account && provider) {
+        const result = await getTrancheRedemptionStatusV2(
+          poolName,
+          trancheType,
+          account,
+          provider,
+        )
+        setRedemptionStatus(result)
+      }
+    }
+    fetchData()
+  }, [account, poolName, provider, trancheType])
 
   useEffect(() => {
     const fetchData = async () => {
@@ -70,6 +89,19 @@ export function LendWithdrawV2({
     fetchData()
   }, [account, poolName, provider, trancheType])
 
+  useEffect(() => {
+    const fetchData = async () => {
+      if (account && provider) {
+        const poolContract = await getPoolContractV2(poolName, provider)
+        if (poolContract) {
+          const poolIsClosed = await poolContract.isPoolClosed()
+          setPoolIsClosed(poolIsClosed)
+        }
+      }
+    }
+    fetchData()
+  }, [account, poolName, provider])
+
   useEffect(() => {
     if (!step) {
       dispatch(setStep(WIDGET_STEP.ConfirmTransfer))
@@ -85,7 +117,12 @@ export function LendWithdrawV2({
     [handleSuccess],
   )
 
-  if (!poolInfo || !poolUnderlyingToken || !redemptionStatus) {
+  if (
+    !poolInfo ||
+    !poolUnderlyingToken ||
+    !redemptionStatus ||
+    poolIsClosed === undefined
+  ) {
     return (
       <WidgetWrapper
         isOpen
@@ -110,10 +147,15 @@ export function LendWithdrawV2({
           tranche={trancheType}
           redemptionStatus={redemptionStatus}
           poolUnderlyingToken={poolUnderlyingToken}
+          poolIsClosed={poolIsClosed}
         />
       )}
       {step === WIDGET_STEP.Transfer && (
-        <Transfer poolInfo={poolInfo} tranche={trancheType} />
+        <Transfer
+          poolInfo={poolInfo}
+          tranche={trancheType}
+          poolIsClosed={poolIsClosed}
+        />
       )}
       {step === WIDGET_STEP.Done && (
         <Done