Merge pull request #5252 from LedgerHQ/bugfix/recover-onboarding-devi…

…ce-compat Bugfix/recover onboarding device compat
LedgerHQ · Nov 9, 2023 · 4ee9955 · 4ee9955 · vercel · Nov 9, 2023
2 parents 0132384 + 3bb71b8
commit 4ee9955
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 12 deletions.
diff --git a/.changeset/calm-lizards-accept.md b/.changeset/calm-lizards-accept.md
@@ -0,0 +1,8 @@
+---
+"@ledgerhq/types-live": patch
+"ledger-live-desktop": patch
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+---
+
+Recover options/promotion remove for uncompatible devices
diff --git a/apps/ledger-live-desktop/src/renderer/components/Onboarding/Screens/SelectUseCase/index.tsx b/apps/ledger-live-desktop/src/renderer/components/Onboarding/Screens/SelectUseCase/index.tsx
@@ -3,6 +3,7 @@ import { useHistory } from "react-router-dom";
 import { useTranslation, Trans } from "react-i18next";
 import { Flex, Text } from "@ledgerhq/react-ui";
 import { DeviceModelId } from "@ledgerhq/devices";
+import { useFeature, isRecoverDisplayed } from "@ledgerhq/live-common/featureFlags/index";
 import { useDispatch } from "react-redux";
 import styled from "styled-components";
 import { UseCaseOption } from "./UseCaseOption";
@@ -22,7 +23,6 @@ import setupNanoDark from "./assets/setupNanoDark.png";
 import restoreUsingRecoverDark from "./assets/restoreUsingRecoverDark.png";
 
 import Illustration from "~/renderer/components/Illustration";
-import { FeatureToggle } from "@ledgerhq/live-common/featureFlags/index";
 import { openModal } from "~/renderer/actions/modals";
 
 registerAssets([
@@ -88,6 +88,7 @@ export function SelectUseCase({ setUseCase, setOpenedPedagogyModal }: Props) {
   const { deviceModelId } = useContext(OnboardingContext);
   const history = useHistory();
   const dispatch = useDispatch();
+  const servicesConfig = useFeature("protectServicesDesktop");
 
   return (
     <ScrollArea withHint>
@@ -187,7 +188,7 @@ export function SelectUseCase({ setUseCase, setOpenedPedagogyModal }: Props) {
                 );
               }}
             />
-            <FeatureToggle featureId="protectServicesDesktop">
+            {isRecoverDisplayed(servicesConfig, deviceModelId) && (
               <UseCaseOption
                 dataTestId="v3-onboarding-restore-using-recover"
                 id="restore-device"
@@ -214,7 +215,7 @@ export function SelectUseCase({ setUseCase, setOpenedPedagogyModal }: Props) {
                   }
                 }}
               />
-            </FeatureToggle>
+            )}
           </RightColumn>
         </Row>
       </SelectUseCaseContainer>

diff --git a/apps/ledger-live-desktop/src/renderer/components/Onboarding/Screens/Tutorial/index.tsx b/apps/ledger-live-desktop/src/renderer/components/Onboarding/Screens/Tutorial/index.tsx
@@ -1,4 +1,4 @@
-import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
+import { useFeature, isRecoverDisplayed } from "@ledgerhq/live-common/featureFlags/index";
 import {
   useAlreadySeededDevicePath,
   useRestore24Path,
@@ -572,12 +572,14 @@ export default function Tutorial({ useCase }: Props) {
             fallbackIfNoAction: () => history.push("/"),
           });
 
