Merge pull request #81 from 00labs/withdraw-lp-check

Take min of pool balance or lender position for withdraw
00labs · Nov 13, 2023 · fa13511 · fa13511
2 parents 0a076b2 + be89942
commit fa13511
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/packages/huma-widget/src/components/Lend/withdraw/2-ChooseAmount.tsx b/packages/huma-widget/src/components/Lend/withdraw/2-ChooseAmount.tsx
@@ -9,18 +9,24 @@ import { ChooseAmountModal } from '../../ChooseAmountModal'
 
 type Props = {
   lenderPosition: BigNumber
+  poolBalance: BigNumber
   poolInfo: PoolInfoType
 }
 
 export function ChooseAmount({
   lenderPosition,
+  poolBalance,
   poolInfo,
 }: Props): React.ReactElement | null {
   const dispatch = useAppDispatch()
   const { poolUnderlyingToken } = poolInfo
   const { symbol, decimals } = poolUnderlyingToken
   const [currentAmount, setCurrentAmount] = useState(0)
-  const withdrawableAmount = downScale<number>(lenderPosition, decimals)
+  // Take the minimum of the pool balance or the lender position
+  const withdrawableAmountBN = lenderPosition.lt(poolBalance)
+    ? lenderPosition
+    : poolBalance
+  const withdrawableAmount = downScale<number>(withdrawableAmountBN, decimals)
 
   const handleChangeAmount = useCallback(
     (newAmount: number) => {

diff --git a/packages/huma-widget/src/components/Lend/withdraw/index.tsx b/packages/huma-widget/src/components/Lend/withdraw/index.tsx
@@ -3,6 +3,7 @@ import {
   POOL_NAME,
   POOL_TYPE,
   useLenderPosition,
+  usePoolBalance,
   usePoolInfo,
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect } from 'react'
@@ -51,21 +52,23 @@ export function LendWithdraw({
     poolType,
     account,
   )
+  const [poolBalance, refreshPoolBalance] = usePoolBalance(poolName, poolType)
 
   useEffect(() => {
-    if (!step && lenderPosition) {
+    if (!step && lenderPosition && poolBalance) {
       dispatch(setStep(WIDGET_STEP.CheckWithdrawable))
     }
-  }, [dispatch, lenderPosition, step])
+  }, [dispatch, lenderPosition, poolBalance, step])
 
   const handleWithdrawSuccess = useCallback(
     (blockNumber: number) => {
       refreshLenderPosition()
+      refreshPoolBalance()
       if (handleSuccess) {
         handleSuccess(blockNumber)
       }
     },
-    [handleSuccess, refreshLenderPosition],
+    [handleSuccess, refreshLenderPosition, refreshPoolBalance],
   )
 
   if (!poolInfo) {
@@ -82,7 +85,11 @@ export function LendWithdraw({
         <CheckWithdrawable poolInfo={poolInfo} handleClose={handleClose} />
       )}
       {step === WIDGET_STEP.ChooseAmount && (
-        <ChooseAmount poolInfo={poolInfo} lenderPosition={lenderPosition!} />
+        <ChooseAmount
+          poolInfo={poolInfo}
+          lenderPosition={lenderPosition!}
+          poolBalance={poolBalance!}
+        />
       )}
       {step === WIDGET_STEP.Transfer && <Transfer poolInfo={poolInfo} />}
       {step === WIDGET_STEP.Done && (