Merge branch 'refactor/sdk-in-markets' into refactor/reserve-overview-page-sdk

Author: AGMASO

src/modules/markets/MarketAssetsList.tsx

@@ -15,19 +15,19 @@ import { MarketAssetsListMobileItemLoader } from './MarketAssetsListMobileItemLo
 const listHeaders = [
   {
     title: <Trans>Asset</Trans>,
-    sortKey: 'underlyingToken.symbol', // Cambiado de 'symbol'
+    sortKey: 'underlyingToken.symbol',
   },
   {
     title: <Trans>Total supplied</Trans>,
-    sortKey: 'size.usd', // Cambiado de 'totalLiquidityUSD'
+    sortKey: 'size.usd',
   },
   {
     title: <Trans>Supply APY</Trans>,
-    sortKey: 'supplyInfo.apy.value', // Cambiado de 'supplyAPY'
+    sortKey: 'supplyInfo.apy.value',
   },
   {
     title: <Trans>Total borrowed</Trans>,
-    sortKey: 'borrowInfo.total.usd', // Cambiado de 'totalDebtUSD'
+    sortKey: 'borrowInfo.total.usd',
   },
   {
     title: (

src/modules/markets/MarketAssetsListItem.tsx

@@ -130,7 +130,7 @@ export const MarketAssetsListItem = ({ ...reserve }: ReserveWithId) => {
       </ListColumn>
 
       <ListColumn>
-        {reserve.borrowInfo ? (
+        {reserve.borrowInfo && Number(reserve.borrowInfo.total.amount.value) > 0 ? (
           <>
             <FormattedNumber
               compact
@@ -165,9 +165,9 @@ export const MarketAssetsListItem = ({ ...reserve }: ReserveWithId) => {
           market={currentMarket}
           protocolAction={ProtocolAction.borrow}
         />
-        {reserve.borrowInfo?.borrowingState === 'DISABLED' && !reserve.isFrozen && (
-          <ReserveSubheader value={'Disabled'} />
-        )}
+        {reserve.borrowInfo?.borrowingState === 'DISABLED' &&
+          !reserve.isFrozen &&
+          reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
       </ListColumn>
 
       <ListColumn minWidth={95} maxWidth={95} align="right">

src/modules/markets/MarketAssetsListMobileItem.tsx

@@ -117,7 +117,7 @@ export const MarketAssetsListMobileItem = ({ ...reserve }: ReserveWithId) => {
             textAlign: 'center',
           }}
         >
-          {reserve.borrowInfo && Number(reserve.borrowInfo.total.amount.value) > 0 ? (
+          {reserve.borrowInfo && Number(reserve.borrowInfo?.total.amount.value) > 0 ? (
             <>
               <FormattedNumber
                 compact
@@ -163,9 +163,9 @@ export const MarketAssetsListMobileItem = ({ ...reserve }: ReserveWithId) => {
           market={currentMarket}
           protocolAction={ProtocolAction.borrow}
         />
-        {reserve.borrowInfo?.borrowingState === 'DISABLED' && !reserve.isFrozen && (
-          <ReserveSubheader value={'Disabled'} />
-        )}
+        {reserve.borrowInfo?.borrowingState === 'DISABLED' &&
+          !reserve.isFrozen &&
+          reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
       </Row>
       <Button
         variant="outlined"