Skip to content

Commit 53b6fe9

Browse files
committed
fix: chain selection
1 parent debe1c6 commit 53b6fe9

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

.env

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,17 @@ NEXT_PUBLIC_IS_TESTNET=true
3636
NEXT_PUBLIC_API_BASE_PATH=/
3737
NEXT_PUBLIC_APP_PROTOCOL=http
3838
NEXT_PUBLIC_HOMEPAGE_CHARTS=["daily_txs"]
39-
# NEXT_PUBLIC_HOMEPAGE_STATS=["total_blocks","average_block_time","total_txs","wallet_addresses","gas_tracker","btc_locked"]
4039
NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
4140
NEXT_PUBLIC_AD_BANNER_PROVIDER=none
4241
NEXT_PUBLIC_PROMOTE_BLOCKSCOUT_IN_TITLE=false
4342
NEXT_PUBLIC_AD_TEXT_PROVIDER=none
4443
NEXT_PUBLIC_NETWORK_LOGO=https://www.kadena.io/_next/static/media/logo_sm.76a6235e.svg
4544
NEXT_PUBLIC_NETWORK_ICON=https://www.kadena.io/_next/static/media/logo_sm.76a6235e.svg
46-
NEXT_PUBLIC_APP_NAME=Chainweb EVM Explorer
47-
NEXT_PUBLIC_APP_SHORT_NAME=EVM Explorer
45+
NEXT_PUBLIC_APP_NAME="Chainweb EVM Explorer"
46+
NEXT_PUBLIC_APP_SHORT_NAME="EVM Explorer"
4847
NEXT_PUBLIC_APP_VERSION=0.1.0
4948

50-
NEXT_PUBLIC_FEATURED_BASE_NETWORK=mainnet
51-
# [{"title":"Mainnet","id":"mainnet","url":"http://chain-%s.evm.kadena.internal:8000/","isActive":true,"icon":"https://www.kadena.io/favicon.ico"},{"title":"Devnet","id":"devnet","url":"http://chain-%s.evm.kadena.internal:8000/","isActive":true,"icon":"https://www.kadena.io/favicon.ico"},{"title":"Testnet","id":"testnet","url":"http://chain-%s.evm.kadena.internal:8000/","isActive":false,"icon":"https://www.kadena.io/favicon.ico"}]
52-
NEXT_PUBLIC_FEATURED_NETWORKS=/assets/configs/networks.json
53-
# [{"title":"Chain 20","url":"http://chain-20.evm.kadena.internal:8000/","group":"mainnet","icon":"https://www.kadena.io/favicon.ico"},{"title":"Chain 21","url":"http://chain-21.evm-devnet.kadena.internal:8000/","group":"devnet","icon":"https://www.kadena.io/favicon.ico"},{"title":"Chain 22","url":"http://chain-22.evm-mainnet.kadena.internal:8000/","group":"mainnet","icon":"https://www.kadena.io/favicon.ico"},{"title":"Chain 23","url":"http://chain-23.evm.kadena.internal:8000/","group":"mainnet","icon":"https://www.kadena.io/favicon.ico"},{"title":"Chain 24","url":"http://chain-24.evm-testnet.kadena.internal:8000/","group":"testnet","icon":"https://www.kadena.io/favicon.ico"}]
54-
NEXT_PUBLIC_FEATURED_CHAINS=/assets/configs/chains.json
49+
NEXT_PUBLIC_FEATURED_NETWORKS=[{"title":"chain20","url":"http://chain-20.evm.kadena.internal:8008/","group":"Testnet","icon":"http://chain-20.evm.kadena.internal:8008/assets/configs/network_icon.svg"},{"title":"chain21","url":"http://chain-21.evm.kadena.internal:8008/","group":"Testnet","icon":"http://chain-21.evm.kadena.internal:8008/assets/configs/network_icon.svg"},{"title":"chain22","url":"http://chain-22.evm.kadena.internal:8008/","group":"Testnet","icon":"http://chain-22.evm.kadena.internal:8008/assets/configs/network_icon.svg"},{"title":"chain23","url":"http://chain-23.evm.kadena.internal:8008/","group":"Testnet","icon":"http://chain-23.evm.kadena.internal:8008/assets/configs/network_icon.svg"},{"title":"chain24","url":"http://chain-24.evm.kadena.internal:8008/","group":"Testnet","icon":"http://chain-24.evm.kadena.internal:8008/assets/configs/network_icon.svg"}]
5550

5651
NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=123456
5752
NEXT_PUBLIC_NETWORK_RPC_URL=https://evm-testnet.chainweb.com/chainweb/0.0/evm-testnet/${CHAINWEB_CHAIN_ID}/evm/rpc/

