Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions pages/reserve-overview.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import { useRouter } from 'next/router';
import { useEffect, useState } from 'react';
import StyledToggleButton from 'src/components/StyledToggleButton';
import StyledToggleButtonGroup from 'src/components/StyledToggleButtonGroup';
import {
ComputedReserveData,
ReserveWithId,
useAppDataContext,
} from 'src/hooks/app-data-provider/useAppDataProvider';
import { useAppDataContext } from 'src/hooks/app-data-provider/useAppDataProvider';
import { AssetCapsProvider } from 'src/hooks/useAssetCaps';
import { AssetCapsProviderSDK } from 'src/hooks/useAssetCapsSDK';
import { MainLayout } from 'src/layouts/MainLayout';
Expand Down Expand Up @@ -55,12 +51,12 @@ export default function ReserveOverview() {
//With SDK
const reserve = supplyReserves.find((reserve) => {
return reserve.underlyingToken.address.toLowerCase() === underlyingAsset?.toLowerCase();
}) as ReserveWithId;
});

//With Reserves
const reserveLegacy = reserves.find((reserve) => {
return reserve.underlyingAsset.toLowerCase() === underlyingAsset?.toLowerCase();
}) as ComputedReserveData;
});
const [pageEventCalled, setPageEventCalled] = useState(false);

useEffect(() => {
Expand All @@ -76,6 +72,15 @@ export default function ReserveOverview() {

const isOverview = mode === 'overview';

// Don't render reserve configuration until SDK data is loaded
if (!reserve || !reserveLegacy) {
return (
<>
<ReserveTopDetailsWrapper underlyingAsset={underlyingAsset} />
</>
);
}

return (
<AssetCapsProviderSDK asset={reserve}>
<ReserveTopDetailsWrapper underlyingAsset={underlyingAsset} />
Expand Down
2 changes: 1 addition & 1 deletion src/modules/markets/MarketAssetsListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const MarketAssetsListItem = ({ ...reserve }: ReserveWithProtocolIncentiv
{reserve.borrowInfo?.borrowingState === 'DISABLED' &&
!reserve.isFrozen &&
!reserve.eModeInfo?.some((eMode) => eMode.canBeBorrowed) &&
reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
reserve.borrowInfo?.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
</ListColumn>

<ListColumn minWidth={95} maxWidth={95} align="right">
Expand Down
2 changes: 1 addition & 1 deletion src/modules/markets/MarketAssetsListMobileItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export const MarketAssetsListMobileItem = ({ ...reserve }: ReserveWithProtocolIn
{reserve.borrowInfo?.borrowingState === 'DISABLED' &&
!reserve.isFrozen &&
!reserve.eModeInfo?.some((eMode) => eMode.canBeBorrowed) &&
reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
reserve.borrowInfo?.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
</Row>
<Button
variant="outlined"
Expand Down
Loading