Skip to content

fix: show available liquidity for e-mode-only borrowable assets #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helpfulBro wants to merge 1 commit into
base: main
Choose a base branch
from
+178 −172
Open

fix: show available liquidity for e-mode-only borrowable assets #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
205 changes: 58 additions & 147 deletions src/modules/reserve-overview/ReserveTopDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
import { ExternalLinkIcon } from '@heroicons/react/outline';
import { Trans } from '@lingui/macro';
import ArrowBackRoundedIcon from '@mui/icons-material/ArrowBackOutlined';
import { Box, Button, Skeleton, SvgIcon, Typography, useMediaQuery, useTheme } from '@mui/material';
import { useRouter } from 'next/router';
import { getMarketInfoById, MarketLogo } from 'src/components/MarketSwitcher';
import { Box, Skeleton, SvgIcon, useMediaQuery, useTheme } from '@mui/material';
import { CircleIcon } from 'src/components/CircleIcon';
import { FormattedNumber } from 'src/components/primitives/FormattedNumber';
import { Link } from 'src/components/primitives/Link';
import { useProtocolDataContext } from 'src/hooks/useProtocolDataContext';
import { useRootStore } from 'src/store/root';
import { assetIsBorrowableOnMarket } from 'src/utils/getMaxAmountAvailableToBorrow';
import { GENERAL } from 'src/utils/events';
import { useShallow } from 'zustand/shallow';

import { TopInfoPanel } from '../../components/TopInfoPanel/TopInfoPanel';
import { TopInfoPanelItem } from '../../components/TopInfoPanel/TopInfoPanelItem';
import {
ComputedReserveData,
useAppDataContext,
} from '../../hooks/app-data-provider/useAppDataProvider';

import CubeIcon from '../../../public/icons/markets/cube-icon.svg';
import PieIcon from '../../../public/icons/markets/pie-icon.svg';
import UptrendIcon from '../../../public/icons/markets/uptrend-icon.svg';
import DollarIcon from '../../../public/icons/markets/dollar-icon.svg';

interface ReserveTopDetailsProps {
underlyingAsset: string;
}

