From 7c99fe59555a4ee0594193830f3200965dd7182d Mon Sep 17 00:00:00 2001
From: mstfash <m.ashraf.hegab@gmail.com>
Date: Sat, 5 Mar 2022 00:10:46 +0200
Subject: [PATCH 1/2] fix residual amount

---
 src/containers/Auctions/AuctionsList.tsx |  6 ++----
 src/hooks/useSafe.ts                     | 17 -----------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/containers/Auctions/AuctionsList.tsx b/src/containers/Auctions/AuctionsList.tsx
index 93562af9..1e52fcd1 100644
--- a/src/containers/Auctions/AuctionsList.tsx
+++ b/src/containers/Auctions/AuctionsList.tsx
@@ -63,16 +63,14 @@ const AuctionsList = ({ type }: Props) => {
                     {account &&
                     auctions &&
                     auctions.length &&
-                    (Number(internalBalance) > 0 ||
-                        Number(protInternalBalance) > 0) ? (
+                    (Number(internalBalance) >= 0.0001 ||
+                        Number(protInternalBalance) >= 0.0001) ? (
                         <Button
                             text={t('claim_tokens')}
                             onClick={() => handleClick('claim_tokens')}
                         />
                     ) : null}
                 </Box>
-
-                <span>{`Status`}</span>
             </InfoBox>
             {auctions && auctions.length > 0 ? (
                 <>
diff --git a/src/hooks/useSafe.ts b/src/hooks/useSafe.ts
index f3006cac..d3b3633a 100644
--- a/src/hooks/useSafe.ts
+++ b/src/hooks/useSafe.ts
@@ -9,7 +9,6 @@ import {
     getLiquidationPrice,
     getRatePercentage,
     returnAvaiableDebt,
-    returnPercentAmount,
     returnTotalDebt,
     returnTotalValue,
     safeIsSafe,
@@ -262,22 +261,6 @@ export function useSafeInfo(type: SafeTypes = 'create') {
             error = error ?? `RAI to repay cannot exceed owed amount`
         }
 
-        if (!rightInputBN.isZero()) {
-            const repayPercent = returnPercentAmount(
-                rightInput,
-                availableRai as string
-            )
-
-            if (
-                rightInputBN.lt(BigNumber.from(availableRaiBN)) &&
-                repayPercent > 95
-            ) {
-                error =
-                    error ??
-                    `You can only repay a minimum of ${availableRai} RAI to avoid leaving residual values`
-            }
-        }
-
         if (!rightInputBN.isZero() && rightInputBN.gt(raiBalanceBN)) {
             error = error ?? `balance_issue`
         }

From aa32459e87cd1aebe61365c2bbbda44f7f4ed7b2 Mon Sep 17 00:00:00 2001
From: mstfash <m.ashraf.hegab@gmail.com>
Date: Sat, 5 Mar 2022 01:24:01 +0200
Subject: [PATCH 2/2] safe fixes

---
 src/containers/OnBoarding/ModifySafe.tsx | 15 ++++++++++-----
 src/hooks/useSafe.ts                     | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/containers/OnBoarding/ModifySafe.tsx b/src/containers/OnBoarding/ModifySafe.tsx
index ea0977b7..ef46984f 100644
--- a/src/containers/OnBoarding/ModifySafe.tsx
+++ b/src/containers/OnBoarding/ModifySafe.tsx
@@ -1,4 +1,4 @@
-import { ethers } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import React, { useCallback, useMemo, useState } from 'react'
 import styled from 'styled-components'
 import Button from '../../components/Button'
@@ -90,20 +90,25 @@ const ModifySafe = ({
             onLeftInput(availableEth as string)
         }
     }
+
     const onMaxRightInput = () => {
         if (isDeposit) {
             onRightInput(availableRai.toString())
         } else {
             const availableRaiBN = ethers.utils.parseEther(availableRai)
 
-            const raiBalanceBN = ethers.utils.parseEther(
-                balances.rai.toString()
-            )
+            const raiBalanceBN = balances.rai
+                ? ethers.utils.parseEther(balances.rai.toString())
+                : BigNumber.from('0')
 
             const isMore = raiBalanceBN.gt(availableRaiBN)
 
             onRightInput(
-                isMore ? availableRai.toString() : balances.rai.toString()
+                isMore
+                    ? availableRai.toString()
+                    : balances.rai
+                    ? balances.rai.toString()
+                    : '0'
             )
         }
     }
diff --git a/src/hooks/useSafe.ts b/src/hooks/useSafe.ts
index d3b3633a..f3006cac 100644
--- a/src/hooks/useSafe.ts
+++ b/src/hooks/useSafe.ts
@@ -9,6 +9,7 @@ import {
     getLiquidationPrice,
     getRatePercentage,
     returnAvaiableDebt,
+    returnPercentAmount,
     returnTotalDebt,
     returnTotalValue,
     safeIsSafe,
@@ -261,6 +262,22 @@ export function useSafeInfo(type: SafeTypes = 'create') {
             error = error ?? `RAI to repay cannot exceed owed amount`
         }
 
+        if (!rightInputBN.isZero()) {
+            const repayPercent = returnPercentAmount(
+                rightInput,
+                availableRai as string
+            )
+
+            if (
+                rightInputBN.lt(BigNumber.from(availableRaiBN)) &&
+                repayPercent > 95
+            ) {
+                error =
+                    error ??
+                    `You can only repay a minimum of ${availableRai} RAI to avoid leaving residual values`
+            }
+        }
+
         if (!rightInputBN.isZero() && rightInputBN.gt(raiBalanceBN)) {
             error = error ?? `balance_issue`
         }