Merge branch 'develop' into fix/bridge-sitemap-generation

Author: mmioana

.storybook/withProviders.tsx

@@ -1,10 +1,8 @@
 import React, { ReactNode, useEffect, useState } from 'react';
 import { NuqsAdapter } from 'nuqs/adapters/next/app';
 import { ReactQueryProvider } from '../src/providers/ReactQueryProvider';
-import {
-  DefaultThemeProvider,
-  MUIThemeProvider,
-} from '../src/providers/ThemeProvider';
+import { DefaultThemeProvider } from '../src/providers/ThemeProvider/DefaultThemeProvider';
+import { MUIThemeProvider } from '../src/providers/ThemeProvider/MUIThemeProvider';
 import TranslationsProvider from '../src/providers/TranslationProvider';
 import { WalletProvider } from '../src/providers/WalletProvider/WalletProvider';
 import { SettingsStoreProvider } from '../src/stores/settings';

next.config.mjs

@@ -10,11 +10,11 @@ const nextConfig = {
   serverExternalPackages: ['pino', 'pino-pretty', 'thread-stream'],
   experimental: {
     serverSourceMaps: false,
-    optimizePackageImports: [
-      'recharts',
-      '@mui/material-nextjs',
-      '@sentry/nextjs',
-    ],
+    optimizePackageImports: [],
+    staleTimes: {
+      dynamic: 30,
+      static: 180,
+    },
   },
   webpack: (config) => {
     config.resolve.extensionAlias = {

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

@@ -0,0 +1,5 @@
+import { EarnsPageSkeleton } from '@/app/ui/earn/EarnsPageSkeleton';
+
+export default function Loading() {
+  return <EarnsPageSkeleton />;
+}

src/app/[lng]/layout.tsx

@@ -17,12 +17,10 @@ import envConfig from '@/config/env-config';
 import { getSiteUrl } from '@/const/urls';
 import { fonts } from '@/fonts/fonts';
 import { ReactQueryProvider } from '@/providers/ReactQueryProvider';
-import {
-  DefaultThemeProvider,
-  MUIThemeProvider,
-} from '@/providers/ThemeProvider';
+import { DefaultThemeProvider } from '@/providers/ThemeProvider/DefaultThemeProvider';
+import { MUIThemeProvider } from '@/providers/ThemeProvider/MUIThemeProvider';
 import TranslationsProvider from '@/providers/TranslationProvider';
-import { WalletProvider } from '@/providers/WalletProvider';
+import { WalletProvider } from '@/providers/WalletProvider/WalletProvider';
 import { PortfolioProvider } from '@/providers/PortfolioProvider/PortfolioProvider';
 import { getMiniAppSettings } from '../lib/getMiniAppSettings';
 import {

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

@@ -0,0 +1,5 @@
+import { MissionsPageSkeleton } from '@/app/ui/missions/MissionsPageSkeleton';
+
+export default function Loading() {
+  return <MissionsPageSkeleton />;
+}

src/app/api/profile/[walletAddress]/flags/route.tsx

@@ -20,12 +20,12 @@ export async function GET(
     const data = await getWalletAccessControl(walletAddress);
 
     if (!data.data || data.data.length === 0) {
-      return NextResponse.json({ hasEarn: false });
+      return NextResponse.json({ hasEarn: false, hasNotifications: false });
     }
 
     const flags = data.data[0];
 
-    return NextResponse.json(pick(flags, ['hasEarn']));
+    return NextResponse.json(pick(flags, ['hasEarn', 'hasNotifications']));
   } catch (error) {
     console.error('Error fetching wallet access control:', error);
     return NextResponse.json(

src/app/not-found.tsx

@@ -3,12 +3,10 @@ import Background from '@/components/Background';
 import { NotFoundComponent } from '@/components/NotFound/NotFound';
 import config, { getPublicEnvVars } from '@/config/env-config';
 import { fonts } from '@/fonts/fonts';
-import {
-  MUIThemeProvider,
-  DefaultThemeProvider,
-} from '@/providers/ThemeProvider';
+import { DefaultThemeProvider } from '@/providers/ThemeProvider/DefaultThemeProvider';
+import { MUIThemeProvider } from '@/providers/ThemeProvider/MUIThemeProvider';
 import TranslationsProvider from '@/providers/TranslationProvider';
-import { WalletProvider } from '@/providers/WalletProvider';
+import { WalletProvider } from '@/providers/WalletProvider/WalletProvider';
 import { AppRouterCacheProvider } from '@mui/material-nextjs/v15-appRouter';
 import Script from 'next/script';
 import { defaultNS, fallbackLng, namespaces } from 'src/i18n';

src/app/ui/mission/MissionDetails.tsx

@@ -11,8 +11,8 @@ import { MissionTask } from './MissionTask';
 import { useAccount } from '@lifi/wallet-management';
 import { Badge } from 'src/components/Badge/Badge';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
-import { useRouter } from 'next/navigation';
 import { AppPaths } from 'src/const/urls';
+import { useGoBack } from 'src/hooks/routing/useGoBack';
 import {
   MissionDetailsColumnContainer,
   MissionDetailsCardContainer,
@@ -48,7 +48,7 @@ export const MissionDetails: FC<MissionDetailsProps> = ({ mission, tasks }) => {
   );
   useResetCurrentActiveTask();
   useSyncMissionDefaultsFromChains(participants, missionId, hasEnded);
-  const router = useRouter();
+  const handleGoBack = useGoBack(AppPaths.Missions);
   const { t } = useTranslation();
 
   const { account } = useAccount();
@@ -71,10 +71,6 @@ export const MissionDetails: FC<MissionDetailsProps> = ({ mission, tasks }) => {
     );
   }, [status]);
 
-  const handleGoBack = () => {
-    router.push(AppPaths.Missions);
-  };
-
   return (
     <MissionDetailsColumnContainer>
       <SectionCardContainer>

src/components/Menu/MenuItem/MenuItemLinkInternal.tsx

@@ -13,7 +13,7 @@ export const MenuItemLinkInternal = ({
   MenuItemProps,
   'label' | 'prefixIcon' | 'suffixIcon' | 'showMoreIcon' | 'link'
 >) => (
-  <MenuItemLink as={Link} prefetch={false} href={link?.url || '#'}>
+  <MenuItemLink as={Link} prefetch href={link?.url || '#'}>
     <MenuItemLabel
       label={label}
       showMoreIcon={showMoreIcon}

src/components/Navbar/layout/DesktopLayout.tsx

@@ -7,11 +7,16 @@ import { LabelButton } from '../components/Buttons/LabelButton';
 import { MainMenuToggle } from '../components/Buttons/MainMenuToggle';
 import type { LayoutVariantProps } from './Layout.types';
 import { NotificationBell } from '@/components/Notifications/NotificationBell';
-import { isBeta } from '@/utils/isBeta';
+import {
+  GatekeeperStatus,
+  useGatekeeperStatus,
+} from '@/app/ui/gatekeeper/useGatekeeperStatus';
 
 export const DesktopLayout: FC<LayoutVariantProps> = ({ secondaryButtons }) => {
   const { links, activeLink } = useMainLinks();
 
+  const { status } = useGatekeeperStatus('hasNotifications');
+
   return (
     <>
       <MainLinksContainer sx={{ width: '100%', mr: 1 }}>
@@ -32,7 +37,7 @@ export const DesktopLayout: FC<LayoutVariantProps> = ({ secondaryButtons }) => {
 
       <SecondaryLinksContainer>
         {secondaryButtons}
-        {isBeta() && <NotificationBell />}
+        {status === GatekeeperStatus.SUCCESS && <NotificationBell />}
         <MainMenuToggle />
       </SecondaryLinksContainer>
     </>