From 15d5e55f3f56715762ad27a15142c834f888a8b3 Mon Sep 17 00:00:00 2001
From: ianwoodard <17186604+IanWoodard@users.noreply.github.com>
Date: Sun, 1 Sep 2024 10:32:46 -0700
Subject: [PATCH 1/2] Fixing undefined includes

---
 earn/src/components/markets/supply/SupplyTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/earn/src/components/markets/supply/SupplyTable.tsx b/earn/src/components/markets/supply/SupplyTable.tsx
index bb4ab15e..6b9a7c53 100644
--- a/earn/src/components/markets/supply/SupplyTable.tsx
+++ b/earn/src/components/markets/supply/SupplyTable.tsx
@@ -315,7 +315,7 @@ export default function SupplyTable(props: SupplyTableProps) {
                       onClick={() => {
                         const hasBadDebt =
                           row.suppliedBalance > row.withdrawableBalance &&
-                          ALOE_II_BAD_DEBT_LENDERS[activeChain.id].includes(row.kitty.address.toLowerCase());
+                          ALOE_II_BAD_DEBT_LENDERS[activeChain.id]?.includes(row.kitty.address.toLowerCase());
                         setSelectedRow({ row, action: hasBadDebt ? 'recover' : 'withdraw' });
                       }}
                       disabled={row.suppliedBalance === 0}

From 74135824a4ab6e1e180e98c34faa87f98e7fbcaf Mon Sep 17 00:00:00 2001
From: ianwoodard <17186604+IanWoodard@users.noreply.github.com>
Date: Sun, 1 Sep 2024 11:38:55 -0700
Subject: [PATCH 2/2] Fixing withdraw modal updates and adding info

---
 .../markets/modal/WithdrawModal.tsx           | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/earn/src/components/markets/modal/WithdrawModal.tsx b/earn/src/components/markets/modal/WithdrawModal.tsx
index f1bdd65b..6888d2ae 100644
--- a/earn/src/components/markets/modal/WithdrawModal.tsx
+++ b/earn/src/components/markets/modal/WithdrawModal.tsx
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 
 import { type WriteContractReturnType } from '@wagmi/core';
 import { lenderAbi } from 'shared/lib/abis/Lender';
+import Info from 'shared/lib/assets/svg/Info';
 import { FilledStylizedButton } from 'shared/lib/components/common/Buttons';
 import Modal from 'shared/lib/components/common/Modal';
 import TokenAmountInput from 'shared/lib/components/common/TokenAmountInput';
@@ -11,6 +12,7 @@ import { GN, GNFormat } from 'shared/lib/data/GoodNumber';
 import { Token } from 'shared/lib/data/Token';
 import useChain from 'shared/lib/hooks/UseChain';
 import { formatNumberInput } from 'shared/lib/util/Numbers';
+import styled from 'styled-components';
 import { Address } from 'viem';
 import { useReadContract } from 'wagmi';
 
@@ -59,6 +61,12 @@ function getConfirmButton(state: ConfirmButtonState, token: Token): { text: stri
   }
 }
 
+const InfoWrapper = styled.div`
+  path {
+    stroke: #647d93;
+  }
+`;
+
 export type WithdrawModalProps = {
   isOpen: boolean;
   selectedRow: SupplyTableRow;
@@ -79,8 +87,6 @@ export default function WithdrawModal(props: WithdrawModalProps) {
     args: [userAddress],
     query: {
       enabled: isOpen,
-      refetchInterval: 3_000,
-      refetchIntervalInBackground: false,
     },
   });
 
@@ -96,11 +102,9 @@ export default function WithdrawModal(props: WithdrawModalProps) {
   } = useRedeem(activeChain.id, selectedRow.kitty.address, inputValue[1] ? GN.Q(112) : withdrawAmount, userAddress);
 
   const maxAmountGN = GN.fromBigInt(maxAmount, selectedRow.asset.decimals);
+  const withdrawablePercentage = userBalance.isZero() ? 0 : maxAmountGN.div(userBalance).recklessMul(100).toNumber();
   const isConstrainedByUtilization =
-    inputValue[1] &&
-    userBalance.isGtZero() &&
-    maxAmountGN.isGtZero() &&
-    maxAmountGN.recklessMul(100).div(userBalance).toNumber() < 99;
+    inputValue[1] && userBalance.isGtZero() && maxAmountGN.isGtZero() && withdrawablePercentage < 99;
 
   useEffect(() => {
     if (txn === undefined) return;
@@ -130,9 +134,23 @@ export default function WithdrawModal(props: WithdrawModalProps) {
     GNFormat.DECIMAL
   );
 
+  // Whether the user is able to withdraw their full balance
+  const isWithdrawingLimited = maxAmountGN.lt(userBalance);
+
   return (
     <Modal isOpen={isOpen} setIsOpen={setIsOpen} title='Withdraw'>
       <div className='w-full flex flex-col gap-4'>
+        {withdrawablePercentage < 99 && isWithdrawingLimited && (
+          <div className='border-2 border-[#647d93] flex items-center p-2 gap-2 rounded-lg bg-grey-75'>
+            <InfoWrapper>
+              <Info width={24} height={24} />
+            </InfoWrapper>
+            <Text size='XS' className='w-full' color='#647d93'>
+              Due to the utilization rate, you can only withdraw {withdrawablePercentage.toFixed(2)}% of your balance.
+              More funds will be available once the utilization rate decreases.
+            </Text>
+          </div>
+        )}
         <TokenAmountInput
           token={selectedRow.asset}
           value={inputValue[0]}