Skip to content

Commit 0c6b995

Browse files
committed
Remove testnet sorting, use hardcoded order
1 parent 9c6bbd8 commit 0c6b995

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

ui/components/TopMenu/TopMenuProtocolList.tsx

+9-20
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
POLYGON,
1313
ROOTSTOCK,
1414
MEZO_TESTNET,
15+
TEST_NETWORK_BY_CHAIN_ID,
1516
} from "@tallyho/tally-background/constants"
1617
import { EVMNetwork, sameNetwork } from "@tallyho/tally-background/networks"
1718
import { selectCurrentNetwork } from "@tallyho/tally-background/redux-slices/selectors"
@@ -26,7 +27,7 @@ import TopMenuProtocolListItem from "./TopMenuProtocolListItem"
2627
import TopMenuProtocolListFooter from "./TopMenuProtocolListFooter"
2728
import { i18n } from "../../_locales/i18n"
2829

29-
export const productionNetworkInfo = {
30+
export const productionNetworkDescription = {
3031
[ETHEREUM.chainID]: i18n.t("protocol.mainnet"),
3132
[POLYGON.chainID]: i18n.t("protocol.l2"),
3233
[OPTIMISM.chainID]: i18n.t("protocol.l2"),
@@ -39,7 +40,7 @@ export const productionNetworkInfo = {
3940

4041
const disabledChainIDs = [ARBITRUM_NOVA.chainID]
4142

42-
const testNetworkInfo = {
43+
const testNetworkDescription = {
4344
[MEZO_TESTNET.chainID]: i18n.t("protocol.mezoTestnet"),
4445
[SEPOLIA.chainID]: i18n.t("protocol.testnet"),
4546
[ARBITRUM_SEPOLIA.chainID]: i18n.t("protocol.testnet"),
@@ -49,21 +50,6 @@ type TopMenuProtocolListProps = {
4950
onProtocolChange: (network: EVMNetwork) => void
5051
}
5152

52-
/**
53-
* Places Mezo network above other networks
54-
*/
55-
const sortByNetworkPriority = (a: EVMNetwork, b: EVMNetwork) => {
56-
const getPriority = (network: EVMNetwork) => {
57-
switch (true) {
58-
case sameNetwork(MEZO_TESTNET, network):
59-
return 0
60-
default:
61-
return 1
62-
}
63-
}
64-
return getPriority(a) - getPriority(b)
65-
}
66-
6753
export default function TopMenuProtocolList({
6854
onProtocolChange,
6955
}: TopMenuProtocolListProps): ReactElement {
@@ -79,7 +65,10 @@ export default function TopMenuProtocolList({
7965
(network) => !isBuiltInNetwork(network),
8066
)
8167

82-
const testNetworks = testnetNetworks.sort(sortByNetworkPriority)
68+
const testNetworks = [...TEST_NETWORK_BY_CHAIN_ID].flatMap(
69+
(chainId) =>
70+
testnetNetworks.find((network) => network.chainID === chainId) ?? [],
71+
)
8372

8473
return (
8574
<div className="container">
@@ -91,7 +80,7 @@ export default function TopMenuProtocolList({
9180
key={network.name}
9281
network={network}
9382
info={
94-
productionNetworkInfo[network.chainID] ||
83+
productionNetworkDescription[network.chainID] ||
9584
t("protocol.compatibleChain")
9685
}
9786
onSelect={onProtocolChange}
@@ -130,7 +119,7 @@ export default function TopMenuProtocolList({
130119
isSelected={sameNetwork(currentNetwork, network)}
131120
key={network.name}
132121
network={network}
133-
info={testNetworkInfo[network.chainID]}
122+
info={testNetworkDescription[network.chainID]}
134123
onSelect={onProtocolChange}
135124
/>
136125
))}

ui/pages/Settings/SettingsAddCustomAsset.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import SharedNetworkIcon from "../../components/Shared/SharedNetworkIcon"
3434
import SharedPageHeader from "../../components/Shared/SharedPageHeader"
3535
import SharedSlideUpMenu from "../../components/Shared/SharedSlideUpMenu"
3636
import SharedTooltip from "../../components/Shared/SharedTooltip"
37-
import { productionNetworkInfo } from "../../components/TopMenu/TopMenuProtocolList"
37+
import { productionNetworkDescription } from "../../components/TopMenu/TopMenuProtocolList"
3838
import TopMenuProtocolListItem from "../../components/TopMenu/TopMenuProtocolListItem"
3939
import { useBackgroundDispatch, useBackgroundSelector } from "../../hooks"
4040
import { useSetState } from "../../hooks/react-hooks"
@@ -270,7 +270,7 @@ export default function SettingsAddCustomAsset(): ReactElement {
270270
}}
271271
showSelectedText={false}
272272
info={
273-
productionNetworkInfo[network.chainID] ||
273+
productionNetworkDescription[network.chainID] ||
274274
sharedT("protocol.compatibleChain")
275275
}
276276
/>

0 commit comments

Comments
 (0)