export const ReserveTopDetails = ({ underlyingAsset }: ReserveTopDetailsProps) => {
const router = useRouter();
const { reserves, loading } = useAppDataContext();
const { currentMarket, currentNetworkConfig } = useProtocolDataContext();
const { market, network } = getMarketInfoById(currentMarket);
const [trackEvent, currentNetworkConfig] = useRootStore(
useShallow((store) => [store.trackEvent, store.currentNetworkConfig])
);

const theme = useTheme();
const downToSM = useMediaQuery(theme.breakpoints.down('sm'));
Expand All @@ -40,133 +35,41 @@ export const ReserveTopDetails = ({ underlyingAsset }: ReserveTopDetailsProps) =
const valueTypographyVariant = downToSM ? 'main16' : 'main21';
const symbolsTypographyVariant = downToSM ? 'secondary16' : 'secondary21';

const ReserveIcon = () => {
return (
<Box mr={3} sx={{ mr: 3, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
{loading ? (
<Skeleton variant="circular" width={40} height={40} sx={{ background: '#383D51' }} />
) : (
<img
src={`/icons/tokens/${poolReserve.iconSymbol.toLowerCase()}.svg`}
width="40px"
height="40px"
alt=""
/>
)}
</Box>
);
};

const ReserveName = () => {
return loading ? (
<Skeleton width={60} height={28} sx={{ background: '#383D51' }} />
) : (
<Typography variant={valueTypographyVariant}>{poolReserve.name}</Typography>
);
const iconStyling = {
display: 'inline-flex',
alignItems: 'center',
color: '#A5A8B6',
'&:hover': { color: '#F1F1F3' },
cursor: 'pointer',
};

return (
<TopInfoPanel
titleComponent={
<Box>
<Box sx={{ display: 'flex', alignItems: 'center', mb: 4, minHeight: '40px' }}>
<Button
variant="surface"
size="medium"
color="primary"
startIcon={
<SvgIcon sx={{ fontSize: '20px' }}>
<ArrowBackRoundedIcon />
</SvgIcon>
}
onClick={() => {
// https://github.com/vercel/next.js/discussions/34980
if (history.state.idx !== 0) router.back();
else router.push('/markets');
}}
sx={{ mr: 3 }}
>
<Trans>Go Back</Trans>
</Button>

<Box sx={{ display: 'flex', alignItems: 'center' }}>
<MarketLogo size={20} logo={network.networkLogoPath} />
<Typography variant="subheader1" sx={{ color: 'common.white' }}>
{market.marketTitle} <Trans>Market</Trans>
</Typography>
{market.v3 && (
<Box
sx={{
color: '#fff',
px: 2,
mx: 2,
borderRadius: '12px',
background: (theme) => theme.palette.gradients.aaveGradient,
}}
>
<Typography variant="subheader2">Version 3</Typography>
</Box>
)}
</Box>
</Box>

{downToSM && (
<Box sx={{ display: 'flex', alignItems: 'center', mb: 6 }}>
<ReserveIcon />
<Box>
{!loading && (
<Typography sx={{ color: '#A5A8B6' }} variant="caption">
{poolReserve.symbol}
</Typography>
)}

<ReserveName />
</Box>
</Box>
)}
</Box>
}
>
{!downToSM && (
<TopInfoPanelItem
title={!loading && <Trans>{poolReserve.symbol}</Trans>}
withoutIconWrapper
icon={<ReserveIcon />}
loading={loading}
>
<ReserveName />
</TopInfoPanelItem>
)}

<TopInfoPanelItem icon={<CubeIcon />} title={<Trans>Reserve Size</Trans>} loading={loading}>
<>
<TopInfoPanelItem title={<Trans>Reserve Size</Trans>} loading={loading} hideIcon>
<FormattedNumber
value={poolReserve?.totalLiquidityUSD}
value={Math.max(Number(poolReserve?.totalLiquidityUSD), 0)}
symbol="USD"
variant={valueTypographyVariant}
symbolsVariant={symbolsTypographyVariant}
symbolsColor="#A5A8B6"
/>
</TopInfoPanelItem>

<TopInfoPanelItem
icon={<PieIcon />}
title={<Trans>Available liquidity</Trans>}
loading={loading}
>
<TopInfoPanelItem title={<Trans>Available liquidity</Trans>} loading={loading} hideIcon>
<FormattedNumber
value={poolReserve?.availableLiquidityUSD}
value={
poolReserve && assetIsBorrowableOnMarket(poolReserve)
? Math.max(Number(poolReserve?.availableLiquidityUSD), 0)
: 0
}
symbol="USD"
variant={valueTypographyVariant}
symbolsVariant={symbolsTypographyVariant}
symbolsColor="#A5A8B6"
/>
</TopInfoPanelItem>

<TopInfoPanelItem
icon={<UptrendIcon />}
title={<Trans>Utilization Rate</Trans>}
loading={loading}
>
<TopInfoPanelItem title={<Trans>Utilization Rate</Trans>} loading={loading} hideIcon>
<FormattedNumber
value={poolReserve?.borrowUsageRatio}
percent
Expand All @@ -176,33 +79,41 @@ export const ReserveTopDetails = ({ underlyingAsset }: ReserveTopDetailsProps) =
/>
</TopInfoPanelItem>

<TopInfoPanelItem
icon={<DollarIcon />}
title={<Trans>Oracle price</Trans>}
titleIcon={
loading ? (
<TopInfoPanelItem title={<Trans>Oracle price</Trans>} loading={loading} hideIcon>
<Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
<FormattedNumber
value={poolReserve?.priceInUSD}
symbol="USD"
variant={valueTypographyVariant}
symbolsVariant={symbolsTypographyVariant}
symbolsColor="#A5A8B6"
/>
{loading ? (
<Skeleton width={16} height={16} sx={{ ml: 1, background: '#383D51' }} />
) : (
<Link
href={currentNetworkConfig.explorerLinkBuilder({ address: poolReserve?.priceOracle })}
sx={{ display: 'inline-flex', alignItems: 'center', ml: 1, color: '#A5A8B6' }}
>
<SvgIcon sx={{ fontSize: '16px' }}>
<ExternalLinkIcon />
</SvgIcon>
</Link>
)
}
loading={loading}
>
<FormattedNumber
value={poolReserve?.priceInUSD}
symbol="USD"
variant={valueTypographyVariant}
symbolsVariant={symbolsTypographyVariant}
symbolsColor="#A5A8B6"
/>
<CircleIcon tooltipText="View oracle contract" downToSM={downToSM}>
<Link
onClick={() =>
trackEvent(GENERAL.EXTERNAL_LINK, {
Link: 'Oracle Price',
oracle: poolReserve?.priceOracle,
assetName: poolReserve.name,
asset: poolReserve.underlyingAsset,
})
}
href={currentNetworkConfig.explorerLinkBuilder({
address: poolReserve?.priceOracle,
})}
sx={iconStyling}
>
<SvgIcon sx={{ fontSize: downToSM ? '12px' : '14px' }}>
<ExternalLinkIcon />
</SvgIcon>
</Link>
</CircleIcon>
)}
</Box>
</TopInfoPanelItem>
</TopInfoPanel>
</>
);
};
50 changes: 50 additions & 0 deletions src/utils/__tests__/getMaxAmountAvailableToBorrow.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import {
assetCanBeBorrowedByUser,
assetIsBorrowableOnMarket,
} from '../getMaxAmountAvailableToBorrow';

const baseReserve = {
borrowingEnabled: false,
isActive: true,
borrowableInIsolation: false,
isFrozen: false,
isPaused: false,
eModes: [{ id: 1, borrowingEnabled: true }],
};

describe('assetIsBorrowableOnMarket', () => {
it('returns true when borrowingEnabled is true', () => {
expect(
assetIsBorrowableOnMarket({ borrowingEnabled: true, eModes: [] })
).toBe(true);
});

it('returns true when borrowable in any e-mode', () => {
expect(
assetIsBorrowableOnMarket({
borrowingEnabled: false,
eModes: [{ id: 1, borrowingEnabled: true }],
})
).toBe(true);
});

it('returns false when not borrowable in normal mode or e-mode', () => {
expect(
assetIsBorrowableOnMarket({
borrowingEnabled: false,
eModes: [{ id: 1, borrowingEnabled: false }],
})
).toBe(false);
});
});

describe('assetCanBeBorrowedByUser', () => {
it('allows e-mode users to borrow when their category permits it', () => {
expect(
assetCanBeBorrowedByUser(baseReserve as any, {
isInEmode: true,
userEmodeCategoryId: 1,
} as any)
).toBe(true);
});
});
Loading