Hide APR for non-borrowable assets in Lend Table (#468)

* 🐛Hide APR in lend table for non-borrowable assets

* 🐛Hide APR in lend table for non-borrowable assets

src/components/Earn/Lend/LendingMarketsTable.tsx

@@ -9,6 +9,7 @@ import { ChevronDown, ChevronUp } from 'components/Icons'
 import AssetListTable from 'components/MarketAssetTable'
 import MarketAssetTableRow from 'components/MarketAssetTable/MarketAssetTableRow'
 import MarketDetails from 'components/MarketAssetTable/MarketDetails'
+import Text from 'components/Text'
 import TitleAndSubCell from 'components/TitleAndSubCell'
 import { BN_ZERO } from 'constants/math'
 import { convertLiquidityRateToAPR } from 'utils/formatters'
@@ -82,6 +83,10 @@ export default function LendingMarketsTable(props: Props) {
         accessorKey: 'marketLiquidityRate',
         header: 'APR',
         cell: ({ row }) => {
+          if (!row.original.borrowEnabled) {
+            return <Text>-</Text>
+          }
+
           return (
             <FormattedNumber
               amount={convertLiquidityRateToAPR(row.original.marketLiquidityRate)}

src/hooks/useLendingMarketAssetsTableData.ts

@@ -1,13 +1,13 @@
 import { useMemo } from 'react'
 
-import { BN } from 'utils/helpers'
+import useCurrentAccountLends from 'hooks/useCurrentAccountLends'
-import { byDenom } from 'utils/array'
+import useDepositEnabledMarkets from 'hooks/useDepositEnabledMarkets'
-import { getAssetByDenom } from 'utils/assets'
+import useDisplayCurrencyPrice from 'hooks/useDisplayCurrencyPrice'
 import useMarketDeposits from 'hooks/useMarketDeposits'
 import useMarketLiquidities from 'hooks/useMarketLiquidities'
-import useDisplayCurrencyPrice from 'hooks/useDisplayCurrencyPrice'
+import { byDenom } from 'utils/array'
-import useDepositEnabledMarkets from 'hooks/useDepositEnabledMarkets'
+import { getAssetByDenom } from 'utils/assets'
-import useCurrentAccountLends from 'hooks/useCurrentAccountLends'
+import { BN } from 'utils/helpers'
 
 function useLendingMarketAssetsTableData(): {
   accountLentAssets: LendingMarketTableData[]
@@ -23,31 +23,34 @@ function useLendingMarketAssetsTableData(): {
     const accountLentAssets: LendingMarketTableData[] = [],
       availableAssets: LendingMarketTableData[] = []
 
-    markets.forEach(({ denom, cap, liquidityRate, liquidationThreshold, maxLtv }) => {
+    markets.forEach(
-      const asset = getAssetByDenom(denom) as Asset
+      ({ denom, cap, liquidityRate, liquidationThreshold, maxLtv, borrowEnabled }) => {
-      const marketDepositAmount = BN(marketDeposits.find(byDenom(denom))?.amount ?? 0)
+        const asset = getAssetByDenom(denom) as Asset
-      const marketLiquidityAmount = BN(marketLiquidities.find(byDenom(denom))?.amount ?? 0)
+        const marketDepositAmount = BN(marketDeposits.find(byDenom(denom))?.amount ?? 0)
-      const accountLentAmount = accountLentAmounts.find(byDenom(denom))?.amount
+        const marketLiquidityAmount = BN(marketLiquidities.find(byDenom(denom))?.amount ?? 0)
-      const accountLentValue = accountLentAmount
+        const accountLentAmount = accountLentAmounts.find(byDenom(denom))?.amount
-        ? convertAmount(asset, accountLentAmount)
+        const accountLentValue = accountLentAmount
-        : undefined
+          ? convertAmount(asset, accountLentAmount)
+          : undefined
 
-      const lendingMarketAsset: LendingMarketTableData = {
+        const lendingMarketAsset: LendingMarketTableData = {
-        asset,
+          asset,
-        marketDepositAmount,
+          marketDepositAmount,
-        accountLentValue,
+          accountLentValue,
-        accountLentAmount,
+          accountLentAmount,
-        marketLiquidityAmount,
+          marketLiquidityAmount,
-        marketDepositCap: cap.max,
+          marketDepositCap: cap.max,
-        marketLiquidityRate: liquidityRate,
+          marketLiquidityRate: liquidityRate,
-        marketLiquidationThreshold: liquidationThreshold,
+          marketLiquidationThreshold: liquidationThreshold,
-        marketMaxLtv: maxLtv,
+          marketMaxLtv: maxLtv,
-      }
+          borrowEnabled,
+        }
 
-      ;(lendingMarketAsset.accountLentValue ? accountLentAssets : availableAssets).push(
+        ;(lendingMarketAsset.accountLentValue ? accountLentAssets : availableAssets).push(
-        lendingMarketAsset,
+          lendingMarketAsset,
-      )
+        )
-    })
+      },
+    )
 
     return { accountLentAssets, availableAssets }
   }, [markets, marketDeposits, marketLiquidities, accountLentAmounts, convertAmount])

src/types/interfaces/asset.d.ts

@@ -86,6 +86,7 @@ interface LendingMarketTableData extends MarketTableData {
   marketDepositCap: BigNumber
   accountLentAmount?: string
   accountLentValue?: BigNumber
+  borrowEnabled: boolean
 }
 
 interface MarketTableData {