Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

Commit 29f4d29

Browse files
toniocodotoniocodo
committed
chore: update to mui7
1 parent 76b81b5 commit 29f4d29

File tree

44 files changed

+455
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+455
-571
lines changed

‎apps/analytics/vite.config.mts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import path from 'path';
55
import { defineConfig } from 'vite';
66
import { viteStaticCopy } from 'vite-plugin-static-copy';
77
import svgr from 'vite-plugin-svgr';
8-
import { sentryVitePlugin } from "@sentry/vite-plugin";
8+
import { sentryVitePlugin } from '@sentry/vite-plugin';
99

1010
export default defineConfig({
1111
root: __dirname,
@@ -65,14 +65,16 @@ export default defineConfig({
6565
],
6666
}),
6767
sentryVitePlugin({
68-
org: "origin-protocol",
69-
project: "origin-analytics",
68+
org: 'origin-protocol',
69+
project: 'origin-analytics',
7070
authToken: process.env.SENTRY_AUTH_TOKEN,
7171
telemetry: false,
7272
silent: true,
7373
sourcemaps: {
74-
filesToDeleteAfterUpload: [path.resolve(__dirname, '../../dist/apps/analytics/assets/*.map')]
75-
}
74+
filesToDeleteAfterUpload: [
75+
path.resolve(__dirname, '../../dist/apps/analytics/assets/*.map'),
76+
],
77+
},
7678
}),
7779
],
7880

@@ -81,5 +83,6 @@ export default defineConfig({
8183
'@formatjs/icu-messageformat-parser':
8284
'@formatjs/icu-messageformat-parser/no-parser',
8385
},
86+
conditions: ['mui-modern', 'module', 'browser', 'development|production'],
8487
},
8588
});

‎apps/defi/vite.config.mts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import path from 'path';
55
import { defineConfig } from 'vite';
66
import { viteStaticCopy } from 'vite-plugin-static-copy';
77
import svgr from 'vite-plugin-svgr';
8-
import { sentryVitePlugin } from "@sentry/vite-plugin";
8+
import { sentryVitePlugin } from '@sentry/vite-plugin';
99

1010
export default defineConfig({
1111
root: __dirname,
@@ -68,14 +68,16 @@ export default defineConfig({
6868
],
6969
}),
7070
sentryVitePlugin({
71-
org: "origin-protocol",
72-
project: "origin-unified-defi",
71+
org: 'origin-protocol',
72+
project: 'origin-unified-defi',
7373
authToken: process.env.SENTRY_AUTH_TOKEN,
7474
telemetry: false,
7575
silent: true,
7676
sourcemaps: {
77-
filesToDeleteAfterUpload: [path.resolve(__dirname, '../../dist/apps/defi/assets/*.map')]
78-
}
77+
filesToDeleteAfterUpload: [
78+
path.resolve(__dirname, '../../dist/apps/defi/assets/*.map'),
79+
],
80+
},
7981
}),
8082
],
8183

@@ -84,5 +86,6 @@ export default defineConfig({
8486
'@formatjs/icu-messageformat-parser':
8587
'@formatjs/icu-messageformat-parser/no-parser',
8688
},
89+
conditions: ['mui-modern', 'module', 'browser', 'development|production'],
8790
},
8891
});

‎apps/governance/vite.config.mts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ export default defineConfig({
7272
'@formatjs/icu-messageformat-parser':
7373
'@formatjs/icu-messageformat-parser/no-parser',
7474
},
75+
conditions: ['mui-modern', 'module', 'browser', 'development|production'],
7576
},
7677
});

