Merge branch 'hotfix'

LedgerHQ · May 16, 2024 · 5b983ff · 5b983ff
2 parents 4d0b535 + c9ea4eb
commit 5b983ff
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/apps/ledger-live-desktop/CHANGELOG.md b/apps/ledger-live-desktop/CHANGELOG.md
@@ -1,5 +1,17 @@
 # ledger-live-desktop
 
+## 2.81.0
+
+### Minor Changes
+
+- [#6865](https://github.com/LedgerHQ/ledger-live/pull/6865) [`ac32e49`](https://github.com/LedgerHQ/ledger-live/commit/ac32e499cb1c1f9951a204ff5544e308415bf928) Thanks [@cksanders](https://github.com/cksanders)! - Fix LIVE-12571 where some users can't unlock LLD when they have set up a password
+
+## 2.81.0-hotfix.0
+
+### Minor Changes
+
+- [#6865](https://github.com/LedgerHQ/ledger-live/pull/6865) [`ac32e49`](https://github.com/LedgerHQ/ledger-live/commit/ac32e499cb1c1f9951a204ff5544e308415bf928) Thanks [@cksanders](https://github.com/cksanders)! - Fix LIVE-12571 where some users can't unlock LLD when they have set up a password
+
 ## 2.80.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-desktop/RELEASE_NOTES.md b/apps/ledger-live-desktop/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+# 2.81.0
+
+### 🐛 Fix
+
+We fixed a bug that caused the app to reject passwords.
+
 # 2.80.0
 
 ### 🐛 Fixes

diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.80.0",
+  "version": "2.81.0",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",

diff --git a/apps/ledger-live-desktop/src/renderer/hooks/useRecoverRestoreOnboarding.ts b/apps/ledger-live-desktop/src/renderer/hooks/useRecoverRestoreOnboarding.ts
@@ -5,13 +5,15 @@ import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 import { saveSettings } from "~/renderer/actions/settings";
 import { useDispatch, useSelector } from "react-redux";
 import { useLocation } from "react-router-dom";
+import { isLocked as isLockedSelector } from "~/renderer/reducers/application";
 import { hasCompletedOnboardingSelector } from "~/renderer/reducers/settings";
 
 const ONBOARDED_VIA_RECOVER_RESTORE_USER_PREFIX = "ONBOARDED_VIA_RECOVER_RESTORE_USER_";
 
 export const useRecoverRestoreOnboarding = (seedPathStatus?: string) => {
   const { pathname } = useLocation();
   const dispatch = useDispatch();
+  const isLocked = useSelector(isLockedSelector);
   const recoverServices = useFeature("protectServicesDesktop");
   const recoverStoreId = recoverServices?.params?.protectId ?? "";
   const hasCompletedOnboarding = useSelector(hasCompletedOnboardingSelector);
@@ -26,13 +28,14 @@ export const useRecoverRestoreOnboarding = (seedPathStatus?: string) => {
     const hasCompletedOnboardingViaRestore = status === "true";
 
     setOnboardedViaRecoverRestore(hasCompletedOnboardingViaRestore);
-
-    dispatch(
-      saveSettings({
-        hasCompletedOnboarding: onboardedViaRecoverRestore,
-      }),
-    );
-  }, [dispatch, onboardedViaRecoverRestore, recoverStoreId]);
+    if (!isLocked) {
+      dispatch(
+        saveSettings({
+          hasCompletedOnboarding: onboardedViaRecoverRestore,
+        }),
+      );
+    }
+  }, [dispatch, isLocked, onboardedViaRecoverRestore, recoverStoreId]);
 
   useEffect(() => {
     const userIsOnboardingOrSettingUp =