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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion toolkit/components/charts/ChartWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const ChartWidget = React.memo(({
hidden={ !zoomRange }
aria-label="Reset zoom"
size="md"
variant="icon_secondary"
variant="icon_background"
onClick={ handleZoomReset }
>
<Icon><RepeatIcon/></Icon>
Expand Down
2 changes: 1 addition & 1 deletion toolkit/components/charts/parts/ChartMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const ChartMenu = ({
<>
<MenuRoot>
<MenuTrigger asChild>
<IconButton variant="icon_secondary" size="md" aria-label="Open chart options menu" loadingSkeleton={ isLoading }>
<IconButton variant="icon_background" size="md" aria-label="Open chart options menu" loadingSkeleton={ isLoading }>
<Icon><DotsIcon/></Icon>
</IconButton>
</MenuTrigger>
Expand Down
2 changes: 1 addition & 1 deletion toolkit/theme/foundations/colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const DEFAULT_THEME_COLORS = {
},
bg: {
_light: { value: '{colors.blue.50}' },
_dark: { value: '{colors.whiteAlpha.100}' },
_dark: { value: '{colors.whiteAlpha.50}' },
},
},
option: {
Expand Down
5 changes: 5 additions & 0 deletions toolkit/theme/foundations/semanticTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ const semanticTokens: ThemingConfig['semanticTokens'] = {
DEFAULT: { value: '{colors.text.primary}' },
},
},
icon_background: {
bg: {
DEFAULT: { value: { _light: '{colors.gray.50}', _dark: '{colors.whiteAlpha.50}' } },
},
},
pagination: {
fg: {
DEFAULT: { value: { _light: '{colors.blackAlpha.800}', _dark: '{colors.gray.50}' } },
Expand Down
22 changes: 22 additions & 0 deletions toolkit/theme/recipes/button.recipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,28 @@ export const recipe = defineRecipe({
color: 'hover',
},
},
icon_background: {
bg: 'button.icon_background.bg',
color: 'icon.secondary',
border: 'none',
_hover: {
color: 'hover',
},
_selected: {
bg: 'selected.control.bg',
color: 'selected.control.text',
_hover: {
bg: 'selected.control.bg',
color: 'hover',
},
_expanded: {
color: 'hover',
},
},
_expanded: {
color: 'hover',
},
},
pagination: {
borderWidth: '2px',
borderStyle: 'solid',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ui/address/details/AddressFavoriteButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const AddressFavoriteButton = ({ className, hash, watchListId }: Props) => {
<IconButton
className={ className }
aria-label="edit"
variant="icon_secondary"
variant="icon_background"
size="md"
selected={ Boolean(watchListId) }
onClick={ onClick }
Expand Down
2 changes: 1 addition & 1 deletion ui/address/details/AddressQrCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const AddressQrCode = ({ hash, className, isLoading }: Props) => {
<IconButton
className={ className }
aria-label="Show QR code"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ onOpen }
>
Expand Down
2 changes: 1 addition & 1 deletion ui/address/tokenSelect/TokenSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const TokenSelect = () => {
>
<IconButton
aria-label="Show all tokens"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ handleIconButtonClick }
>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ui/marketplace/Banner/FeaturedApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const FeaturedApp = ({
<IconButton
aria-label="Mark as favorite"
title="Mark as favorite"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ handleFavoriteClick }
selected={ isFavorite }
Expand Down
2 changes: 1 addition & 1 deletion ui/marketplace/Banner/FeaturedAppMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const FeaturedAppMobile = ({
top={{ base: 1, sm: '18px' }}
aria-label="Mark as favorite"
title="Mark as favorite"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ onFavoriteClick }
selected={ isFavorite }
Expand Down
6 changes: 3 additions & 3 deletions ui/marketplace/MarketplaceAppCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const MarketplaceAppCard = ({
<IconButton
aria-label="Mark as favorite"
title="Mark as favorite"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ handleFavoriteClick }
selected={ isFavorite }
Expand All @@ -182,9 +182,9 @@ const MarketplaceAppCard = ({
<CopyToClipboard
text={ isBrowser() ? window.location.origin + `/apps/${ id }` : '' }
type="share"
variant="icon_secondary"
variant="icon_background"
size="md"
borderRadius="none"
borderRadius="base"
ml={ 0 }
boxSize={ 8 }
/>
Expand Down
5 changes: 3 additions & 2 deletions ui/marketplace/MarketplaceAppModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const MarketplaceAppModal = ({
<IconButton
aria-label="Mark as favorite"
title="Mark as favorite"
variant="icon_secondary"
variant="icon_background"
size="md"
onClick={ handleFavoriteClick }
selected={ isFavorite }
Expand All @@ -194,10 +194,11 @@ const MarketplaceAppModal = ({
<CopyToClipboard
text={ isBrowser() ? window.location.origin + `/apps/${ id }` : '' }
type="share"
variant="icon_secondary"
variant="icon_background"
size="md"
ml={ 0 }
boxSize={ 8 }
borderRadius="base"
/>
</Flex>
</Flex>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ui/optimismSuperchain/address/OpSuperchainAddressTxs.pw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ test.describe('local txs', () => {
});

test('base view', async() => {
await expect(component).toHaveScreenshot();
await expect(component).toHaveScreenshot({ maxDiffPixels: 5 });
});

test.describe('mobile', () => {
test.use({ viewport: pwConfig.viewport.mobile });

test('base view', async() => {
await expect(component).toHaveScreenshot();
await expect(component).toHaveScreenshot({ maxDiffPixels: 5 });
});
});
});
5 changes: 3 additions & 2 deletions ui/pages/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,10 @@ const Chart = () => {
text={ config.app.baseUrl + router.asPath }
type="link"
ml={ 0 }
borderRadius="none"
variant="icon_secondary"
borderRadius="base"
variant="icon_background"
size="md"
boxSize={ 8 }
/>
)
)) }
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/Marketplace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const Marketplace = () => {
<MenuRoot>
<MenuTrigger asChild>
<IconButton
variant="icon_secondary"
variant="icon_background"
size="md"
ml="auto"
>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui/pages/__screenshots__/Token.pw.tsx_default_base-view-1.png
Binary file modified ui/pages/__screenshots__/Token.pw.tsx_default_bridged-token-1.png
Binary file modified ui/pages/__screenshots__/Token.pw.tsx_default_scam-token-1.png
2 changes: 1 addition & 1 deletion ui/shared/AccountActionsMenu/AccountActionsMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const AccountActionsMenu = ({ isLoading, className, showUpdateMetadataItem }: Pr
return (
<MenuRoot unmountOnExit={ false }>
<MenuTrigger asChild>
<IconButton variant="icon_secondary" size="md" className={ className } onClick={ handleButtonClick } aria-label="Show address menu">
<IconButton variant="icon_background" size="md" className={ className } onClick={ handleButtonClick } aria-label="Show address menu">
<IconSvg name="dots"/>
</IconButton>
</MenuTrigger>
Expand Down
2 changes: 1 addition & 1 deletion ui/shared/AccountActionsMenu/parts/ButtonItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const ButtonItem = ({ className, label, onClick, icon, isDisabled }: Props) => {
className={ className }
onClick={ onClick }
disabled={ isDisabled }
variant="icon_secondary"
variant="icon_background"
boxSize={ 8 }
>
{ typeof icon === 'string' ? <IconSvg name={ icon } boxSize={ 6 }/> : icon }
Expand Down
4 changes: 2 additions & 2 deletions ui/shared/PrevNext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const PrevNext = ({ className, onClick, prevLabel, nextLabel, isPrevDisabled, is
<IconButton
aria-label="prev"
borderRadius="sm"
variant="subtle"
variant="icon_background"
boxSize={ 6 }
onClick={ handelPrevClick }
disabled={ isPrevDisabled }
Expand All @@ -52,7 +52,7 @@ const PrevNext = ({ className, onClick, prevLabel, nextLabel, isPrevDisabled, is
<IconButton
aria-label="next"
borderRadius="sm"
variant="subtle"
variant="icon_background"
boxSize={ 6 }
ml="10px"
onClick={ handelNextClick }
Expand Down
2 changes: 1 addition & 1 deletion ui/shared/address/AddressAddToWallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const AddressAddToWallet = ({ className, token, tokenId, isLoading, variant = 'i
<IconButton
className={ className }
aria-label="Add token to wallet"
variant="plain"
variant="icon_background"
size="md"
onClick={ handleClick }
>
Expand Down
31 changes: 26 additions & 5 deletions ui/showcases/IconButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,42 @@ const IconButtonShowcase = () => {
<SamplesStack>
<Sample label="variant: icon_secondary">
<IconButton size="md" variant="icon_secondary">
<IconSvg name="heart_outline"/>
<IconSvg name="info"/>
</IconButton>
<IconButton size="md" variant="icon_secondary" data-hover>
<IconSvg name="heart_outline"/>
<IconSvg name="info"/>
</IconButton>
<IconButton size="md" variant="icon_secondary" disabled>
<IconSvg name="heart_outline"/>
<IconSvg name="info"/>
</IconButton>
<IconButton size="md" variant="icon_secondary" selected>
<IconSvg name="heart_filled"/>
<IconSvg name="info"/>
</IconButton>
<IconButton size="md" variant="icon_secondary" selected data-hover>
<IconSvg name="heart_filled"/>
<IconSvg name="info"/>
</IconButton>
<IconButton size="md" variant="icon_secondary" selected disabled>
<IconSvg name="info"/>
</IconButton>
</Sample>

<Sample label="variant: icon_background">
<IconButton size="md" variant="icon_background">
<IconSvg name="heart_outline"/>
</IconButton>
<IconButton size="md" variant="icon_background" data-hover>
<IconSvg name="heart_outline"/>
</IconButton>
<IconButton size="md" variant="icon_background" disabled>
<IconSvg name="heart_outline"/>
</IconButton>
<IconButton size="md" variant="icon_background" selected>
<IconSvg name="heart_filled"/>
</IconButton>
<IconButton size="md" variant="icon_background" selected data-hover>
<IconSvg name="heart_filled"/>
</IconButton>
<IconButton size="md" variant="icon_background" selected disabled>
<IconSvg name="heart_filled"/>
</IconButton>
</Sample>
Expand Down
4 changes: 2 additions & 2 deletions ui/showcases/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const MenuShowcase = () => {
<Sample label="variant: subtle">
<MenuRoot>
<MenuTrigger asChild>
<IconButton variant="icon_secondary" size="md">
<IconButton variant="icon_background" size="md">
<IconSvg name="dots"/>
</IconButton>
</MenuTrigger>
Expand All @@ -30,7 +30,7 @@ const MenuShowcase = () => {

<MenuRoot>
<MenuTrigger asChild>
<IconButton variant="icon_secondary" size="md" loadingSkeleton>
<IconButton variant="icon_background" size="md" loadingSkeleton>
<IconSvg name="dots"/>
</IconButton>
</MenuTrigger>
Expand Down
Loading