Merge pull request #973 from ensdomains/network-switch

storywithoutend · web-flow · commit ee2ef540feca · 2025-03-26T09:32:12.000+02:00
Remove unsupported network logic
diff --git a/.env b/.env
@@ -20,5 +20,3 @@ BATCH_GATEWAY_URLS='["https://ccip-v2.ens.xyz/"]'
 
 NEXT_PUBLIC_POSTHOG_KEY=phc_Fgf9Nr86STb590T6qQQ5XI3G63UQ4LQGyA1aKS5ROvS
 NEXT_PUBLIC_POSTHOG_HOST=https://jakob.ens.domains
-
-NEXT_PUBLIC_PARA_API_KEY_PROD=c5695b18d016139ac4db1c7f98a87e68
diff --git a/package.json b/package.json
@@ -181,6 +181,7 @@
   },
   "pnpm": {
     "overrides": {
+      "@getpara/react-sdk": "1.6.1-dev.0",
       "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
       "@wagmi/core": "2.13.3",
       "@walletconnect/ethereum-provider": "2.11.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -2,7 +2,6 @@
   "title": "Your web3 username",
   "description": "Your identity across web3, one name for all your crypto addresses, and your decentralised website.",
   "loading": "Loading",
-  "unsupportedNetwork": "Unsupported network",
   "notFound": "404 Not Found",
   "etherscan": "Etherscan",
   "action": {
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
@@ -2,7 +2,6 @@
   "title": "Tu nombre de usuario de Web3",
   "description": "Tu identidad en todo Web3, un nombre para todas tus direcciones de criptomonedas y tu sitio web descentralizado.",
   "loading": "Cargando",
-  "unsupportedNetwork": "Red no compatible",
   "notFound": "404 No encontrado",
   "etherscan": "Etherscan",
   "action": {
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json
@@ -2,7 +2,6 @@
   "title": "Jouw web3 gebruikersnaam",
   "description": "Jouw web3 identiteit, een naam voor al je crypto Adressen, en je gedecentraliseerde website.",
   "loading": "Laden",
-  "unsupportedNetwork": "Netwerk niet ondersteund",
   "action": {
     "cancel": "Annuleer",
     "change": "Verander",
diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json
@@ -2,7 +2,6 @@
   "title": "Seu nome de usuário na Web3",
   "description": "Sua identidade em toda a Web3, um nome para todos os seus endereços de criptomoedas e seu site descentralizado.",
   "loading": "Carregando",
-  "unsupportedNetwork": "Rede não suportada",
   "notFound": "404 Não encontrado",
   "etherscan": "Etherscan",
   "action": {
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
@@ -2,7 +2,6 @@
   "title": "Ваше веб3 имя пользователя",
   "description": "Ваша идентификация в веб3, одно имя для всех ваших криптоадресов и вашего децентрализованного вебсайта.",
   "loading": "Загрузка",
-  "unsupportedNetwork": "Неподдерживаемая сеть",
   "notFound": "404 Не найдено",
   "etherscan": "Etherscan",
   "action": {
diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json
@@ -2,7 +2,6 @@
   "title": "Ваш веб3 ім'я користувача",
   "description": "Ваша ідентичність у веб3, одне ім'я для всіх ваших криптоадрес і ваш децентралізований вебсайт.",
   "loading": "Завантаження",
-  "unsupportedNetwork": "Мережева підтримка не підтримується",
   "notFound": "404 Не знайдено",
   "etherscan": "Etherscan",
   "action": {
diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
@@ -2,7 +2,6 @@
   "title": "您的 web3 用户名",
   "description": "您在 web3 上的身份，一个名称就能解析到您所有的加密地址和您的去中心化网站。",
   "loading": "加载中",
-  "unsupportedNetwork": "不支持的网络",
   "notFound": "404 未找到",
   "etherscan": "Etherscan",
   "action": {
diff --git a/src/layouts/Basic.tsx b/src/layouts/Basic.tsx
@@ -5,9 +5,7 @@ import { useAccount, useSwitchChain } from 'wagmi'
 
 import ErrorScreen from '@app/components/@atoms/ErrorScreen'
 import { getSupportedChainById } from '@app/constants/chains'
-import { useRouterWithHistory } from '@app/hooks/useRouterWithHistory'
 import { useSetupIntercom } from '@app/hooks/useSetupIntercom'
-import { shouldRedirect } from '@app/utils/shouldRedirect'
 
 import { Navigation } from './Navigation'
 
@@ -83,7 +81,6 @@ export const Basic = withErrorBoundary(({ children }: { children: React.ReactNod
   const { switchChain, isPending, isError } = useSwitchChain()
   useSetupIntercom()
 
-  const router = useRouterWithHistory()
   const [error] = useErrorBoundary()
 
   useEffect(() => {
@@ -94,10 +91,6 @@ export const Basic = withErrorBoundary(({ children }: { children: React.ReactNod
     }
   }, [isConnected, hasProgrammaticChainSwitching, isPending, isError, chainId, switchChain])
 
-  useEffect(() => {
-    shouldRedirect(router, 'Basic.tsx', '/unsupportedNetwork', { isConnected, chainId })
-  }, [isConnected, chainId, router])
-
   return (
     <Container className="min-safe">
       <Navigation />
diff --git a/src/pages/unsupportedNetwork.tsx b/src/pages/unsupportedNetwork.tsx
diff --git a/src/utils/query/paraWallet.ts b/src/utils/query/paraWallet.ts
@@ -13,7 +13,6 @@ import i18n from '../../i18n'
 import { ENS_LINKS, WC_PROJECT_ID } from '../constants'
 import { transports } from './wagmi'
 
-// const prodParaApiKey = process.env.NEXT_PUBLIC_PARA_API_KEY_PROD
 const prodParaApiKey = 'c5695b18d016139ac4db1c7f98a87e68'
 
 const APP_NAME = 'ENS'
diff --git a/src/utils/shouldRedirect.test.ts b/src/utils/shouldRedirect.test.ts
@@ -51,24 +51,6 @@ describe('shouldRedirect', () => {
     expect(mockRouter.pathname).toBe(`/`)
   })
 
-  it('Basic.tsx should return expected path if has valid arguments', () => {
-    const params = {
-      isConnected: true,
-      chainId: 0,
-    }
-    shouldRedirect(mockRouter as never, 'Basic.tsx', '/unsupportedNetwork', params)
-    expect(mockRouter.pathname).toBe(`/unsupportedNetwork`)
-  })
-
-  it('Basic.tsx should not return expected path if has valid arguments', () => {
-    const params = {
-      isConnected: false,
-      chainId: 0,
-    }
-    shouldRedirect(mockRouter as never, 'Basic.tsx', '/unsupportedNetwork', params)
-    expect(mockRouter.pathname).toBe(`/`)
-  })
-
   it('DnsClaim.tsx should return "/" path if has valid arguments', () => {
     const params = {
       shouldRun: true,
diff --git a/src/utils/shouldRedirect.ts b/src/utils/shouldRedirect.ts
