Merge branch 'hotfix'

LedgerHQ · May 17, 2024 · 6beccf3 · 6beccf3
2 parents 5b983ff + f28bb19
commit 6beccf3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 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.1
+
+### Patch Changes
+
+- [#6871](https://github.com/LedgerHQ/ledger-live/pull/6871) [`7857c4e`](https://github.com/LedgerHQ/ledger-live/commit/7857c4e41bbcfe4e421ed3b18d50090c253e319e) Thanks [@LucasWerey](https://github.com/LucasWerey)! - Fix analytics that were overriding app.json
+
+## 2.81.1-hotfix.0
+
+### Patch Changes
+
+- [#6871](https://github.com/LedgerHQ/ledger-live/pull/6871) [`7857c4e`](https://github.com/LedgerHQ/ledger-live/commit/7857c4e41bbcfe4e421ed3b18d50090c253e319e) Thanks [@LucasWerey](https://github.com/LucasWerey)! - Fix analytics that were overriding app.json
+
 ## 2.81.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-desktop/RELEASE_NOTES.md b/apps/ledger-live-desktop/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-# 2.81.0
+# 2.81.1
 
 ### 🐛 Fix
 

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.81.0",
+  "version": "2.81.1",
   "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/Default.tsx b/apps/ledger-live-desktop/src/renderer/Default.tsx
@@ -52,6 +52,7 @@ import {
   hasCompletedOnboardingSelector,
   hasSeenAnalyticsOptInPromptSelector,
 } from "~/renderer/reducers/settings";
+import { isLocked as isLockedSelector } from "~/renderer/reducers/application";
 import { setShareAnalytics, setSharePersonalizedRecommendations } from "./actions/settings";
 
 const PlatformCatalog = lazy(() => import("~/renderer/screens/platform"));
@@ -198,13 +199,16 @@ export default function Default() {
   const listAppsV2 = useFeature("listAppsV2minor1");
   const analyticsFF = useFeature("lldAnalyticsOptInPrompt");
   const hasSeenAnalyticsOptInPrompt = useSelector(hasSeenAnalyticsOptInPromptSelector);
+  const isLocked = useSelector(isLockedSelector);
   const dispatch = useDispatch();
 
   useEffect(() => {
-    if (!analyticsFF?.enabled || hasSeenAnalyticsOptInPrompt) return;
-    dispatch(setShareAnalytics(false));
-    dispatch(setSharePersonalizedRecommendations(false));
-  });
+    if (!isLocked && analyticsFF?.enabled && !hasSeenAnalyticsOptInPrompt) {
+      dispatch(setShareAnalytics(false));
+      dispatch(setSharePersonalizedRecommendations(false));
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isLocked]);
 
   useEffect(() => {
     if (!listAppsV2) return;