feat(PROTECT-3040): capture device model id in recover (#6760)

LedgerHQ · Apr 26, 2024 · 987feb2 · 987feb2
1 parent 966e718
commit 987feb2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/.changeset/wet-wombats-whisper.md b/.changeset/wet-wombats-whisper.md
@@ -0,0 +1,6 @@
+---
+"ledger-live-desktop": patch
+"ledger-live-mobile": patch
+---
+
+Ensure we send the device model id to recover webview
diff --git a/apps/ledger-live-desktop/src/renderer/components/SyncOnboarding/Manual/BackupStep.tsx b/apps/ledger-live-desktop/src/renderer/components/SyncOnboarding/Manual/BackupStep.tsx
@@ -74,8 +74,7 @@ const BackupBody: React.FC<ChoiceBodyProps> = ({ isOpened }) => {
 
   const servicesConfig = useFeature("protectServicesDesktop");
 
-  const recoverActivatePath =
-    useCustomPath(servicesConfig, "activate", "lld-stax-onboarding") || "";
+  const recoverActivatePath = useCustomPath(servicesConfig, "activate", "lld-onboarding-24") || "";
 
   const navigateToRecover = useCallback(() => {
     console.log("recoverActivatePath", recoverActivatePath);

diff --git a/apps/ledger-live-desktop/src/renderer/hooks/useRecoverRestoreOnboarding.ts b/apps/ledger-live-desktop/src/renderer/hooks/useRecoverRestoreOnboarding.ts
@@ -6,7 +6,6 @@ import { saveSettings } from "~/renderer/actions/settings";
 import { useDispatch, useSelector } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { hasCompletedOnboardingSelector } from "~/renderer/reducers/settings";
-import { useCustomPath } from "@ledgerhq/live-common/hooks/recoverFeatureFlag";
 
 const ONBOARDED_VIA_RECOVER_RESTORE_USER_PREFIX = "ONBOARDED_VIA_RECOVER_RESTORE_USER_";
 
@@ -16,8 +15,6 @@ export const useRecoverRestoreOnboarding = (seedPathStatus?: string) => {
   const recoverServices = useFeature("protectServicesDesktop");
   const recoverStoreId = recoverServices?.params?.protectId ?? "";
   const hasCompletedOnboarding = useSelector(hasCompletedOnboardingSelector);
-  const recoverRestoreStaxPath = useCustomPath(recoverServices, "restore", "lld-onboarding-24");
-
   const [onboardedViaRecoverRestore, setOnboardedViaRecoverRestore] = useState<boolean>();
 
   const confirmRecoverOnboardingStatus = useCallback(async () => {
@@ -41,8 +38,7 @@ export const useRecoverRestoreOnboarding = (seedPathStatus?: string) => {
     const userIsOnboardingOrSettingUp =
       pathname.includes("onboarding") || pathname.includes("settings");
 
-    const syncOnboardingFromRestoreStax =
-      seedPathStatus === "recover_seed" && recoverRestoreStaxPath;
+    const syncOnboardingFromRestoreStax = seedPathStatus === "recover_seed";
 
     if (
       (!userIsOnboardingOrSettingUp || syncOnboardingFromRestoreStax) &&

diff --git a/apps/ledger-live-desktop/src/renderer/screens/recover/Player.tsx b/apps/ledger-live-desktop/src/renderer/screens/recover/Player.tsx
@@ -80,11 +80,21 @@ export default function RecoverPlayer({
       lang: locale,
       availableOnDesktop,
       deviceId: state?.deviceId,
+      deviceModelId: device?.modelId,
       currency,
       ...params,
       ...queryParams,
     }),
-    [availableOnDesktop, locale, params, queryParams, state?.deviceId, currency, theme],
+    [
+      theme,
+      locale,
+      availableOnDesktop,
+      device?.modelId,
+      state?.deviceId,
+      currency,
+      params,
+      queryParams,
+    ],
   );
 
   return manifest ? (

diff --git a/apps/ledger-live-mobile/src/screens/Protect/Player.tsx b/apps/ledger-live-mobile/src/screens/Protect/Player.tsx
@@ -86,6 +86,7 @@ export function RecoverPlayer({ navigation, route }: Props) {
           lang: locale,
           currency,
           deviceId: device?.deviceId,
+          deviceModelId: device?.modelId,
           ...params,
         }}
       />