fix: btc withdraw all issue

burrowHQ · Jan 21, 2025 · 237b942 · 237b942
1 parent 86f8ce5
commit 237b942
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/components/Modal/Action.tsx b/components/Modal/Action.tsx
@@ -31,6 +31,7 @@ export default function Action({
   collateralType,
   poolAsset,
   isDisabled,
+  maxWithdrawAmount,
 }) {
   const [loading, setLoading] = useState(false);
   const { amount, useAsCollateral, isMax } = useAppSelector(getSelectedValues);
@@ -45,6 +46,7 @@ export default function Action({
   const { available, canUseAsCollateral, extraDecimals, collateral, disabled, decimals } =
     getModalData({
       ...asset,
+      maxWithdrawAmount,
       maxBorrowAmount,
       healthFactor,
       amount,
@@ -117,6 +119,7 @@ export default function Action({
           amount,
           isMax,
           isMeme,
+          available,
         });
         break;
       }

diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
@@ -230,6 +230,7 @@ const Modal = () => {
             <Alerts data={alerts} />
             <Action
               maxBorrowAmount={maxBorrowAmount}
+              maxWithdrawAmount={maxWithdrawAmount}
               healthFactor={healthFactor}
               collateralType={selectedCollateralType}
               poolAsset={assets[tokenId]}

diff --git a/store/actions/withdraw.ts b/store/actions/withdraw.ts
@@ -31,9 +31,17 @@ interface Props {
   amount: string;
   isMax: boolean;
   isMeme: boolean;
+  available: number;
 }
 
-export async function withdraw({ tokenId, extraDecimals, amount, isMax, isMeme }: Props) {
+export async function withdraw({
+  tokenId,
+  extraDecimals,
+  amount,
+  isMax,
+  isMeme,
+  available,
+}: Props) {
   const state = store.getState();
   const { oracleContract, logicContract, memeOracleContract, logicMEMEContract, selector } =
     await getBurrow();
@@ -65,9 +73,8 @@ export async function withdraw({ tokenId, extraDecimals, amount, isMax, isMeme }
   const suppliedBalance = new Decimal(account.portfolio?.supplied[tokenId]?.balance || 0);
   const hasBorrow = account.portfolio?.borrows?.length > 0;
   const maxAmount = computeWithdrawMaxAmount(tokenId, assets, account.portfolio!);
-
   const expandedAmount = isMax
-    ? maxAmount
+    ? decimalMin(maxAmount, expandTokenDecimal(available, decimals + extraDecimals))
     : decimalMin(maxAmount, expandTokenDecimal(amount, decimals + extraDecimals));
 
   const transactions: Transaction[] = [];