fixup! feat(suite): move testnets into experimental features

Author: TomasBoda

packages/suite/src/hooks/settings/useNetworkSupport.ts

@@ -18,8 +18,8 @@ export const useNetworkSupport = () => {
     const useTestnetNetworks = useSelector(selectHasExperimentalFeature('testnet-networks'));
     const deviceSupportedNetworkSymbols = useSelector(selectDeviceSupportedNetworks);
 
-    const mainnets = getMainnets(isDebug, useExperimentalNetworks);
-    const testnets = getTestnets(isDebug, useExperimentalNetworks, useTestnetNetworks);
+    const mainnets = getMainnets({ debug: isDebug, useExperimentalNetworks });
+    const testnets = getTestnets({ debug: isDebug, useExperimentalNetworks, useTestnetNetworks });
 
     const isNetworkSupported = (network: Network) =>
         deviceSupportedNetworkSymbols.includes(network.symbol);

suite-common/wallet-config/src/__tests__/utils.test.ts

@@ -7,24 +7,35 @@ const mockNetworks = [bitcoin, ethereum, testnet, regtest];
 
 describe(getMainnets.name, () => {
     it('returns non-testnet, non-debug-only networks when debug is false', () => {
-        const result = getMainnets(false, false, mockNetworks);
+        const result = getMainnets({
+            allNetworks: mockNetworks,
+        });
         expect(result).toEqual([bitcoin, ethereum]);
     });
 });
 
 describe(getTestnets.name, () => {
     it('returns testnet, non-debug-only networks when debug is false', () => {
-        const result = getTestnets(false, false, true, mockNetworks);
+        const result = getTestnets({
+            useTestnetNetworks: true,
+            allNetworks: mockNetworks,
+        });
         expect(result).toEqual([testnet]);
     });
 
     it('includes all testnets when debug is true', () => {
-        const result = getTestnets(true, false, true, mockNetworks);
+        const result = getTestnets({
+            debug: true,
+            useTestnetNetworks: true,
+            allNetworks: mockNetworks,
+        });
         expect(result).toEqual([testnet, regtest]);
     });
 
     it('returns no testnets when testnet networks feature flag is disabled', () => {
-        const result = getTestnets(false, false, false, mockNetworks);
+        const result = getTestnets({
+            allNetworks: mockNetworks,
+        });
         expect(result).toEqual([]);
     });
 });

suite-common/wallet-config/src/utils.ts

@@ -19,24 +19,37 @@ export const networksCollection: Network[] = Object.values(networks);
  */
 export const networkSymbolCollection = networksCollection.map(n => n.symbol);
 
-export const getMainnets = (
+interface GetMainnetsProps {
+    debug?: boolean;
+    useExperimentalNetworks?: boolean;
+    allNetworks?: Network[];
+}
+
+export const getMainnets = ({
     debug = false,
     useExperimentalNetworks = false,
     allNetworks = networksCollection,
-) =>
+}: GetMainnetsProps) =>
     allNetworks.filter(
         n =>
             !n.testnet &&
             (!n.isDebugOnlyNetwork || debug) &&
             (!n.isExperimentalOnlyNetwork || useExperimentalNetworks),
     );
 
-export const getTestnets = (
+interface GetTestnetsProps {
+    debug?: boolean;
+    useExperimentalNetworks?: boolean;
+    useTestnetNetworks?: boolean;
+    allNetworks?: Network[];
+}
+
+export const getTestnets = ({
     debug = false,
     useExperimentalNetworks = false,
     useTestnetNetworks = false,
     allNetworks = networksCollection,
-) =>
+}: GetTestnetsProps) =>
     allNetworks.filter(
         n =>
             n.testnet === true &&
@@ -45,7 +58,7 @@ export const getTestnets = (
             (!n.isExperimentalOnlyNetwork || useExperimentalNetworks),
     );
 
-export const getTestnetSymbols = () => getTestnets(false, false, true).map(n => n.symbol);
+export const getTestnetSymbols = () => getTestnets({ useTestnetNetworks: true }).map(n => n.symbol);
 
 export const isBlockbookBasedNetwork = (symbol: NetworkSymbol) =>
     networks[symbol]?.backendTypes.some(backend => backend === 'blockbook');