feat(suite-native): release connect popup and walletConnect for ios

Author: vytick

suite-native/app/e2e/utils.ts

@@ -20,7 +20,6 @@ const INITIAL_LAUNCH_ARGS: LaunchArgumentsWithPreloadedState = {
     // Main loop synchronization is infinitely blocking iOS tests while is the graph displayed, so we need to disable it.
     // Not sure about the cause of it yet.
     DTXDisableMainRunLoopSync: platform === 'ios',
-    isConnectPopupEnabled_v2: true,
     isDebugKeysAllowed: true,
     isTradingBuyEnabled: true,
     areDebugOnlyNetworksEnabled: true,

suite-native/app/src/initActions.ts

@@ -12,7 +12,6 @@ import {
 } from '@suite-common/wallet-core';
 import { walletConnectInitThunk } from '@suite-common/walletconnect';
 import { initAnalyticsThunk } from '@suite-native/analytics';
-import { FeatureFlag, selectIsFeatureFlagEnabled } from '@suite-native/feature-flags';
 import { initNativeLocalFirstStorageThunk } from '@suite-native/local-first-storage';
 import { setIsAppReady } from '@suite-native/state/src/appSlice';
 
@@ -56,9 +55,7 @@ export const postOnboardingInit = createThunk(
         // Create Portfolio Tracker device if it doesn't exist
         dispatch(createImportedDeviceThunk());
 
-        if (selectIsFeatureFlagEnabled(getState(), FeatureFlag.IsWalletConnectEnabled)) {
-            dispatch(walletConnectInitThunk());
-        }
+        dispatch(walletConnectInitThunk());
 
         dispatch(initNativeLocalFirstStorageThunk());
     },

suite-native/config/src/launch-arguments.ts

@@ -5,9 +5,7 @@ export type LaunchArguments = {
     DTXDisableMainRunLoopSync?: boolean;
     isBluetoothEnabled?: boolean;
     isCardanoSendEnabled?: boolean;
-    isConnectPopupEnabled_v2?: boolean;
     isDebugKeysAllowed?: boolean;
-    isWalletConnectEnabled_v2?: boolean;
     isTradingBuyEnabled?: boolean;
     isTradingExchangeEnabled?: boolean;
     isTradingSellEnabled?: boolean;

suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts

@@ -20,9 +20,7 @@ describe('featureFlagsSlice', () => {
                 isBluetoothEnabled: false,
                 areDebugOnlyNetworksEnabled: false,
                 isCardanoSendEnabled: false,
-                isConnectPopupEnabled_v2: true,
                 isDebugKeysAllowed: false,
-                isWalletConnectEnabled_v2: true,
                 isLocalFirstStorageEnabled: false,
                 isTradingBuyEnabled: false,
                 isTradingExchangeEnabled: false,
@@ -47,9 +45,7 @@ describe('featureFlagsSlice', () => {
                 isBluetoothEnabled: false,
                 areDebugOnlyNetworksEnabled: false,
                 isCardanoSendEnabled: false,
-                isConnectPopupEnabled_v2: false,
                 isDebugKeysAllowed: false,
-                isWalletConnectEnabled_v2: false,
                 isLocalFirstStorageEnabled: false,
                 isTradingBuyEnabled: false,
                 isTradingExchangeEnabled: false,

suite-native/feature-flags/src/featureFlagsSlice.ts

@@ -7,9 +7,7 @@ export const FeatureFlag = {
     IsBluetoothEnabled: 'isBluetoothEnabled',
     AreDebugOnlyNetworksEnabled: 'areDebugOnlyNetworksEnabled',
     IsCardanoSendEnabled: 'isCardanoSendEnabled',
-    IsConnectPopupEnabled: 'isConnectPopupEnabled_v2', // v2: after changing default value for Android
     IsDebugKeysAllowed: 'isDebugKeysAllowed',
-    IsWalletConnectEnabled: 'isWalletConnectEnabled_v2', // v2: after changing default value for Android
     IsTradingBuyEnabled: 'isTradingBuyEnabled',
     IsTradingExchangeEnabled: 'isTradingExchangeEnabled',
     IsTradingSellEnabled: 'isTradingSellEnabled',
@@ -35,13 +33,7 @@ export const featureFlagsInitialState: FeatureFlagsState = {
         process.env.EXPO_PUBLIC_FF_ARE_DEBUG_ONLY_NETWORKS_ENABLED === 'true',
     [FeatureFlag.IsCardanoSendEnabled]:
         process.env.EXPO_PUBLIC_FF_IS_CARDANO_SEND_ENABLED === 'true',
-    [FeatureFlag.IsConnectPopupEnabled]:
-        process.env.EXPO_PUBLIC_FF_IS_CONNECT_POPUP_ENABLED === 'true' ||
-        (isAndroid() && process.env.EXPO_PUBLIC_FF_IS_CONNECT_POPUP_ENABLED !== 'false'),
     [FeatureFlag.IsDebugKeysAllowed]: process.env.EXPO_PUBLIC_FF_IS_DEBUG_KEYS_ALLOWED === 'true',
-    [FeatureFlag.IsWalletConnectEnabled]:
-        process.env.EXPO_PUBLIC_FF_IS_WALLET_CONNECT_ENABLED === 'true' ||
-        (isAndroid() && process.env.EXPO_PUBLIC_FF_IS_WALLET_CONNECT_ENABLED !== 'false'),
     [FeatureFlag.IsTradingBuyEnabled]: process.env.EXPO_PUBLIC_FF_IS_TRADING_BUY_ENABLED === 'true',
     [FeatureFlag.IsTradingExchangeEnabled]:
         process.env.EXPO_PUBLIC_FF_IS_TRADING_SWAP_ENABLED === 'true',
@@ -60,8 +52,6 @@ export const featureFlagsPersistedKeys: Array<keyof FeatureFlagsState> = [
     FeatureFlag.IsBluetoothEnabled,
     FeatureFlag.AreDebugOnlyNetworksEnabled,
     FeatureFlag.IsCardanoSendEnabled,
-    FeatureFlag.IsConnectPopupEnabled,
-    FeatureFlag.IsWalletConnectEnabled,
     FeatureFlag.IsTradingBuyEnabled,
     FeatureFlag.IsTradingExchangeEnabled,
     FeatureFlag.IsTradingSellEnabled,

suite-native/module-connect-popup/package.json

@@ -26,7 +26,6 @@
         "@suite-native/config": "workspace:*",
         "@suite-native/device": "workspace:*",
         "@suite-native/device-manager": "workspace:*",
-        "@suite-native/feature-flags": "workspace:^",
         "@suite-native/helpers": "workspace:^",
         "@suite-native/icons": "workspace:^",
         "@suite-native/intl": "workspace:^",

suite-native/module-connect-popup/src/hooks/useConnectPopupNavigation.ts

@@ -7,7 +7,6 @@ import * as Linking from 'expo-linking';
 import { connectPopupDeeplinkThunk, selectConnectPopupCall } from '@suite-common/connect-popup';
 import { selectPendingProposal, walletConnectPairThunk } from '@suite-common/walletconnect';
 import { isDevelopOrDebugEnv } from '@suite-native/config';
-import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
 import {
     RootStackParamList,
     RootStackRoutes,
@@ -36,8 +35,6 @@ const isWalletConnectUrl = (url: string): boolean => url.startsWith('trezorsuite
 // TODO: will be necessary to handle if device is not connected/unlocked so we probably want to wait until user unlock device
 // we already have some modals like biometrics or coin enabled which are waiting for device to be connected
 export const useConnectPopupNavigation = () => {
-    const featureFlagEnabled = useFeatureFlag(FeatureFlag.IsConnectPopupEnabled);
-    const featureFlagWalletConnectEnabled = useFeatureFlag(FeatureFlag.IsWalletConnectEnabled);
     const navigation = useNavigation<NavigationProp>();
     const dispatch = useDispatch();
     const connectPopupCall = useSelector(selectConnectPopupCall);
@@ -48,9 +45,9 @@ export const useConnectPopupNavigation = () => {
     const url = Linking.useURL();
 
     useEffect(() => {
-        if (featureFlagEnabled && url && isConnectPopupUrl(url)) {
+        if (url && isConnectPopupUrl(url)) {
             dispatch(connectPopupDeeplinkThunk({ url }));
-        } else if (featureFlagWalletConnectEnabled && url && isWalletConnectUrl(url)) {
+        } else if (url && isWalletConnectUrl(url)) {
             try {
                 const parsedUrl = new URL(url);
                 const wcUri = parsedUrl?.searchParams?.get('uri');
@@ -59,7 +56,7 @@ export const useConnectPopupNavigation = () => {
                 // Malformed url, ignore
             }
         }
-    }, [url, featureFlagEnabled, featureFlagWalletConnectEnabled, dispatch]);
+    }, [url, dispatch]);
 
     useEffect(() => {
         if (connectPopupCall?.state === 'deeplink-callback') {

suite-native/module-connect-popup/tsconfig.json

@@ -34,7 +34,6 @@
         { "path": "../config" },
         { "path": "../device" },
         { "path": "../device-manager" },
-        { "path": "../feature-flags" },
         { "path": "../helpers" },
         { "path": "../icons" },
         { "path": "../intl" },

suite-native/module-dev-utils/src/components/FeatureFlags.tsx

@@ -17,9 +17,7 @@ const featureFlagsTitleMap = {
     [FeatureFlagEnum.IsBluetoothEnabled]: 'Bluetooth',
     [FeatureFlagEnum.AreDebugOnlyNetworksEnabled]: '🧪 Debug only networks',
     [FeatureFlagEnum.IsCardanoSendEnabled]: 'Cardano send',
-    [FeatureFlagEnum.IsConnectPopupEnabled]: 'Connect Popup',
     [FeatureFlagEnum.IsDebugKeysAllowed]: 'Device Auth Check Debug Keys',
-    [FeatureFlagEnum.IsWalletConnectEnabled]: 'WalletConnect',
     [FeatureFlagEnum.IsTradingBuyEnabled]: '💰 Trading Buy',
     [FeatureFlagEnum.IsTradingExchangeEnabled]: '💰 Trading Swap',
     [FeatureFlagEnum.IsTradingSellEnabled]: '💰 Trading Sell',

suite-native/module-settings/src/components/ConnectionSettings.tsx

@@ -12,7 +12,6 @@ import {
     TitledSection,
     useBottomSheetModal,
 } from '@suite-native/atoms';
-import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
 import { Icon } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
 import { WalletConnectPairBottomSheet } from '@suite-native/module-connect-popup';
@@ -25,72 +24,52 @@ import {
 import { AppSettingsCardWithIconLayout } from './AppSettingsCardWithIconLayout';
 
 export const ConnectionSettings = () => {
-    const isConnectPopupEnabled = useFeatureFlag(FeatureFlag.IsConnectPopupEnabled);
-    const isWalletConnectEnabled = useFeatureFlag(FeatureFlag.IsWalletConnectEnabled);
     const { bottomSheetRef, openModal, closeModal } = useBottomSheetModal();
 
     const navigation = useNavigation<StackNavigationProps<RootStackParamList, RootStackRoutes>>();
 
-    if (!isConnectPopupEnabled && !isWalletConnectEnabled) {
-        return null;
-    }
-
     return (
         <TitledSection title={<Translation id="moduleSettings.items.connections.title" />}>
             <Card noPadding>
-                {isWalletConnectEnabled && (
-                    <AppSettingsCardWithIconLayout
-                        icon="walletConnect"
-                        title={
-                            <Translation id="moduleSettings.items.connections.walletConnect.title" />
-                        }
-                        onPress={() => navigation.navigate(RootStackRoutes.WalletConnectPair)}
-                        testID="@settings/wallet-connect"
-                        borderColor={null}
-                        noShadow
-                    />
-                )}
-                {isWalletConnectEnabled && (
-                    <>
-                        <CardDivider />
-                        <Box paddingHorizontal="sp16" paddingVertical="sp12">
-                            <WalletConnectPairBottomSheet
-                                ref={bottomSheetRef}
-                                onClose={closeModal}
-                            />
-                            <TouchableOpacity
-                                onPress={openModal}
-                                testID="@settings/wallet-connect-add"
-                            >
-                                <HStack justifyContent="space-between" alignItems="center">
-                                    <HStack spacing="sp16" alignItems="center">
-                                        <RoundedIcon
-                                            name="qrCode"
-                                            color="iconPrimaryDefault"
-                                            backgroundColor="backgroundPrimarySubtleOnElevation0"
-                                            iconSize="mediumLarge"
-                                        />
-                                        <Text color="textPrimaryDefault">
-                                            <Translation id="moduleSettings.items.connections.walletConnect.add" />
-                                        </Text>
-                                    </HStack>
-                                    <Icon name="plus" color="textSecondaryHighlight" />
-                                </HStack>
-                            </TouchableOpacity>
-                        </Box>
-                    </>
-                )}
-            </Card>
-            {isConnectPopupEnabled && (
                 <AppSettingsCardWithIconLayout
-                    icon="trezorLogo"
+                    icon="walletConnect"
                     title={
-                        <Translation id="moduleSettings.items.connections.trezorConnect.title" />
+                        <Translation id="moduleSettings.items.connections.walletConnect.title" />
                     }
-                    onPress={() => navigation.navigate(RootStackRoutes.ConnectPermissions)}
-                    testID="@settings/connect-permissions"
+                    onPress={() => navigation.navigate(RootStackRoutes.WalletConnectPair)}
+                    testID="@settings/wallet-connect"
+                    borderColor={null}
+                    noShadow
                 />
-            )}
+
+                <CardDivider />
+                <Box paddingHorizontal="sp16" paddingVertical="sp12">
+                    <WalletConnectPairBottomSheet ref={bottomSheetRef} onClose={closeModal} />
+                    <TouchableOpacity onPress={openModal} testID="@settings/wallet-connect-add">
+                        <HStack justifyContent="space-between" alignItems="center">
+                            <HStack spacing="sp16" alignItems="center">
+                                <RoundedIcon
+                                    name="qrCode"
+                                    color="iconPrimaryDefault"
+                                    backgroundColor="backgroundPrimarySubtleOnElevation0"
+                                    iconSize="mediumLarge"
+                                />
+                                <Text color="textPrimaryDefault">
+                                    <Translation id="moduleSettings.items.connections.walletConnect.add" />
+                                </Text>
+                            </HStack>
+                            <Icon name="plus" color="textSecondaryHighlight" />
+                        </HStack>
+                    </TouchableOpacity>
+                </Box>
+            </Card>
+
+            <AppSettingsCardWithIconLayout
+                icon="trezorLogo"
+                title={<Translation id="moduleSettings.items.connections.trezorConnect.title" />}
+                onPress={() => navigation.navigate(RootStackRoutes.ConnectPermissions)}
+                testID="@settings/connect-permissions"
+            />
         </TitledSection>
     );
 };