Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/future/image';
import Image from 'next/image';
import { FC } from 'react';
import styles from './Technologies.module.scss';
import { ITechnologies } from './Technologies.type';
Expand Down
16 changes: 6 additions & 10 deletions packages/base/components/default/WalletModal/WalletModal.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
import Portal from '@components/common/Portal';
import useWeb3 from '@hooks/useWeb3';
import { FC, MouseEvent, useEffect, useMemo, useState } from 'react';
import { v4 as uuidv4 } from 'uuid';
import GradientContainer from '../GradientContainer';
import { IWalletModal } from './WalletModal.type';

import { WALLETS_ARRAY } from '@contexts/Web3Context/Web3Context.variables';
import useWeb3 from '@hooks/useWeb3';
import classNames from 'classnames';
import Image from 'next/future/image';
import Image from 'next/image';
import { FC, MouseEvent, useEffect, useId, useState } from 'react';
import { ESize } from 'theme/theme.enum';
import GradientContainer from '../GradientContainer';
import Text from '../Text';
import { EFontWeight, ETextAlign } from '../Text/Text.enum';
import styles from './WalletModal.module.scss';
import { IWalletModal } from './WalletModal.type';

const WalletModal: FC<IWalletModal> = ({ isOpen = false, onClose = () => {} }) => {
const { connectWallet, isConnectingWallet, disconnectWallet, isWalletConnected, walletName } = useWeb3();

const [isModalVisible, setIsModalVisible] = useState<boolean>(false);

const uuid = useMemo(() => {
return uuidv4();
}, []);
const uuid = useId();

useEffect(() => {
if (!uuid) {
Expand Down
1,092 changes: 300 additions & 792 deletions packages/base/package-lock.json

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions packages/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,20 @@
"@walletconnect/web3-provider": "^1.8.0",
"classnames": "^2.3.2",
"ethers": "^5.7.2",
"next": "12.3.1",
"next": "13.2.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-icons": "^4.6.0",
"sass": "^1.56.1",
"sharp": "^0.31.2",
"uuid": "^9.0.0"
"react-icons": "^4.7.1",
"sass": "^1.56.1"
},
"devDependencies": {
"@types/node": "18.11.11",
"@types/node": "18.14.2",
"@types/react": "18.0.25",
"@types/react-dom": "18.0.9",
"@types/uuid": "^8.3.4",
"eslint": "^8.27.0",
"eslint": "^8.35.0",
"eslint-config-next": "^13.0.6",
"prettier": "2.8.0",
"prettier": "2.8.4",
"typescript": "4.9.3"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box } from '@mui/system';
import Image from 'next/future/image';
import Image from 'next/image';
import { FC } from 'react';
import { StyledLink, StyledLogoContainer } from './Technologies.styles';
import { ITechnologies } from './Technologies.type';
Expand Down
11 changes: 5 additions & 6 deletions packages/mui/components/default/WalletModal/WalletModal.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import Portal from '@components/common/Portal';
import { WALLETS_ARRAY } from '@contexts/Web3Context/Web3Context.variables';
import useWeb3 from '@hooks/useWeb3';
import Image from 'next/image';
import { FC, MouseEvent, useEffect, useId, useState } from 'react';
import GradientContainer from '../GradientContainer';
import { StyledModalBackground, StyledModalButton } from './WalletModal.styles';
import { IWalletModal } from './WalletModal.type';

import { WALLETS_ARRAY } from '@contexts/Web3Context/Web3Context.variables';
import Image from 'next/future/image';
import { ESize } from 'theme/theme.enum';
import GradientContainer from '../GradientContainer';
import Text from '../Text';
import { EFontWeight, ETextAlign } from '../Text/Text.enum';
import { StyledModalBackground, StyledModalButton } from './WalletModal.styles';
import { IWalletModal } from './WalletModal.type';

const WalletModal: FC<IWalletModal> = ({ isOpen = false, onClose = () => {} }) => {
const { connectWallet, isConnectingWallet, disconnectWallet, isWalletConnected, walletName } = useWeb3();
Expand Down
Loading