Merge branch 'develop' into feat/add-tests-github-action

next.config.mjs

@@ -9,8 +9,8 @@ const nextConfig = {
       '.js': ['.ts', '.tsx', '.js', '.jsx'],
     };
     config.resolve.fallback = { fs: false, net: false, tls: false };
-    config.externals.push('pino-pretty', 'lokijs', 'encoding');
-    // config.externals.push('pino-pretty');
+    // Walletconnect configuration is blocking the build, pino-pretty needs to be added as an external
+    config.externals.push('pino-pretty');
     return config;
   },
   images: {

package.json

@@ -36,7 +36,6 @@
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "i18next": "^23.11.2",
-    "i18next-browser-languagedetector": "^7.2.1",
     "i18next-resources-for-ts": "^1.5.0",
     "i18next-resources-to-backend": "^1.2.1",
     "next": "^14.2.3",

src/app/[lng]/buy/page.tsx

@@ -1,18 +1,7 @@
-import { getCookies } from '@/app/lib/getCookies';
 import App from '@/app/ui/app/App';
 
-export const dynamic = 'force-dynamic';
-
 const Page = async () => {
-  const { activeTheme, welcomeScreenClosed } = getCookies();
-
-  return (
-    <App
-      starterVariant="buy"
-      activeTheme={activeTheme}
-      welcomeScreenClosedCookie={welcomeScreenClosed === 'true' ? true : false}
-    />
-  );
+  return <App starterVariant="buy" />;
 };
 
 export default Page;

src/app/[lng]/exchange/page.tsx

@@ -0,0 +1,7 @@
+import App from '@/app/ui/app/App';
+
+const Page = async () => {
+  return <App starterVariant="default" />;
+};
+
+export default Page;

src/app/[lng]/layout.tsx

@@ -1,9 +1,6 @@
 import { AppProvider } from '@/providers/AppProvider';
 import i18nConfig from 'i18nconfig';
 import React from 'react';
-import { namespaces } from 'src/i18n';
-import initTranslations from '../i18n';
-import { getCookies } from '../lib/getCookies';
 
 export default async function RootLayout({
   children,
@@ -13,14 +10,7 @@ export default async function RootLayout({
   params: { lng: string };
   req: any;
 }) {
-  const { resources } = await initTranslations(lng, namespaces);
-  const { activeTheme } = getCookies();
-
-  return (
-    <AppProvider i18nResources={resources} lang={lng} theme={activeTheme}>
-      {children}
-    </AppProvider>
-  );
+  return <AppProvider lang={lng}>{children}</AppProvider>;
 }
 
 export function generateStaticParams() {

src/app/[lng]/memecoins/page.tsx

@@ -1,18 +1,8 @@
 import { getCookies } from '@/app/lib/getCookies';
 import App from '@/app/ui/app/App';
 
-export const dynamic = 'force-dynamic';
-
 const Page = () => {
-  const { activeTheme } = getCookies();
-
-  return (
-    <App
-      starterVariant="default"
-      activeTheme={activeTheme}
-      welcomeScreenClosedCookie={true}
-    />
-  );
+  return <App starterVariant="default" />;
 };
 
 export default Page;

src/app/[lng]/page.tsx

@@ -1,16 +1,5 @@
-import { getCookies } from '../lib/getCookies';
 import App from '../ui/app/App';
 
-export const dynamic = 'force-dynamic';
-
 export default function Page() {
-  const { activeTheme, welcomeScreenClosed } = getCookies();
-
-  return (
-    <App
-      starterVariant="default"
-      activeTheme={activeTheme}
-      welcomeScreenClosedCookie={welcomeScreenClosed === 'true' ? true : false}
-    />
-  );
+  return <App starterVariant="default" />;
 }

src/app/[lng]/refuel/page.tsx

@@ -0,0 +1,7 @@
+import App from '@/app/ui/app/App';
+
+const Page = async () => {
+  return <App starterVariant="refuel" />;
+};
+
+export default Page;

src/app/ui/app/App.tsx

@@ -3,28 +3,26 @@ import { Snackbar } from '@/components/Snackbar/Snackbar';
 import { WelcomeScreen } from '@/components/WelcomeScreen/WelcomeScreen';
 import { Widgets } from '@/components/Widgets/Widgets';
 import type { StarterVariantType } from '@/types/internal';
-import type { ThemeModesSupported } from '@/types/settings';
+import { getCookies } from '@/app/lib/getCookies';
 export interface AppProps {
   starterVariant: StarterVariantType;
-  activeTheme: ThemeModesSupported | undefined;
-  welcomeScreenClosedCookie: boolean;
 }
 
-const App = ({
-  starterVariant,
-  activeTheme,
-  welcomeScreenClosedCookie,
-}: AppProps) => {
+const App = ({ starterVariant }: AppProps) => {
+  const { activeTheme, welcomeScreenClosed } = getCookies();
+  const isWelcomeScreenClosed = welcomeScreenClosed === 'true';
+
   return (
     <>
-      <WelcomeScreen closed={welcomeScreenClosedCookie} />
+      <WelcomeScreen closed={isWelcomeScreenClosed} />
       <Widgets
         widgetVariant={starterVariant}
         activeTheme={activeTheme}
-        closedWelcomeScreen={welcomeScreenClosedCookie}
+        closedWelcomeScreen={isWelcomeScreenClosed}
       />
       <FeatureCards />
       <Snackbar />
+      <PixelBg />
     </>
   );
 };

src/components/Blog/CTAs/InstructionsAccordion/InstructionsAccordionItem.tsx

@@ -30,6 +30,7 @@ const parseTitle = (title: string, link: { label: string; url: string }) => {
         cleanText += `<a href="${link.url}" target="${!link.url.includes('jumper.exchange') || link.url[0] === '/' ? '_self' : '_blank'}">${link.label}</a>`;
       }
     }
+    return null;
   });
   return cleanText;
 };

src/components/Menus/MainMenu/useMainMenuContent.tsx

@@ -11,7 +11,6 @@ import {
   EXPLORER_URL,
   JUMPER_LEARN_PATH,
   JUMPER_LOYALTY_PATH,
-  JUMPER_MEMECOIN_PATH,
   X_URL,
 } from '@/const/urls';
 import { useUserTracking } from '@/hooks/userTracking/useUserTracking';
@@ -25,12 +24,11 @@ import AccountCircleIcon from '@mui/icons-material/AccountCircle';
 import DeveloperModeIcon from '@mui/icons-material/DeveloperMode';
 import LanguageIcon from '@mui/icons-material/Language';
 import SchoolIcon from '@mui/icons-material/School';
-import WhatshotIcon from '@mui/icons-material/Whatshot';
 import SearchOutlinedIcon from '@mui/icons-material/SearchOutlined';
 import XIcon from '@mui/icons-material/X';
 import { Typography } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
-import { usePathname, useRouter } from 'next/navigation';
+import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
 import { useThemeSwitchTabs } from './useThemeSwitchTabs';
 
@@ -46,7 +44,6 @@ export const useMainMenuContent = () => {
     utm_campaign: 'jumper_to_explorer',
     utm_medium: 'menu',
   });