configs/app/ui.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ const UI = Object.freeze({
6565
hiddenLinks,
6666
highlightedRoutes,
6767
otherLinks: parseEnvJson<Array<NavItemExternal>>(getEnvValue('NEXT_PUBLIC_OTHER_LINKS')) || [],
68-
baseNetwork: getEnvValue('NEXT_PUBLIC_FEATURED_BASE_NETWORK') || 'mainnet',
69-
baseChain: getEnvValue('CHAINWEB_CHAIN_ID') || 20,
70-
featuredNetworks: getExternalAssetFilePath('NEXT_PUBLIC_FEATURED_NETWORKS') ?? '/assets/configs/networks.json',
68+
featuredNetworks: getExternalAssetFilePath('NEXT_PUBLIC_FEATURED_NETWORKS') ?? '/assets/configs/featured_networks.json',
7169
layout: (getEnvValue('NEXT_PUBLIC_NAVIGATION_LAYOUT') || 'vertical') as NavigationLayout,
7270
},
7371
footer: {

ui/shared/HomeChainSelector.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import type { FormEventHandler } from 'react';
99

1010
import type { FeaturedNetwork } from '../../types/networks';
1111

12-
import config from 'configs/app';
13-
1412
import { Select, CompactSelect, InlineSelect } from '../../toolkit/chakra/select';
1513
import type { SelectOption, SelectProps } from '../../toolkit/chakra/select';
1614
import { useNetworkMenu } from '../snippets/networkMenu/useNetworkMenu';
@@ -65,10 +63,7 @@ export const useHomeChainSelector = () => {
6563
}));
6664

6765
if (networkItems && networkItems.length > 0 && !activeNetwork) {
68-
let currentNetwork = networkItems.find((network) => currentUrl.includes(network.group));
69-
70-
currentNetwork ??= networkItems.find((network) => network.group === config.UI.navigation.baseNetwork) ?? networkItems[0];
71-
66+
const currentNetwork = networkItems.find((network) => currentUrl === network.url) ?? networkItems[0];
7267
setActiveNetwork({ label: capitalize(currentNetwork.title), value: currentNetwork.group });
7368
setNetworks(createListCollection({
7469
items: _networks,
@@ -90,7 +85,7 @@ export const useHomeChainSelector = () => {
9085

9186
if (!currentChain) {
9287
const availableChains = _chains.filter((chain) => chain);
93-
currentChain = _chains.find((chain) => chain.value.includes(`chain-${ config.UI.navigation.baseChain }`)) ?? availableChains[0];
88+
currentChain = availableChains[0];
9489
}
9590

9691
if (currentChain && !currentUrl.startsWith(currentChain.value)) {

ui/snippets/networkMenu/NetworkMenuContentDesktop.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from 'react';
33

44
import type { FeaturedNetwork, NetworkGroup } from 'types/networks';
55

6-
import config from 'configs/app';
76
import { PopoverBody, PopoverContent } from 'toolkit/chakra/popover';
87
import { Skeleton } from 'toolkit/chakra/skeleton';
98
import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'toolkit/chakra/tabs';
@@ -16,7 +15,7 @@ interface Props {
1615
}
1716

1817
const NetworkMenuPopup = ({ items, tabs }: Props) => {
19-
const [ defaultTab ] = tabs ?? [ config.UI.navigation.baseNetwork as NetworkGroup ];
18+
const [ defaultTab ] = tabs ?? [ ];
2019
const selectedNetwork = items?.find(({ url }) => url === window.location.href) ?? items?.[0];
2120
const selectedTab = tabs.find((tab) => selectedNetwork?.group === tab) ?? defaultTab;
2221

ui/snippets/networkMenu/NetworkMenuContentMobile.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import React from 'react';
44

55
import type { NetworkGroup, FeaturedNetwork } from 'types/networks';
66

7-
import config from 'configs/app';
87
import type { SelectOption } from 'toolkit/chakra/select';
98
import { Select } from 'toolkit/chakra/select';
109
import { Skeleton } from 'toolkit/chakra/skeleton';
@@ -16,7 +15,7 @@ interface Props {
1615
}
1716

1817
const NetworkMenuContentMobile = ({ items, tabs }: Props) => {
19-
const [ defaultTab ] = tabs ?? [ config.UI.navigation.baseNetwork ];
18+
const [ defaultTab ] = tabs ?? [ ];
2019
const selectedNetwork = items?.find(({ url }) => url === window.location.href) ?? items?.[0];
2120
const [ selectedTab, setSelectedTab ] = React.useState<NetworkGroup>(defaultTab);
2221

0 commit comments

Comments
 (0)