‎apps/prime/src/App.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Box, Grid2, Stack } from '@mui/material';
1+
import { Box, Grid, Stack } from '@mui/material';
22
import {
33
AdCards,
44
GlobalStatsCard,
@@ -30,8 +30,8 @@ export const App = () => {
3030
px: { xs: 2, md: 4 },
3131
}}
3232
>
33-
<Grid2 container spacing={4}>
34-
<Grid2
33+
<Grid container spacing={4}>
34+
<Grid
3535
sx={{ order: { xs: 2, md: 1 } }}
3636
size={{
3737
xs: 12,
@@ -45,17 +45,17 @@ export const App = () => {
4545
flexDirection: { xs: 'column', sm: 'row', md: 'column' },
4646
}}
4747
/>
48-
</Grid2>
49-
<Grid2
48+
</Grid>
49+
<Grid
5050
sx={{ order: { xs: 1, md: 2 } }}
5151
size={{
5252
xs: 12,
5353
md: 6,
5454
}}
5555
>
5656
<Outlet />
57-
</Grid2>
58-
<Grid2
57+
</Grid>
58+
<Grid
5959
sx={{ order: 3 }}
6060
size={{
6161
xs: 12,
@@ -76,8 +76,8 @@ export const App = () => {
7676
/>
7777
</ErrorBoundary>
7878
</Stack>
79-
</Grid2>
80-
</Grid2>
79+
</Grid>
80+
</Grid>
8181
</Box>
8282
</Stack>
8383
</ErrorBoundary>

‎apps/prime/src/components/Topnav.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Button,
77
Divider,
88
Drawer,
9-
Grid2,
9+
Grid,
1010
Link,
1111
Popover,
1212
Stack,
@@ -70,8 +70,8 @@ export function Topnav(props: BoxProps) {
7070
backdropFilter: 'blur(15px)',
7171
})}
7272
>
73-
<Grid2 container sx={{ width: 1 }}>
74-
<Grid2 size={6}>
73+
<Grid container sx={{ width: 1 }}>
74+
<Grid size={6}>
7575
<Stack
7676
direction="row"
7777
spacing={3}
@@ -104,8 +104,8 @@ export function Topnav(props: BoxProps) {
104104
/>
105105
)}
106106
</Stack>
107-
</Grid2>
108-
<Grid2 size={6}>
107+
</Grid>
108+
<Grid size={6}>
109109
<Box
110110
sx={{
111111
display: 'flex',
@@ -136,8 +136,8 @@ export function Topnav(props: BoxProps) {
136136
</Button>
137137
)}
138138
</Box>
139-
</Grid2>
140-
</Grid2>
139+
</Grid>
140+
</Grid>
141141
</Box>
142142
{isSm && (
143143
<Drawer

‎apps/prime/vite.config.mts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ export default defineConfig({
7272
'@formatjs/icu-messageformat-parser':
7373
'@formatjs/icu-messageformat-parser/no-parser',
7474
},
75+
conditions: ['mui-modern', 'module', 'browser', 'development|production'],
7576
},
7677
});

‎libs/analytics/arm/src/views/OverviewView.tsx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid2 } from '@mui/material';
1+
import { Grid } from '@mui/material';
22
import { useLayout } from '@origin/analytics/shared';
33

44
import { ApyChart } from '../components/ApyChart';
@@ -13,28 +13,28 @@ export const OverviewView = () => {
1313
const [{ isDrawerOpen }] = useLayout();
1414

1515
return (
16-
<Grid2 container spacing={2}>
17-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
16+
<Grid container spacing={2}>
17+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
1818
<ApyChart height={300} />
19-
</Grid2>
20-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
19+
</Grid>
20+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
2121
<TvlChart height={300} />
22-
</Grid2>
23-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
22+
</Grid>
23+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
2424
<VaultAssetsChart height={300} />
25-
</Grid2>
26-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
25+
</Grid>
26+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
2727
<ProtocolRevenueChart height={300} />
28-
</Grid2>
29-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
28+
</Grid>
29+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
3030
<TradingVolumeChart height={300} />
31-
</Grid2>
32-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
31+
</Grid>
32+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
3333
<TradingProfitChart height={300} />
34-
</Grid2>
35-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
34+
</Grid>
35+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 6, lg: 6 }}>
3636
<TradesChart height={300} />
37-
</Grid2>
38-
</Grid2>
37+
</Grid>
38+
</Grid>
3939
);
4040
};