-  const pathname = usePathname();
 
   const themeSwitchTabs = useThemeSwitchTabs();
 

src/components/ProfilePage/LevelBox/TierBox.style.ts

@@ -1,4 +1,4 @@
-import { alpha, type Breakpoint } from '@mui/material';
+import { alpha } from '@mui/material';
 import { Box, styled } from '@mui/system';
 
 export const TierMainBox = styled(Box)(({ theme }) => ({

src/components/ProfilePage/ProfilePage.tsx

@@ -16,7 +16,7 @@ export const ProfilePage = () => {
   const { account } = useAccounts();
   const { isLoading, points, tier, pdas } = useLoyaltyPass();
   const { imageLink } = useMercleNft({ userAddress: account?.address });
-  const { quests } = useOngoingQuests();
+  const { quests, isQuestLoading } = useOngoingQuests();
 
   return (
     <ProfilePageContainer className="profile-page">
@@ -38,7 +38,7 @@ export const ProfilePage = () => {
             <TierBox points={points} tier={tier} loading={isLoading} />
           </ProfilePageHeaderBox>
         </Stack>
-        <QuestCarousel quests={quests} />
+        <QuestCarousel quests={quests} loading={isQuestLoading} />
         <QuestCompletedList pdas={pdas} loading={isLoading} />
       </Stack>
     </ProfilePageContainer>

src/components/ProfilePage/QuestCard/VoidQuestCard.tsx

@@ -28,29 +28,16 @@ export const VoidQuestCard = ({ connected }: VoidQuestCardProps) => {
             : alpha(theme.palette.white.main, 0.08),
       }}
     >
-      {connected ? (
-        <EmojiEventsIcon
-          sx={{
-            height: '64px',
-            width: '64px',
-            color:
-              theme.palette.mode === 'light'
-                ? theme.palette.grey[400]
-                : alpha(theme.palette.grey[400], 0.08),
-          }}
-        />
-      ) : (
-        <QuestionMarkIcon
-          sx={{
-            height: '96px',
-            width: '96px',
-            color:
-              theme.palette.mode === 'light'
-                ? theme.palette.grey[400]
-                : alpha(theme.palette.grey[400], 0.08),
-          }}
-        />
-      )}
+      <QuestionMarkIcon
+        sx={{
+          height: '96px',
+          width: '96px',
+          color:
+            theme.palette.mode === 'light'
+              ? theme.palette.grey[400]
+              : alpha(theme.palette.grey[400], 0.08),
+        }}
+      />
     </Box>
   );
 };