-        if (useCase === UseCase.setupDevice && upsellPath) {
-          history.push(upsellPath);
-        } else if (useCase === UseCase.recoveryPhrase && restore24Path) {
-          history.push(restore24Path);
-        } else if (useCase === UseCase.connectDevice && devicePairingPath) {
-          history.push(devicePairingPath);
+        if (isRecoverDisplayed(recoverFF, connectedDevice?.modelId)) {
+          if (useCase === UseCase.setupDevice && upsellPath) {
+            history.push(upsellPath);
+          } else if (useCase === UseCase.recoveryPhrase && restore24Path) {
+            history.push(restore24Path);
+          } else if (useCase === UseCase.connectDevice && devicePairingPath) {
+            history.push(devicePairingPath);
+          }
         }
       }, 0);
       return () => {
@@ -593,6 +595,7 @@ export default function Tutorial({ useCase }: Props) {
     restore24Path,
     upsellPath,
     useCase,
+    recoverFF,
   ]);
 
   const steps = useMemo(() => {

diff --git a/apps/ledger-live-mobile/src/screens/Onboarding/steps/useCaseSelection.tsx b/apps/ledger-live-mobile/src/screens/Onboarding/steps/useCaseSelection.tsx
@@ -1,5 +1,5 @@
 import { DeviceModelId, getDeviceModel } from "@ledgerhq/devices";
-import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
+import { useFeature, isRecoverDisplayed } from "@ledgerhq/live-common/featureFlags/index";
 import { Flex, Icons, Text } from "@ledgerhq/native-ui";
 import { useNavigation, useRoute } from "@react-navigation/native";
 import React, { useState } from "react";
@@ -117,7 +117,7 @@ const OnboardingStepUseCaseSelection = () => {
             onPress: onPressRecoveryPhrase,
             icon: <Icons.Note color={colors.primary.c80} />,
           },
-          ...(servicesConfig?.enabled
+          ...(isRecoverDisplayed(servicesConfig, deviceModelId)
             ? [
                 {
                   title: t("onboarding.stepUseCase.protect.title"),

diff --git a/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts b/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts
@@ -157,6 +157,7 @@ export const DEFAULT_FEATURES: Features = {
         loginURI:
           "ledgerlive://recover/protect-simu?redirectTo=login&source=lld-welcome-login&ajs_recover_source=lld-welcome-login&ajs_recover_campaign=recover-launch",
       },
+      compatibleDevices: [],
       discoverTheBenefitsLink: "https://www.ledger.com/recover",
       onboardingCompleted: {
         alreadySubscribedURI: "ledgerlive://recover/protect-simu?redirectTo=login",
@@ -290,6 +291,7 @@ export const DEFAULT_FEATURES: Features = {
     enabled: false,
     params: {
       deeplink: "",
+      compatibleDevices: [],
       account: {
         homeURI:
           "ledgerlive://recover/protect-simu?redirectTo=account&source=llm-myledger-access-card&ajs_prop_source=llm-myledger-access-card&ajs_prop_campaign=recover-launch",

diff --git a/libs/ledger-live-common/src/featureFlags/helper.tsx b/libs/ledger-live-common/src/featureFlags/helper.tsx
@@ -0,0 +1,9 @@
+export function isRecoverDisplayed(feature, deviceModelId) {
+  return (
+    feature?.enabled &&
+    feature?.params?.compatibleDevices?.find(
+      (device: { name: string; available: boolean }) =>
+        device.name === deviceModelId && device.available,
+    )
+  );
+}
diff --git a/libs/ledger-live-common/src/featureFlags/index.ts b/libs/ledger-live-common/src/featureFlags/index.ts
@@ -7,3 +7,4 @@ export * from "./defaultFeatures";
 export * from "./groupedFeatures";
 export * from "./FeatureFlagsContext";
 export * from "./useHasOverriddenFeatureFlags";
+export * from "./helper";
diff --git a/libs/ledgerjs/packages/types-live/src/feature.ts b/libs/ledgerjs/packages/types-live/src/feature.ts
@@ -299,8 +299,15 @@ export type Feature_NewsfeedPage = Feature<{
   whitelistedLocales: string[];
 }>;
 
+export type CompatibleDevice = {
+  available: boolean;
+  comingSoon: boolean;
+  name: string;
+};
+
 export type Feature_ProtectServicesMobile = Feature<{
   deeplink: string;
+  compatibleDevices: CompatibleDevice[];
   onboardingRestore: {
     restoreInfoDrawer: {
       enabled: boolean;
@@ -328,6 +335,7 @@ export type Feature_ProtectServicesDesktop = Feature<{
   availableOnDesktop: boolean;
   openRecoverFromSidebar: boolean;
   discoverTheBenefitsLink: string;
+  compatibleDevices: CompatibleDevice[];
   onboardingRestore: {
     restoreInfoDrawer: {
       enabled: boolean;