Remove web3 modal

Author: youngkidwarrior

apps/next/pages/_app.tsx

@@ -1,6 +1,5 @@
 import '../public/reset.css'
 import '../styles/globals.css'
-
 import 'raf/polyfill'
 import '@my/ui/src/config/fonts.css'
 
@@ -10,38 +9,12 @@ import type { AuthProviderProps } from 'app/provider/auth'
 import { api } from 'app/utils/api'
 import type { NextPage } from 'next'
 import Head from 'next/head'
-import { useEffect, type ReactElement, type ReactNode } from 'react'
+import type { ReactElement, ReactNode } from 'react'
 import type { SolitoAppProps } from 'solito'
 import { Provider } from 'app/provider'
-import { projectId, config as wagmiConfig } from 'app/provider/wagmi/config'
-import { createWeb3Modal, useWeb3ModalTheme } from '@web3modal/wagmi/react'
-import { baseMainnetClient } from '@my/wagmi'
 import { YStack, H1, H2 } from '@my/ui'
 import { IconSendLogo } from 'app/components/icons'
 
-createWeb3Modal({
-  wagmiConfig,
-  projectId,
-  defaultChain: baseMainnetClient.chain,
-  themeVariables: {
-    '--w3m-accent': '#86AE80',
-  },
-  tokens: {
-    8453: {
-      address: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
-    },
-    845337: {
-      address: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
-    },
-    1: {
-      address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    },
-    1337: {
-      address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    },
-  },
-})
-
 if (process.env.NODE_ENV === 'production') {
   require('../public/tamagui.css')
 }
@@ -57,12 +30,7 @@ function MyApp({
   // reference: https://nextjs.org/docs/pages/building-your-application/routing/pages-and-layouts
   const getLayout = Component.getLayout || ((page) => page)
 
-  const [theme, setTheme] = useRootTheme()
-  const { setThemeMode } = useWeb3ModalTheme()
-
-  useEffect(() => {
-    setThemeMode(theme)
-  }, [theme, setThemeMode])
+  const [, setTheme] = useRootTheme()
 
   return (
     <>

packages/app/features/auth/account-recovery/eoa/RecoverWithEOA.tsx

@@ -7,7 +7,6 @@ import {
 import { Button, ButtonText } from '@my/ui'
 import type { SignMessageErrorType } from '@wagmi/core'
 import type { SignState } from 'app/features/auth/account-recovery/account-recovery'
-import { OpenConnectModalWrapper } from 'app/utils/OpenConnectModalWrapper'
 import { useAccount, useSignMessage } from 'wagmi'
 import type { SignMessageData, SignMessageVariables } from 'wagmi/query'
 
@@ -48,10 +47,8 @@ export default function RecoverWithEOA(props: Props) {
   }
 
   return (
-    <OpenConnectModalWrapper width={'50%'}>
-      <Button onPress={isConnected ? onPress : null} theme="green" br="$4">
-        <ButtonText testID="account-recovery-eoa-btn">EOA</ButtonText>
-      </Button>
-    </OpenConnectModalWrapper>
+    <Button onPress={isConnected ? onPress : null} theme="green" br="$4">
+      <ButtonText testID="account-recovery-eoa-btn">EOA</ButtonText>
+    </Button>
   )
 }

packages/app/jest.config.ts

@@ -156,7 +156,7 @@ const config: Config = {
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
   transformIgnorePatterns: [
-    'node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|moti|sentry-expo|native-base|react-native-svg|solito|@web3modal|@web3modal/*|@wagmi|wagmi/*|viem|viem/*|@tamagui/animations-moti)',
+    'node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|moti|sentry-expo|native-base|react-native-svg|solito|@tamagui/animations-moti)',
   ],
 
   moduleNameMapper: {

packages/app/package.json

@@ -39,7 +39,6 @@
     "@wagmi/chains": "^1.8.0",
     "@wagmi/connectors": "^5.1.1",
     "@wagmi/core": "^2.13.1",
-    "@web3modal/wagmi": "^5.0.2",
     "base64-arraybuffer": "^1.0.2",
     "burnt": "^0.12.1",
     "cbor": "^9.0.1",

packages/app/provider/wagmi/WagmiProvider.native.tsx

@@ -1,8 +1,6 @@
-import type { FC, ReactNode } from 'react'
 import { WagmiProvider as OGWagmiProvider } from 'wagmi'
-import { projectId, config } from './config'
-
-if (!projectId) throw new Error('Project ID is not defined')
+import { config } from '@my/wagmi'
+import type { FC, ReactNode } from 'react'
 
 export const WagmiProvider: FC<{ children: ReactNode }> = ({
   children,
@@ -11,3 +9,9 @@ export const WagmiProvider: FC<{ children: ReactNode }> = ({
 }) => {
   return <OGWagmiProvider config={config}>{children}</OGWagmiProvider>
 }
+
+declare module 'wagmi' {
+  interface Register {
+    config: typeof config
+  }
+}