Drop the remaining "symbolic" names

Author: mondoreale

src/getters/getEnvironmentConfig.ts

@@ -1,3 +1,4 @@
+import { Chain } from '@streamr/config'
 import { z } from 'zod'
 import config from '~/config/environments.toml'
 import { defaultChainKey } from '~/consts'
@@ -15,25 +16,19 @@ const EnvironmentConfig = z
             !defaultChain || availableChains.includes(defaultChain),
         'Default chain is not listed in the collection of available chains',
     )
-    .transform(
-        ({
-            availableChains: symbolicChainNames,
-            defaultChain: defaultSymbolicChainName,
-            ...rest
-        }) => {
-            const availableChains = symbolicChainNames.map(getChainConfig)
-
-            const defaultChain = defaultSymbolicChainName
-                ? getChainConfig(defaultSymbolicChainName)
-                : availableChains[0]
-
-            return {
-                ...rest,
-                availableChains,
-                defaultChain,
-            }
-        },
-    )
+    .transform(({ availableChains, defaultChain, ...rest }) => {
+        const availableChainConfigs: Chain[] = availableChains.map(getChainConfig)
+
+        const defaultChainConfig: Chain = defaultChain
+            ? getChainConfig(defaultChain)
+            : availableChainConfigs[0]
+
+        return {
+            ...rest,
+            availableChains: availableChainConfigs,
+            defaultChain: defaultChainConfig,
+        }
+    })
 
 type EnvironmentConfig = z.infer<typeof EnvironmentConfig>
 

src/utils/chains.ts

@@ -61,7 +61,7 @@ export function useCurrentChainFullName() {
 interface ChainEntry {
     config: Chain
     configExtension: ChainConfigExtension
-    symbolicName: string
+    chainKey: string
 }
 
 const chainEntriesByIdOrName: Partial<Record<string | number, ChainEntry | null>> = {}
@@ -76,23 +76,23 @@ function getChainEntry(chainIdOrName: string | number) {
 
     if (typeof entry === 'undefined') {
         entry = (() => {
-            const source = Object.entries<Chain>(configs).find(([symbolicName, config]) =>
+            const source = Object.entries<Chain>(configs).find(([chainKey, config]) =>
                 typeof chainIdOrName === 'string'
                     ? getPreferredChainName(chainIdOrName) ===
-                      getPreferredChainName(symbolicName)
+                      getPreferredChainName(chainKey)
                     : chainIdOrName === config.id,
             )
 
             if (!source) {
                 return null
             }
 
-            const [rawSymbolicName, config] = source
+            const [rawChainKey, config] = source
 
-            const symbolicName = getPreferredChainName(rawSymbolicName)
+            const chainKey = getPreferredChainName(rawChainKey)
 
             const configExtension =
-                parsedChainConfigExtension[symbolicName] || fallbackChainConfigExtension
+                parsedChainConfigExtension[chainKey] || fallbackChainConfigExtension
 
             const { dockerHost } = configExtension
 
@@ -122,7 +122,7 @@ function getChainEntry(chainIdOrName: string | number) {
             })
 
             return {
-                symbolicName,
+                chainKey,
                 config: sanitizedConfig,
                 configExtension,
             }
@@ -142,12 +142,12 @@ function getChainEntry(chainIdOrName: string | number) {
     return entry
 }
 
-export function getChainConfig(chainIdOrSymbolicName: string | number): Chain {
-    return getChainEntry(chainIdOrSymbolicName).config
+export function getChainConfig(chainIdOrChainKey: string | number): Chain {
+    return getChainEntry(chainIdOrChainKey).config
 }
 
 export function getChainKey(chainId: number) {
-    return getChainEntry(chainId).symbolicName
+    return getChainEntry(chainId).chainKey
 }
 
 export function getChainConfigExtension(chainId: number) {