fix: skip health score calc for non-collateral assets

Author: onghwan

packages/core-mobile/app/new/features/defiMarket/components/deposit/AaveAvaxSelectAmountForm.tsx

@@ -45,10 +45,13 @@ export const AaveAvaxSelectAmountForm = ({
   })
 
   const { data: borrowData } = useAaveBorrowData(WAVAX_ADDRESS as Address)
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useAaveHealthScore({
     borrowData,
     tokenDecimals: asset.token.decimals,
-    direction: 'deposit'
+    direction: 'deposit',
+    isUsedAsCollateral
   })
 
   const validateAmount = useCallback(

packages/core-mobile/app/new/features/defiMarket/components/deposit/AaveErc20SelectAmountForm.tsx

@@ -59,10 +59,13 @@ export const AaveErc20SelectAmountForm = ({
 
   const underlyingAssetAddress = market.asset.contractAddress as Address
   const { data: borrowData } = useAaveBorrowData(underlyingAssetAddress)
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useAaveHealthScore({
     borrowData,
     tokenDecimals: market.asset.decimals,
-    direction: 'deposit'
+    direction: 'deposit',
+    isUsedAsCollateral
   })
 
   const validateAmount = useCallback(

packages/core-mobile/app/new/features/defiMarket/components/deposit/BenqiAvaxSelectAmountForm.tsx

@@ -46,9 +46,12 @@ export const BenqiAvaxSelectAmountForm = ({
   const { data: borrowData } = useBenqiBorrowData(
     market.asset.mintTokenAddress as Address
   )
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useBenqiHealthScore({
     borrowData,
-    direction: 'deposit'
+    direction: 'deposit',
+    isUsedAsCollateral
   })
 
   const validateAmount = useCallback(

packages/core-mobile/app/new/features/defiMarket/components/deposit/BenqiErc20SelectAmountForm.tsx

@@ -56,9 +56,12 @@ export const BenqiErc20SelectAmountForm = ({
   const { data: borrowData } = useBenqiBorrowData(
     market.asset.mintTokenAddress as Address
   )
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useBenqiHealthScore({
     borrowData,
-    direction: 'deposit'
+    direction: 'deposit',
+    isUsedAsCollateral
   })
 
   const validateAmount = useCallback(

packages/core-mobile/app/new/features/defiMarket/components/withdraw/AaveSelectAmountForm.tsx

@@ -83,23 +83,28 @@ export const WithdrawAaveSelectAmountForm = ({
   const underlyingAssetAddress = (market.asset.contractAddress ??
     WAVAX_ADDRESS) as Address
   const { data: borrowData } = useAaveBorrowData(underlyingAssetAddress)
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useAaveHealthScore({
     borrowData,
     tokenDecimals: market.asset.decimals,
-    direction: 'withdraw'
+    direction: 'withdraw',
+    isUsedAsCollateral
   })
 
   const { blockingError: zeroLtvError } = useAaveZeroLtvCollateral()
   const hasDebt = borrowData !== undefined && borrowData.totalDebtUSD > 0n
   const blockingError = hasDebt ? zeroLtvError : undefined
 
-  // Max safe withdraw: keep health factor >= 1.01 (liquidation threshold-based)
+  // Max safe withdraw: keep health factor >= 1.02 (liquidation threshold-based)
+  // Only applies when this asset is used as collateral and user has debt
   const maxWithdrawAmount = useMemo(() => {
     if (
       !borrowData ||
       borrowData.totalDebtUSD === 0n ||
       !borrowData.tokenPriceUSD ||
-      !borrowData.liquidationThreshold
+      !borrowData.liquidationThreshold ||
+      !isUsedAsCollateral
     ) {
       return tokenBalance
     }
@@ -123,7 +128,7 @@ export const WithdrawAaveSelectAmountForm = ({
       market.asset.symbol
     )
     return maxUnit.lt(tokenBalance) ? maxUnit : tokenBalance
-  }, [borrowData, tokenBalance, market.asset])
+  }, [borrowData, tokenBalance, market.asset, isUsedAsCollateral])
 
   const validateAmount = useCallback(
     async (amt: TokenUnit) => {

packages/core-mobile/app/new/features/defiMarket/components/withdraw/BenqiSelectAmountForm.tsx

@@ -40,19 +40,23 @@ export const WithdrawBenqiSelectAmountForm = ({
   const { data: borrowData } = useBenqiBorrowData(
     market.asset.mintTokenAddress as Address
   )
+  const isUsedAsCollateral = market.usageAsCollateralEnabledOnUser === true
+
   const { currentHealthScore, calculateHealthScore } = useBenqiHealthScore({
     borrowData,
-    direction: 'withdraw'
+    direction: 'withdraw',
+    isUsedAsCollateral
   })
 
   // Max safe withdraw: keep health factor at same level as borrow max
-  // maxWithdrawUSD = liquidity * 10^WAD / collateralFactor
+  // Only applies when this asset is used as collateral and user has debt
   const maxWithdrawAmount = useMemo(() => {
     if (
       !borrowData ||
       borrowData.totalDebtUSD === 0n ||
       !borrowData.tokenPriceUSD ||
-      !borrowData.collateralFactor
+      !borrowData.collateralFactor ||
+      !isUsedAsCollateral
     ) {
       return tokenBalance
     }
@@ -73,7 +77,7 @@ export const WithdrawBenqiSelectAmountForm = ({
       market.asset.symbol
     )
     return maxUnit.lt(tokenBalance) ? maxUnit : tokenBalance
-  }, [borrowData, tokenBalance, market.asset])
+  }, [borrowData, tokenBalance, market.asset, isUsedAsCollateral])
 
   const validateAmount = useCallback(
     async (amt: TokenUnit) => {

packages/core-mobile/app/new/features/defiMarket/hooks/aave/useAaveHealthScore.ts

@@ -7,11 +7,13 @@ import { AaveBorrowData } from '../../types'
 export function useAaveHealthScore({
   borrowData,
   tokenDecimals,
-  direction
+  direction,
+  isUsedAsCollateral = true
 }: {
   borrowData: AaveBorrowData | undefined
   tokenDecimals: number
   direction: 'deposit' | 'withdraw'
+  isUsedAsCollateral?: boolean
 }): {
   currentHealthScore: number | undefined
   calculateHealthScore: (amount: TokenUnit) => number | undefined
@@ -24,6 +26,8 @@ export function useAaveHealthScore({
   const calculateHealthScore = useCallback(
     (amount: TokenUnit): number | undefined => {
       if (!borrowData) return undefined
+      if (!isUsedAsCollateral) return currentHealthScore
+
       const {
         totalCollateralUSD,
         totalDebtUSD,
@@ -47,7 +51,13 @@ export function useAaveHealthScore({
         (totalDebtUSD * 10000n)
       return Number(formatUnits(newHealthFactor, WAD))
     },
-    [borrowData, tokenDecimals, direction]
+    [
+      borrowData,
+      tokenDecimals,
+      direction,
+      isUsedAsCollateral,
+      currentHealthScore
+    ]
   )
 
   return { currentHealthScore, calculateHealthScore }

packages/core-mobile/app/new/features/defiMarket/hooks/benqi/useBenqiHealthScore.ts

@@ -6,10 +6,12 @@ import { BenqiBorrowData } from '../../types'
 
 export function useBenqiHealthScore({
   borrowData,
-  direction
+  direction,
+  isUsedAsCollateral = true
 }: {
   borrowData: BenqiBorrowData | undefined
   direction: 'deposit' | 'withdraw'
+  isUsedAsCollateral?: boolean
 }): {
   currentHealthScore: number | undefined
   calculateHealthScore: (amount: TokenUnit) => number | undefined
@@ -25,6 +27,8 @@ export function useBenqiHealthScore({
   const calculateHealthScore = useCallback(
     (amount: TokenUnit): number | undefined => {
       if (!borrowData) return undefined
+      if (!isUsedAsCollateral) return currentHealthScore
+
       const { liquidity, totalDebtUSD, tokenPriceUSD, collateralFactor } =
         borrowData
       if (totalDebtUSD === 0n) return Infinity
@@ -41,7 +45,7 @@ export function useBenqiHealthScore({
         ((newLiquidity + totalDebtUSD) * WAD_SCALE) / totalDebtUSD
       return Number(formatUnits(newHealth, WAD))
     },
-    [borrowData, direction]
+    [borrowData, direction, isUsedAsCollateral, currentHealthScore]
   )
 
   return { currentHealthScore, calculateHealthScore }