Simplify getting chain name in the "Switch Chain" modal

Consistent naming.

Author: mondoreale

src/modals/SwitchNetworkModal.tsx

@@ -2,28 +2,26 @@ import React from 'react'
 import styled from 'styled-components'
 import { Buttons } from '~/components/Buttons'
 import PngIcon from '~/shared/components/PngIcon'
-import { getChainDisplayName, getChainKey } from '~/utils/chains'
+import { getChainDisplayName, getChainKey, isKnownChainId } from '~/utils/chains'
 import { RejectionReason } from '~/utils/exceptions'
 import { Footer } from './BaseModal'
 import Modal, { ModalProps } from './Modal'
 
 interface Props extends Pick<ModalProps, 'onReject' | 'darkBackdrop'> {
-    expectedNetwork: number | string
-    actualNetwork: number | string
+    expectedChainId: number
+    actualChainId: number
     onResolve?: () => void
 }
 
-function getChainName(chainId: number | string) {
-    try {
-        return getChainDisplayName(getChainKey(chainId, { failOnNotFound: true }))
-    } catch (_) {
-        return `#${chainId}`
-    }
+function getChainName(chainId: number) {
+    return isKnownChainId(chainId)
+        ? getChainDisplayName(getChainKey(chainId))
+        : `#${chainId}`
 }
 
 export default function SwitchNetworkModal({
-    expectedNetwork,
-    actualNetwork,
+    expectedChainId,
+    actualChainId,
     onReject,
     onResolve,
     ...props
@@ -47,9 +45,9 @@ export default function SwitchNetworkModal({
                     <PngIcon name="wallet" alt="Switch network" />
                 </IconWrap>
                 <P>
-                    Please switch to the <em>{getChainName(expectedNetwork)}</em> network
+                    Please switch to the <em>{getChainName(expectedChainId)}</em> network
                     in your Ethereum wallet. It&apos;s currently in{' '}
-                    <em>{getChainName(actualNetwork)}</em>
+                    <em>{getChainName(actualChainId)}</em>
                     &nbsp;network.
                 </P>
             </Content>

src/utils/chains.ts

@@ -12,25 +12,14 @@ import formatConfigUrl from './formatConfigUrl'
 
 const lowerCasedChainKeyToChainKeyMap: Record<string, ChainKey | null | undefined> = {}
 
-interface GetChainKeyOptions {
-    failOnNotFound?: boolean
-}
-
 /**
  * @param candidate Chain key or chain slug (from config extension) or chain number. Defaults
  * to the default chain key (currently 'polygon').
  */
-export function getChainKey(
-    candidate: string | number,
-    { failOnNotFound = false }: GetChainKeyOptions = {},
-): ChainKey {
+export function getChainKey(candidate: string | number): ChainKey {
     const key = typeof candidate === 'number' ? candidate : candidate.toLowerCase()
 
     if (lowerCasedChainKeyToChainKeyMap[key] === null) {
-        if (failOnNotFound) {
-            throw new Error('ChainKey not found')
-        }
-
         return defaultChainKey
     }
 
@@ -74,10 +63,6 @@ export function getChainKey(
 
     lowerCasedChainKeyToChainKeyMap[key] = null
 
-    if (failOnNotFound) {
-        throw new Error('ChainKey not found')
-    }
-
     return defaultChainKey
 }
 
@@ -186,6 +171,10 @@ export function isChainKey(candidate: string): candidate is ChainKey {
     return Object.prototype.hasOwnProperty.call(configs, candidate)
 }
 
+export function isKnownChainId(candidate: number): boolean {
+    return Object.entries(configs).some(([, { id }]) => id === candidate)
+}
+
 export function getChainDisplayName(chainIdOrChainKey: ChainKey | number): string {
     const { config, configExtension } = getChainEntry(getChainKey(chainIdOrChainKey))
 

src/utils/networkPreflight.ts

@@ -14,15 +14,15 @@ export default async function networkPreflight(expectedChainId: number) {
     const provider = await getWalletProvider()
 
     try {
-        const currentChainId = await getChainId()
+        const actualChainId = await getChainId()
 
-        if (currentChainId === expectedChainId) {
+        if (actualChainId === expectedChainId) {
             return false
         }
 
         await toaster(SwitchNetworkModal, Layer.Modal).pop({
-            expectedNetwork: expectedChainId,
-            actualNetwork: currentChainId,
+            expectedChainId,
+            actualChainId,
         })
 
         await provider.request({