Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat: migrate to MUI v6 #334

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat: migrate to MUI v6 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3b62c7e
feat: migrate to mui v6
chybisov Dec 17, 2024
c57683f
feat: migrate to mui v6
chybisov Dec 17, 2024
c902e99
feat: migrate to mui v6
chybisov Dec 17, 2024
e9cda4e
feat: migrate to mui v6
chybisov Dec 17, 2024
90f06e4
feat: migrate to mui v6
chybisov Dec 17, 2024
bbb0738
feat: migrate to mui v6
chybisov Dec 17, 2024
f182f81
feat: migrate to mui v6
chybisov Dec 17, 2024
a02eab9
fix: should show wallet menu in split mode
chybisov Dec 18, 2024
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 examples/deposit-flow/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
"dependencies": {
"@lifi/sdk": "^3.4.3",
"@lifi/widget": "workspace:^",
"@mui/material": "^5.16.11",
"@mui/material": "^6.2.0",
"@tanstack/react-query": "^5.62.7",
"events": "^3.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.55",
"wagmi": "^2.14.1"
"wagmi": "^2.14.3"
},
"devDependencies": {
"@types/events": "^3.0.3",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
Expand Down
8 changes: 4 additions & 4 deletions examples/dynamic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
"@dynamic-labs/wagmi-connector": "^3.9.2",
"@lifi/wallet-management": "workspace:^",
"@lifi/widget": "workspace:^",
"@mui/material": "^5.16.11",
"@mui/material": "^6.2.0",
"@solana/wallet-adapter-base": "^0.9.23",
"@solana/wallet-adapter-react": "^0.15.35",
"@solana/web3.js": "^1.95.8",
"@solana/web3.js": "^1.98.0",
"@tanstack/react-query": "^5.62.7",
"mitt": "^3.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.55",
"wagmi": "^2.14.1"
"wagmi": "^2.14.3"
},
"devDependencies": {
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react-swc": "^3.7.2",
"globals": "^15.13.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs-page-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"start": "next start"
},
"dependencies": {
"@lifi/widget": "^3.12.4",
"@lifi/widget": "^3.12.5",
"next": "^14.2.20",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"typescript": "^5.7.2"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"dependencies": {
"@lifi/sdk": "^3.4.3",
"@lifi/widget": "^3.12.4",
"@lifi/widget": "^3.12.5",
"next": "^14.2.20",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"typescript": "^5.7.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/nuxt/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"@lifi/widget": "^3.12.4",
"@lifi/widget": "^3.12.5",
"nuxt": "3.14.1592",
"veaury": "^2.6.1",
"vite-plugin-node-polyfills": "^0.22.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/rainbowkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.55",
"wagmi": "^2.14.1"
"wagmi": "^2.14.3"
},
"devDependencies": {
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react-swc": "^3.7.2",
"typescript": "^5.7.2",
Expand Down
8 changes: 4 additions & 4 deletions examples/remix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"typecheck": "tsc"
},
"dependencies": {
"@lifi/widget": "^3.12.4",
"@lifi/widget": "^3.12.5",
"@remix-run/css-bundle": "^2.15.1",
"@remix-run/node": "^2.15.1",
"@remix-run/react": "^2.15.1",
"@remix-run/serve": "^2.15.1",
"isbot": "^5.1.13",
"isbot": "^5.1.18",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"remix-utils": "^7.6.0"
"remix-utils": "^8.0.0"
},
"devDependencies": {
"@remix-run/dev": "^2.15.1",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"typescript": "^5.7.2",
"vite": "^6.0.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@tsconfig/svelte": "^5.0.4",
"@types/events": "^3.0.3",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"svelte": "^5.12.0",
"svelte": "^5.14.1",
"svelte-check": "^4.1.1",
"svelte-preprocess": "^6.0.2",
"tslib": "^2.8.1",
Expand Down
10 changes: 5 additions & 5 deletions examples/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
},
"dependencies": {
"@lifi/sdk": "^3.4.3",
"@lifi/wallet-management": "^3.4.6",
"@lifi/wallet-management": "^3.4.7",
"@lifi/widget": "workspace:^",
"@mui/material": "^5.16.11",
"@mui/material": "^6.2.0",
"@tanstack/react-query": "^5.62.7",
"@wagmi/connectors": "^5.6.1",
"@wagmi/connectors": "^5.7.0",
"events": "^3.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.55",
"wagmi": "^2.14.1"
"wagmi": "^2.14.3"
},
"devDependencies": {
"@types/events": "^3.0.3",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"dependencies": {
"@lifi/widget": "^3.12.4",
"@lifi/widget": "^3.12.5",
"veaury": "^2.6.1",
"vue": "^3.5.13"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/zustand-widget-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
},
"dependencies": {
"@lifi/widget": "workspace:^",
"@mui/material": "^5.16.11",
"@mui/material": "^6.2.0",
"@tanstack/react-query": "^5.62.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"wagmi": "^2.14.1",
"wagmi": "^2.14.3",
"zustand": "^5.0.2"
},
"devDependencies": {
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react": "^4.3.4",
"globals": "^15.13.0",
Expand Down
8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
"postinstall": "husky"
},
"lint-staged": {
"*": ["pnpm pre-commit"]
"*": [
"pnpm pre-commit"
]
},
"standard-version": {
"scripts": {
Expand All @@ -42,15 +44,15 @@
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@commitlint/cli": "^19.6.0",
"@commitlint/cli": "^19.6.1",
"@commitlint/config-conventional": "^19.6.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/events": "^3.0.3",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react": "^18.3.17",
"@types/react-dom": "^18.3.5",
"cpy-cli": "^5.0.0",
"fs-extra": "^11.2.0",
Expand Down
20 changes: 12 additions & 8 deletions packages/wallet-management/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@lifi/sdk": "^3.4.3",
"@mui/icons-material": "^5.16.11",
"@mui/lab": "5.0.0-alpha.174",
"@mui/material": "^5.16.11",
"@mui/system": "^5.16.8",
"@mui/icons-material": "^6.2.0",
"@mui/lab": "6.0.0-beta.19",
"@mui/material": "^6.2.0",
"@mui/system": "^6.2.0",
"@solana/wallet-adapter-base": "^0.9.23",
"@solana/wallet-adapter-react": "^0.15.35",
"@solana/web3.js": "^1.95.8",
"@solana/web3.js": "^1.98.0",
"@wagmi/core": "^2.16.0",
"i18next": "^24.1.0",
"i18next": "^24.1.2",
"mitt": "^3.0.1",
"react": "^18.3.1",
"react-i18next": "^15.2.0",
"use-sync-external-store": "^1.4.0",
"viem": "^2.21.55",
"wagmi": "^2.14.1",
"wagmi": "^2.14.3",
"zustand": "^5.0.2"
},
"devDependencies": {
Expand All @@ -81,5 +81,9 @@
"react": ">=18",
"react-dom": ">=18"
},
"files": ["dist/**", "src/**", "!tsconfig.json"]
"files": [
"dist/**",
"src/**",
"!tsconfig.json"
]
}
39 changes: 24 additions & 15 deletions packages/wallet-management/src/components/ListItemButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,29 @@ import {
styled,
} from '@mui/material'

export const ListItemButton = styled(MuiListItemButton)(
({ theme, disabled }) => {
const backgroundHoverColor =
theme.palette.mode === 'light'
? alpha(theme.palette.common.black, 0.04)
: alpha(theme.palette.common.white, 0.04)
return {
borderRadius: theme.shape.borderRadius,
paddingLeft: theme.spacing(1.5),
height: 56,
'&:hover': {
backgroundColor: !disabled && backgroundHoverColor,
export const ListItemButton = styled(MuiListItemButton)(({ theme }) => {
const backgroundHoverColor =
theme.palette.mode === 'light'
? alpha(theme.palette.common.black, 0.04)
: alpha(theme.palette.common.white, 0.04)
return {
borderRadius: theme.shape.borderRadius,
paddingLeft: theme.spacing(1.5),
height: 56,
'&:hover': {
backgroundColor: backgroundHoverColor,
},
variants: [
{
props: ({ disabled }) => disabled,
style: {
opacity: 0.5,
cursor: 'auto',
'&:hover': {
backgroundColor: 'none',
},
},
},
...(disabled ? { opacity: 0.5, cursor: 'auto' } : {}),
}
],
}
)
})
Loading
Loading