Skip to content

Commit 45fae1d

Browse files
authored
Merge branch 'develop' into fix/modal-widget-width-mobile
2 parents 41d2296 + 733facc commit 45fae1d

238 files changed

Lines changed: 8096 additions & 2409 deletions

File tree

Some content is hidden

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

.github/workflows/checks.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ jobs:
7777
- name: Run unit tests
7878
run: pnpm test:unit
7979

80+
test-unit-components:
81+
runs-on: ubuntu-latest
82+
steps:
83+
- *checkout
84+
- *pnpm-setup
85+
- *node-setup
86+
- *install-dependencies
87+
- name: Run unit component tests
88+
run: pnpm test:unit-components
89+
8090
test-snapshots:
8191
runs-on: ubuntu-latest
8292
steps:

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-latest
8383
strategy:
8484
matrix:
85-
shard: [1, 2, 3, 4, 5, 6]
85+
shard: [1, 2, 3, 4, 5]
8686
fail-fast: false
8787
steps:
8888
- uses: actions/checkout@v4

.storybook/withProviders.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import React, { ReactNode, useEffect, useState } from 'react';
22
import { NuqsAdapter } from 'nuqs/adapters/next/app';
33
import { ReactQueryProvider } from '../src/providers/ReactQueryProvider';
4-
import {
5-
DefaultThemeProvider,
6-
MUIThemeProvider,
7-
} from '../src/providers/ThemeProvider';
4+
import { DefaultThemeProvider } from '../src/providers/ThemeProvider/DefaultThemeProvider';
5+
import { MUIThemeProvider } from '../src/providers/ThemeProvider/MUIThemeProvider';
86
import TranslationsProvider from '../src/providers/TranslationProvider';
97
import { WalletProvider } from '../src/providers/WalletProvider/WalletProvider';
108
import { SettingsStoreProvider } from '../src/stores/settings';

new-types.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ declare namespace NodeJS {
2020
NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: string;
2121
NEXT_PUBLIC_BACKEND_URL: string;
2222
NEXT_PUBLIC_INTERCOM_APP_ID: string;
23+
NEXT_PUBLIC_NOTIFICATIONS_URL: string;
2324
}
2425
}

