Staging Release

jumperexchange · Oct 7, 2024 · bdb3174 · bdb3174
2 parents 3ebaf00 + 214be5d
commit bdb3174
Show file tree

Hide file tree

Showing 41 changed files with 698 additions and 376 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -1,6 +1,11 @@
 name: Playwright Tests
 on:
-  push:
+  - pull_request
+  - workflow_dispatch
+permissions:
+  checks: write
+  pull-requests: write
+  contents: write
 jobs:
   test:
     timeout-minutes: 10
@@ -22,3 +27,7 @@ jobs:
         name: playwright-report
         path: playwright-report/
         retention-days: 30
+    - uses: daun/playwright-report-summary@v3
+      if: always()
+      with:
+        report-file: test-results.json
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,4 @@ next-env.d.ts
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+test-results.json
diff --git a/next.config.mjs b/next.config.mjs
@@ -35,18 +35,18 @@ const nextConfig = {
         port: '',
         pathname: '/uploads/**',
       },
+      {
+        protocol: 'https',
+        hostname: 'storage.googleapis.com',
+        port: '',
+        pathname: '/jumper-static-assets/upload/**',
+      },
       // {
       //   protocol: 'https',
       //   hostname: 'cdn.mygateway.xyz',
       //   port: '',
       //   pathname: '/**',
       // },
