diff --git a/src/swap/SwapScreen.test.tsx b/src/swap/SwapScreen.test.tsx index 9305ed46402..c4530d1487b 100644 --- a/src/swap/SwapScreen.test.tsx +++ b/src/swap/SwapScreen.test.tsx @@ -1698,9 +1698,11 @@ describe('SwapScreen', () => { fireEvent.press(within(swapFromContainer).getByTestId('SwapAmountInput/TokenSelect')) - expect(queryByText('tokenBottomSheet.filters.network, {"networkName":"Celo"}')).toBeFalsy() expect( - queryByText('tokenBottomSheet.filters.network, {"networkName":"Ethereum"}') + queryByText('tokenBottomSheet.filters.network, {"networkName":"Celo Alfajores"}') + ).toBeFalsy() + expect( + queryByText('tokenBottomSheet.filters.network, {"networkName":"Ethereum Sepolia"}') ).toBeFalsy() // deselect pre-selected filters to show all tokens @@ -1728,7 +1730,9 @@ describe('SwapScreen', () => { // deselect pre-selected filters to show all tokens fireEvent.press(getByText('tokenBottomSheet.filters.myTokens')) // select celo filter - fireEvent.press(getByText('tokenBottomSheet.filters.network, {"networkName":"Celo"}')) + fireEvent.press( + getByText('tokenBottomSheet.filters.network, {"networkName":"Celo Alfajores"}') + ) expectedCeloTokens.forEach((token) => { expect(within(tokenBottomSheet).getByText(token.name)).toBeTruthy() @@ -1738,8 +1742,12 @@ describe('SwapScreen', () => { ) // select eth filter - fireEvent.press(getByText('tokenBottomSheet.filters.network, {"networkName":"Celo"}')) - fireEvent.press(getByText('tokenBottomSheet.filters.network, {"networkName":"Ethereum"}')) + fireEvent.press( + getByText('tokenBottomSheet.filters.network, {"networkName":"Celo Alfajores"}') + ) + fireEvent.press( + getByText('tokenBottomSheet.filters.network, {"networkName":"Ethereum Sepolia"}') + ) expectedEthTokens.forEach((token) => { expect(within(tokenBottomSheet).getByText(token.name)).toBeTruthy() diff --git a/src/swap/useFilterChips.ts b/src/swap/useFilterChips.ts index a757cb1416e..1aff9cc6171 100644 --- a/src/swap/useFilterChips.ts +++ b/src/swap/useFilterChips.ts @@ -2,6 +2,7 @@ import { useTranslation } from 'react-i18next' import { FilterChip } from 'src/components/FilterChipsCarousel' import { TOKEN_MIN_AMOUNT } from 'src/config' import useSelector from 'src/redux/useSelector' +import { NETWORK_NAMES } from 'src/shared/conts' import { getDynamicConfigParams, getFeatureGate } from 'src/statsig' import { DynamicConfigs } from 'src/statsig/constants' import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types' @@ -10,7 +11,6 @@ import { Field } from 'src/swap/types' import { TokenBalance } from 'src/tokens/slice' import { getSupportedNetworkIdsForSwap } from 'src/tokens/utils' import { NetworkId } from 'src/transactions/types' -import { networkIdToNetwork } from 'src/web3/networkConfig' export default function useFilterChip(selectingField: Field | null): FilterChip[] { const { t } = useTranslation() @@ -24,12 +24,10 @@ export default function useFilterChip(selectingField: Field | null): FilterChip< const networkIdFilters = supportedNetworkIds.length > 1 ? supportedNetworkIds.map((networkId: NetworkId) => { - const networkName = networkIdToNetwork[networkId] return { id: networkId, name: t('tokenBottomSheet.filters.network', { - // title cased network name (always english) - networkName: `${networkName.charAt(0).toUpperCase()}${networkName.slice(1)}`, + networkName: NETWORK_NAMES[networkId], }), filterFn: (token: TokenBalance) => token.networkId === networkId, isSelected: false,