diff --git a/suite-native/config/src/supportedNetworks.ts b/suite-native/config/src/supportedNetworks.ts index 55401130f54..95f56870751 100644 --- a/suite-native/config/src/supportedNetworks.ts +++ b/suite-native/config/src/supportedNetworks.ts @@ -18,11 +18,25 @@ export const orderedAccountTypes: AccountType[] = [ 'ledger', ]; -const discoveryBlacklist: NetworkSymbol[] = ['op', 'base', 'arb']; - // All supported coins for device discovery export const networkSymbolsWhitelistMap: Record<'mainnet' | 'testnet', readonly NetworkSymbol[]> = { - mainnet: ['btc', 'eth', 'pol', 'sol', 'bsc', 'ltc', 'etc', 'ada', 'xrp', 'bch', 'doge', 'zec'], + mainnet: [ + 'btc', + 'eth', + 'pol', + 'sol', + 'bsc', + 'ltc', + 'etc', + 'ada', + 'xrp', + 'bch', + 'doge', + 'zec', + 'op', + 'base', + 'arb', + ], testnet: ['test', 'regtest', 'tsep', 'thol', 'dsol', 'tada', 'txrp'], }; @@ -48,15 +62,6 @@ export const filterTestnetNetworks = ( return networkSymbols.filter(networkSymbol => !isTestnet(networkSymbol)); }; -export const filterBlacklistedNetworks = ( - networksToFilter: Network[], - allowList: NetworkSymbol[], -) => - networksToFilter.filter( - network => - !discoveryBlacklist.includes(network.symbol) || allowList.includes(network.symbol), - ); - export const portfolioTrackerMainnets = sortNetworks( getMainnets().filter(network => networkSymbolsWhitelistMap.mainnet.includes(network.symbol)), ).map(network => network.symbol); diff --git a/suite-native/discovery/src/discoveryConfigSlice.ts b/suite-native/discovery/src/discoveryConfigSlice.ts index f59d1834891..600ae0a4dda 100644 --- a/suite-native/discovery/src/discoveryConfigSlice.ts +++ b/suite-native/discovery/src/discoveryConfigSlice.ts @@ -10,7 +10,6 @@ import { selectDeviceSupportedNetworks, } from '@suite-common/wallet-core'; import { - filterBlacklistedNetworks, filterTestnetNetworks, isDetoxTestBuild, portfolioTrackerMainnets, @@ -105,34 +104,20 @@ const createMemoizedSelector = createWeakMapSelector.withTypes< DeviceRootState & DiscoveryConfigSliceRootState & FeatureFlagsRootState >(); -export const selectFeatureFlagEnabledNetworkSymbols = createMemoizedSelector( - [state => selectIsFeatureFlagEnabled(state, FeatureFlag.AreEthL2sEnabled)], - areEthL2sEnabled => { - const allowlist: NetworkSymbol[] = []; - - if (areEthL2sEnabled) { - allowlist.push('base', 'op', 'arb'); - } - - return returnStableArrayIfEmpty(allowlist); - }, -); - export const selectDiscoverySupportedNetworks = createMemoizedSelector( [ selectDeviceSupportedNetworks, selectAreTestnetsEnabled, - selectFeatureFlagEnabledNetworkSymbols, + (_state, forcedAreTestnetsEnabled?: boolean) => forcedAreTestnetsEnabled, ], - (deviceNetworks, defaultAreTestnetsEnabled, allowlist, forcedAreTestnetsEnabled) => { + (deviceNetworks, defaultAreTestnetsEnabled, forcedAreTestnetsEnabled) => { const areTestnetsEnabled = forcedAreTestnetsEnabled ?? defaultAreTestnetsEnabled; return pipe( deviceNetworks, networkSymbols => filterTestnetNetworks(networkSymbols, areTestnetsEnabled), filterUnavailableNetworks, - availableNetworks => filterBlacklistedNetworks(availableNetworks, allowlist), sortNetworks, returnStableArrayIfEmpty, ); @@ -147,11 +132,6 @@ export const selectDiscoveryNetworkSymbols = createMemoizedSelector( supportedNetworks => returnStableArrayIfEmpty(supportedNetworks.map(n => n.symbol)), ); -export const selectPortfolioTrackerMainnetNetworkSymbols = createMemoizedSelector( - [selectFeatureFlagEnabledNetworkSymbols], - allowlist => returnStableArrayIfEmpty([...portfolioTrackerMainnets, ...allowlist]), -); - export const selectPortfolioTrackerTestnetNetworkSymbols = createMemoizedSelector( [state => selectIsFeatureFlagEnabled(state, FeatureFlag.IsRegtestEnabled)], isRegtestEnabled => @@ -163,8 +143,8 @@ export const selectPortfolioTrackerTestnetNetworkSymbols = createMemoizedSelecto ); export const selectPortfolioTrackerNetworkSymbols = createMemoizedSelector( - [selectPortfolioTrackerMainnetNetworkSymbols, selectPortfolioTrackerTestnetNetworkSymbols], - (mainnets, testnets) => returnStableArrayIfEmpty([...mainnets, ...testnets]), + [selectPortfolioTrackerTestnetNetworkSymbols], + testnets => returnStableArrayIfEmpty([...portfolioTrackerMainnets, ...testnets]), ); export const selectIsCoinEnablingInitFinished = ( diff --git a/suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts b/suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts index 1fccbb49401..74af89b6ad5 100644 --- a/suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts +++ b/suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts @@ -25,7 +25,6 @@ describe('featureFlagsSlice', () => { isCardanoSendEnabled: true, isRegtestEnabled: true, isConnectPopupEnabled: true, - areEthL2sEnabled: true, isTradingEnabled: true, isDeviceOnboardingEnabled: true, IsFwRevisionCheckEnabled: true, @@ -52,7 +51,6 @@ describe('featureFlagsSlice', () => { isCardanoSendEnabled: false, isRegtestEnabled: false, isConnectPopupEnabled: false, - areEthL2sEnabled: false, isTradingEnabled: false, isDeviceOnboardingEnabled: false, IsFwRevisionCheckEnabled: false, @@ -79,7 +77,6 @@ describe('featureFlagsSlice', () => { isCardanoSendEnabled: false, isRegtestEnabled: false, isConnectPopupEnabled: false, - areEthL2sEnabled: false, isTradingEnabled: false, isDeviceOnboardingEnabled: false, IsFwRevisionCheckEnabled: false, diff --git a/suite-native/feature-flags/src/featureFlagsSlice.ts b/suite-native/feature-flags/src/featureFlagsSlice.ts index b9da94ffe29..496ae148c13 100644 --- a/suite-native/feature-flags/src/featureFlagsSlice.ts +++ b/suite-native/feature-flags/src/featureFlagsSlice.ts @@ -8,7 +8,6 @@ export const FeatureFlag = { IsCardanoSendEnabled: 'isCardanoSendEnabled', IsRegtestEnabled: 'isRegtestEnabled', IsConnectPopupEnabled: 'isConnectPopupEnabled', - AreEthL2sEnabled: 'areEthL2sEnabled', IsDeviceOnboardingEnabled: 'isDeviceOnboardingEnabled', IsTradingEnabled: 'isTradingEnabled', IsFwRevisionCheckEnabled: 'IsFwRevisionCheckEnabled', @@ -27,7 +26,6 @@ export const featureFlagsInitialState: FeatureFlagsState = { [FeatureFlag.IsCardanoSendEnabled]: isAndroid() && isDevelopOrDebugEnv(), [FeatureFlag.IsRegtestEnabled]: isDebugEnv() || isDetoxTestBuild(), [FeatureFlag.IsConnectPopupEnabled]: isDevelopOrDebugEnv(), - [FeatureFlag.AreEthL2sEnabled]: isDebugEnv(), [FeatureFlag.IsDeviceOnboardingEnabled]: isDebugEnv() && !isDetoxTestBuild(), [FeatureFlag.IsTradingEnabled]: isDebugEnv(), [FeatureFlag.IsFwRevisionCheckEnabled]: isDevelopOrDebugEnv(), @@ -38,7 +36,6 @@ export const featureFlagsPersistedKeys: Array = [ FeatureFlag.IsCardanoSendEnabled, FeatureFlag.IsRegtestEnabled, FeatureFlag.IsConnectPopupEnabled, - FeatureFlag.AreEthL2sEnabled, FeatureFlag.IsDeviceOnboardingEnabled, FeatureFlag.IsTradingEnabled, FeatureFlag.IsFwRevisionCheckEnabled, diff --git a/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx b/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx index 3250147a3dc..6ffc6114237 100644 --- a/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx +++ b/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx @@ -4,10 +4,8 @@ import { useSelector } from 'react-redux'; import { type NetworkSymbol } from '@suite-common/wallet-config'; import { SelectableNetworkItem } from '@suite-native/accounts'; import { HeaderedCard, VStack } from '@suite-native/atoms'; -import { - selectPortfolioTrackerMainnetNetworkSymbols, - selectPortfolioTrackerTestnetNetworkSymbols, -} from '@suite-native/discovery'; +import { portfolioTrackerMainnets } from '@suite-native/config'; +import { selectPortfolioTrackerTestnetNetworkSymbols } from '@suite-native/discovery'; import { Translation } from '@suite-native/intl'; type SelectableAssetListProps = { @@ -33,7 +31,6 @@ const NetworkItemSection = ({ ); export const SelectableNetworkList = ({ onSelectItem }: SelectableAssetListProps) => { - const portfolioMainnetNetworkSymbols = useSelector(selectPortfolioTrackerMainnetNetworkSymbols); const portfolioTestnetsNetworkSymbols = useSelector( selectPortfolioTrackerTestnetNetworkSymbols, ); @@ -42,7 +39,7 @@ export const SelectableNetworkList = ({ onSelectItem }: SelectableAssetListProps } - symbols={portfolioMainnetNetworkSymbols} + symbols={portfolioTrackerMainnets} onSelectItem={onSelectItem} />