diff --git a/bun.lockb b/bun.lockb index e41215af..4d39559b 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index eb1a7371..1f9eb968 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@yearn-finance/web-lib", - "version": "3.0.86", + "version": "3.0.88", "main": "./dist/index.js", "types": "./dist/index.d.js", "files": [ @@ -26,6 +26,7 @@ }, "dependencies": { "@babel/core": "^7.24.7", + "@builtbymom/web3": "^0.0.122", "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@headlessui/react": "^2.0.4", @@ -45,11 +46,13 @@ "eslint-plugin-react-hooks": "^4.6.2", "ethers": "5.7.2", "eventemitter3": "^5.0.1", + "framer-motion": "^11.2.11", "graphql": "^16.8.2", "graphql-request": "^7.0.1", "husky": "^9.0.11", "lint-staged": "^15.2.7", "next": "^14.2.4", + "next-seo": "^6.5.0", "nprogress": "^0.2.0", "prettier": "^3.3.2", "react-hot-toast": "2.4.1", @@ -96,4 +99,4 @@ "viem": "1.19.9", "wagmi": "1.4.7" } -} +} \ No newline at end of file diff --git a/src/components/Header.tsx b/src/components/Header.tsx index dc170b0c..aa381f4e 100755 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -14,7 +14,6 @@ import {IconWallet} from '../icons/IconWallet'; import {Button} from './Button'; import type {AnchorHTMLAttributes, DetailedHTMLProps, ReactElement} from 'react'; -import type {Chain} from 'viem'; const Link = ( props: DetailedHTMLProps, HTMLAnchorElement> & {tag: ReactElement} @@ -90,7 +89,7 @@ function NetworkSelector({networks}: {networks: number[]}): ReactElement { const noFork = config.chains.filter(({id}): boolean => id !== 1337); return noFork .filter(({id}): boolean => id !== 1337 && ((networks.length > 0 && networks.includes(id)) || true)) - .map((network: Chain): TNetwork => ({value: network.id, label: network.name})); + .map((network): TNetwork => ({value: network.id, label: network.name})); }, [connectors, networks]); const currentNetwork = useMemo((): TNetwork | undefined => { diff --git a/src/components/ModalMobileMenu.tsx b/src/components/ModalMobileMenu.tsx index d1d6e5e6..6217e87c 100755 --- a/src/components/ModalMobileMenu.tsx +++ b/src/components/ModalMobileMenu.tsx @@ -1,5 +1,5 @@ import React, {cloneElement, Fragment, useEffect, useMemo, useRef, useState} from 'react'; -import {useAccount, useConnect} from 'wagmi'; +import {useConnect} from 'wagmi'; import {useWeb3} from '@builtbymom/web3/contexts/useWeb3'; import {truncateHex} from '@builtbymom/web3/utils/tools.address'; import {getConfig, retrieveConfig} from '@builtbymom/web3/utils/wagmi'; @@ -75,8 +75,7 @@ function Modal(props: TModal): ReactElement { export function ModalMobileMenu(props: TModalMobileMenu): ReactElement { const {isOpen, onClose, shouldUseWallets = true, shouldUseNetworks = true, children} = props; - const {onSwitchChain, isActive, address, ens, lensProtocolHandle, onDesactivate, onConnect} = useWeb3(); - const {chain} = useAccount(); + const {onSwitchChain, isActive, address, ens, lensProtocolHandle, onDesactivate, onConnect, chainID} = useWeb3(); const [walletIdentity, set_walletIdentity] = useState('Connect a wallet'); const detectedWalletProvider = useInjectedWallet(); const {connectors} = useConnect(); @@ -86,11 +85,11 @@ export function ModalMobileMenu(props: TModalMobileMenu): ReactElement { try { const config = retrieveConfig(); const noFork = config.chains.filter(({id}): boolean => id !== 1337); - return noFork.map((network: Chain): TNetwork => ({value: network.id, label: network.name})); + return noFork.map((network): TNetwork => ({value: network.id, label: network.name})); } catch (error) { const config = getConfig({chains: props.supportedNetworks as any[]}); const noFork = config.chains.filter(({id}): boolean => id !== 1337); - return noFork.map((network: Chain): TNetwork => ({value: network.id, label: network.name})); + return noFork.map((network): TNetwork => ({value: network.id, label: network.name})); } }, [connectors, props.supportedNetworks]); @@ -154,7 +153,7 @@ export function ModalMobileMenu(props: TModalMobileMenu): ReactElement { className={'yearn--select-no-arrow yearn--select-reset !pr-6 text-sm'}> {supportedNetworks.map((network): ReactElement => { const label = network.label || `Unknown chain (${network.value})`; - const selectedID = chain?.id || 1; + const selectedID = chainID || 1; const isSelected = selectedID === network.value; return (