refactor: remove feature flag "deviceSupportEuropa" (for Ledger Flex)

LedgerHQ · Sep 9, 2024 · c668987 · c668987
1 parent 9abf63b
commit c668987
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 161 deletions.
diff --git a/.changeset/soft-cherries-fold.md b/.changeset/soft-cherries-fold.md
@@ -0,0 +1,8 @@
+---
+"@ledgerhq/types-live": patch
+"ledger-live-desktop": patch
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+---
+
+Remove feature flag "deviceSupportEuropa" (for Ledger Flex)
diff --git a/apps/ledger-live-desktop/src/renderer/components/CustomImage/DeviceModelPicker.tsx b/apps/ledger-live-desktop/src/renderer/components/CustomImage/DeviceModelPicker.tsx
@@ -5,33 +5,22 @@ import {
   supportedDeviceModelIds,
 } from "@ledgerhq/live-common/device/use-cases/isCustomLockScreenSupported";
 import { Bar, Flex, Text } from "@ledgerhq/react-ui";
-import { DeviceModelId } from "@ledgerhq/types-devices";
-import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 type Props = {
   deviceModelId: CLSSupportedDeviceModelId;
   onChange: (deviceModelId: CLSSupportedDeviceModelId) => void;
 };
 
 export default function DeviceModelPicker({ deviceModelId, onChange }: Props) {
-  const supportDeviceEuropa = useFeature("supportDeviceEuropa")?.enabled;
-  const supportedAndEnabledDeviceModelIds = supportedDeviceModelIds.filter(() => {
-    const devicesSupported: Record<CLSSupportedDeviceModelId, boolean> = {
-      [DeviceModelId.stax]: true,
-      [DeviceModelId.europa]: Boolean(supportDeviceEuropa),
-    };
-    return devicesSupported[deviceModelId];
-  }, [supportDeviceEuropa]);
-
   return (
     <Flex height={40}>
       <Bar
-        initialActiveIndex={supportedAndEnabledDeviceModelIds.indexOf(deviceModelId)}
+        initialActiveIndex={supportedDeviceModelIds.indexOf(deviceModelId)}
         onTabChange={i => {
-          onChange(supportedAndEnabledDeviceModelIds[i]);
+          onChange(supportedDeviceModelIds[i]);
         }}
       >
-        {supportedAndEnabledDeviceModelIds.map(deviceModelId => (
+        {supportedDeviceModelIds.map(deviceModelId => (
           <Text
             px={3}
             color="inherit"

diff --git a/...r-live-desktop/src/renderer/components/Onboarding/Screens/SelectDevice/DeviceSelector.tsx b/...r-live-desktop/src/renderer/components/Onboarding/Screens/SelectDevice/DeviceSelector.tsx
@@ -1,8 +1,7 @@
-import React, { useMemo } from "react";
+import React from "react";
 import styled from "styled-components";
 import { DeviceModelId, getDeviceModel } from "@ledgerhq/devices";
 import { Flex } from "@ledgerhq/react-ui";
-import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 import { DeviceSelectorOption } from "./DeviceSelectorOption";
 import DeviceIllustration from "~/renderer/components/DeviceIllustration";
 
@@ -13,45 +12,28 @@ const DeviceSelectContainer = styled(Flex).attrs({
   height: "100%",
 })``;
 
-const allDevices = [
-  {
-    id: DeviceModelId.nanoS,
-    enabled: true,
-  },
-  {
-    id: DeviceModelId.nanoSP,
-    enabled: true,
-  },
-  {
-    id: DeviceModelId.nanoX,
-    enabled: true,
-  },
+const allDevicesModelIds = [
+  DeviceModelId.stax,
+  DeviceModelId.europa,
+  DeviceModelId.nanoS,
+  DeviceModelId.nanoSP,
+  DeviceModelId.nanoX,
 ];
+
 interface DeviceSelectorProps {
   onClick: (arg1: DeviceModelId) => void;
 }
 
 export function DeviceSelector({ onClick }: DeviceSelectorProps) {
-  const deviceEuropaSupported = useFeature("supportDeviceEuropa");
-
-  const devices = useMemo(
-    () => [
-      { id: DeviceModelId.stax, enabled: true },
-      ...(deviceEuropaSupported?.enabled ? [{ id: DeviceModelId.europa, enabled: true }] : []),
-      ...allDevices,
-    ],
-    [deviceEuropaSupported],
-  );
-
   return (
     <DeviceSelectContainer>
-      {devices.map(({ id, enabled }, index, arr) => (
+      {allDevicesModelIds.map((deviceModelId, index, arr) => (
         <DeviceSelectorOption
-          id={`device-${id}`}
-          key={id}
-          label={getDeviceModel(id as DeviceModelId).productName}
-          Illu={<DeviceIllustration deviceId={id as DeviceModelId} />}
-          onClick={() => enabled && onClick(id as DeviceModelId)}
+          id={`device-${deviceModelId}`}
+          key={deviceModelId}
+          label={getDeviceModel(deviceModelId).productName}
+          Illu={<DeviceIllustration deviceId={deviceModelId as DeviceModelId} />}
+          onClick={() => onClick(deviceModelId as DeviceModelId)}
           isFirst={index === 0}
           isLast={index === arr.length - 1}
         />

diff --git a/...e-desktop/src/renderer/screens/settings/sections/Developer/FeatureFlagsSettings/index.tsx b/...e-desktop/src/renderer/screens/settings/sections/Developer/FeatureFlagsSettings/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useMemo, useCallback, useRef } from "react";
+import React, { useEffect, useState, useMemo, useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import ButtonV2 from "~/renderer/components/Button";
 import Button from "~/renderer/components/ButtonV3";
@@ -29,7 +29,7 @@ export const FeatureFlagContent = withV3StyleProvider((props: { expanded?: boole
   const { t } = useTranslation();
   const featureFlagsButtonVisible = useSelector(featureFlagsButtonVisibleSelector);
   const dispatch = useDispatch();
-  const { getFeature, overrideFeature, isFeature, resetFeatures } = useFeatureFlags();
+  const { isFeature, resetFeatures } = useFeatureFlags();
   const [focusedName, setFocusedName] = useState<string | undefined>();
   const [searchInput, setSearchInput] = useState("");
   const [activeTabIndex, setActiveTabIndex] = useState(0);
@@ -69,35 +69,6 @@ export const FeatureFlagContent = withV3StyleProvider((props: { expanded?: boole
       );
   }, [searchInput]);
 
-  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const pressCount = useRef(0);
-
-  const [cheatActivated, setCheatActivated] = useState(false);
-  const ruleThemAll = useCallback(() => {
-    groupedFeatures.europa.featureIds.forEach(featureId =>
-      overrideFeature(featureId, { ...getFeature(featureId), enabled: true }),
-    );
-    setCheatActivated(true);
-  }, [getFeature, overrideFeature]);
-
-  const onDescriptionClick = useCallback(() => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current);
-    }
-    pressCount.current += 1;
-    const timeout = setTimeout(() => {
-      pressCount.current = 0;
-    }, 300);
-    if (pressCount.current > 6) {
-      ruleThemAll();
-      pressCount.current = 0;
-    }
-    timeoutRef.current = timeout;
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [ruleThemAll]);
-
   const flagsList = useMemo(
     () =>
       filteredFlags.map(flagName => (
@@ -143,10 +114,7 @@ export const FeatureFlagContent = withV3StyleProvider((props: { expanded?: boole
 
   return (
     <Flex flexDirection="column" pt={2} rowGap={2} alignSelf="stretch">
-      <div onClick={onDescriptionClick}>
-        {t("settings.developer.featureFlagsDesc")}
-        {cheatActivated ? " With great power comes great responsibility." : null}
-      </div>
+      <div>{t("settings.developer.featureFlagsDesc")}</div>
       {!props.expanded ? null : (
         <>
           <Flex flexDirection="row" alignItems="center" columnGap={3}>

diff --git a/apps/ledger-live-desktop/tests/userdata/speculos-tests-app.json b/apps/ledger-live-desktop/tests/userdata/speculos-tests-app.json
@@ -101,14 +101,6 @@
         "llmNewFirmwareUpdateUx": {
           "enabled": true,
           "overridesRemote": true
-        },
-        "supportDeviceEuropa": {
-          "enabled": true,
-          "overridesRemote": true
-        },
-        "supportDeviceStax": {
-          "enabled": true,
-          "overridesRemote": true
         }
       },
       "featureFlagsButtonVisible": false,

diff --git a/apps/ledger-live-mobile/src/screens/CustomImage/PreviewPreEdit.tsx b/apps/ledger-live-mobile/src/screens/CustomImage/PreviewPreEdit.tsx
@@ -25,7 +25,6 @@ import {
   CLSSupportedDeviceModelId,
   supportedDeviceModelIds,
 } from "@ledgerhq/live-common/device/use-cases/isCustomLockScreenSupported";
-import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 import { BaseComposite, StackNavigatorProps } from "~/components/RootNavigator/types/helpers";
 import { CustomImageNavigatorParamList } from "~/components/RootNavigator/types/CustomImageNavigator";
@@ -111,14 +110,6 @@ const PreviewPreEdit = ({ navigation, route }: NavigationProps) => {
     params.deviceModelId ?? DeviceModelId.stax,
   );
 
-  const supportDeviceEuropa = useFeature("supportDeviceEuropa")?.enabled;
-  const supportedAndEnabledDeviceModelIds = supportedDeviceModelIds.filter(() => {
-    const devicesSupported: Record<CLSSupportedDeviceModelId, boolean> = {
-      [DeviceModelId.stax]: true,
-      [DeviceModelId.europa]: Boolean(supportDeviceEuropa),
-    };
-    return devicesSupported[deviceModelId];
-  }, [supportDeviceEuropa]);
   const targetDisplayDimensions = useMemo(
     () => getScreenVisibleAreaDimensions(deviceModelId),
     [deviceModelId],
@@ -373,9 +364,9 @@ const PreviewPreEdit = ({ navigation, route }: NavigationProps) => {
   return (
     <SafeAreaView style={{ flex: 1 }} edges={["bottom"]}>
       <TrackScreen category={analyticsScreenName} />
-      {!params.deviceModelId && supportDeviceEuropa && (
+      {!params.deviceModelId && (
         <TabContainer>
-          {supportedAndEnabledDeviceModelIds.map(modelId => (
+          {supportedDeviceModelIds.map(modelId => (
             <Tab
               key={modelId}
               onPress={() => onChangeDeviceModelId(modelId)}

diff --git a/apps/ledger-live-mobile/src/screens/Onboarding/steps/deviceSelection.tsx b/apps/ledger-live-mobile/src/screens/Onboarding/steps/deviceSelection.tsx
@@ -1,8 +1,7 @@
 import { getDeviceModel } from "@ledgerhq/devices/index";
-import useFeature from "@ledgerhq/live-common/featureFlags/useFeature";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { useNavigation } from "@react-navigation/native";
-import React, { useMemo, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform } from "react-native";
 import { isSyncOnboardingSupported } from "@ledgerhq/live-common/device/use-cases/isSyncOnboardingSupported";
@@ -53,24 +52,20 @@ export const devices = {
 
 const NOT_SUPPORTED_DEVICES_IOS = [DeviceModelId.nanoS, DeviceModelId.nanoSP];
 
+const availableDevices = [
+  devices.stax,
+  devices.europa,
+  devices.nanoX,
+  devices.nanoSP,
+  devices.nanoS,
+];
+
 function OnboardingStepDeviceSelection() {
   const navigation = useNavigation<NavigationProp>();
   const { t } = useTranslation();
-  const deviceEuropaSupported = useFeature("supportDeviceEuropa");
 
   const [isOpen, setOpen] = useState<boolean>(false);
 
-  const availableDevices = useMemo(
-    () => [
-      devices.stax,
-      ...(deviceEuropaSupported?.enabled ? [devices.europa] : []),
-      devices.nanoX,
-      devices.nanoSP,
-      devices.nanoS,
-    ],
-    [deviceEuropaSupported],
-  );
-
   const getProductName = (modelId: DeviceModelId) =>
     getDeviceModel(modelId)?.productName.replace("Ledger", "").trimStart() || modelId;
 

diff --git a/apps/ledger-live-mobile/src/screens/Settings/Debug/index.tsx b/apps/ledger-live-mobile/src/screens/Settings/Debug/index.tsx
@@ -1,49 +1,15 @@
-import React, { useCallback, useRef } from "react";
+import React from "react";
 import { IconsLegacy, Alert as AlertBox, Flex } from "@ledgerhq/native-ui";
-import { Alert, TouchableWithoutFeedback, View } from "react-native";
-import { useFeatureFlags } from "@ledgerhq/live-common/featureFlags/FeatureFlagsContext";
-import { groupedFeatures } from "@ledgerhq/live-common/featureFlags/groupedFeatures";
 import { TrackScreen } from "~/analytics";
 import SettingsRow from "~/components/SettingsRow";
 import { ScreenName } from "~/const";
 import SettingsNavigationScrollView from "../SettingsNavigationScrollView";
 import { StackNavigatorProps } from "~/components/RootNavigator/types/helpers";
 import { SettingsNavigatorStackParamList } from "~/components/RootNavigator/types/SettingsNavigator";
-import PoweredByLedger from "../PoweredByLedger";
 
 export default function DebugSettings({
   navigation: { navigate },
 }: StackNavigatorProps<SettingsNavigatorStackParamList, ScreenName.DebugSettings>) {
-  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const pressCount = useRef(0);
-
-  const { getFeature, overrideFeature } = useFeatureFlags();
-
-  const ruleThemAll = useCallback(() => {
-    groupedFeatures.europa.featureIds.forEach(featureId =>
-      overrideFeature(featureId, { ...getFeature(featureId), enabled: true }),
-    );
-    Alert.alert("I can only show you the door, you're the one that has to walk through it.");
-  }, [overrideFeature, getFeature]);
-
-  const onDebugHiddenPress = useCallback(() => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current);
-    }
-    pressCount.current += 1;
-    const timeout = setTimeout(() => {
-      pressCount.current = 0;
-    }, 300);
-    if (pressCount.current > 6) {
-      ruleThemAll();
-      pressCount.current = 0;
-    }
-    timeoutRef.current = timeout;
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [ruleThemAll]);
-
   return (
     <SettingsNavigationScrollView>
       <TrackScreen category="Settings" name="Debug" />
@@ -99,11 +65,6 @@ export default function DebugSettings({
         iconLeft={<IconsLegacy.EmojiHappyMedium size={24} color="black" />}
         onPress={() => navigate(ScreenName.DebugPlayground)}
       />
-      <TouchableWithoutFeedback onPress={onDebugHiddenPress}>
-        <View>
-          <PoweredByLedger />
-        </View>
-      </TouchableWithoutFeedback>
     </SettingsNavigationScrollView>
   );
 }
diff --git a/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts b/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts
@@ -460,7 +460,6 @@ export const DEFAULT_FEATURES: Features = {
 
   lldChatbotSupport: DEFAULT_FEATURE,
   llmChatbotSupport: DEFAULT_FEATURE,
-  supportDeviceEuropa: DEFAULT_FEATURE,
   lldRefreshMarketData: {
     ...DEFAULT_FEATURE,
     params: {

diff --git a/libs/ledger-live-common/src/featureFlags/groupedFeatures.ts b/libs/ledger-live-common/src/featureFlags/groupedFeatures.ts
@@ -1,6 +1,6 @@
 import { FeatureId } from "@ledgerhq/types-live";
 
-export type GroupedFeature = "europa" | "disableNft";
+export type GroupedFeature = "disableNft";
 
 /** Helper to group several feature flag ids under a common feature flag */
 export const groupedFeatures: Record<
@@ -9,9 +9,6 @@ export const groupedFeatures: Record<
     featureIds: FeatureId[];
   }
 > = {
-  europa: {
-    featureIds: ["supportDeviceEuropa", "deviceInitialApps"],
-  },
   disableNft: {
     featureIds: ["disableNftLedgerMarket", "disableNftRaribleOpensea", "disableNftSend"],
   },

diff --git a/libs/ledgerjs/packages/types-live/src/feature.ts b/libs/ledgerjs/packages/types-live/src/feature.ts
@@ -179,7 +179,6 @@ export type Features = CurrencyFeatures & {
   nftsFromSimplehash: Feature_NftsFromSimpleHash;
   lldActionCarousel: Feature_lldActionCarousel;
   marketperformanceWidgetDesktop: Feature_MarketperformanceWidgetDesktop;
-  supportDeviceEuropa: Feature_SupportDeviceEuropa;
   lldRefreshMarketData: Feature_LldRefreshMarketData;
   llmRefreshMarketData: Feature_LlmRefreshMarketData;
   spamReportNfts: Feature_SpamReportNfts;
@@ -504,7 +503,6 @@ export type Feature_PtxSwapThorswapProvider = DefaultFeature;
 export type Feature_PtxSwapReceiveTRC20WithoutTrx = DefaultFeature;
 export type Feature_FlexibleContentCards = DefaultFeature;
 export type Feature_MyLedgerDisplayAppDeveloperName = DefaultFeature;
-export type Feature_SupportDeviceEuropa = DefaultFeature;
 export type Feature_LldChatbotSupport = DefaultFeature;
 export type Feature_LlmChatbotSupport = DefaultFeature;
 export type Feature_SpamReportNfts = DefaultFeature;