From 02a1ff3ee3c7b7cede9da386c6465454814a083a Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:32:24 +1000 Subject: [PATCH 1/2] fix: empty loan state for repaid positions --- .../hooks/useAllLendingPositionsData.tsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx b/src/pages/Lending/hooks/useAllLendingPositionsData.tsx index 28a82cebc96..6a57a7d5bac 100644 --- a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx +++ b/src/pages/Lending/hooks/useAllLendingPositionsData.tsx @@ -115,7 +115,23 @@ export const useAllLendingPositionsData = ({ assetId }: UseAllLendingPositionsDa ) const isLoading = useMemo(() => positions.some(position => position.isLoading), [positions]) - const isActive = useMemo(() => positions.some(position => position.data), [positions]) + + const isActive = useMemo(() => { + return positions.some(position => { + const data = position.data + if (!data) return false + const { + collateralBalanceCryptoPrecision, + collateralBalanceFiatUserCurrency, + debtBalanceFiatUserCurrency, + } = data + return ( + (collateralBalanceCryptoPrecision && parseFloat(collateralBalanceCryptoPrecision) > 0) || + (collateralBalanceFiatUserCurrency && parseFloat(collateralBalanceFiatUserCurrency) > 0) || + (debtBalanceFiatUserCurrency && parseFloat(debtBalanceFiatUserCurrency) > 0) + ) + }) + }, [positions]) return { debtValueUserCurrency, From 4de0861b62fface20bf0cdbf22f415cc7c5c296f Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:23:48 +1000 Subject: [PATCH 2/2] chore: simplify expression --- .../Lending/hooks/useAllLendingPositionsData.tsx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx b/src/pages/Lending/hooks/useAllLendingPositionsData.tsx index 6a57a7d5bac..5f481818033 100644 --- a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx +++ b/src/pages/Lending/hooks/useAllLendingPositionsData.tsx @@ -120,16 +120,8 @@ export const useAllLendingPositionsData = ({ assetId }: UseAllLendingPositionsDa return positions.some(position => { const data = position.data if (!data) return false - const { - collateralBalanceCryptoPrecision, - collateralBalanceFiatUserCurrency, - debtBalanceFiatUserCurrency, - } = data - return ( - (collateralBalanceCryptoPrecision && parseFloat(collateralBalanceCryptoPrecision) > 0) || - (collateralBalanceFiatUserCurrency && parseFloat(collateralBalanceFiatUserCurrency) > 0) || - (debtBalanceFiatUserCurrency && parseFloat(debtBalanceFiatUserCurrency) > 0) - ) + const { collateralBalanceCryptoPrecision } = data + return collateralBalanceCryptoPrecision && parseFloat(collateralBalanceCryptoPrecision) > 0 }) }, [positions])