Skip to content

Commit

Permalink
Merge branch 'develop' into LF-11136-jumper-create-react-components-t…
Browse files Browse the repository at this point in the history
…o-use-the-zap-widget
  • Loading branch information
dennyscode committed Dec 12, 2024
2 parents 2694b4a + ac94106 commit 24a5f3b
Show file tree
Hide file tree
Showing 5 changed files with 1,963 additions and 2,802 deletions.
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
84 changes: 41 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions src/components/Menu/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ import { ButtonSecondary } from '@/components/Button/Button.style';
import type { MenuKeysEnum } from '@/const/menuKeys';
import type { Breakpoint, SxProps, Theme } from '@mui/material';
import { Typography, useTheme } from '@mui/material';
import type { MouseEventHandler } from 'react';
import type { MouseEvent, MouseEventHandler, ReactNode } from 'react';
import { MenuItemContainer, MenuItemLink } from '.';
import { MenuItemLabel } from './MenuItemLabel';

export interface MenuItemLinkType {
url: string;
external?: boolean;
}

interface MenuItemProps {
open: boolean;
showButton: boolean | undefined;
children?: Element | JSX.Element | undefined;
children?: ReactNode; // Update the type here
disableRipple?: boolean | undefined;
autoFocus?: boolean;
showMoreIcon?: boolean;
Expand Down Expand Up @@ -49,7 +50,7 @@ export const MenuItem = ({
showButton={showButton || false}
sx={styles}
autoFocus={autoFocus}
onClick={(event) => {
onClick={(event: MouseEvent<HTMLLIElement>) => {
event.stopPropagation();
if (!children) {
onClick && onClick(event);
Expand Down
Loading

0 comments on commit 24a5f3b

Please sign in to comment.