-      {
-        protocol: 'https',
-        hostname: 'jumper-static.s3.us-east-2.amazonaws.com',
-        port: '',
-        pathname: '/**',
-      },
       {
         protocol: 'https',
         hostname: 'resolve.mercle.xyz',

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -32,7 +32,7 @@ export default defineConfig({
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
+  reporter: [['html'], ['json', { outputFile: 'test-results.json' }]],
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */

diff --git a/src/app/[lng]/(infos)/learn/[slug]/page.tsx b/src/app/[lng]/(infos)/learn/[slug]/page.tsx
@@ -44,7 +44,7 @@ export async function generateMetadata({
       title: `Jumper Learn | ${sliceStrToXChar(articleData.Title, 45)}`,
       description: articleData.Subtitle,
       alternates: {
-        canonical: `${process.env.NEXT_PUBLIC_SITE_URL}/${params.slug}`,
+        canonical: `${process.env.NEXT_PUBLIC_SITE_URL}/learn/${params.slug}`,
       },
       twitter: openGraph,
       openGraph,

diff --git a/src/app/sitemap.ts b/src/app/sitemap.ts
@@ -9,62 +9,35 @@ function withoutTrailingSlash(url: string) {
   return url.endsWith('/') ? url.slice(0, -1) : url;
 }
 
-function generateAlternates(path: string) {
-  return {
-    languages: {
-      ...locales.reduce((acc, loc) => {
-        const pages = {
-          ...acc,
-          [loc]: withoutTrailingSlash(
-            `${process.env.NEXT_PUBLIC_SITE_URL}${loc !== 'en' ? `/${loc}` : ''}${path}`,
-          ),
-        };
-
-        return pages;
-      }, {}),
-    },
-  };
-}
-
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   // paths
   const routes = pages.flatMap((route: SitemapPage) => {
-    return locales.map((locale) => {
-      return {
-        url: withoutTrailingSlash(
-          `${process.env.NEXT_PUBLIC_SITE_URL}${locale !== 'en' ? `/${locale}` : ''}${route.path}`,
-        ),
-        lastModified: new Date().toISOString().split('T')[0],
-        changeFrequency: 'weekly' as ChangeFrequency,
-        alternates: generateAlternates(route.path),
-        priority: route.priority,
-      };
-    });
+    return {
+      url: withoutTrailingSlash(
+        `${process.env.NEXT_PUBLIC_SITE_URL}${route.path}`,
+      ),
+      lastModified: new Date().toISOString().split('T')[0],
+      changeFrequency: 'weekly' as ChangeFrequency,
+      priority: route.priority,
+    };
   });
 
   // articles by slug
   const articles = await getArticles().then(
     (article: StrapiResponse<BlogArticleData>) => {
-      return locales.flatMap((locale) => {
-        return article.data.map((el) => {
-          return {
-            url: withoutTrailingSlash(
-              `${process.env.NEXT_PUBLIC_SITE_URL}${locale !== 'en' ? `/${locale}` : ''}${JUMPER_LEARN_PATH}${el.attributes.Slug}`,
-            ),
-            lastModified: new Date(
-              el.attributes.updatedAt ||
-                el.attributes.publishedAt ||
-                Date.now(),
-            )
-              .toISOString()
-              .split('T')[0],
-            changeFrequency: 'weekly' as ChangeFrequency,
-            alternates: generateAlternates(
-              `${JUMPER_LEARN_PATH}${el.attributes.Slug}`,
-            ),
-            priority: 0.8,
-          };
-        });
+      return article.data.map((el) => {
+        return {
+          url: withoutTrailingSlash(
+            `${process.env.NEXT_PUBLIC_SITE_URL}${JUMPER_LEARN_PATH}${el.attributes.Slug}`,
+          ),
+          lastModified: new Date(
+            el.attributes.updatedAt || el.attributes.publishedAt || Date.now(),
+          )
+            .toISOString()
+            .split('T')[0],
+          changeFrequency: 'weekly' as ChangeFrequency,
+          priority: 0.8,
+        };
       });
     },
   );

diff --git a/src/components/Blog/CTAs/InstructionsAccordion/InstructionsAccordionItem.tsx b/src/components/Blog/CTAs/InstructionsAccordion/InstructionsAccordionItem.tsx
@@ -18,6 +18,12 @@ import {
   InstructionsAccordionLinkBox,
   InstructionsAccordionToggle,
 } from '.';
+import { useUserTracking } from 'src/hooks/userTracking';
+import {
+  TrackingAction,
+  TrackingCategory,
+  TrackingEventParameter,
+} from 'src/const/trackingKeys';
 
 interface InstructionsAccordionItemProps extends InstructionItemProps {
   index: number;
@@ -53,6 +59,7 @@ export const InstructionsAccordionItem = ({
 }: InstructionsAccordionItemProps) => {
   const [open, setOpen] = useState(false);
   const theme = useTheme();
+  const { trackEvent } = useUserTracking();
   const isTablet = useMediaQuery(theme.breakpoints.up('sm' as Breakpoint));
   const handleOpen:
     | MouseEventHandler<HTMLDivElement | HTMLButtonElement>
@@ -69,6 +76,20 @@ export const InstructionsAccordionItem = ({
     }
   }, []);
 
+  const handleClick = (i: number) => {
+    trackEvent({
+      category: TrackingCategory.Quests,
+      action: TrackingAction.ClickMissionCtaSteps,
+      label: `click-mission-cta-steps`,
+      data: {
+        [TrackingEventParameter.MissionCtaStepsTitle]: title || '',
+        [TrackingEventParameter.MissionCtaStepsLink]: buttonLinks?.[i] || '',
+        [TrackingEventParameter.MissionCtaStepsCTA]: buttonTitles?.[i] || '',
+        [TrackingEventParameter.MissionCtaStepsIndex]: index || -1,
+      },
+    });
+  };
+
   return (
     <InstructionsAccordionItemContainer
       sx={{
@@ -140,6 +161,7 @@ export const InstructionsAccordionItem = ({
                         target="_blank"
                         rel="noreferrer"
                         style={{ textDecoration: 'none', color: 'inherit' }}
+                        onClick={() => handleClick(i)}
                       >
                         <InstructionsAccordionLinkBox>
                           <Typography

diff --git a/src/components/Link.style.ts b/src/components/Link.style.ts
diff --git a/src/components/OptionalLink.tsx b/src/components/OptionalLink.tsx
@@ -0,0 +1,31 @@
+import { Link as MuiLink, type CSSObject } from '@mui/material';
+import Link from 'next/link';
+import type { PropsWithChildren } from 'react';
+
+interface OptionalLinkProps {
+  href?: string;
+  ariaLabel?: string;
+  sx?: CSSObject;
+}
+
+export const OptionalLink: React.FC<PropsWithChildren<OptionalLinkProps>> = (
+  props,
+) => {
+  if (props.href) {
+    return (
+      <MuiLink
+        component={Link}
+        href={props.href}
+        aria-label={props.ariaLabel}
+        style={{
+          textDecoration: 'inherit',
+          ...(props.sx as React.CSSProperties),
+        }}
+      >
+        {props.children}
+      </MuiLink>
+    );
+  } else {
+    return props.children;
+  }
+};
diff --git a/src/components/ProfilePage/AddressBox/AddressBox.tsx b/src/components/ProfilePage/AddressBox/AddressBox.tsx
@@ -4,6 +4,7 @@ import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import { useTheme } from '@mui/material';
 import Image from 'next/image';
 import { useTranslation } from 'react-i18next';
+import { useMercleNft } from 'src/hooks/useMercleNft';
 import type { Address } from 'viem';
 import { useEnsName } from 'wagmi';
 import { mainnet } from 'wagmi/chains';
@@ -18,12 +19,12 @@ import {
 interface AddressBoxProps {
   address?: string;
   isEVM?: boolean;
-  imageLink?: string;
 }
 
-export const AddressBox = ({ address, isEVM, imageLink }: AddressBoxProps) => {
+export const AddressBox = ({ address, isEVM }: AddressBoxProps) => {
   const { t } = useTranslation();
   const theme = useTheme();
+  const { imageLink } = useMercleNft({ userAddress: address });
   const { setSnackbarState } = useMenuStore((state) => state);
   const { data: ensName, isSuccess } = useEnsName({
     address: address as Address | undefined,
@@ -96,16 +97,18 @@ export const AddressBox = ({ address, isEVM, imageLink }: AddressBoxProps) => {
         <ProfileIconButton onClick={() => handleCopyButton()}>
           <ContentCopyIcon sx={{ height: '16px' }} />
         </ProfileIconButton>
-        <a
-          href={`https://etherscan.io/address/${address}`}
-          target="_blank"
-          style={{ textDecoration: 'none', color: 'inherit' }}
-          rel="noreferrer"
-        >
-          <ProfileIconButton>
-            <OpenInNewIcon sx={{ height: '16px' }} />
-          </ProfileIconButton>
-        </a>
+        {address && (
+          <a
+            href={`https://etherscan.io/address/${address}`}
+            target="_blank"
+            style={{ textDecoration: 'none', color: 'inherit' }}
+            rel="noreferrer"
+          >
+            <ProfileIconButton>
+              <OpenInNewIcon sx={{ height: '16px' }} />
+            </ProfileIconButton>
+          </a>
+        )}
       </AddressDisplayBox>
     </AddressBoxContainer>
   );

diff --git a/src/components/ProfilePage/Common/IconHeader.tsx b/src/components/ProfilePage/Common/IconHeader.tsx
@@ -16,6 +16,7 @@ export const IconHeader = ({ tooltipKey, title }: IconHeaderProps) => {
       {title}
       <Tooltip
         title={t(tooltipKey as any)}
+        sx={{ cursor: 'help' }}
         placement="top"
         enterTouchDelay={0}
         arrow

diff --git a/src/components/ProfilePage/LevelBox/LevelIndicator.tsx b/src/components/ProfilePage/LevelBox/LevelIndicator.tsx
@@ -1,13 +1,13 @@
 import { LevelButton } from '../../Button';
-import { NoSelectTypography } from '../ProfilePage.style';
 import { XPIcon } from '../../illustrations/XPIcon';
+import { NoSelectTypography } from '../ProfilePage.style';
 
 interface LevelButtonProps {
   level: number;
-  points: number;
+  bound: number;
 }
 
-export const LevelIndicator = ({ level, points }: LevelButtonProps) => {
+export const LevelIndicator = ({ level, bound }: LevelButtonProps) => {
   return (
     <LevelButton aria-label="XP Level" size="medium">
       <NoSelectTypography
@@ -16,7 +16,7 @@ export const LevelIndicator = ({ level, points }: LevelButtonProps) => {
         fontWeight={600}
         marginRight="8px"
       >
-        LEVEL {level} • {points}
+        LEVEL {level} • {bound}
       </NoSelectTypography>
       <XPIcon size={16} />
     </LevelButton>

diff --git a/src/components/ProfilePage/LevelBox/PointsBox.tsx b/src/components/ProfilePage/LevelBox/PointsBox.tsx
@@ -9,7 +9,7 @@ interface PointsBoxProps {
 export const PointsBox = ({ points }: PointsBoxProps) => {
   return (
     <Box>
-      <IconHeader tooltipKey="profile_page.pointsInfo" title="POINTS" />
+      <IconHeader tooltipKey="profile_page.pointsInfo" title="XP" />
       <CenteredBox>
         <PointsDisplay points={points} />
       </CenteredBox>