Commit 0d73ad81 authored by tom's avatar tom

remove old semantic tokens

parent a6a228b3
...@@ -48,9 +48,9 @@ const ERROR_SCREEN_STYLES: HTMLChakraProps<'div'> = { ...@@ -48,9 +48,9 @@ const ERROR_SCREEN_STYLES: HTMLChakraProps<'div'> = {
}; };
function MyApp({ Component, pageProps }: AppPropsWithLayout) { function MyApp({ Component, pageProps }: AppPropsWithLayout) {
// TODO @tom2drum currently there is hydration mismatch between server and client // to avoid hydration mismatch between server and client
// because we use useColorMode hook in the layout component // we have to render the app only on client (when it is mounted)
// not sure how to fix it though // https://github.com/pacocoursey/next-themes?tab=readme-ov-file#avoid-hydration-mismatch
const [ mounted, setMounted ] = React.useState(false); const [ mounted, setMounted ] = React.useState(false);
React.useEffect(() => { React.useEffect(() => {
......
// TODO @tom2drum convert this to rem
const breakpoints = { const breakpoints = {
// maybe we need them in future
sm: '415px', sm: '415px',
// md: '768px',
lg: '1000px', lg: '1000px',
xl: '1440px', xl: '1440px',
'2xl': '1920px', '2xl': '1920px',
......
...@@ -6,7 +6,6 @@ const heroBannerButton = config.UI.homepage.heroBanner?.button; ...@@ -6,7 +6,6 @@ const heroBannerButton = config.UI.homepage.heroBanner?.button;
const semanticTokens: ThemingConfig['semanticTokens'] = { const semanticTokens: ThemingConfig['semanticTokens'] = {
colors: { colors: {
// NEW TOKENS
button: { button: {
outline: { outline: {
fg: { fg: {
...@@ -108,7 +107,7 @@ const semanticTokens: ThemingConfig['semanticTokens'] = { ...@@ -108,7 +107,7 @@ const semanticTokens: ThemingConfig['semanticTokens'] = {
hover: { value: { _light: '{colors.blue.400}' } }, hover: { value: { _light: '{colors.blue.400}' } },
}, },
secondary: { secondary: {
DEFAULT: { value: { _light: '{colors.gray.400}', _dark: '{colors.gray.500}' } }, DEFAULT: { value: { _light: '{colors.gray.500}', _dark: '{colors.gray.400}' } },
}, },
underlaid: { underlaid: {
bg: { value: { _light: '{colors.gray.100}', _dark: '{colors.gray.800}' } }, bg: { value: { _light: '{colors.gray.100}', _dark: '{colors.gray.800}' } },
...@@ -420,7 +419,7 @@ const semanticTokens: ThemingConfig['semanticTokens'] = { ...@@ -420,7 +419,7 @@ const semanticTokens: ThemingConfig['semanticTokens'] = {
icon: { icon: {
// TODO @tom2drum revise this colors // TODO @tom2drum revise this colors
backTo: { value: '{colors.gray.400}' }, backTo: { value: '{colors.gray.400}' },
externalLink: { value: { _light: '{colors.gray.400}', _dark: '{colors.gray.400}' } }, externalLink: { value: { _light: '{colors.gray.400}', _dark: '{colors.gray.500}' } },
content: { value: { _light: '{colors.gray.500}', _dark: '{colors.gray.300}' } }, content: { value: { _light: '{colors.gray.500}', _dark: '{colors.gray.300}' } },
info: { value: { _light: '{colors.gray.400}', _dark: '{colors.gray.500}' } }, info: { value: { _light: '{colors.gray.400}', _dark: '{colors.gray.500}' } },
}, },
...@@ -442,39 +441,6 @@ const semanticTokens: ThemingConfig['semanticTokens'] = { ...@@ -442,39 +441,6 @@ const semanticTokens: ThemingConfig['semanticTokens'] = {
thumb: { value: { _light: '{colors.blackAlpha.300}', _dark: '{colors.whiteAlpha.300}' } }, thumb: { value: { _light: '{colors.blackAlpha.300}', _dark: '{colors.whiteAlpha.300}' } },
}, },
}, },
// OLD TOKENS
// text: {
// DEFAULT: { value: '{colors.blackAlpha.800}' },
// _dark: { value: '{colors.whiteAlpha.800}' },
// },
text_secondary: {
DEFAULT: { value: '{colors.gray.500}' },
_dark: { value: '{colors.gray.400}' },
},
// link: {
// DEFAULT: { value: '{colors.blue.600}' },
// _dark: { value: '{colors.blue.300}' },
// },
link_hovered: {
DEFAULT: { value: '{colors.blue.400}' },
},
icon_link_external: {
DEFAULT: { value: '{colors.gray.300}' },
_dark: { value: '{colors.gray.500}' },
},
icon_info: {
DEFAULT: { value: '{colors.gray.400}' },
_dark: { value: '{colors.gray.500}' },
},
// error: {
// DEFAULT: { value: '{colors.red.500}' },
// _dark: { value: '{colors.red.500}' },
// },
// dialog_bg: {
// DEFAULT: { value: '{colors.white}' },
// _dark: { value: '{colors.gray.900}' },
// },
}, },
shadows: { shadows: {
popover: { popover: {
......
...@@ -10,6 +10,7 @@ const globalCss: SystemConfig['globalCss'] = { ...@@ -10,6 +10,7 @@ const globalCss: SystemConfig['globalCss'] = {
color: 'global.body.fg', color: 'global.body.fg',
WebkitTapHighlightColor: 'transparent', WebkitTapHighlightColor: 'transparent',
fontVariantLigatures: 'no-contextual', fontVariantLigatures: 'no-contextual',
focusRingStyle: 'hidden',
}, },
mark: { mark: {
bg: 'global.mark.bg', bg: 'global.mark.bg',
......
...@@ -43,7 +43,7 @@ const AddressAccountHistoryListItem = (props: Props) => { ...@@ -43,7 +43,7 @@ const AddressAccountHistoryListItem = (props: Props) => {
</Flex> </Flex>
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ props.tx.rawTransactionData.timestamp * 1000 } timestamp={ props.tx.rawTransactionData.timestamp * 1000 }
color="text_secondary" color="text.secondary"
borderRadius="sm" borderRadius="sm"
fontWeight={ 500 } fontWeight={ 500 }
/> />
......
...@@ -30,7 +30,7 @@ const AddressAccountHistoryTableItem = (props: Props) => { ...@@ -30,7 +30,7 @@ const AddressAccountHistoryTableItem = (props: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ props.tx.rawTransactionData.timestamp * 1000 } timestamp={ props.tx.rawTransactionData.timestamp * 1000 }
isLoading={ props.isPlaceholderData } isLoading={ props.isPlaceholderData }
color="text_secondary" color="text.secondary"
borderRadius="sm" borderRadius="sm"
flexShrink={ 0 } flexShrink={ 0 }
/> />
......
...@@ -63,7 +63,7 @@ const AddressCoinBalanceListItem = (props: Props) => { ...@@ -63,7 +63,7 @@ const AddressCoinBalanceListItem = (props: Props) => {
timestamp={ props.block_timestamp } timestamp={ props.block_timestamp }
enableIncrement={ props.page === 1 } enableIncrement={ props.page === 1 }
isLoading={ props.isLoading } isLoading={ props.isLoading }
color="text_secondary" color="text.secondary"
/> />
</Flex> </Flex>
</ListItemMobile> </ListItemMobile>
......
...@@ -65,7 +65,7 @@ const ContractCodeIde = ({ className, hash, isLoading }: Props) => { ...@@ -65,7 +65,7 @@ const ContractCodeIde = ({ className, hash, isLoading }: Props) => {
</PopoverTrigger> </PopoverTrigger>
<PopoverContent w="240px"> <PopoverContent w="240px">
<PopoverBody > <PopoverBody >
<chakra.span color="text_secondary" fontSize="xs">Redactors</chakra.span> <chakra.span color="text.secondary" fontSize="xs">Redactors</chakra.span>
<Flex <Flex
flexDir="column" flexDir="column"
alignItems="flex-start" alignItems="flex-start"
......
...@@ -70,7 +70,7 @@ const ContractAbiItem = ({ data, index, id, addressHash, sourceAddress, tab, onS ...@@ -70,7 +70,7 @@ const ContractAbiItem = ({ data, index, id, addressHash, sourceAddress, tab, onS
alignItems="center" alignItems="center"
columnGap={ 2 } columnGap={ 2 }
> >
<CopyToClipboard text={ url } type="link" ml={ 0 } color="text_secondary" as="div"/> <CopyToClipboard text={ url } type="link" ml={ 0 } color="text.secondary" as="div"/>
<Box fontWeight={ 500 } display="flex" alignItems="center"> <Box fontWeight={ 500 } display="flex" alignItems="center">
{ index + 1 }. { data.type === 'fallback' || data.type === 'receive' ? data.type : data.name } { index + 1 }. { data.type === 'fallback' || data.type === 'receive' ? data.type : data.name }
{ data.type === 'fallback' && ( { data.type === 'fallback' && (
......
...@@ -42,7 +42,7 @@ const AddressEpochRewardsListItem = ({ item, isLoading }: Props) => { ...@@ -42,7 +42,7 @@ const AddressEpochRewardsListItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.block_timestamp } timestamp={ item.block_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
......
...@@ -25,7 +25,7 @@ const AddressEpochRewardsTableItem = ({ item, isLoading }: Props) => { ...@@ -25,7 +25,7 @@ const AddressEpochRewardsTableItem = ({ item, isLoading }: Props) => {
<Flex alignItems="center" gap={ 3 }> <Flex alignItems="center" gap={ 3 }>
<BlockEntity number={ item.block_number } isLoading={ isLoading } noIcon fontWeight={ 600 }/> <BlockEntity number={ item.block_number } isLoading={ isLoading } noIcon fontWeight={ 600 }/>
<Skeleton loading={ isLoading }> <Skeleton loading={ isLoading }>
<Text color="text_secondary" fontWeight={ 600 }>{ `Epoch # ${ item.epoch_number }` }</Text> <Text color="text.secondary" fontWeight={ 600 }>{ `Epoch # ${ item.epoch_number }` }</Text>
</Skeleton> </Skeleton>
<TimeAgoWithTooltip timestamp={ item.block_timestamp } isLoading={ isLoading } color="text.secondary" fontWeight={ 400 }/> <TimeAgoWithTooltip timestamp={ item.block_timestamp } isLoading={ isLoading } color="text.secondary" fontWeight={ 400 }/>
</Flex> </Flex>
......
...@@ -53,7 +53,7 @@ const BreadcrumbItem = ({ text, href, isLast, scrollRef }: BreadcrumbItemProps) ...@@ -53,7 +53,7 @@ const BreadcrumbItem = ({ text, href, isLast, scrollRef }: BreadcrumbItemProps)
> >
{ text } { text }
</Box> </Box>
<CopyToClipboard text={ currentUrl } type="link" mx={ 0 } color="text_secondary"/> <CopyToClipboard text={ currentUrl } type="link" mx={ 0 } color="text.secondary"/>
</Grid> </Grid>
); );
} }
...@@ -91,7 +91,7 @@ const AddressMudBreadcrumbs = (props: TableViewProps | RecordViewProps) => { ...@@ -91,7 +91,7 @@ const AddressMudBreadcrumbs = (props: TableViewProps | RecordViewProps) => {
width="fit-content" width="fit-content"
fontSize="sm" fontSize="sm"
> >
<IconSvg name="MUD" boxSize={ 5 } color={ addressQuery.data?.is_verified ? 'green.500' : 'text_secondary' }/> <IconSvg name="MUD" boxSize={ 5 } color={ addressQuery.data?.is_verified ? 'green.500' : 'text.secondary' }/>
<BreadcrumbItem <BreadcrumbItem
text="MUD World" text="MUD World"
href={ route({ pathname: '/address/[hash]', query: queryParams }) } href={ route({ pathname: '/address/[hash]', query: queryParams }) }
......
...@@ -64,7 +64,7 @@ const AddressMudRecord = ({ tableId, recordId, isQueryEnabled = true, scrollRef ...@@ -64,7 +64,7 @@ const AddressMudRecord = ({ tableId, recordId, isQueryEnabled = true, scrollRef
<TableCell colSpan={ 2 } fontSize="sm"> <TableCell colSpan={ 2 } fontSize="sm">
<Flex justifyContent="space-between"> <Flex justifyContent="space-between">
<TruncatedValue value={ getValueString(data.record.decoded[keyName]) } mr={ 2 }/> <TruncatedValue value={ getValueString(data.record.decoded[keyName]) } mr={ 2 }/>
{ index === 0 && <Box color="text_secondary">{ dayjs(data.record.timestamp).format('lll') }</Box> } { index === 0 && <Box color="text.secondary">{ dayjs(data.record.timestamp).format('lll') }</Box> }
</Flex> </Flex>
</TableCell> </TableCell>
</TableRow> </TableRow>
...@@ -81,7 +81,7 @@ const AddressMudRecord = ({ tableId, recordId, isQueryEnabled = true, scrollRef ...@@ -81,7 +81,7 @@ const AddressMudRecord = ({ tableId, recordId, isQueryEnabled = true, scrollRef
{ keyName } ({ data.schema.key_types[index] }) { keyName } ({ data.schema.key_types[index] })
</Text> </Text>
<Text wordBreak="break-word">{ getValueString(data.record.decoded[keyName]) }</Text> <Text wordBreak="break-word">{ getValueString(data.record.decoded[keyName]) }</Text>
{ index === 0 && <Box color="text_secondary">{ dayjs(data.record.timestamp).format('lll') }</Box> } { index === 0 && <Box color="text.secondary">{ dayjs(data.record.timestamp).format('lll') }</Box> }
</VStack> </VStack>
)) } )) }
<TableRoot borderRadius="8px" style={{ tableLayout: 'auto' }} width="100%" mt={ 2 } overflow="hidden"> <TableRoot borderRadius="8px" style={{ tableLayout: 'auto' }} width="100%" mt={ 2 } overflow="hidden">
......
...@@ -42,21 +42,21 @@ const ERC20TokensListItem = ({ token, value, isLoading }: Props) => { ...@@ -42,21 +42,21 @@ const ERC20TokensListItem = ({ token, value, isLoading }: Props) => {
{ token.exchange_rate !== undefined && token.exchange_rate !== null && ( { token.exchange_rate !== undefined && token.exchange_rate !== null && (
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Price</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Price</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
<span>{ `$${ Number(token.exchange_rate).toLocaleString() }` }</span> <span>{ `$${ Number(token.exchange_rate).toLocaleString() }` }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
) } ) }
<HStack gap={ 3 } alignItems="baseline"> <HStack gap={ 3 } alignItems="baseline">
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Quantity</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Quantity</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" whiteSpace="pre-wrap" wordBreak="break-word"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" whiteSpace="pre-wrap" wordBreak="break-word">
<span>{ tokenQuantity }</span> <span>{ tokenQuantity }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
{ tokenValue !== undefined && ( { tokenValue !== undefined && (
<HStack gap={ 3 } alignItems="baseline"> <HStack gap={ 3 } alignItems="baseline">
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" whiteSpace="pre-wrap" wordBreak="break-word"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" whiteSpace="pre-wrap" wordBreak="break-word">
<span>${ tokenValue }</span> <span>${ tokenValue }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
......
...@@ -53,7 +53,7 @@ const TokenBalances = () => { ...@@ -53,7 +53,7 @@ const TokenBalances = () => {
name="Net Worth" name="Net Worth"
value={ addressData?.exchange_rate ? `${ prefix }$${ totalUsd.toFormat(2) }` : 'N/A' } value={ addressData?.exchange_rate ? `${ prefix }$${ totalUsd.toFormat(2) }` : 'N/A' }
isLoading={ addressQuery.isPending || tokenQuery.isPending } isLoading={ addressQuery.isPending || tokenQuery.isPending }
icon={ <IconSvg name="wallet" boxSize="20px" flexShrink={ 0 } color="text_secondary"/> } icon={ <IconSvg name="wallet" boxSize="20px" flexShrink={ 0 } color="text.secondary"/> }
/> />
<TokenBalancesItem <TokenBalancesItem
name={ `${ currencyUnits.ether } Balance` } name={ `${ currencyUnits.ether } Balance` }
...@@ -67,7 +67,7 @@ const TokenBalances = () => { ...@@ -67,7 +67,7 @@ const TokenBalances = () => {
value={ tokensNumText } value={ tokensNumText }
valueSecondary={ `${ prefix }$${ tokensInfo.usd.toFormat(2) }` } valueSecondary={ `${ prefix }$${ tokensInfo.usd.toFormat(2) }` }
isLoading={ addressQuery.isPending || tokenQuery.isPending } isLoading={ addressQuery.isPending || tokenQuery.isPending }
icon={ <IconSvg name="tokens" boxSize="20px" flexShrink={ 0 } color="text_secondary"/> } icon={ <IconSvg name="tokens" boxSize="20px" flexShrink={ 0 } color="text.secondary"/> }
/> />
</Flex> </Flex>
); );
......
...@@ -38,7 +38,7 @@ const AddressesListItem = ({ ...@@ -38,7 +38,7 @@ const AddressesListItem = ({
mr={ 2 } mr={ 2 }
truncation="constant" truncation="constant"
/> />
<Skeleton loading={ isLoading } fontSize="sm" ml="auto" minW={ 6 } color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" ml="auto" minW={ 6 } color="text.secondary">
<span>{ index }</span> <span>{ index }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
...@@ -47,21 +47,21 @@ const AddressesListItem = ({ ...@@ -47,21 +47,21 @@ const AddressesListItem = ({
)) } )) }
<HStack gap={ 3 } maxW="100%" alignItems="flex-start"> <HStack gap={ 3 } maxW="100%" alignItems="flex-start">
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" minW="0" whiteSpace="pre-wrap"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" minW="0" whiteSpace="pre-wrap">
<span>{ addressBalance.dp(8).toFormat() }</span> <span>{ addressBalance.dp(8).toFormat() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
{ !totalSupply.eq(ZERO) && ( { !totalSupply.eq(ZERO) && (
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Percentage</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Percentage</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
<span>{ addressBalance.div(BigNumber(totalSupply)).multipliedBy(100).dp(8).toFormat() + '%' }</span> <span>{ addressBalance.div(BigNumber(totalSupply)).multipliedBy(100).dp(8).toFormat() + '%' }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
) } ) }
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
<span>{ Number(item.transaction_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
......
...@@ -32,13 +32,13 @@ const AddressesLabelSearchListItem = ({ ...@@ -32,13 +32,13 @@ const AddressesLabelSearchListItem = ({
/> />
<HStack gap={ 3 } maxW="100%" alignItems="flex-start"> <HStack gap={ 3 } maxW="100%" alignItems="flex-start">
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" minW="0" whiteSpace="pre-wrap"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" minW="0" whiteSpace="pre-wrap">
<span>{ addressBalance.dp(8).toFormat() }</span> <span>{ addressBalance.dp(8).toFormat() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
<span>{ Number(item.transaction_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
......
...@@ -36,7 +36,7 @@ const ItemByColumn = ({ item, column, isLoading }: Props) => { ...@@ -36,7 +36,7 @@ const ItemByColumn = ({ item, column, isLoading }: Props) => {
case 'method': case 'method':
return item.method ? <Badge loading={ isLoading } truncated>{ item.method }</Badge> : null; return item.method ? <Badge loading={ isLoading } truncated>{ item.method }</Badge> : null;
case 'age': case 'age':
return <TimeAgoWithTooltip timestamp={ item.timestamp } isLoading={ isLoading } color="text_secondary" fontWeight={ 400 }/>; return <TimeAgoWithTooltip timestamp={ item.timestamp } isLoading={ isLoading } color="text.secondary" fontWeight={ 400 }/>;
case 'from': case 'from':
return ( return (
<Flex w="100%"> <Flex w="100%">
......
...@@ -122,7 +122,7 @@ const AssetFilter = ({ value = [], handleFilterChange }: Props) => { ...@@ -122,7 +122,7 @@ const AssetFilter = ({ value = [], handleFilterChange }: Props) => {
{ tokensQuery.isLoading && <Spinner display="block" mt={ 3 }/> } { tokensQuery.isLoading && <Spinner display="block" mt={ 3 }/> }
{ tokensQuery.data && !searchTerm && ( { tokensQuery.data && !searchTerm && (
<> <>
<Text color="text_secondary" fontWeight="600" mt={ 3 }>Popular</Text> <Text color="text.secondary" fontWeight="600" mt={ 3 }>Popular</Text>
<Flex rowGap={ 3 } flexWrap="wrap" gap={ 3 } mb={ 2 }> <Flex rowGap={ 3 } flexWrap="wrap" gap={ 3 } mb={ 2 }>
{ [ NATIVE_TOKEN, ...tokensQuery.data.items ].map(token => ( { [ NATIVE_TOKEN, ...tokensQuery.data.items ].map(token => (
<Tag <Tag
......
...@@ -24,7 +24,7 @@ const BreakDownItem = ({ amount, percentage, address, addressFrom, token }: Item ...@@ -24,7 +24,7 @@ const BreakDownItem = ({ amount, percentage, address, addressFrom, token }: Item
return ( return (
<Flex alignItems="center" columnGap={ 2 } rowGap={ 1 } flexWrap="wrap"> <Flex alignItems="center" columnGap={ 2 } rowGap={ 1 } flexWrap="wrap">
<Box color="text_secondary">{ percentage }% of amount</Box> <Box color="text.secondary">{ percentage }% of amount</Box>
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
{ BigNumber(amount).dividedBy(WEI).toFixed() } { BigNumber(amount).dividedBy(WEI).toFixed() }
<TokenEntity token={ token } noCopy onlySymbol/> <TokenEntity token={ token } noCopy onlySymbol/>
...@@ -33,7 +33,7 @@ const BreakDownItem = ({ amount, percentage, address, addressFrom, token }: Item ...@@ -33,7 +33,7 @@ const BreakDownItem = ({ amount, percentage, address, addressFrom, token }: Item
<> <>
<AddressEntity address={ addressFrom } truncation="constant"/> <AddressEntity address={ addressFrom } truncation="constant"/>
<IconSvg name="flame" boxSize={ 5 } color="gray.500"/> <IconSvg name="flame" boxSize={ 5 } color="gray.500"/>
<Box color="text_secondary">burnt</Box> <Box color="text.secondary">burnt</Box>
</> </>
) : <AddressFromTo from={ addressFrom } to={ address }/> } ) : <AddressFromTo from={ addressFrom } to={ address }/> }
</Flex> </Flex>
......
...@@ -59,12 +59,12 @@ const BlockEpochElectionRewardDetailsMobile = ({ type, token }: Props) => { ...@@ -59,12 +59,12 @@ const BlockEpochElectionRewardDetailsMobile = ({ type, token }: Props) => {
<Flex key={ index } flexDir="column" alignItems="flex-start" rowGap={ 1 } fontWeight={ 400 }> <Flex key={ index } flexDir="column" alignItems="flex-start" rowGap={ 1 } fontWeight={ 400 }>
<AddressEntity address={ item.account } noIcon w="100%"/> <AddressEntity address={ item.account } noIcon w="100%"/>
<Flex columnGap={ 1 } alignItems="center"> <Flex columnGap={ 1 } alignItems="center">
<Box flexShrink={ 0 } color="text_secondary">got</Box> <Box flexShrink={ 0 } color="text.secondary">got</Box>
<Box>{ amount.valueStr }</Box> <Box>{ amount.valueStr }</Box>
<TokenEntity token={ token } noIcon onlySymbol w="auto"/> <TokenEntity token={ token } noIcon onlySymbol w="auto"/>
</Flex> </Flex>
<Flex columnGap={ 1 } alignItems="center" w="100%"> <Flex columnGap={ 1 } alignItems="center" w="100%">
<Box flexShrink={ 0 } color="text_secondary">on behalf of</Box> <Box flexShrink={ 0 } color="text.secondary">on behalf of</Box>
<AddressEntity address={ item.associated_account } noIcon/> <AddressEntity address={ item.associated_account } noIcon/>
</Flex> </Flex>
</Flex> </Flex>
......
...@@ -24,7 +24,7 @@ const BlockCountdownTimerItem = ({ label, value }: Props) => { ...@@ -24,7 +24,7 @@ const BlockCountdownTimerItem = ({ label, value }: Props) => {
fontWeight={ 600 } fontWeight={ 600 }
w="100%" w="100%"
/> />
<Box fontSize="sm" lineHeight="20px" mt={ 1 } color="text_secondary">{ label }</Box> <Box fontSize="sm" lineHeight="20px" mt={ 1 } color="text.secondary">{ label }</Box>
</Box> </Box>
); );
}; };
......
...@@ -61,14 +61,14 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro ...@@ -61,14 +61,14 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro
timestamp={ data.timestamp } timestamp={ data.timestamp }
enableIncrement={ enableTimeIncrement } enableIncrement={ enableTimeIncrement }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight={ 400 } fontWeight={ 400 }
display="inline-block" display="inline-block"
/> />
</Flex> </Flex>
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
<Text fontWeight={ 500 }>Size</Text> <Text fontWeight={ 500 }>Size</Text>
<Skeleton loading={ isLoading } display="inline-block" color="text_secondary"> <Skeleton loading={ isLoading } display="inline-block" color="text.secondary">
<span>{ data.size.toLocaleString() } bytes</span> <span>{ data.size.toLocaleString() } bytes</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
...@@ -97,7 +97,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro ...@@ -97,7 +97,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro
<Box> <Box>
<Text fontWeight={ 500 }>Gas used</Text> <Text fontWeight={ 500 }>Gas used</Text>
<Flex mt={ 2 }> <Flex mt={ 2 }>
<Skeleton loading={ isLoading } display="inline-block" color="text_secondary" mr={ 4 }> <Skeleton loading={ isLoading } display="inline-block" color="text.secondary" mr={ 4 }>
<span>{ BigNumber(data.gas_used || 0).toFormat() }</span> <span>{ BigNumber(data.gas_used || 0).toFormat() }</span>
</Skeleton> </Skeleton>
<BlockGasUsed <BlockGasUsed
...@@ -111,7 +111,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro ...@@ -111,7 +111,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro
{ !isRollup && !config.UI.views.block.hiddenFields?.total_reward && ( { !isRollup && !config.UI.views.block.hiddenFields?.total_reward && (
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
<Text fontWeight={ 500 }>Reward { currencyUnits.ether }</Text> <Text fontWeight={ 500 }>Reward { currencyUnits.ether }</Text>
<Skeleton loading={ isLoading } display="inline-block" color="text_secondary"> <Skeleton loading={ isLoading } display="inline-block" color="text.secondary">
<span>{ totalReward.toFixed() }</span> <span>{ totalReward.toFixed() }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
...@@ -122,7 +122,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro ...@@ -122,7 +122,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro
<Flex columnGap={ 4 } mt={ 2 }> <Flex columnGap={ 4 } mt={ 2 }>
<Flex> <Flex>
<IconSvg name="flame" boxSize={ 5 } color="gray.500" isLoading={ isLoading }/> <IconSvg name="flame" boxSize={ 5 } color="gray.500" isLoading={ isLoading }/>
<Skeleton loading={ isLoading } display="inline-block" color="text_secondary" ml={ 2 }> <Skeleton loading={ isLoading } display="inline-block" color="text.secondary" ml={ 2 }>
<span>{ burntFees.div(WEI).toFixed() }</span> <span>{ burntFees.div(WEI).toFixed() }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
...@@ -133,7 +133,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro ...@@ -133,7 +133,7 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement, animation }: Pro
{ !isRollup && !config.UI.views.block.hiddenFields?.base_fee && baseFeeValue && ( { !isRollup && !config.UI.views.block.hiddenFields?.base_fee && baseFeeValue && (
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
<Text fontWeight={ 500 }>Base fee</Text> <Text fontWeight={ 500 }>Base fee</Text>
<Skeleton loading={ isLoading } display="inline-block" color="text_secondary"> <Skeleton loading={ isLoading } display="inline-block" color="text.secondary">
<span>{ baseFeeValue }</span> <span>{ baseFeeValue }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
......
...@@ -62,7 +62,7 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr ...@@ -62,7 +62,7 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr
timestamp={ data.timestamp } timestamp={ data.timestamp }
enableIncrement={ enableTimeIncrement } enableIncrement={ enableTimeIncrement }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight={ 400 } fontWeight={ 400 }
display="inline-block" display="inline-block"
/> />
......
...@@ -17,7 +17,7 @@ const ContractVerificationFormRow = ({ children, className }: Props) => { ...@@ -17,7 +17,7 @@ const ContractVerificationFormRow = ({ children, className }: Props) => {
return ( return (
<> <>
<GridItem className={ className } _notFirst={{ mt: { base: 3, lg: 0 } }}>{ firstChildren }</GridItem> <GridItem className={ className } _notFirst={{ mt: { base: 3, lg: 0 } }}>{ firstChildren }</GridItem>
{ isMobile && !secondChildren ? null : <GridItem fontSize="sm" className={ className } color="text_secondary">{ secondChildren }</GridItem> } { isMobile && !secondChildren ? null : <GridItem fontSize="sm" className={ className } color="text.secondary">{ secondChildren }</GridItem> }
</> </>
); );
}; };
......
...@@ -106,7 +106,7 @@ const ContractVerificationFieldCommit = ({ latestCommitHash }: Props) => { ...@@ -106,7 +106,7 @@ const ContractVerificationFieldCommit = ({ latestCommitHash }: Props) => {
{ latestCommitHash ? ( { latestCommitHash ? (
<div> <div>
<span >We have found the latest commit hash for the repository: </span> <span >We have found the latest commit hash for the repository: </span>
<Code color="text_secondary">{ latestCommitHash.slice(0, 7) }</Code> <Code color="text.secondary">{ latestCommitHash.slice(0, 7) }</Code>
<span>. If you want to use it, </span> <span>. If you want to use it, </span>
<Link onClick={ handleUseLatestCommitClick }>click here</Link> <Link onClick={ handleUseLatestCommitClick }>click here</Link>
<span>.</span> <span>.</span>
......
...@@ -90,9 +90,9 @@ const ContractVerificationFieldCompiler = ({ isVyper, isStylus }: Props) => { ...@@ -90,9 +90,9 @@ const ContractVerificationFieldCompiler = ({ isVyper, isStylus }: Props) => {
{ isVyper || isStylus ? null : ( { isVyper || isStylus ? null : (
<chakra.div mt={{ base: 0, lg: 8 }}> <chakra.div mt={{ base: 0, lg: 8 }}>
<span >The compiler version is specified in </span> <span >The compiler version is specified in </span>
<Code color="text_secondary">pragma solidity X.X.X</Code> <Code color="text.secondary">pragma solidity X.X.X</Code>
<span>. Use the compiler version rather than the nightly build. If using the Solidity compiler, run </span> <span>. Use the compiler version rather than the nightly build. If using the Solidity compiler, run </span>
<Code color="text_secondary">solc —version</Code> <Code color="text.secondary">solc —version</Code>
<span> to check.</span> <span> to check.</span>
</chakra.div> </chakra.div>
) } ) }
......
...@@ -23,7 +23,7 @@ const ContractVerificationFieldName = ({ hint }: Props) => { ...@@ -23,7 +23,7 @@ const ContractVerificationFieldName = ({ hint }: Props) => {
{ hint ? <span>{ hint }</span> : ( { hint ? <span>{ hint }</span> : (
<> <>
<span>Must match the name specified in the code. For example, in </span> <span>Must match the name specified in the code. For example, in </span>
<Code color="text_secondary">{ `contract MyContract {..}` }</Code> <Code color="text.secondary">{ `contract MyContract {..}` }</Code>
<span>. <chakra.span fontWeight={ 600 }>MyContract</chakra.span> is the contract name.</span> <span>. <chakra.span fontWeight={ 600 }>MyContract</chakra.span> is the contract name.</span>
</> </>
) } ) }
......
...@@ -56,7 +56,7 @@ const ContractVerificationFieldSources = ({ fileTypes, multiple, required, title ...@@ -56,7 +56,7 @@ const ContractVerificationFieldSources = ({ fileTypes, multiple, required, title
const renderUploadButton = React.useCallback(() => { const renderUploadButton = React.useCallback(() => {
return ( return (
<div> <div>
<Text fontWeight={ 500 } color="text_secondary" mb={ 3 }>{ title }</Text> <Text fontWeight={ 500 } color="text.secondary" mb={ 3 }>{ title }</Text>
<Button size="sm" variant="outline"> <Button size="sm" variant="outline">
Drop file{ multiple ? 's' : '' } or click here Drop file{ multiple ? 's' : '' } or click here
</Button> </Button>
......
...@@ -44,7 +44,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -44,7 +44,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.l1_block_timestamp } timestamp={ item.l1_block_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</TableCell> </TableCell>
...@@ -65,7 +65,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -65,7 +65,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle" isNumeric> <TableCell verticalAlign="middle" isNumeric>
<Skeleton loading={ isLoading } color="text_secondary" display="inline-block"> <Skeleton loading={ isLoading } color="text.secondary" display="inline-block">
<span>{ BigNumber(item.l2_transaction_gas_limit).toFormat() }</span> <span>{ BigNumber(item.l2_transaction_gas_limit).toFormat() }</span>
</Skeleton> </Skeleton>
</TableCell> </TableCell>
......
...@@ -50,7 +50,7 @@ const ScrollL2DepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -50,7 +50,7 @@ const ScrollL2DepositsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.origination_timestamp } timestamp={ item.origination_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -62,7 +62,7 @@ const ScrollL2DepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -62,7 +62,7 @@ const ScrollL2DepositsTableItem = ({ item, isLoading }: Props) => {
noIcon noIcon
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
Pending Claim Pending Claim
</chakra.span> </chakra.span>
) } ) }
......
...@@ -58,7 +58,7 @@ const DepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -58,7 +58,7 @@ const DepositsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</TableCell> </TableCell>
......
...@@ -50,7 +50,7 @@ const ZkEvmL2DepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -50,7 +50,7 @@ const ZkEvmL2DepositsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -63,7 +63,7 @@ const ZkEvmL2DepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -63,7 +63,7 @@ const ZkEvmL2DepositsTableItem = ({ item, isLoading }: Props) => {
noIcon noIcon
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
Pending Claim Pending Claim
</chakra.span> </chakra.span>
) } ) }
......
...@@ -14,7 +14,7 @@ const GasTrackerFaqItem = ({ question, answer }: Props) => { ...@@ -14,7 +14,7 @@ const GasTrackerFaqItem = ({ question, answer }: Props) => {
{ question } { question }
</AccordionItemTrigger> </AccordionItemTrigger>
<AccordionItemContent pb={ 4 } px={ 0 }> <AccordionItemContent pb={ 4 } px={ 0 }>
<Text color="text_secondary">{ answer }</Text> <Text color="text.secondary">{ answer }</Text>
</AccordionItemContent> </AccordionItemContent>
</AccordionItem> </AccordionItem>
); );
......
...@@ -56,12 +56,12 @@ const GasTrackerPriceSnippet = ({ data, type, isLoading }: Props) => { ...@@ -56,12 +56,12 @@ const GasTrackerPriceSnippet = ({ data, type, isLoading }: Props) => {
<GasPrice data={ data } fontSize={{ base: '36px', xl: '48px' }} lineHeight="48px" fontWeight={ 600 } letterSpacing="-1px" fontFamily="heading"/> <GasPrice data={ data } fontSize={{ base: '36px', xl: '48px' }} lineHeight="48px" fontWeight={ 600 } letterSpacing="-1px" fontFamily="heading"/>
</Skeleton> </Skeleton>
</Flex> </Flex>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" mt={ 3 } w="fit-content"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" mt={ 3 } w="fit-content">
{ data.price !== null && data.fiat_price !== null && <GasPrice data={ data } prefix={ `${ asymp } ` } unitMode="secondary"/> } { data.price !== null && data.fiat_price !== null && <GasPrice data={ data } prefix={ `${ asymp } ` } unitMode="secondary"/> }
<span> per transaction</span> <span> per transaction</span>
{ typeof data.time === 'number' && data.time > 0 && <span> / { (data.time / SECOND).toLocaleString(undefined, { maximumFractionDigits: 1 }) }s</span> } { typeof data.time === 'number' && data.time > 0 && <span> / { (data.time / SECOND).toLocaleString(undefined, { maximumFractionDigits: 1 }) }s</span> }
</Skeleton> </Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" mt={ 2 } w="fit-content" whiteSpace="pre"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" mt={ 2 } w="fit-content" whiteSpace="pre">
{ typeof data.base_fee === 'number' && <span>Base { data.base_fee.toLocaleString(undefined, { maximumFractionDigits: 0 }) }</span> } { typeof data.base_fee === 'number' && <span>Base { data.base_fee.toLocaleString(undefined, { maximumFractionDigits: 0 }) }</span> }
{ typeof data.base_fee === 'number' && typeof data.priority_fee === 'number' && <span> / </span> } { typeof data.base_fee === 'number' && typeof data.priority_fee === 'number' && <span> / </span> }
{ typeof data.priority_fee === 'number' && <span>Priority { data.priority_fee.toLocaleString(undefined, { maximumFractionDigits: 0 }) }</span> } { typeof data.priority_fee === 'number' && <span>Priority { data.priority_fee.toLocaleString(undefined, { maximumFractionDigits: 0 }) }</span> }
......
...@@ -63,7 +63,7 @@ const LatestTxsItem = ({ tx, isLoading }: Props) => { ...@@ -63,7 +63,7 @@ const LatestTxsItem = ({ tx, isLoading }: Props) => {
timestamp={ tx.timestamp } timestamp={ tx.timestamp }
enableIncrement enableIncrement
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
fontSize="sm" fontSize="sm"
ml={ 3 } ml={ 3 }
......
...@@ -108,8 +108,8 @@ const Stats = () => { ...@@ -108,8 +108,8 @@ const Stats = () => {
boxSize={ 5 } boxSize={ 5 }
flexShrink={ 0 } flexShrink={ 0 }
cursor="pointer" cursor="pointer"
color="icon_info" color="icon.info"
_hover={{ color: 'link_hovered' }} _hover={{ color: 'link.primary.hove' }}
/> />
</GasInfoTooltip> </GasInfoTooltip>
) : null; ) : null;
......
...@@ -62,7 +62,7 @@ const LatestDepositsItem = ({ l1BlockNumber, l1TxHash, l2TxHash, timestamp, isLo ...@@ -62,7 +62,7 @@ const LatestDepositsItem = ({ l1BlockNumber, l1TxHash, l2TxHash, timestamp, isLo
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ timestamp } timestamp={ timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</Flex> </Flex>
<Grid gridTemplateColumns="56px auto"> <Grid gridTemplateColumns="56px auto">
...@@ -89,7 +89,7 @@ const LatestDepositsItem = ({ l1BlockNumber, l1TxHash, l2TxHash, timestamp, isLo ...@@ -89,7 +89,7 @@ const LatestDepositsItem = ({ l1BlockNumber, l1TxHash, l2TxHash, timestamp, isLo
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ timestamp } timestamp={ timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
w="fit-content" w="fit-content"
h="fit-content" h="fit-content"
my="2px" my="2px"
......
...@@ -51,7 +51,7 @@ const InternalTxsListItem = ({ ...@@ -51,7 +51,7 @@ const InternalTxsListItem = ({
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ timestamp } timestamp={ timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
fontSize="sm" fontSize="sm"
/> />
...@@ -74,7 +74,7 @@ const InternalTxsListItem = ({ ...@@ -74,7 +74,7 @@ const InternalTxsListItem = ({
/> />
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value { currencyUnits.ether }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value { currencyUnits.ether }</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" minW={ 6 }> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" minW={ 6 }>
<span>{ BigNumber(value).div(BigNumber(10 ** config.chain.currency.decimals)).toFormat() }</span> <span>{ BigNumber(value).div(BigNumber(10 ** config.chain.currency.decimals)).toFormat() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
......
...@@ -49,7 +49,7 @@ const InternalTxsTableItem = ({ ...@@ -49,7 +49,7 @@ const InternalTxsTableItem = ({
timestamp={ timestamp } timestamp={ timestamp }
enableIncrement enableIncrement
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
fontSize="sm" fontSize="sm"
/> />
......
...@@ -107,7 +107,7 @@ const FeaturedApp = ({ ...@@ -107,7 +107,7 @@ const FeaturedApp = ({
<Skeleton <Skeleton
loading={ isLoading } loading={ isLoading }
color="text_secondary" color="text.secondary"
fontSize="xs" fontSize="xs"
flex={ 1 } flex={ 1 }
> >
......
...@@ -150,7 +150,7 @@ const MarketplaceAppCard = ({ ...@@ -150,7 +150,7 @@ const MarketplaceAppCard = ({
<Skeleton <Skeleton
loading={ isLoading } loading={ isLoading }
color="text_secondary" color="text.secondary"
fontSize="xs" fontSize="xs"
lineHeight="16px" lineHeight="16px"
> >
......
...@@ -18,7 +18,7 @@ const MarketplaceAppIntegrationIcon = ({ external, internalWallet }: Props) => { ...@@ -18,7 +18,7 @@ const MarketplaceAppIntegrationIcon = ({ external, internalWallet }: Props) => {
if (external) { if (external) {
icon = 'link_external'; icon = 'link_external';
color = 'icon_link_external'; color = 'icon.externalLink';
text = 'This app opens in a separate tab'; text = 'This app opens in a separate tab';
boxSize = 4; boxSize = 4;
} else if (internalWallet) { } else if (internalWallet) {
......
...@@ -41,7 +41,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => { ...@@ -41,7 +41,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => {
fontWeight={ 600 } fontWeight={ 600 }
noIcon noIcon
/> />
) : <chakra.span color="text_secondary">N/A</chakra.span> } ) : <chakra.span color="text.secondary">N/A</chakra.span> }
</TableCell> </TableCell>
) } ) }
{ direction === 'from-rollup' && ( { direction === 'from-rollup' && (
...@@ -68,7 +68,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => { ...@@ -68,7 +68,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => {
noIcon noIcon
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
N/A N/A
</chakra.span> </chakra.span>
) } ) }
...@@ -77,7 +77,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => { ...@@ -77,7 +77,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.origination_timestamp } timestamp={ item.origination_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -94,7 +94,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => { ...@@ -94,7 +94,7 @@ const ArbitrumL2MessagesTableItem = ({ item, direction, isLoading }: Props) => {
noIcon noIcon
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
N/A N/A
</chakra.span> </chakra.span>
) } ) }
......
...@@ -33,13 +33,13 @@ const MudWorldsListItem = ({ ...@@ -33,13 +33,13 @@ const MudWorldsListItem = ({
/> />
<HStack gap={ 3 } maxW="100%" alignItems="flex-start"> <HStack gap={ 3 } maxW="100%" alignItems="flex-start">
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 } flexShrink={ 0 }>{ `Balance ${ currencyUnits.ether }` }</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary" minW="0" whiteSpace="pre-wrap"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary" minW="0" whiteSpace="pre-wrap">
<span>{ addressBalance.dp(8).toFormat() }</span> <span>{ addressBalance.dp(8).toFormat() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
<span>{ Number(item.transaction_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
......
...@@ -76,7 +76,7 @@ const NameDomainDetails = ({ query }: Props) => { ...@@ -76,7 +76,7 @@ const NameDomainDetails = ({ query }: Props) => {
{ dayjs(query.data.expiry_date).format('llll') } { dayjs(query.data.expiry_date).format('llll') }
</Skeleton> </Skeleton>
<TextSeparator color="gray.500"/> <TextSeparator color="gray.500"/>
<Skeleton loading={ isLoading } color="text_secondary" display="inline"> <Skeleton loading={ isLoading } color="text.secondary" display="inline">
<NameDomainExpiryStatus date={ query.data?.expiry_date }/> <NameDomainExpiryStatus date={ query.data?.expiry_date }/>
</Skeleton> </Skeleton>
</DetailedInfo.ItemValue> </DetailedInfo.ItemValue>
......
...@@ -23,7 +23,7 @@ const NameDomainExpiryStatus = ({ date }: Props) => { ...@@ -23,7 +23,7 @@ const NameDomainExpiryStatus = ({ date }: Props) => {
return <chakra.span color="red.600">{ diff } days left</chakra.span>; return <chakra.span color="red.600">{ diff } days left</chakra.span>;
} }
return <chakra.span color="text_secondary">Expires { dayjs(date).fromNow() }</chakra.span>; return <chakra.span color="text.secondary">Expires { dayjs(date).fromNow() }</chakra.span>;
}; };
export default React.memo(NameDomainExpiryStatus); export default React.memo(NameDomainExpiryStatus);
...@@ -40,7 +40,7 @@ const NameDomainHistoryListItem = ({ isLoading, domain, event }: Props) => { ...@@ -40,7 +40,7 @@ const NameDomainHistoryListItem = ({ isLoading, domain, event }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ event.timestamp } timestamp={ event.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
......
...@@ -44,7 +44,7 @@ const NameDomainHistoryTableItem = ({ isLoading, event, domain }: Props) => { ...@@ -44,7 +44,7 @@ const NameDomainHistoryTableItem = ({ isLoading, event, domain }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ event.timestamp } timestamp={ event.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</TableCell> </TableCell>
......
...@@ -108,7 +108,6 @@ const NameDomainsActionBar = ({ ...@@ -108,7 +108,6 @@ const NameDomainsActionBar = ({
mr={ 2 } mr={ 2 }
alt={ `${ protocol.title } protocol icon` } alt={ `${ protocol.title } protocol icon` }
fallback={ <IconSvg name="ENS_slim" boxSize={ 5 } mr={ 2 }/> } fallback={ <IconSvg name="ENS_slim" boxSize={ 5 } mr={ 2 }/> }
// fallbackStrategy={ protocol.icon_url ? 'onError' : 'beforeLoadOrError' }
/> />
<span>{ protocol.short_name }</span> <span>{ protocol.short_name }</span>
<chakra.span color="text.secondary" whiteSpace="pre"> { topLevelDomains }</chakra.span> <chakra.span color="text.secondary" whiteSpace="pre"> { topLevelDomains }</chakra.span>
......
...@@ -35,7 +35,7 @@ const NameDomainsTableItem = ({ ...@@ -35,7 +35,7 @@ const NameDomainsTableItem = ({
{ registrationDate && ( { registrationDate && (
<Skeleton loading={ isLoading }> <Skeleton loading={ isLoading }>
{ dayjs(registrationDate).format('lll') } { dayjs(registrationDate).format('lll') }
<chakra.span color="text_secondary"> { dayjs(registrationDate).fromNow() }</chakra.span> <chakra.span color="text.secondary"> { dayjs(registrationDate).fromNow() }</chakra.span>
</Skeleton> </Skeleton>
) } ) }
</TableCell> </TableCell>
......
...@@ -59,7 +59,7 @@ const OptimisticL2OutputRootsListItem = ({ item, isLoading }: Props) => { ...@@ -59,7 +59,7 @@ const OptimisticL2OutputRootsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Label isLoading={ isLoading }>Output root</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Output root</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<Flex overflow="hidden" whiteSpace="nowrap" alignItems="center" w="100%" justifyContent="start"> <Flex overflow="hidden" whiteSpace="nowrap" alignItems="center" w="100%" justifyContent="start">
<Skeleton loading={ isLoading } color="text_secondary"> <Skeleton loading={ isLoading } color="text.secondary">
<HashStringShorten hash={ item.output_root } type="long"/> <HashStringShorten hash={ item.output_root } type="long"/>
</Skeleton> </Skeleton>
<CopyToClipboard text={ item.output_root } isLoading={ isLoading }/> <CopyToClipboard text={ item.output_root } isLoading={ isLoading }/>
......
...@@ -31,7 +31,7 @@ const OptimisticL2OutputRootsTableItem = ({ item, isLoading }: Props) => { ...@@ -31,7 +31,7 @@ const OptimisticL2OutputRootsTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.l1_timestamp } timestamp={ item.l1_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
display="inline-block" display="inline-block"
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
......
...@@ -229,18 +229,18 @@ const AdvancedFilter = () => { ...@@ -229,18 +229,18 @@ const AdvancedFilter = () => {
<HStack gap={ 2 } flexWrap="wrap" mb={ 6 }> <HStack gap={ 2 } flexWrap="wrap" mb={ 6 }>
{ filterTags.map(t => ( { filterTags.map(t => (
<Tag key={ t.name } colorScheme="blue" display="inline-flex" onClose={ onClearFilter(t.key) } closable> <Tag key={ t.name } colorScheme="blue" display="inline-flex" onClose={ onClearFilter(t.key) } closable>
<chakra.span color="text_secondary">{ t.name }: </chakra.span> <chakra.span color="text.secondary">{ t.name }: </chakra.span>
<chakra.span color="text">{ t.value }</chakra.span> <chakra.span color="text">{ t.value }</chakra.span>
</Tag> </Tag>
)) } )) }
{ filterTags.length === 0 && ( { filterTags.length === 0 && (
<> <>
<Tag colorScheme="blue" display="inline-flex"> <Tag colorScheme="blue" display="inline-flex">
<chakra.span color="text_secondary">Type: </chakra.span> <chakra.span color="text.secondary">Type: </chakra.span>
<chakra.span color="text">All</chakra.span> <chakra.span color="text">All</chakra.span>
</Tag> </Tag>
<Tag colorScheme="blue" display="inline-flex"> <Tag colorScheme="blue" display="inline-flex">
<chakra.span color="text_secondary">Age: </chakra.span> <chakra.span color="text.secondary">Age: </chakra.span>
<chakra.span color="text">7d</chakra.span> <chakra.span color="text">7d</chakra.span>
</Tag> </Tag>
</> </>
......
...@@ -75,7 +75,7 @@ const BlockCountdown = ({ hideCapybaraRunner }: Props) => { ...@@ -75,7 +75,7 @@ const BlockCountdown = ({ hideCapybaraRunner }: Props) => {
> >
<TruncatedValue value={ `Block #${ height }` } w="100%"/> <TruncatedValue value={ `Block #${ height }` } w="100%"/>
</Heading> </Heading>
<Box mt={ 2 } color="text_secondary"> <Box mt={ 2 } color="text.secondary">
<Box fontWeight={ 600 }>Estimated target date</Box> <Box fontWeight={ 600 }>Estimated target date</Box>
<Box>{ dayjs().add(Number(data.result.EstimateTimeInSec), 's').format('llll') }</Box> <Box>{ dayjs().add(Number(data.result.EstimateTimeInSec), 's').format('llll') }</Box>
</Box> </Box>
......
...@@ -50,7 +50,7 @@ const GasTracker = () => { ...@@ -50,7 +50,7 @@ const GasTracker = () => {
{ data?.gas_price_updated_at && ( { data?.gas_price_updated_at && (
<Skeleton loading={ isLoading } whiteSpace="pre" display="flex" alignItems="center"> <Skeleton loading={ isLoading } whiteSpace="pre" display="flex" alignItems="center">
<span>Last updated </span> <span>Last updated </span>
<chakra.span color="text_secondary">{ dayjs(data.gas_price_updated_at).format('DD MMM, HH:mm:ss') }</chakra.span> <chakra.span color="text.secondary">{ dayjs(data.gas_price_updated_at).format('DD MMM, HH:mm:ss') }</chakra.span>
{ data.gas_prices_update_in !== 0 && ( { data.gas_prices_update_in !== 0 && (
<GasInfoUpdateTimer <GasInfoUpdateTimer
key={ dataUpdatedAt } key={ dataUpdatedAt }
...@@ -65,7 +65,7 @@ const GasTracker = () => { ...@@ -65,7 +65,7 @@ const GasTracker = () => {
{ data?.coin_price && ( { data?.coin_price && (
<Skeleton loading={ isLoading } ml={{ base: 0, lg: 'auto' }} whiteSpace="pre" display="flex" alignItems="center"> <Skeleton loading={ isLoading } ml={{ base: 0, lg: 'auto' }} whiteSpace="pre" display="flex" alignItems="center">
<NativeTokenIcon mr={ 2 } boxSize={ 6 }/> <NativeTokenIcon mr={ 2 } boxSize={ 6 }/>
<chakra.span color="text_secondary">{ config.chain.currency.symbol }</chakra.span> <chakra.span color="text.secondary">{ config.chain.currency.symbol }</chakra.span>
<span> ${ Number(data.coin_price).toLocaleString(undefined, { maximumFractionDigits: 2 }) }</span> <span> ${ Number(data.coin_price).toLocaleString(undefined, { maximumFractionDigits: 2 }) }</span>
</Skeleton> </Skeleton>
) } ) }
......
...@@ -51,7 +51,7 @@ const Item = ({ name, fileSize, bgColor }: IconInfo & HTMLChakraProps<'div'>) => ...@@ -51,7 +51,7 @@ const Item = ({ name, fileSize, bgColor }: IconInfo & HTMLChakraProps<'div'>) =>
<Tooltip content={ copied ? 'Copied' : 'Copy to clipboard' } open={ copied }> <Tooltip content={ copied ? 'Copied' : 'Copy to clipboard' } open={ copied }>
<Box fontWeight={ 500 } mt={ 2 }>{ name }</Box> <Box fontWeight={ 500 } mt={ 2 }>{ name }</Box>
</Tooltip> </Tooltip>
<Box color="text_secondary">{ formatFileSize(fileSize) }</Box> <Box color="text.secondary">{ formatFileSize(fileSize) }</Box>
</Flex> </Flex>
); );
}; };
......
...@@ -136,7 +136,7 @@ const PublicTagsSubmitFieldTag = ({ index, isDisabled, errors, onAddClick, onRem ...@@ -136,7 +136,7 @@ const PublicTagsSubmitFieldTag = ({ index, isDisabled, errors, onAddClick, onRem
slug: 'new', slug: 'new',
ordinal: 0, ordinal: 0,
}}/> }}/>
<chakra.span color="text_secondary" fontSize="sm"> <chakra.span color="text.secondary" fontSize="sm">
{ tagTypes?.find(({ type }) => type === field.type[0].value)?.description } { tagTypes?.find(({ type }) => type === field.type[0].value)?.description }
</chakra.span> </chakra.span>
</Flex> </Flex>
......
...@@ -14,7 +14,7 @@ const PublicTagsSubmitResultSuccess = ({ data }: Props) => { ...@@ -14,7 +14,7 @@ const PublicTagsSubmitResultSuccess = ({ data }: Props) => {
return ( return (
<Grid gridTemplateColumns={{ base: '1fr', lg: '1fr 1fr' }} rowGap={ 3 } columnGap={ 3 }> <Grid gridTemplateColumns={{ base: '1fr', lg: '1fr 1fr' }} rowGap={ 3 } columnGap={ 3 }>
<GridItem overflow="hidden"> <GridItem overflow="hidden">
<Box fontSize="sm" color="text_secondary" fontWeight={ 500 }>Smart contract / Address (0x...)</Box> <Box fontSize="sm" color="text.secondary" fontWeight={ 500 }>Smart contract / Address (0x...)</Box>
<Flex flexDir="column" rowGap={ 2 } mt={ 2 }> <Flex flexDir="column" rowGap={ 2 } mt={ 2 }>
{ data.items { data.items
.map(({ addresses }) => addresses) .map(({ addresses }) => addresses)
...@@ -29,7 +29,7 @@ const PublicTagsSubmitResultSuccess = ({ data }: Props) => { ...@@ -29,7 +29,7 @@ const PublicTagsSubmitResultSuccess = ({ data }: Props) => {
</Flex> </Flex>
</GridItem> </GridItem>
<GridItem> <GridItem>
<Box fontSize="sm" color="text_secondary" fontWeight={ 500 }>Tag</Box> <Box fontSize="sm" color="text.secondary" fontWeight={ 500 }>Tag</Box>
<Flex rowGap={ 2 } columnGap={ 2 } mt={ 2 } justifyContent="flex-start" flexWrap="wrap"> <Flex rowGap={ 2 } columnGap={ 2 } mt={ 2 } justifyContent="flex-start" flexWrap="wrap">
{ data.items { data.items
.map(({ tags }) => tags) .map(({ tags }) => tags)
......
...@@ -42,7 +42,7 @@ const PublicTagsSubmitResultWithErrors = ({ data }: Props) => { ...@@ -42,7 +42,7 @@ const PublicTagsSubmitResultWithErrors = ({ data }: Props) => {
rowGap={ 3 } rowGap={ 3 }
> >
<GridItem px={{ base: 4, lg: 6 }} pt={{ base: 2, lg: 4 }} pb={{ base: 0, lg: 4 }} overflow="hidden"> <GridItem px={{ base: 4, lg: 6 }} pt={{ base: 2, lg: 4 }} pb={{ base: 0, lg: 4 }} overflow="hidden">
<Box fontSize="sm" color="text_secondary" fontWeight={ 500 }>Smart contract / Address (0x...)</Box> <Box fontSize="sm" color="text.secondary" fontWeight={ 500 }>Smart contract / Address (0x...)</Box>
<Flex flexDir="column" rowGap={ 2 } mt={ 2 }> <Flex flexDir="column" rowGap={ 2 } mt={ 2 }>
{ item.addresses.map((hash) => ( { item.addresses.map((hash) => (
<AddressEntity <AddressEntity
...@@ -54,7 +54,7 @@ const PublicTagsSubmitResultWithErrors = ({ data }: Props) => { ...@@ -54,7 +54,7 @@ const PublicTagsSubmitResultWithErrors = ({ data }: Props) => {
</Flex> </Flex>
</GridItem> </GridItem>
<GridItem px={{ base: 4, lg: 6 }} pb={{ base: 2, lg: 4 }} pt={{ base: 0, lg: 4 }}> <GridItem px={{ base: 4, lg: 6 }} pb={{ base: 2, lg: 4 }} pt={{ base: 0, lg: 4 }}>
<Box fontSize="sm" color="text_secondary" fontWeight={ 500 }>Tag</Box> <Box fontSize="sm" color="text.secondary" fontWeight={ 500 }>Tag</Box>
<Flex rowGap={ 2 } columnGap={ 2 } mt={ 2 } justifyContent="flex-start" flexWrap="wrap"> <Flex rowGap={ 2 } columnGap={ 2 } mt={ 2 } justifyContent="flex-start" flexWrap="wrap">
{ item.tags.map((tag) => ( { item.tags.map((tag) => (
<EntityTag <EntityTag
......
...@@ -178,7 +178,7 @@ const LoginStepContent = ({ goNext, closeModal, openAuthModal }: Props) => { ...@@ -178,7 +178,7 @@ const LoginStepContent = ({ goNext, closeModal, openAuthModal }: Props) => {
> >
{ buttonText } { buttonText }
</Button> </Button>
<Text textStyle="sm" color="text_secondary" textAlign="center"> <Text textStyle="sm" color="text.secondary" textAlign="center">
Already registered for Blockscout Merits on another network or chain? Connect the same wallet here. Already registered for Blockscout Merits on another network or chain? Connect the same wallet here.
</Text> </Text>
</> </>
......
...@@ -15,7 +15,7 @@ const AdditionalInfoButton = (props: Props, ref: React.ForwardedRef<HTMLButtonEl ...@@ -15,7 +15,7 @@ const AdditionalInfoButton = (props: Props, ref: React.ForwardedRef<HTMLButtonEl
return ( return (
<IconButton <IconButton
ref={ ref } ref={ ref }
color="icon_info" color="icon.info"
_hover={{ color: 'link.primary.hover' }} _hover={{ color: 'link.primary.hover' }}
_open={{ _open={{
bgColor: { _light: 'blue.50', _dark: 'gray.600' }, bgColor: { _light: 'blue.50', _dark: 'gray.600' },
......
...@@ -23,7 +23,7 @@ const ApiKeySnippet = ({ apiKey, name, isLoading }: Props) => { ...@@ -23,7 +23,7 @@ const ApiKeySnippet = ({ apiKey, name, isLoading }: Props) => {
<CopyToClipboard text={ apiKey } isLoading={ isLoading }/> <CopyToClipboard text={ apiKey } isLoading={ isLoading }/>
</Flex> </Flex>
{ name && ( { name && (
<Skeleton loading={ isLoading } display="inline-block" fontSize="sm" color="text_secondary" mt={ 1 }> <Skeleton loading={ isLoading } display="inline-block" fontSize="sm" color="text.secondary" mt={ 1 }>
<span>{ name }</span> <span>{ name }</span>
</Skeleton> </Skeleton>
) } ) }
......
...@@ -36,7 +36,7 @@ const CurrencyValue = ({ value, currency = '', decimals, exchangeRate, className ...@@ -36,7 +36,7 @@ const CurrencyValue = ({ value, currency = '', decimals, exchangeRate, className
<chakra.span display="inline-block"> <chakra.span display="inline-block">
{ valueResult }{ currency ? ` ${ currency }` : '' } { valueResult }{ currency ? ` ${ currency }` : '' }
</chakra.span> </chakra.span>
{ usdResult && <chakra.span color="text_secondary" fontWeight={ 400 }>(${ usdResult })</chakra.span> } { usdResult && <chakra.span color="text.secondary" fontWeight={ 400 }>(${ usdResult })</chakra.span> }
</chakra.span> </chakra.span>
); );
}; };
......
...@@ -30,7 +30,7 @@ const Hint = ({ label, className, tooltipProps, isLoading, as }: Props) => { ...@@ -30,7 +30,7 @@ const Hint = ({ label, className, tooltipProps, isLoading, as }: Props) => {
borderRadius="sm" borderRadius="sm"
as={ as } as={ as }
> >
<IconSvg name="info" w="100%" h="100%" color="icon_info" _hover={{ color: 'link.primary.hover' }}/> <IconSvg name="info" w="100%" h="100%" color="icon.info" _hover={{ color: 'link.primary.hover' }}/>
</IconButton> </IconButton>
</Tooltip> </Tooltip>
); );
......
...@@ -62,7 +62,7 @@ const Value = chakra(({ children, className }: ValueProps) => { ...@@ -62,7 +62,7 @@ const Value = chakra(({ children, className }: ValueProps) => {
<GridItem <GridItem
className={ className } className={ className }
py="5px" py="5px"
color="text_secondary" color="text.secondary"
overflow="hidden" overflow="hidden"
> >
{ children } { children }
......
...@@ -36,7 +36,6 @@ const NativeTokenIcon = ({ isLoading, className, type }: Props) => { ...@@ -36,7 +36,6 @@ const NativeTokenIcon = ({ isLoading, className, type }: Props) => {
src={ src || undefined } src={ src || undefined }
alt={ `${ config.chain.currency.symbol } logo` } alt={ `${ config.chain.currency.symbol } logo` }
fallback={ <TokenLogoPlaceholder borderRadius="base" className={ className }/> } fallback={ <TokenLogoPlaceholder borderRadius="base" className={ className }/> }
// fallbackStrategy={ src ? 'onError' : 'beforeLoadOrError' }
/> />
); );
}; };
......
...@@ -82,7 +82,7 @@ const TokenTransferListItem = ({ ...@@ -82,7 +82,7 @@ const TokenTransferListItem = ({
timestamp={ timestamp } timestamp={ timestamp }
enableIncrement={ enableTimeIncrement } enableIncrement={ enableTimeIncrement }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
fontSize="sm" fontSize="sm"
/> />
......
...@@ -94,7 +94,7 @@ const TokenTransferTableItem = ({ ...@@ -94,7 +94,7 @@ const TokenTransferTableItem = ({
timestamp={ timestamp } timestamp={ timestamp }
enableIncrement={ enableTimeIncrement } enableIncrement={ enableTimeIncrement }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
mt="10px" mt="10px"
display="inline-block" display="inline-block"
......
...@@ -21,7 +21,7 @@ const FtTokenTransferSnippet = ({ token, value, decimals }: Props) => { ...@@ -21,7 +21,7 @@ const FtTokenTransferSnippet = ({ token, value, decimals }: Props) => {
return ( return (
<> <>
<chakra.span color="text_secondary">for</chakra.span> <chakra.span color="text.secondary">for</chakra.span>
<span>{ valueStr }</span> <span>{ valueStr }</span>
<TokenEntity <TokenEntity
token={{ ...token, name: token.symbol || token.name }} token={{ ...token, name: token.symbol || token.name }}
...@@ -29,7 +29,7 @@ const FtTokenTransferSnippet = ({ token, value, decimals }: Props) => { ...@@ -29,7 +29,7 @@ const FtTokenTransferSnippet = ({ token, value, decimals }: Props) => {
noSymbol noSymbol
w="auto" w="auto"
/> />
{ usd && <chakra.span color="text_secondary">(${ usd })</chakra.span> } { usd && <chakra.span color="text.secondary">(${ usd })</chakra.span> }
</> </>
); );
}; };
......
...@@ -21,7 +21,7 @@ const NftTokenTransferSnippet = ({ value, token, tokenId }: Props) => { ...@@ -21,7 +21,7 @@ const NftTokenTransferSnippet = ({ value, token, tokenId }: Props) => {
if (token.type === 'ERC-404') { if (token.type === 'ERC-404') {
return null; return null;
} }
return <chakra.span color="text_secondary"> N/A </chakra.span>; return <chakra.span color="text.secondary"> N/A </chakra.span>;
} }
return ( return (
...@@ -42,15 +42,15 @@ const NftTokenTransferSnippet = ({ value, token, tokenId }: Props) => { ...@@ -42,15 +42,15 @@ const NftTokenTransferSnippet = ({ value, token, tokenId }: Props) => {
<> <>
{ num ? ( { num ? (
<> <>
<chakra.span color="text_secondary">for</chakra.span> <chakra.span color="text.secondary">for</chakra.span>
<span>{ num }</span> <span>{ num }</span>
<chakra.span color="text_secondary">token ID</chakra.span> <chakra.span color="text.secondary">token ID</chakra.span>
</> </>
) : ( ) : (
<chakra.span color="text_secondary">for token ID</chakra.span> <chakra.span color="text.secondary">for token ID</chakra.span>
) } ) }
{ tokenIdContent } { tokenIdContent }
<chakra.span color="text_secondary">of</chakra.span> <chakra.span color="text.secondary">of</chakra.span>
<TokenEntity <TokenEntity
token={ token } token={ token }
noCopy noCopy
......
...@@ -79,7 +79,7 @@ const ChartWidget = ({ ...@@ -79,7 +79,7 @@ const ChartWidget = ({
{ description && ( { description && (
<Skeleton <Skeleton
loading={ isLoading } loading={ isLoading }
color="text_secondary" color="text.secondary"
fontSize="xs" fontSize="xs"
mt={ 1 } mt={ 1 }
> >
......
...@@ -51,11 +51,10 @@ const Icon = (props: IconProps) => { ...@@ -51,11 +51,10 @@ const Icon = (props: IconProps) => {
mr={ 2 } mr={ 2 }
alt={ `${ props.protocol.title } protocol icon` } alt={ `${ props.protocol.title } protocol icon` }
fallback={ icon } fallback={ icon }
// fallbackStrategy={ props.protocol.icon_url ? 'onError' : 'beforeLoadOrError' }
/> />
<div> <div>
<span>{ props.protocol.short_name }</span> <span>{ props.protocol.short_name }</span>
<chakra.span color="text_secondary" whiteSpace="pre"> { props.protocol.tld_list.map((tld) => `.${ tld }`).join((' ')) }</chakra.span> <chakra.span color="text.secondary" whiteSpace="pre"> { props.protocol.tld_list.map((tld) => `.${ tld }`).join((' ')) }</chakra.span>
</div> </div>
</Flex> </Flex>
<Text>{ props.protocol.description }</Text> <Text>{ props.protocol.description }</Text>
...@@ -99,7 +98,6 @@ const Icon = (props: IconProps) => { ...@@ -99,7 +98,6 @@ const Icon = (props: IconProps) => {
flexShrink={ 0 } flexShrink={ 0 }
alt={ `${ props.protocol.title } protocol icon` } alt={ `${ props.protocol.title } protocol icon` }
fallback={ icon } fallback={ icon }
// fallbackStrategy={ props.protocol.icon_url ? 'onError' : 'beforeLoadOrError' }
/> />
</Tooltip> </Tooltip>
); );
......
...@@ -53,8 +53,6 @@ const Icon = (props: IconProps) => { ...@@ -53,8 +53,6 @@ const Icon = (props: IconProps) => {
src={ props.token.icon_url ?? undefined } src={ props.token.icon_url ?? undefined }
alt={ `${ props.token.name || 'token' } logo` } alt={ `${ props.token.name || 'token' } logo` }
fallback={ <TokenLogoPlaceholder { ...styles }/> } fallback={ <TokenLogoPlaceholder { ...styles }/> }
// TODO @tom2drum implement fallbackStrategy in Image component
// fallbackStrategy={ props.token.icon_url ? 'onError' : 'beforeLoadOrError' }
/> />
); );
}; };
...@@ -93,7 +91,7 @@ const Symbol = (props: SymbolProps) => { ...@@ -93,7 +91,7 @@ const Symbol = (props: SymbolProps) => {
alignItems="center" alignItems="center"
maxW="20%" maxW="20%"
ml={ 2 } ml={ 2 }
color="text_secondary" color="text.secondary"
> >
<div>(</div> <div>(</div>
<TruncatedTextTooltip label={ symbol }> <TruncatedTextTooltip label={ symbol }>
......
...@@ -44,8 +44,8 @@ const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen, placement }: Pr ...@@ -44,8 +44,8 @@ const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen, placement }: Pr
<Flex flexDir="column" textStyle="xs" rowGap={ 3 }> <Flex flexDir="column" textStyle="xs" rowGap={ 3 }>
{ data.gas_price_updated_at && ( { data.gas_price_updated_at && (
<Flex justifyContent="space-between"> <Flex justifyContent="space-between">
<Box color="text_secondary">Last update</Box> <Box color="text.secondary">Last update</Box>
<Flex color="text_secondary" justifyContent="flex-end" columnGap={ 2 } ml={ 3 }> <Flex color="text.secondary" justifyContent="flex-end" columnGap={ 2 } ml={ 3 }>
{ dayjs(data.gas_price_updated_at).format('MMM DD, HH:mm:ss') } { dayjs(data.gas_price_updated_at).format('MMM DD, HH:mm:ss') }
{ data.gas_prices_update_in !== 0 && { data.gas_prices_update_in !== 0 &&
<GasInfoUpdateTimer key={ dataUpdatedAt } startTime={ dataUpdatedAt } duration={ data.gas_prices_update_in }/> } <GasInfoUpdateTimer key={ dataUpdatedAt } startTime={ dataUpdatedAt } duration={ data.gas_prices_update_in }/> }
......
...@@ -79,7 +79,7 @@ const StatsWidget = ({ ...@@ -79,7 +79,7 @@ const StatsWidget = ({
<Box w={{ base: '100%', lg: icon ? 'calc(100% - 48px)' : '100%' }}> <Box w={{ base: '100%', lg: icon ? 'calc(100% - 48px)' : '100%' }}>
<Skeleton <Skeleton
loading={ isLoading } loading={ isLoading }
color="text_secondary" color="text.secondary"
textStyle="xs" textStyle="xs"
w="fit-content" w="fit-content"
> >
......
...@@ -54,7 +54,7 @@ const TxFee = ({ className, tx, accuracy, accuracyUsd, isLoading, withCurrency = ...@@ -54,7 +54,7 @@ const TxFee = ({ className, tx, accuracy, accuracyUsd, isLoading, withCurrency =
<Skeleton whiteSpace="pre" loading={ isLoading } display="flex" className={ className }> <Skeleton whiteSpace="pre" loading={ isLoading } display="flex" className={ className }>
<span>{ valueStr } </span> <span>{ valueStr } </span>
{ valueStr !== '0' && <TokenEntity token={ token } noCopy onlySymbol w="auto" ml={ 1 }/> } { valueStr !== '0' && <TokenEntity token={ token } noCopy onlySymbol w="auto" ml={ 1 }/> }
{ usd && withUsd && <chakra.span color="text_secondary"> (${ usd })</chakra.span> } { usd && withUsd && <chakra.span color="text.secondary"> (${ usd })</chakra.span> }
</Skeleton> </Skeleton>
); );
} }
......
...@@ -126,7 +126,7 @@ const TxInterpretationElementByType = ( ...@@ -126,7 +126,7 @@ const TxInterpretationElementByType = (
return <chakra.span>{ numberString + ' ' }</chakra.span>; return <chakra.span>{ numberString + ' ' }</chakra.span>;
} }
case 'timestamp': { case 'timestamp': {
return <chakra.span color="text_secondary" whiteSpace="pre">{ dayjs(Number(value) * 1000).format('MMM DD YYYY') }</chakra.span>; return <chakra.span color="text.secondary" whiteSpace="pre">{ dayjs(Number(value) * 1000).format('MMM DD YYYY') }</chakra.span>;
} }
case 'external_link': { case 'external_link': {
return <Link external href={ value.link }>{ value.name }</Link>; return <Link external href={ value.link }>{ value.name }</Link>;
......
...@@ -14,7 +14,7 @@ type Props = { ...@@ -14,7 +14,7 @@ type Props = {
}; };
const VerificationStep = ({ step, isLast, isPassed, isPending, noIcon }: Props) => { const VerificationStep = ({ step, isLast, isPassed, isPending, noIcon }: Props) => {
let stepColor = 'text_secondary'; let stepColor = 'text.secondary';
if (isPending) { if (isPending) {
stepColor = 'yellow.500'; stepColor = 'yellow.500';
} else if (isPassed) { } else if (isPassed) {
......
...@@ -73,7 +73,7 @@ const NavLink = ({ item, onClick, isCollapsed, isDisabled }: Props) => { ...@@ -73,7 +73,7 @@ const NavLink = ({ item, onClick, isCollapsed, isDisabled }: Props) => {
display={{ base: 'inline', lg: isExpanded ? 'inline' : 'none', xl: isCollapsed ? 'none' : 'inline' }} display={{ base: 'inline', lg: isExpanded ? 'inline' : 'none', xl: isCollapsed ? 'none' : 'inline' }}
> >
<span>{ item.text }</span> <span>{ item.text }</span>
{ !isInternalLink && <IconSvg name="link_external" boxSize={ 3 } color="icon_link_external" verticalAlign="middle"/> } { !isInternalLink && <IconSvg name="link_external" boxSize={ 3 } color="icon.externalLink" verticalAlign="middle"/> }
</chakra.span> </chakra.span>
{ isHighlighted && ( { isHighlighted && (
<LightningLabel <LightningLabel
......
...@@ -45,7 +45,7 @@ const SearchBarSuggestApp = ({ data, isMobile, searchTerm, onClick }: Props) => ...@@ -45,7 +45,7 @@ const SearchBarSuggestApp = ({ data, isMobile, searchTerm, onClick }: Props) =>
> >
<span dangerouslySetInnerHTML={{ __html: highlightText(data.title, searchTerm) }}/> <span dangerouslySetInnerHTML={{ __html: highlightText(data.title, searchTerm) }}/>
</Text> </Text>
{ data.external && <IconSvg name="link_external" color="icon_link_external" boxSize={ 3 } verticalAlign="middle" flexShrink={ 0 }/> } { data.external && <IconSvg name="link_external" color="icon.externalLink" boxSize={ 3 } verticalAlign="middle" flexShrink={ 0 }/> }
</Flex> </Flex>
<Text <Text
color="text.secondary" color="text.secondary"
...@@ -81,7 +81,7 @@ const SearchBarSuggestApp = ({ data, isMobile, searchTerm, onClick }: Props) => ...@@ -81,7 +81,7 @@ const SearchBarSuggestApp = ({ data, isMobile, searchTerm, onClick }: Props) =>
{ data.external && ( { data.external && (
<IconSvg <IconSvg
name="link_external" name="link_external"
color="icon_link_external" color="icon.externalLink"
boxSize={ 3 } boxSize={ 3 }
verticalAlign="middle" verticalAlign="middle"
flexShrink={ 0 } flexShrink={ 0 }
......
...@@ -58,7 +58,7 @@ const TopBarStats = () => { ...@@ -58,7 +58,7 @@ const TopBarStats = () => {
{ data?.coin_price && ( { data?.coin_price && (
<Flex columnGap={ 1 }> <Flex columnGap={ 1 }>
<Skeleton loading={ isPlaceholderData }> <Skeleton loading={ isPlaceholderData }>
<chakra.span color="text_secondary">{ config.chain.currency.symbol } </chakra.span> <chakra.span color="text.secondary">{ config.chain.currency.symbol } </chakra.span>
<span>${ Number(data.coin_price).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 6 }) }</span> <span>${ Number(data.coin_price).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 6 }) }</span>
</Skeleton> </Skeleton>
{ data.coin_price_change_percentage && ( { data.coin_price_change_percentage && (
...@@ -73,7 +73,7 @@ const TopBarStats = () => { ...@@ -73,7 +73,7 @@ const TopBarStats = () => {
{ !isMobile && data?.secondary_coin_price && config.chain.secondaryCoin.symbol && ( { !isMobile && data?.secondary_coin_price && config.chain.secondaryCoin.symbol && (
<Flex columnGap={ 1 } ml={ data?.coin_price ? 3 : 0 }> <Flex columnGap={ 1 } ml={ data?.coin_price ? 3 : 0 }>
<Skeleton loading={ isPlaceholderData }> <Skeleton loading={ isPlaceholderData }>
<chakra.span color="text_secondary">{ config.chain.secondaryCoin.symbol } </chakra.span> <chakra.span color="text.secondary">{ config.chain.secondaryCoin.symbol } </chakra.span>
<span>${ Number(data.secondary_coin_price).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 6 }) }</span> <span>${ Number(data.secondary_coin_price).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 6 }) }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
...@@ -82,7 +82,7 @@ const TopBarStats = () => { ...@@ -82,7 +82,7 @@ const TopBarStats = () => {
{ data?.gas_prices && data.gas_prices.average !== null && config.features.gasTracker.isEnabled && ( { data?.gas_prices && data.gas_prices.average !== null && config.features.gasTracker.isEnabled && (
<> <>
<Skeleton loading={ isPlaceholderData } display="inline-flex" whiteSpace="pre-wrap"> <Skeleton loading={ isPlaceholderData } display="inline-flex" whiteSpace="pre-wrap">
<chakra.span color="text_secondary">Gas </chakra.span> <chakra.span color="text.secondary">Gas </chakra.span>
<GasInfoTooltip data={ data } dataUpdatedAt={ dataUpdatedAt } placement={ !data?.coin_price ? 'bottom-start' : undefined }> <GasInfoTooltip data={ data } dataUpdatedAt={ dataUpdatedAt } placement={ !data?.coin_price ? 'bottom-start' : undefined }>
<Link> <Link>
<GasPrice data={ data.gas_prices.average }/> <GasPrice data={ data.gas_prices.average }/>
......
...@@ -56,7 +56,7 @@ const UserProfileContentWallet = ({ onClose, className }: Props) => { ...@@ -56,7 +56,7 @@ const UserProfileContentWallet = ({ onClose, className }: Props) => {
{ web3Wallet.isReconnecting ? <Spinner size="sm" m="2px" flexShrink={ 0 }/> : ( { web3Wallet.isReconnecting ? <Spinner size="sm" m="2px" flexShrink={ 0 }/> : (
<IconButton <IconButton
aria-label="Open wallet" aria-label="Open wallet"
color="icon_info" color="icon.info"
boxSize={ 5 } boxSize={ 5 }
onClick={ handleOpenWalletClick } onClick={ handleOpenWalletClick }
loading={ web3Wallet.isOpen } loading={ web3Wallet.isOpen }
......
...@@ -29,7 +29,7 @@ const UserWalletMenuContent = ({ isAutoConnectDisabled, address, domain, isRecon ...@@ -29,7 +29,7 @@ const UserWalletMenuContent = ({ isAutoConnectDisabled, address, domain, isRecon
<Box> <Box>
{ isAutoConnectDisabled && <UserWalletAutoConnectAlert/> } { isAutoConnectDisabled && <UserWalletAutoConnectAlert/> }
<Text fontSize="sm" fontWeight={ 600 } mb={ 1 }>My wallet</Text> <Text fontSize="sm" fontWeight={ 600 } mb={ 1 }>My wallet</Text>
<Text fontSize="sm" mb={ 5 } fontWeight={ 400 } color="text_secondary"> <Text fontSize="sm" mb={ 5 } fontWeight={ 400 } color="text.secondary">
Your wallet is used to interact with apps and contracts in the explorer. Your wallet is used to interact with apps and contracts in the explorer.
</Text> </Text>
<Flex alignItems="center" columnGap={ 2 } justifyContent="space-between"> <Flex alignItems="center" columnGap={ 2 } justifyContent="space-between">
...@@ -43,7 +43,7 @@ const UserWalletMenuContent = ({ isAutoConnectDisabled, address, domain, isRecon ...@@ -43,7 +43,7 @@ const UserWalletMenuContent = ({ isAutoConnectDisabled, address, domain, isRecon
{ isReconnecting ? <Spinner size="sm" m="2px" flexShrink={ 0 }/> : ( { isReconnecting ? <Spinner size="sm" m="2px" flexShrink={ 0 }/> : (
<IconButton <IconButton
aria-label="Open wallet" aria-label="Open wallet"
color="icon_info" color="icon.info"
boxSize={ 5 } boxSize={ 5 }
onClick={ handleOpenWalletClick } onClick={ handleOpenWalletClick }
flexShrink={ 0 } flexShrink={ 0 }
......
...@@ -78,7 +78,7 @@ const ChartsWidgetsList = ({ filterQuery, isError, isPlaceholderData, charts, in ...@@ -78,7 +78,7 @@ const ChartsWidgetsList = ({ filterQuery, isError, isPlaceholderData, charts, in
</Heading> </Heading>
{ section.id === 'gas' && homeStatsQuery.data && homeStatsQuery.data.gas_prices && ( { section.id === 'gas' && homeStatsQuery.data && homeStatsQuery.data.gas_prices && (
<GasInfoTooltip data={ homeStatsQuery.data } dataUpdatedAt={ homeStatsQuery.dataUpdatedAt }> <GasInfoTooltip data={ homeStatsQuery.data } dataUpdatedAt={ homeStatsQuery.dataUpdatedAt }>
<IconSvg name="info" boxSize={ 5 } display="block" cursor="pointer" color="icon_info" _hover={{ color: 'link_hovered' }}/> <IconSvg name="info" boxSize={ 5 } display="block" cursor="pointer" color="icon.info" _hover={{ color: 'link.primary.hover' }}/>
</GasInfoTooltip> </GasInfoTooltip>
) } ) }
</Skeleton> </Skeleton>
......
...@@ -59,7 +59,7 @@ const Item = ({ data, isLoading }: ItemProps) => { ...@@ -59,7 +59,7 @@ const Item = ({ data, isLoading }: ItemProps) => {
value={ data.trait_type } value={ data.trait_type }
textStyle="xs" textStyle="xs"
w="100%" w="100%"
color="text_secondary" color="text.secondary"
fontWeight={ 500 } fontWeight={ 500 }
mb={ 1 } mb={ 1 }
isLoading={ isLoading } isLoading={ isLoading }
......
...@@ -43,7 +43,7 @@ const TokenTransferTableItem = ({ item, isLoading }: Props) => { ...@@ -43,7 +43,7 @@ const TokenTransferTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.timestamp } timestamp={ item.timestamp }
enableIncrement enableIncrement
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
display="inline-block" display="inline-block"
/> />
......
...@@ -25,7 +25,7 @@ const TxAssetFlowsListItem = (props: Props) => { ...@@ -25,7 +25,7 @@ const TxAssetFlowsListItem = (props: Props) => {
name="lightning" name="lightning"
height="5" height="5"
width="5" width="5"
color="text_secondary" color="text.secondary"
/> />
<Text textStyle="sm" fontWeight="medium"> <Text textStyle="sm" fontWeight="medium">
......
...@@ -25,11 +25,11 @@ const TxAuthorizationsListItem = ({ address, authority, chain_id: chainId, nonce ...@@ -25,11 +25,11 @@ const TxAuthorizationsListItem = ({ address, authority, chain_id: chainId, nonce
</HStack> </HStack>
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontWeight={ 500 }>Chain</Skeleton> <Skeleton loading={ isLoading } fontWeight={ 500 }>Chain</Skeleton>
<Skeleton loading={ isLoading } color="text_secondary">{ chainId === Number(config.chain.id) ? 'this' : 'any' }</Skeleton> <Skeleton loading={ isLoading } color="text.secondary">{ chainId === Number(config.chain.id) ? 'this' : 'any' }</Skeleton>
</HStack> </HStack>
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontWeight={ 500 }>Nonce</Skeleton> <Skeleton loading={ isLoading } fontWeight={ 500 }>Nonce</Skeleton>
<Skeleton loading={ isLoading } color="text_secondary">{ nonce }</Skeleton> <Skeleton loading={ isLoading } color="text.secondary">{ nonce }</Skeleton>
</HStack> </HStack>
</ListItemMobile> </ListItemMobile>
); );
......
...@@ -36,7 +36,7 @@ const TxDetailsGasPrice = ({ gasPrice, gasToken, isLoading }: Props) => { ...@@ -36,7 +36,7 @@ const TxDetailsGasPrice = ({ gasPrice, gasToken, isLoading }: Props) => {
<Skeleton loading={ isLoading } mr={ 1 }> <Skeleton loading={ isLoading } mr={ 1 }>
{ BigNumber(gasPrice).dividedBy(WEI).toFixed() } { currencyUnits.ether } { BigNumber(gasPrice).dividedBy(WEI).toFixed() } { currencyUnits.ether }
</Skeleton> </Skeleton>
<Skeleton loading={ isLoading } color="text_secondary"> <Skeleton loading={ isLoading } color="text.secondary">
<span>({ BigNumber(gasPrice).dividedBy(WEI_IN_GWEI).toFixed() } { currencyUnits.gwei })</span> <span>({ BigNumber(gasPrice).dividedBy(WEI_IN_GWEI).toFixed() } { currencyUnits.gwei })</span>
</Skeleton> </Skeleton>
</> </>
......
...@@ -306,7 +306,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => { ...@@ -306,7 +306,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => {
{ Boolean(data.confirmations) && ( { Boolean(data.confirmations) && (
<> <>
<TextSeparator color="gray.500"/> <TextSeparator color="gray.500"/>
<Skeleton loading={ isLoading } color="text_secondary"> <Skeleton loading={ isLoading } color="text.secondary">
<span>{ data.confirmations } Block confirmations</span> <span>{ data.confirmations } Block confirmations</span>
</Skeleton> </Skeleton>
</> </>
...@@ -384,7 +384,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => { ...@@ -384,7 +384,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => {
{ data.confirmation_duration && ( { data.confirmation_duration && (
<> <>
<TextSeparator color="gray.500"/> <TextSeparator color="gray.500"/>
<Skeleton loading={ isLoading } color="text_secondary"> <Skeleton loading={ isLoading } color="text.secondary">
<span>{ getConfirmationDuration(data.confirmation_duration) }</span> <span>{ getConfirmationDuration(data.confirmation_duration) }</span>
</Skeleton> </Skeleton>
</> </>
......
...@@ -55,7 +55,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -55,7 +55,7 @@ const TxDetailsAction = ({ action }: Props) => {
return ( return (
<Flex flexWrap="wrap" columnGap={ 2 } rowGap={ 2 } alignItems="center" fontWeight={ 500 }> <Flex flexWrap="wrap" columnGap={ 2 } rowGap={ 2 } alignItems="center" fontWeight={ 500 }>
<chakra.span color="text_secondary">{ text0 }</chakra.span> <chakra.span color="text.secondary">{ text0 }</chakra.span>
<span>{ amount0 }</span> <span>{ amount0 }</span>
...@@ -70,7 +70,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -70,7 +70,7 @@ const TxDetailsAction = ({ action }: Props) => {
flexShrink={ 0 } flexShrink={ 0 }
/> />
<chakra.span color="text_secondary">{ type === 'swap' ? 'for' : 'and' }</chakra.span> <chakra.span color="text.secondary">{ type === 'swap' ? 'for' : 'and' }</chakra.span>
<span>{ amount1 }</span> <span>{ amount1 }</span>
...@@ -85,7 +85,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -85,7 +85,7 @@ const TxDetailsAction = ({ action }: Props) => {
flexShrink={ 0 } flexShrink={ 0 }
/> />
<chakra.span color="text_secondary">{ text1 }</chakra.span> <chakra.span color="text.secondary">{ text1 }</chakra.span>
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
<IconSvg name="uniswap" boxSize={ 5 } color="white" bgColor="#ff007a" borderRadius="full" p="2px"/> <IconSvg name="uniswap" boxSize={ 5 } color="white" bgColor="#ff007a" borderRadius="full" p="2px"/>
...@@ -107,7 +107,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -107,7 +107,7 @@ const TxDetailsAction = ({ action }: Props) => {
return ( return (
<div> <div>
<Flex rowGap={ 2 } columnGap={ 2 } flexWrap="wrap" alignItems="center" whiteSpace="pre-wrap" fontWeight={ 500 }> <Flex rowGap={ 2 } columnGap={ 2 } flexWrap="wrap" alignItems="center" whiteSpace="pre-wrap" fontWeight={ 500 }>
<chakra.span color="text_secondary">Minted</chakra.span> <chakra.span color="text.secondary">Minted</chakra.span>
<TokenEntity <TokenEntity
token={ token } token={ token }
...@@ -116,7 +116,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -116,7 +116,7 @@ const TxDetailsAction = ({ action }: Props) => {
rowGap={ 2 } rowGap={ 2 }
/> />
<chakra.span color="text_secondary">to</chakra.span> <chakra.span color="text.secondary">to</chakra.span>
<AddressEntity <AddressEntity
address={{ hash: data.to }} address={{ hash: data.to }}
...@@ -132,7 +132,7 @@ const TxDetailsAction = ({ action }: Props) => { ...@@ -132,7 +132,7 @@ const TxDetailsAction = ({ action }: Props) => {
return ( return (
<Flex key={ data.address + id } whiteSpace="pre-wrap" columnGap={ 2 }> <Flex key={ data.address + id } whiteSpace="pre-wrap" columnGap={ 2 }>
<chakra.span flexShrink={ 0 }>1</chakra.span> <chakra.span flexShrink={ 0 }>1</chakra.span>
<chakra.span color="text_secondary" flexShrink={ 0 }>of token ID</chakra.span> <chakra.span color="text.secondary" flexShrink={ 0 }>of token ID</chakra.span>
<NftEntity hash={ data.address } id={ id } w="min-content" variant="content"/> <NftEntity hash={ data.address } id={ id } w="min-content" variant="content"/>
</Flex> </Flex>
); );
......
...@@ -34,13 +34,13 @@ const TxInternalsListItem = ({ type, from, to, value, success, error, gas_limit: ...@@ -34,13 +34,13 @@ const TxInternalsListItem = ({ type, from, to, value, success, error, gas_limit:
/> />
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value { currencyUnits.ether }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Value { currencyUnits.ether }</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary"> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">
{ BigNumber(value).div(BigNumber(10 ** config.chain.currency.decimals)).toFormat() } { BigNumber(value).div(BigNumber(10 ** config.chain.currency.decimals)).toFormat() }
</Skeleton> </Skeleton>
</HStack> </HStack>
<HStack gap={ 3 }> <HStack gap={ 3 }>
<Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Gas limit</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" fontWeight={ 500 }>Gas limit</Skeleton>
<Skeleton loading={ isLoading } fontSize="sm" color="text_secondary">{ BigNumber(gasLimit).toFormat() }</Skeleton> <Skeleton loading={ isLoading } fontSize="sm" color="text.secondary">{ BigNumber(gasLimit).toFormat() }</Skeleton>
</HStack> </HStack>
</ListItemMobile> </ListItemMobile>
); );
......
...@@ -62,7 +62,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -62,7 +62,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.commitment_transaction.timestamp } timestamp={ item.commitment_transaction.timestamp }
fallbackText="Undefined" fallbackText="Undefined"
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
......
...@@ -34,7 +34,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -34,7 +34,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.l1_timestamp } timestamp={ item.l1_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
display="inline-block" display="inline-block"
color="text_secondary" color="text.secondary"
my={ 1 } my={ 1 }
/> />
</TableCell> </TableCell>
......
...@@ -58,7 +58,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -58,7 +58,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.commitment_transaction.timestamp } timestamp={ item.commitment_transaction.timestamp }
fallbackText="Undefined" fallbackText="Undefined"
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
......
...@@ -41,7 +41,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -41,7 +41,7 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.timestamp } timestamp={ item.timestamp }
fallbackText="Undefined" fallbackText="Undefined"
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
......
...@@ -41,7 +41,7 @@ const ZkSyncTxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -41,7 +41,7 @@ const ZkSyncTxnBatchesTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.timestamp } timestamp={ item.timestamp }
fallbackText="Undefined" fallbackText="Undefined"
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
......
...@@ -69,7 +69,7 @@ const TxsListItem = ({ tx, isLoading, showBlockInfo, currentAddress, enableTimeI ...@@ -69,7 +69,7 @@ const TxsListItem = ({ tx, isLoading, showBlockInfo, currentAddress, enableTimeI
timestamp={ tx.timestamp } timestamp={ tx.timestamp }
enableIncrement={ enableTimeIncrement } enableIncrement={ enableTimeIncrement }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
fontWeight="400" fontWeight="400"
fontSize="sm" fontSize="sm"
/> />
...@@ -79,7 +79,7 @@ const TxsListItem = ({ tx, isLoading, showBlockInfo, currentAddress, enableTimeI ...@@ -79,7 +79,7 @@ const TxsListItem = ({ tx, isLoading, showBlockInfo, currentAddress, enableTimeI
<Skeleton loading={ isLoading } display="inline-block" whiteSpace="pre">Method </Skeleton> <Skeleton loading={ isLoading } display="inline-block" whiteSpace="pre">Method </Skeleton>
<Skeleton <Skeleton
loading={ isLoading } loading={ isLoading }
color="text_secondary" color="text.secondary"
overflow="hidden" overflow="hidden"
whiteSpace="nowrap" whiteSpace="nowrap"
textOverflow="ellipsis" textOverflow="ellipsis"
......
...@@ -33,7 +33,7 @@ const UserOpsListItem = ({ item, isLoading, showTx, showSender }: Props) => { ...@@ -33,7 +33,7 @@ const UserOpsListItem = ({ item, isLoading, showTx, showSender }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
......
...@@ -101,7 +101,7 @@ const VerifiedAddressesTableItem = ({ item, application, onAdd, onEdit, isLoadin ...@@ -101,7 +101,7 @@ const VerifiedAddressesTableItem = ({ item, application, onAdd, onEdit, isLoadin
<VerifiedAddressesStatus status={ item.metadata.tokenName ? application?.status : undefined }/> <VerifiedAddressesStatus status={ item.metadata.tokenName ? application?.status : undefined }/>
</Skeleton> </Skeleton>
</TableCell> </TableCell>
<TableCell fontSize="sm" color="text_secondary"> <TableCell fontSize="sm" color="text.secondary">
<Skeleton loading={ isLoading } display="inline-block"> <Skeleton loading={ isLoading } display="inline-block">
{ item.metadata.tokenName && application ? dayjs(application.updatedAt).format('MMM DD, YYYY') : null } { item.metadata.tokenName && application ? dayjs(application.updatedAt).format('MMM DD, YYYY') : null }
</Skeleton> </Skeleton>
......
...@@ -55,7 +55,7 @@ const BeaconChainWithdrawalsTableItem = ({ item, view, isLoading }: Props) => { ...@@ -55,7 +55,7 @@ const BeaconChainWithdrawalsTableItem = ({ item, view, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
display="inline-block" display="inline-block"
/> />
</TableCell> </TableCell>
......
...@@ -51,7 +51,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -51,7 +51,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
fallbackText="N/A" fallbackText="N/A"
isLoading={ isLoading } isLoading={ isLoading }
display="inline-block" display="inline-block"
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -73,7 +73,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -73,7 +73,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
} }
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
<Skeleton loading={ isLoading } color="text_secondary" minW="50px" minH="20px" display="inline-block">{ timeToEnd }</Skeleton> <Skeleton loading={ isLoading } color="text.secondary" minW="50px" minH="20px" display="inline-block">{ timeToEnd }</Skeleton>
</TableCell> </TableCell>
</TableRow> </TableRow>
); );
......
...@@ -49,7 +49,7 @@ const ScrollL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -49,7 +49,7 @@ const ScrollL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.origination_timestamp } timestamp={ item.origination_timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -61,7 +61,7 @@ const ScrollL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -61,7 +61,7 @@ const ScrollL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
noIcon noIcon
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
Pending Claim Pending Claim
</chakra.span> </chakra.span>
) } ) }
......
...@@ -58,7 +58,7 @@ const WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -58,7 +58,7 @@ const WithdrawalsTableItem = ({ item, isLoading }: Props) => {
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
display="inline-block" display="inline-block"
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
</TableRow> </TableRow>
......
...@@ -50,7 +50,7 @@ const ZkEvmL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -50,7 +50,7 @@ const ZkEvmL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
<TimeAgoWithTooltip <TimeAgoWithTooltip
timestamp={ item.timestamp } timestamp={ item.timestamp }
isLoading={ isLoading } isLoading={ isLoading }
color="text_secondary" color="text.secondary"
/> />
</TableCell> </TableCell>
<TableCell verticalAlign="middle"> <TableCell verticalAlign="middle">
...@@ -63,7 +63,7 @@ const ZkEvmL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -63,7 +63,7 @@ const ZkEvmL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
textStyle="sm" textStyle="sm"
/> />
) : ( ) : (
<chakra.span color="text_secondary"> <chakra.span color="text.secondary">
Pending Claim Pending Claim
</chakra.span> </chakra.span>
) } ) }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment