Merge branch 'develop' into LF-10781-jumper-add-unique-image-to-seo-b…

…ridge-page

.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.3.cjs

package.json

@@ -4,94 +4,92 @@
   "type": "module",
   "private": true,
   "repository": "https://github.com/jumperexchange/jumper-exchange",
-  "packageManager": "[email protected].1",
+  "packageManager": "[email protected].3",
   "dependencies": {
-    "@bigmi/react": "^0.0.4",
-    "@emotion/cache": "^11.13.1",
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.13.0",
+    "@bigmi/react": "^0.0.5",
+    "@emotion/cache": "^11.14.0",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.0",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@headlessui/react": "^2.2.0",
-    "@lifi/explorer": "^0.0.3",
-    "@lifi/sdk": "^3.4.1",
-    "@lifi/wallet-management": "^3.4.4",
-    "@lifi/widget": "^3.12.1",
+    "@lifi/explorer": "^0.0.4",
+    "@lifi/sdk": "^3.4.2",
+    "@lifi/wallet-management": "^3.4.6",
+    "@lifi/widget": "^3.12.3",
     "@metaplex-foundation/mpl-core": "^1.1.1",
     "@metaplex-foundation/umi": "^0.9.2",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@metaplex-foundation/umi-signer-wallet-adapters": "^0.9.2",
-    "@mui/icons-material": "^5.16.7",
-    "@mui/material": "^5.16.7",
-    "@mui/material-nextjs": "^5.16.6",
-    "@next/third-parties": "^14.2.17",
-    "@rive-app/react-canvas": "^4.16.1",
+    "@mui/icons-material": "^5.16.11",
+    "@mui/material": "^5.16.11",
+    "@mui/material-nextjs": "^5.16.8",
+    "@next/third-parties": "^14.2.20",
+    "@rive-app/react-canvas": "^4.17.1",
     "@safe-global/safe-apps-sdk": "^9.1.0",
-    "@sentry/browser": "^8.37.1",
-    "@sentry/nextjs": "^8.37.1",
-    "@sentry/react": "^8.37.1",
+    "@sentry/browser": "^8.43.0",
+    "@sentry/nextjs": "^8.43.0",
+    "@sentry/react": "^8.43.0",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-solflare": "^0.6.28",
-    "@solana/web3.js": "^1.95.4",
+    "@solana/web3.js": "^1.95.8",
     "@strapi/blocks-react-renderer": "^1.0.1",
-    "@synthetixio/synpress": "4.0.0-alpha.7",
-    "@tanstack/react-query": "^5.59.20",
+    "@tanstack/react-query": "^5.62.7",
     "@widgetbot/react-embed": "^1.9.0",
     "accept-language": "^3.0.20",
-    "axios": "^1.7.7",
     "blo": "^1.2.0",
-    "dotenv-cli": "^7.4.2",
     "ethers": "^6.13.4",
     "fontaine": "^0.5.0",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
-    "i18next": "^23.16.5",
+    "i18next": "^24.1.0",
     "i18next-resources-for-ts": "^1.5.0",
     "i18next-resources-to-backend": "^1.2.1",
-    "next": "^14.2.17",
+    "next": "^14.2.20",
     "next-i18n-router": "^5.5.1",
     "next-themes": "^0.3.0",
     "react": "^18.3.1",
     "react-animated-counter": "^1.7.9",
     "react-cookie": "^7.2.2",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.1.2",
-    "react-i18next": "^15.1.1",
+    "react-i18next": "^15.1.4",
     "shallow-equal": "^3.1.0",
     "sharp": "^0.33.5",
     "siwe": "^2.3.2",
-    "uuid": "^10.0.0",
-    "wait-on": "^8.0.1",
-    "xvfb": "^0.4.0",
-    "zustand": "^4.5.5"
+    "uuid": "^11.0.3",
+    "zustand": "^5.0.2"
   },
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
-    "@eslint/eslintrc": "^3.1.0",
-    "@metamask/test-dapp": "8.2.0",
-    "@next/eslint-plugin-next": "^14.2.17",
-    "@playwright/test": "^1.48.2",
+    "@eslint/eslintrc": "^3.2.0",
+    "@metamask/test-dapp": "8.13.0",
+    "@next/eslint-plugin-next": "^14.2.20",
+    "@playwright/test": "^1.49.1",
+    "@synthetixio/synpress": "4.0.0-alpha.7",
     "@types/gtag.js": "^0.0.20",
-    "@types/node": "^22.9.0",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
+    "@types/node": "^22.10.2",
+    "@types/react": "^18.3.16",
+    "@types/react-dom": "^18.3.5",
     "@types/uuid": "^10.0.0",
+    "dotenv-cli": "^7.4.4",
     "eslint": "8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "globals": "^15.12.0",
-    "husky": "^9.1.6",
-    "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
+    "globals": "^15.13.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.2.11",
+    "prettier": "^3.4.2",
     "rollup-plugin-polyfill-node": "^0.13.0",
-    "typescript": "^5.6.3",
-    "web-vitals": "^4.2.4"
+    "typescript": "^5.7.2",
+    "web-vitals": "^4.2.4",
+    "xvfb": "^0.4.0"
   },
   "scripts": {
     "dev": "next dev",

src/components/Menu/MenuItem.tsx

@@ -10,6 +10,7 @@ export interface MenuItemLinkType {
   url: string;
   external?: boolean;
 }
+
 interface MenuItemProps {
   open: boolean;
   showButton: boolean | undefined;

synpressCache.ts

@@ -1,14 +1,18 @@
 import { spawn } from 'child_process';
 
 async function buildSynpressCache() {
-  console.log('Building Synpress cache...');
+  // console.log('Building Synpress cache...');
 
   return new Promise<void>((resolve, reject) => {
-    const process = spawn('yarn', ['build:cache', '--force', 'tests/wallet-setup/'], { stdio: 'inherit' });
+    const process = spawn(
+      'yarn',
+      ['build:cache', '--force', 'tests/wallet-setup/'],
+      { stdio: 'inherit' },
+    );
 
     process.on('close', (code) => {
       if (code === 0) {
-        console.log('Synpress cache build complete.');
+        // console.log('Synpress cache build complete.');
         resolve();
       } else {
         console.error(`Failed to build Synpress cache with exit code ${code}`);

tests/connectWallet.spec.ts

@@ -1,7 +1,11 @@
 import { execSync } from 'child_process';
 import { testWithSynpress } from '@synthetixio/synpress-core';
 import { MetaMask, metaMaskFixtures } from '@synthetixio/synpress';
-import { openOrCloseMainMenu, itemInMenu, closeWelcomeScreen } from './testData/commonFunctions';
+import {
+  openOrCloseMainMenu,
+  itemInMenu,
+  closeWelcomeScreen,
+} from './testData/commonFunctions';
 import basicSetup from './wallet-setup/basic.setup';
 
 const test = testWithSynpress(metaMaskFixtures(basicSetup));
@@ -20,9 +24,15 @@ test.describe('Connect Metamask with Jumper app and open /profile page', () => {
       extensionId,
     );
     const connectWalletButton = page.locator('#connect-wallet-button');
-    const metaMaskWalletOption = page.locator('xpath=//span[normalize-space(text())="MetaMask"]');
-    const availableMissionTitle = page.locator('xpath=//p[normalize-space(text())="Available Missions"]');
-    const ethereumOption = page.locator('xpath=//span[normalize-space(text())="Ethereum"]');
+    const metaMaskWalletOption = page.locator(
+      'xpath=//span[normalize-space(text())="MetaMask"]',
+    );
+    const availableMissionTitle = page.locator(
+      'xpath=//p[normalize-space(text())="Available Missions"]',
+    );
+    const ethereumOption = page.locator(
+      'xpath=//span[normalize-space(text())="Ethereum"]',
+    );
     await page.goto('/');
     await expect(connectWalletButton).toBeEnabled();
     await connectWalletButton.click();

tests/e2e.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import values from '../tests/testData/values.json' assert { type:"json"};
+import values from '../tests/testData/values.json' assert { type: 'json' };
 import {
   closeWelcomeScreen,
   expectBackgroundColorToHaveCss,

tests/swapActions.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@playwright/test';
-import chainData from './testData/chainData.json' assert {type:"json"};
+import chainData from './testData/chainData.json' assert { type: 'json' };
 import {
   buildUlParams,
   checkIfBestReturnLabelIsVisible,
@@ -34,7 +34,7 @@ test.describe('On chain swaps', () => {
     await page.goto(`/${urlParams}`);
     await checkIfBestReturnLabelIsVisible(page);
   });
- 
+
   test(`Check ${chainData.ARBtoARB.ETHtoUSDT.tokenSymbol} to ${chainData.ARBtoARB.ETHtoUSDT.toTokenSymbol} swap pair on ARB chain`, async ({
     page,
   }) => {

tests/wallet-setup/basic.setup.ts

@@ -8,4 +8,4 @@ export default defineWalletSetup(PASSWORD, async (context, walletPage) => {
   const metamask = new MetaMask(context, walletPage, PASSWORD);
 
   await metamask.importWallet(SEED_PHRASE);
-});
+});

tests/wallet-setup/synpress.ts

@@ -1,5 +1,5 @@
-import { testWithSynpress, metaMaskFixtures } from '@synthetixio/synpress'
+import { testWithSynpress, metaMaskFixtures } from '@synthetixio/synpress';
 
-import connectedSetup from '../wallet-setup/connected.setup'
+import connectedSetup from '../wallet-setup/connected.setup';
 
-export default testWithSynpress(metaMaskFixtures(connectedSetup))
+export default testWithSynpress(metaMaskFixtures(connectedSetup));