next.config.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ const nextConfig = {
1010
serverExternalPackages: ['pino', 'pino-pretty', 'thread-stream'],
1111
experimental: {
1212
serverSourceMaps: false,
13-
optimizePackageImports: [
14-
'recharts',
15-
'@mui/material-nextjs',
16-
'@sentry/nextjs',
17-
],
13+
optimizePackageImports: [],
14+
staleTimes: {
15+
dynamic: 30,
16+
static: 180,
17+
},
1818
},
1919
webpack: (config) => {
2020
config.resolve.extensionAlias = {

package.json

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,28 @@
2424
"@formatjs/intl-localematcher": "^0.8.2",
2525
"@intercom/messenger-js-sdk": "^0.0.18",
2626
"@lifi/explorer": "0.6.3",
27-
"@lifi/sdk": "^4.0.0-beta.5",
28-
"@lifi/sdk-provider-bitcoin": "^4.0.0-beta.5",
29-
"@lifi/sdk-provider-ethereum": "^4.0.0-beta.5",
30-
"@lifi/sdk-provider-solana": "^4.0.0-beta.5",
31-
"@lifi/sdk-provider-sui": "^4.0.0-beta.5",
32-
"@lifi/wallet-management": "4.0.0-beta.12",
33-
"@lifi/widget": "4.0.0-beta.14",
34-
"@lifi/widget-provider": "4.0.0-beta.11",
35-
"@lifi/widget-provider-bitcoin": "^4.0.0-beta.11",
36-
"@lifi/widget-provider-ethereum": "^4.0.0-beta.11",
37-
"@lifi/widget-provider-solana": "^4.0.0-beta.11",
38-
"@lifi/widget-provider-sui": "^4.0.0-beta.11",
27+
"@lifi/sdk": "^4.0.0-beta.7",
28+
"@lifi/sdk-provider-bitcoin": "^4.0.0-beta.7",
29+
"@lifi/sdk-provider-ethereum": "^4.0.0-beta.7",
30+
"@lifi/sdk-provider-solana": "^4.0.0-beta.7",
31+
"@lifi/sdk-provider-sui": "^4.0.0-beta.7",
32+
"@lifi/sdk-provider-tron": "^4.0.0-beta.7",
33+
"@lifi/wallet-management": "4.0.0-beta.17",
34+
"@lifi/widget": "4.0.0-beta.17",
35+
"@lifi/widget-provider": "4.0.0-beta.17",
36+
"@lifi/widget-provider-bitcoin": "^4.0.0-beta.17",
37+
"@lifi/widget-provider-ethereum": "^4.0.0-beta.17",
38+
"@lifi/widget-provider-solana": "^4.0.0-beta.17",
39+
"@lifi/widget-provider-sui": "^4.0.0-beta.17",
40+
"@lifi/widget-provider-tron": "^4.0.0-beta.17",
3941
"@merkl/api": "1.9.23",
4042
"@metamask/connect-evm": "^0.9.1",
4143
"@mswjs/interceptors": "^0.41.3",
42-
"@mui/icons-material": "^7.3.9",
43-
"@mui/material": "^7.3.9",
44-
"@mui/material-nextjs": "^7.3.9",
45-
"@mui/system": "^7.3.9",
46-
"@mui/utils": "^7.3.9",
44+
"@mui/icons-material": "^9.0.0",
45+
"@mui/material": "^9.0.0",
46+
"@mui/material-nextjs": "^9.0.0",
47+
"@mui/system": "^9.0.0",
48+
"@mui/utils": "^9.0.0",
4749
"@mysten/dapp-kit-react": "^2.0.0",
4850
"@mysten/sui": "^2.15.0",
4951
"@safe-global/safe-apps-sdk": "^9.1.0",
@@ -56,6 +58,7 @@
5658
"@strapi/blocks-react-renderer": "^1.0.2",
5759
"@tanstack/react-form": "^1.28.6",
5860
"@tanstack/react-query": "^5.97.0",
61+
"@tronweb3/tronwallet-adapter-react-hooks": "^1.1.11",
5962
"@turtledev/api": "1.4.5",
6063
"@wagmi/core": "^3.4.1",
6164
"@walletconnect/ethereum-provider": "^2.23.9",
@@ -178,6 +181,7 @@
178181
"test:ci:e2e": "npx playwright test",
179182
"test:ci:e2e:qase": "QASE_MODE=testops npx playwright test",
180183
"test:unit": "vitest run --project=unit",
184+
"test:unit-components": "vitest run --project=unit-components",
181185
"test:snapshots": "vitest run --project=snapshots",
182186
"test:snapshots:generate": "vitest run --project=snapshots -u",
183187
"test:storybook": "vitest run --project=storybook",

pnpm-lock.yaml

Lines changed: 3227 additions & 1300 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/[lng]/(main)/layout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Layout } from 'src/Layout';
55
import App from '../../ui/app/App';
66

77
export const fetchCache = 'default-cache';
8+
export const revalidate = 300; // 5 minutes
89

910
export const metadata: Metadata = {
1011
other: {
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { notFound } from 'next/navigation';
2+
import { MainWidgetContainer } from 'src/components/Containers/MainWidgetContainer';
3+
import { isAnonymousSwapEnabled } from '@/app/lib/getFeatureFlag';
4+
import { Widget } from '@/components/Widgets/Widget';
5+
import { Widgets } from '@/components/Widgets/Widgets';
6+
7+
const Page = async () => {
8+
const variant = 'private';
9+
10+
if (!isAnonymousSwapEnabled()) {
11+
return notFound();
12+
}
13+
14+
return (
15+
<MainWidgetContainer>
16+
<Widget starterVariant={variant} />
17+
<Widgets widgetVariant={variant} />
18+
</MainWidgetContainer>
19+
);
20+
};
21+
22+
export default Page;

src/app/[lng]/earn/loading.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { EarnsPageSkeleton } from '@/app/ui/earn/EarnsPageSkeleton';
2+
3+
export default function Loading() {
4+
return <EarnsPageSkeleton />;
5+
}

0 commit comments

Comments
 (0)