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

Update @mui/material and @mui/icons-material to latest version #400

Merged
merged 2 commits into from
Dec 30, 2024
Merged

Update @mui/material and @mui/icons-material to latest version #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea05681
Update @mui/material to latest version
benaor Dec 28, 2024
a2af316
fix(mui): breaking changes after update to MUI 6
benaor Dec 29, 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
4 changes: 2 additions & 2 deletions packages/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@emeraldpay/hashicon-react": "^0.5.2",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.20",
"@mui/icons-material": "^6.3.0",
"@mui/material": "^6.3.0",
"@sentry/react": "^7.117.0",
"copy-to-clipboard": "^3.3.3",
"crypto-browserify": "^3.12.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/extension/src/components/pages/About/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, useCallback } from 'react';

import LinkIcon from '@mui/icons-material/Link';
import { List, ListItem, ListItemIcon, ListItemText, Typography } from '@mui/material';
import { List, ListItemButton, ListItemIcon, ListItemText, Typography } from '@mui/material';
import { useNavigate } from 'react-router-dom';

import {
Expand Down Expand Up @@ -70,12 +70,12 @@ export const About: FC = () => {
<Typography variant="subtitle2">Links</Typography>
<List>
{aboutLinks.map(({ name, url }) => (
<ListItem button key={name} onClick={() => openExternalLink(url)}>
<ListItemButton key={name} onClick={() => openExternalLink(url)}>
<ListItemIcon>
<LinkIcon />
</ListItemIcon>
<ListItemText primary={name} />
</ListItem>
</ListItemButton>
))}
</List>
</div>
Expand Down
8 changes: 4 additions & 4 deletions packages/extension/src/components/pages/AddNewTrustline/TokenModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { FC } from 'react';
import {
Modal,
List,
ListItem,
ListItemText,
ListItemAvatar,
Avatar,
Expand All @@ -12,7 +11,8 @@ import {
DialogActions,
Button,
DialogTitle,
CircularProgress
CircularProgress,
ListItemButton
} from '@mui/material';

import { convertHexCurrencyString } from '../../../utils';
Expand Down Expand Up @@ -93,7 +93,7 @@ export const TokenModal: FC<TokenModalProps> = ({
) : (
<List style={{ maxHeight: '240px', overflow: 'auto', paddingTop: 0 }}>
{tokens.map((token, index) => (
<ListItem button key={index} onClick={() => onSelectToken(token)}>
<ListItemButton key={index} onClick={() => onSelectToken(token)}>
<ListItemAvatar>
<Avatar src={token.icon} alt={`${token.currency} icon`} />
</ListItemAvatar>
Expand Down Expand Up @@ -127,7 +127,7 @@ export const TokenModal: FC<TokenModalProps> = ({
}}
secondaryTypographyProps={{ component: 'div' }}
/>
</ListItem>
</ListItemButton>
))}
</List>
)}
Expand Down
6 changes: 3 additions & 3 deletions packages/extension/src/components/pages/EditWallet/EditWallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, useCallback, useEffect, useMemo, useState } from 'react';

import NavigateNextIcon from '@mui/icons-material/NavigateNext';
import { Button, CircularProgress, List, ListItem, ListItemText } from '@mui/material';
import { Button, CircularProgress, List, ListItemButton, ListItemText } from '@mui/material';
import { useNavigate, useParams } from 'react-router-dom';

import { LIST_WALLETS_PATH } from '../../../constants';
Expand Down Expand Up @@ -109,13 +109,13 @@ export const EditWallet: FC = () => {
</div>
<List>
{items.map(({ name, value, onClick }) => (
<ListItem button key={name} onClick={onClick}>
<ListItemButton key={name} onClick={onClick}>
<ListItemText primary={name} />
<div style={{ display: 'flex', alignItems: 'center' }}>
{value ? <ListItemText primary={value} /> : null}
<NavigateNextIcon />
</div>
</ListItem>
</ListItemButton>
))}
</List>
</div>
Expand Down
11 changes: 5 additions & 6 deletions packages/extension/src/components/pages/Settings/MenuGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CSSProperties, FC } from 'react';

import NavigateNextIcon from '@mui/icons-material/NavigateNext';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import { ListItem, ListItemIcon, ListItemText } from '@mui/material';
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material';

import { SECONDARY_GRAY } from '../../../constants';

Expand Down Expand Up @@ -60,16 +60,15 @@ export const MenuGroup: FC<MenuGroupProps> = ({ sectionName, items }) => {
<div style={sectionHeaderStyle}>{sectionName}</div>
<div style={groupStyles}>
{items.map(({ name, type, onClick }, index, arr) => (
<ListItem
button
<ListItemButton
key={name}
onClick={onClick}
style={{
...(index === 0
? firstListItemStyles
: index === arr.length - 1
? lastListItemStyles
: {}),
? lastListItemStyles
: {}),
...(index !== arr.length - 1 ? listItemStyles : {})
}}
sx={{
Expand All @@ -91,7 +90,7 @@ export const MenuGroup: FC<MenuGroupProps> = ({ sectionName, items }) => {
<NavigateNextIcon />
)}
</ListItemIcon>
</ListItem>
</ListItemButton>
))}
</div>
</>
Expand Down
Loading
Loading