fix: recover to support all devices but LNS (#7539)

LedgerHQ · Aug 8, 2024 · 9581686 · 9581686
1 parent 2830ed4
commit 9581686
Show file tree

Hide file tree

Showing 8 changed files with 2,617 additions and 12,882 deletions.
diff --git a/.changeset/chilled-apples-share.md b/.changeset/chilled-apples-share.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Fix Recover support to include LSP for Restore
diff --git a/apps/ledger-live-desktop/.prettierignore b/apps/ledger-live-desktop/.prettierignore
@@ -3,4 +3,6 @@ src/renderer/families/generated.ts
 analytics.min.js
 src/renderer/animations/**/*.json
 src/renderer/components/Onboarding/Screens/Tutorial/assets/animations/**/*.json
-tests/artifacts
+tests/artifacts
+tests/**/*-snapshots/
+
diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -25,7 +25,7 @@
     "lint:ci": "zx scripts/ci-lint.mjs",
     "lint:fix": "eslint src tools static tests --ext .js,.jsx,.json,.ts,.tsx --fix",
     "prettier": "prettier --write \"{src,tools,tests}/**/*.{js,jsx,json,ts,tsx}\"",
-    "prettier:check": "prettier -c \"{src,tools}/**/*.{js,jsx,json,ts,tsx}\"",
+    "prettier:check": "prettier -c \"{src,tools,tests}/**/*.{js,jsx,json,ts,tsx}\"",
     "preinstall-deps": "rimraf node_modules/paralleljs/package.json",
     "install-deps": "electron-builder install-app-deps",
     "postinstall": "node ./scripts/post-install.js",

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
@@ -206,14 +206,11 @@ export function SelectUseCase({ setUseCase, setOpenedPedagogyModal }: Props) {
                 onClick={() => {
                   track("Onboarding - Restore With Recover");
 
-                  if (
-                    deviceModelId &&
-                    [DeviceModelId.nanoX, DeviceModelId.stax].includes(deviceModelId)
-                  ) {
+                  if (deviceModelId === DeviceModelId.nanoS) {
+                    dispatch(openModal("MODAL_PROTECT_DISCOVER", undefined));
+                  } else {
                     setUseCase(UseCase.recover);
                     history.push(`/onboarding/${UseCase.recover}/${ScreenId.pairMyNano}`);
-                  } else {
-                    dispatch(openModal("MODAL_PROTECT_DISCOVER", undefined));
                   }
                 }}
               />

diff --git a/apps/ledger-live-desktop/tests/userdata/skip-onboarding-with-terms.json b/apps/ledger-live-desktop/tests/userdata/skip-onboarding-with-terms.json
@@ -48,4 +48,4 @@
     "accounts": [],
     "countervalues": {}
   }
-}
+}
diff --git a/apps/ledger-live-desktop/tests/userdata/skip-onboarding.json b/apps/ledger-live-desktop/tests/userdata/skip-onboarding.json
@@ -48,4 +48,4 @@
     "accounts": [],
     "countervalues": {}
   }
-}
+}