‎libs/analytics/home/src/views/HomeView.tsx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Box, Grid2, Stack, Typography } from '@mui/material';
1+
import { Box, Grid, Stack, Typography } from '@mui/material';
22
import { trackSentryError, useLayout } from '@origin/analytics/shared';
33
import { ErrorBoundary, ErrorCard } from '@origin/shared/components';
44
import { useIntl } from 'react-intl';
@@ -20,8 +20,8 @@ export const HomeView = () => {
2020
const [{ isDrawerOpen }] = useLayout();
2121

2222
return (
23-
<Grid2 container spacing={2}>
24-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 8, lg: 8 }}>
23+
<Grid container spacing={2}>
24+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 8, lg: 8 }}>
2525
<Stack spacing={2}>
2626
<Stack spacing={2}>
2727
<Stack
@@ -54,43 +54,43 @@ export const HomeView = () => {
5454
</Stack>
5555
<Controls />
5656
</Stack>
57-
<Grid2 container spacing={2}>
58-
<Grid2 size={{ xs: 12, md: 6 }}>
57+
<Grid container spacing={2}>
58+
<Grid size={{ xs: 12, md: 6 }}>
5959
<ErrorBoundary
6060
ErrorComponent={<ErrorCard />}
6161
onError={trackSentryError}
6262
>
6363
<NetAssetsCard height={CHART_HEIGHT} />
6464
</ErrorBoundary>
65-
</Grid2>
66-
<Grid2 size={{ xs: 12, md: 6 }}>
65+
</Grid>
66+
<Grid size={{ xs: 12, md: 6 }}>
6767
<ErrorBoundary
6868
ErrorComponent={<ErrorCard />}
6969
onError={trackSentryError}
7070
>
7171
<ProtocolRevenueCard height={CHART_HEIGHT} />
7272
</ErrorBoundary>
73-
</Grid2>
74-
<Grid2 size={{ xs: 12, md: 6 }}>
73+
</Grid>
74+
<Grid size={{ xs: 12, md: 6 }}>
7575
<ErrorBoundary
7676
ErrorComponent={<ErrorCard />}
7777
onError={trackSentryError}
7878
>
7979
<TokenSupplyCard height={CHART_HEIGHT} />
8080
</ErrorBoundary>
81-
</Grid2>
82-
<Grid2 size={{ xs: 12, md: 6 }}>
81+
</Grid>
82+
<Grid size={{ xs: 12, md: 6 }}>
8383
<ErrorBoundary
8484
ErrorComponent={<ErrorCard />}
8585
onError={trackSentryError}
8686
>
8787
<TvlCard height={CHART_HEIGHT} />
8888
</ErrorBoundary>
89-
</Grid2>
90-
</Grid2>
89+
</Grid>
90+
</Grid>
9191
</Stack>
92-
</Grid2>
93-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 12 : 4, lg: 4 }}>
92+
</Grid>
93+
<Grid size={{ xs: 12, md: isDrawerOpen ? 12 : 4, lg: 4 }}>
9494
<Stack spacing={2}>
9595
<Typography variant="featured3" sx={{ fontWeight: 'bold' }}>
9696
{intl.formatMessage({ defaultMessage: 'OGN Token Metrics' })}
@@ -120,7 +120,7 @@ export const HomeView = () => {
120120
</Stack>
121121
<OgnPerformanceCard />
122122
</Stack>
123-
</Grid2>
124-
</Grid2>
123+
</Grid>
124+
</Grid>
125125
);
126126
};

‎libs/analytics/oeth/src/views/OverviewView.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Card, CardContent, Grid2, Stack } from '@mui/material';
1+
import { Card, CardContent, Grid, Stack } from '@mui/material';
22
import { OverviewView as GenericOverview } from '@origin/analytics/shared';
33
import { ValueLabel } from '@origin/shared/components';
44
import { tokens } from '@origin/shared/contracts';
@@ -34,7 +34,7 @@ export const OverviewView = () => {
3434

3535
return (
3636
<GenericOverview token={tokens.mainnet.OETH}>
37-
<Grid2 size={12}>
37+
<Grid size={12}>
3838
<Stack
3939
sx={{
4040
border: '1px solid',
@@ -103,7 +103,7 @@ export const OverviewView = () => {
103103
<OethDistributionCard height={300} />
104104
</Stack>
105105
</Stack>
106-
</Grid2>
106+
</Grid>
107107
</GenericOverview>
108108
);
109109
};

‎libs/analytics/shared/src/components/Collaterals/components/CollateralsCard.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CardContent,
44
CardHeader,
55
Divider,
6-
Grid2,
6+
Grid,
77
Stack,
88
Typography,
99
} from '@mui/material';
@@ -76,8 +76,8 @@ export const CollateralsCard = ({
7676
</Typography>
7777
</Stack>
7878
) : (
79-
<Grid2 container spacing={3}>
80-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 7 : 6, lg: 6 }}>
79+
<Grid container spacing={3}>
80+
<Grid size={{ xs: 12, md: isDrawerOpen ? 7 : 6, lg: 6 }}>
8181
<Stack
8282
direction="column"
8383
sx={{
@@ -125,8 +125,8 @@ export const CollateralsCard = ({
125125
</Stack>
126126
</Stack>
127127
</Stack>
128-
</Grid2>
129-
<Grid2 size={{ xs: 12, md: isDrawerOpen ? 5 : 6, lg: 6 }} ref={ref}>
128+
</Grid>
129+
<Grid size={{ xs: 12, md: isDrawerOpen ? 5 : 6, lg: 6 }} ref={ref}>
130130
<Stack
131131
sx={{
132132
justifyContent: 'center',
@@ -148,8 +148,8 @@ export const CollateralsCard = ({
148148
hideLabels
149149
/>
150150
</Stack>
151-
</Grid2>
152-
</Grid2>
151+
</Grid>
152+
</Grid>
153153
)}
154154
</CardContent>
155155
</Card>

0 commit comments

Comments
 (0)