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
6 changes: 3 additions & 3 deletions packages/wallet-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"@emotion/styled": "^11.14.1",
"@lifi/sdk": "4.0.0-beta.5",
"@lifi/widget-provider": "workspace:*",
"@mui/icons-material": "^7.3.9",
"@mui/material": "^7.3.9",
"@mui/system": "^7.3.9",
"@mui/icons-material": "^7.3.10",
"@mui/material": "^7.3.10",
"@mui/system": "^7.3.10",
"i18next": "^26.0.4",
"mitt": "^3.0.1",
"react-i18next": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/wallet-management/src/components/WalletTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export const WalletTag: StyledComponent<ChipProps & WalletTagProps> = styled(
},
style: {
color: theme.vars.palette.primary.main,
backgroundColor: `rgba(${theme.vars.palette.primary.mainChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.primary.main} 8%, transparent)`,
...theme.applyStyles('dark', {
color: theme.vars.palette.text.primary,
backgroundColor: `rgba(${theme.vars.palette.primary.mainChannel} / 0.42)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.primary.main} 42%, transparent)`,
}),
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/widget-playground-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@emotion/styled": "^11.14.1",
"@lifi/widget": "workspace:*",
"@lifi/widget-playground": "workspace:*",
"@mui/material": "^7.3.9",
"@mui/material-nextjs": "^7.3.9",
"@mui/material": "^7.3.10",
"@mui/material-nextjs": "^7.3.10",
"@tanstack/react-query": "^5.97.0",
"core-js": "^3.49.0",
"next": "^16.2.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/widget-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"@lifi/widget-provider-sui": "workspace:*",
"@metamask/connect-evm": "^0.9.1",
"@monaco-editor/react": "^4.7.0",
"@mui/icons-material": "^7.3.9",
"@mui/lab": "7.0.1-beta.23",
"@mui/material": "^7.3.9",
"@mui/system": "^7.3.9",
"@mui/icons-material": "^7.3.10",
"@mui/lab": "7.0.1-beta.24",
"@mui/material": "^7.3.10",
"@mui/system": "^7.3.10",
"@reown/appkit": ">=1.8.18",
"@reown/appkit-adapter-bitcoin": "^1.8.19",
"@reown/appkit-adapter-solana": "^1.8.19",
Expand Down
4 changes: 2 additions & 2 deletions packages/widget-playground/src/components/Card/Card.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ export const Card: React.FC<React.ComponentProps<typeof MuiCard> & CardProps> =
style: {
borderWidth: 1,
borderStyle: 'solid',
borderColor: `rgba(${theme.vars.palette.secondary.mainChannel} / 0.32)`,
borderColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 32%, transparent)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 24%, white)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 28%, white)`,
},
...theme.applyStyles('dark', {
borderColor: `rgba(${theme.vars.palette.secondary.mainChannel} / 0.32)`,
borderColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 32%, transparent)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 24%, black)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 28%, black)`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ export const TabButtonsContainer: React.FC<React.ComponentProps<typeof Box>> =
const controlSelected = (theme: Theme) => ({
borderRadius: theme.vars.shape.borderRadiusSecondary,
backgroundColor: theme.vars.palette.common.white,
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
...theme.applyStyles('dark', {
backgroundColor: theme.vars.palette.background.default,
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.backgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.background} 4%, transparent)`,
}),
})

Expand Down Expand Up @@ -124,9 +124,9 @@ export const Input: React.FC<React.ComponentProps<typeof InputBase>> = styled(
},
...getCardFieldsetBackgroundColor(theme),
borderRadius: theme.vars.shape.borderRadiusSecondary,
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
...theme.applyStyles('dark', {
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.backgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.background} 4%, transparent)`,
}),
}
})
Expand Down
4 changes: 2 additions & 2 deletions packages/widget-playground/src/components/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const Switch: React.FC<React.ComponentProps<typeof MuiSwitch>> = styled(
borderColor: theme.vars.palette.common.white,
},
[`&.${switchClasses.disabled} .${switchClasses.thumb}`]: {
color: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.12)`,
color: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 12%, transparent)`,
},
[`&.${switchClasses.disabled} + .${switchClasses.track}`]: {
opacity: 0.7,
Expand All @@ -45,7 +45,7 @@ export const Switch: React.FC<React.ComponentProps<typeof MuiSwitch>> = styled(
},
[`.${switchClasses.track}`]: {
borderRadius: 24 / 2,
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.16)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 16%, transparent)`,
opacity: 1,
transition: theme.transitions.create(['background-color'], {
duration: theme.transitions.duration.standard,
Expand Down
4 changes: 2 additions & 2 deletions packages/widget-playground/src/components/Tabs/Tabs.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ export const Tabs: React.FC<React.ComponentProps<typeof MuiTabs>> = styled(
backgroundColor: theme.vars.palette.common.white,
borderRadius:
Math.max(theme.shape.borderRadius, theme.shape.borderRadiusSecondary) - 4,
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
...theme.applyStyles('dark', {
backgroundColor: theme.vars.palette.background.default,
boxShadow: `0px 2px 4px rgba(${theme.vars.palette.common.backgroundChannel} / 0.04)`,
boxShadow: `0px 2px 4px color-mix(in srgb, ${theme.vars.palette.common.background} 4%, transparent)`,
}),
},
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ const floatingToolButtonColors = (theme: Theme) => ({
color: theme.vars.palette.text.primary,
backgroundColor: theme.vars.palette.common.white,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.backgroundChannel}, 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.background} 8%, transparent)`,
},
...theme.applyStyles('dark', {
backgroundColor: theme.vars.palette.grey[900],
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.backgroundChannel}, 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.background} 4%, transparent)`,
},
}),
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const createTheme = (playgroundColor?: string): Theme =>
ownerState.variant === 'elevation' && {
'&:hover': {
cursor: 'pointer',
filter: `drop-shadow(0 1px 4px rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.08))`,
filter: `drop-shadow(0 1px 4px color-mix(in srgb, ${theme.vars.palette.common.onBackground} 8%, transparent))`,
},
}),
...(!ownerState.onClick && {
Expand All @@ -158,7 +158,7 @@ export const createTheme = (playgroundColor?: string): Theme =>
style: ({ theme }) => ({
border: 'none',
boxShadow: 'none',
filter: `drop-shadow(0 1px 4px rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04))`,
filter: `drop-shadow(0 1px 4px color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent))`,
}),
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-playground/src/utils/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const safe6DigitHexColor = (color: string): string => {
export const getCardFieldsetBackgroundColor = (
theme: Theme
): Record<string, any> => ({
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
...theme.applyStyles('dark', {
backgroundColor: theme.vars.palette.grey[800],
}),
Expand Down
6 changes: 3 additions & 3 deletions packages/widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
"@lifi/sdk": "4.0.0-beta.5",
"@lifi/wallet-management": "workspace:*",
"@lifi/widget-provider": "workspace:*",
"@mui/icons-material": "^7.3.9",
"@mui/material": "^7.3.9",
"@mui/system": "^7.3.9",
"@mui/icons-material": "^7.3.10",
"@mui/material": "^7.3.10",
"@mui/system": "^7.3.10",
"@tanstack/react-router": "^1.168.10",
"@tanstack/react-virtual": "^3.13.23",
"i18next": "^26.0.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ export const InputPriceButton: React.FC<React.ComponentProps<typeof Button>> =
...(onClick
? {
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
...theme.applyStyles('dark', {
backgroundColor: 'transparent',
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
}),
}
Expand Down
12 changes: 6 additions & 6 deletions packages/widget/src/components/ButtonTertiary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ export const ButtonTertiary: React.FC<React.ComponentProps<typeof Button>> =
color: theme.vars.palette.text.primary,
height: 40,
fontSize: 14,
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
'&:hover, &:active': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 8%, transparent)`,
},
[`&.${buttonClasses.loading}:disabled`]: {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
...theme.applyStyles('dark', {
color: theme.vars.palette.text.primary,
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
'&:hover, &:active': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 8%, transparent)`,
},
[`&.${buttonClasses.loading}:disabled`]: {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
}),
[`.${buttonClasses.loadingIndicator}`]: {
Expand Down
4 changes: 2 additions & 2 deletions packages/widget/src/components/Card/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ export const Card: React.FC<React.ComponentProps<typeof MuiCard> & CardProps> =
style: {
borderWidth: 1,
borderStyle: 'solid',
borderColor: `rgba(${theme.vars.palette.secondary.mainChannel} / 0.32)`,
borderColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 32%, transparent)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 24%, white)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 28%, white)`,
},
...theme.applyStyles('dark', {
borderColor: `rgba(${theme.vars.palette.secondary.mainChannel} / 0.32)`,
borderColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 32%, transparent)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 24%, black)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.secondary.main} 28%, black)`,
Expand Down
4 changes: 2 additions & 2 deletions packages/widget/src/components/Card/CardIconButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export const CardIconButton: React.FC<
>(({ theme }) => {
return {
padding: theme.spacing(0.5),
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 8%, transparent)`,
},
fontSize: '1rem',
}
Expand Down
4 changes: 2 additions & 2 deletions packages/widget/src/components/Card/CardLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ export const CardLabel: React.FC<
{
props: { variant: 'warning' },
style: {
backgroundColor: `rgba(${theme.vars.palette.warning.mainChannel} / 0.32)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.warning.main} 32%, transparent)`,
color: `color-mix(in srgb, ${theme.vars.palette.warning.main} 64%, black)`,
...theme.applyStyles('dark', {
backgroundColor: `rgba(${theme.vars.palette.warning.mainChannel} / 0.16)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.warning.main} 16%, transparent)`,
color: theme.vars.palette.warning.main,
}),
},
Expand Down
2 changes: 1 addition & 1 deletion packages/widget/src/components/ContextMenu.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ export const ContextMenuButton: React.FC<
top: theme.spacing(1.75),
right: theme.spacing(2),
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
}))
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ export const ActivitiesIconButton: React.FC<
{
props: { active: true },
style: ({ theme }) => ({
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 8%, transparent)`,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.12)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 12%, transparent)`,
},
...theme.applyStyles('dark', {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.12)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 12%, transparent)`,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.16)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 16%, transparent)`,
},
}),
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/widget/src/components/Header/Header.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ export const WalletButton: React.FC<
borderRadius: `calc(${theme.vars.shape.borderRadius} * 2)`,
backgroundColor: 'transparent',
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
...theme.applyStyles('dark', {
backgroundColor: 'transparent',
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.common.onBackground} 4%, transparent)`,
},
}),
[`.${buttonClasses.endIcon} > *:nth-of-type(1)`]: {
Expand Down
16 changes: 8 additions & 8 deletions packages/widget/src/components/Header/SettingsButton.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,27 @@ export const SettingsIconButton: React.FC<
switch (variant) {
case 'info':
return {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.08)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 8%, transparent)`,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.12)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 12%, transparent)`,
},
...theme.applyStyles('dark', {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.12)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 12%, transparent)`,
'&:hover': {
backgroundColor: `rgba(${theme.vars.palette.info.mainChannel} / 0.16)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.info.main} 16%, transparent)`,
},
}),
}
case 'warning':
return {
backgroundColor: `rgba(${theme.vars.palette.warning.mainChannel} / 0.32)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.warning.main} 32%, transparent)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, rgba(${theme.vars.palette.warning.mainChannel} / 0.32) 80%, black)`,
backgroundColor: `color-mix(in srgb, color-mix(in srgb, ${theme.vars.palette.warning.main} 32%, transparent) 80%, black)`,
},
...theme.applyStyles('dark', {
backgroundColor: `rgba(${theme.vars.palette.warning.mainChannel} / 0.16)`,
backgroundColor: `color-mix(in srgb, ${theme.vars.palette.warning.main} 16%, transparent)`,
'&:hover': {
backgroundColor: `color-mix(in srgb, rgba(${theme.vars.palette.warning.mainChannel} / 0.16) 80%, black)`,
backgroundColor: `color-mix(in srgb, color-mix(in srgb, ${theme.vars.palette.warning.main} 16%, transparent) 80%, black)`,
},
}),
}
Expand Down
14 changes: 7 additions & 7 deletions packages/widget/src/components/IconCircle/IconCircle.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ export const getStatusColor = (
switch (status) {
case 'success':
return {
color: theme.vars.palette.success.mainChannel,
color: theme.vars.palette.success.main,
mixAmount: 12,
lightDarken: 0,
darkDarken: 0,
}
case 'error':
return {
color: theme.vars.palette.error.mainChannel,
color: theme.vars.palette.error.main,
mixAmount: 12,
lightDarken: 0,
darkDarken: 0,
}
case 'warning':
return {
color: theme.vars.palette.warning.mainChannel,
color: theme.vars.palette.warning.main,
mixAmount: 48,
lightDarken: 0.32,
darkDarken: 0,
}
case 'info':
return {
color: theme.vars.palette.info.mainChannel,
color: theme.vars.palette.info.main,
mixAmount: 12,
lightDarken: 0,
darkDarken: 0,
Expand All @@ -61,21 +61,21 @@ export const IconCircleRoot: React.FC<
({ theme, colorConfig, circleSize }) => {
const svgSize = Math.round(circleSize * iconSizeRatio)
return {
backgroundColor: `color-mix(in srgb, rgb(${colorConfig.color}) ${colorConfig.mixAmount}%, ${theme.vars.palette.background.paper})`,
backgroundColor: `color-mix(in srgb, ${colorConfig.color} ${colorConfig.mixAmount}%, ${theme.vars.palette.background.paper})`,
borderRadius: '50%',
width: circleSize,
height: circleSize,
display: 'grid',
position: 'relative',
placeItems: 'center',
'& > svg': {
color: `color-mix(in srgb, rgb(${colorConfig.color}) ${(1 - colorConfig.lightDarken) * 100}%, black)`,
color: `color-mix(in srgb, ${colorConfig.color} ${(1 - colorConfig.lightDarken) * 100}%, black)`,
width: svgSize,
height: svgSize,
},
...theme.applyStyles('dark', {
'& > svg': {
color: `color-mix(in srgb, rgb(${colorConfig.color}) ${(1 - colorConfig.darkDarken) * 100}%, black)`,
color: `color-mix(in srgb, ${colorConfig.color} ${(1 - colorConfig.darkDarken) * 100}%, black)`,
width: svgSize,
height: svgSize,
},
Expand Down
Loading
Loading