From 912cfd582911aeaf2faadc27d767477fcec9f23b Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Mon, 11 Sep 2023 20:41:54 +0100
Subject: [PATCH 1/2] :fire:  removing privacyMode feature flag

---
 packages/desktop-client/src/components/PrivacyFilter.tsx      | 4 +---
 packages/desktop-client/src/components/Titlebar.tsx           | 3 +--
 .../desktop-client/src/components/settings/Experimental.tsx   | 1 -
 packages/desktop-client/src/hooks/useFeatureFlag.ts           | 1 -
 packages/loot-core/src/types/prefs.d.ts                       | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/desktop-client/src/components/PrivacyFilter.tsx b/packages/desktop-client/src/components/PrivacyFilter.tsx
index a1d038f5f91..ac8fd543a75 100644
--- a/packages/desktop-client/src/components/PrivacyFilter.tsx
+++ b/packages/desktop-client/src/components/PrivacyFilter.tsx
@@ -8,7 +8,6 @@ import React, {
 
 import usePrivacyMode from 'loot-core/src/client/privacy';
 
-import useFeatureFlag from '../hooks/useFeatureFlag';
 import { useResponsive } from '../ResponsiveProvider';
 
 import View from './common/View';
@@ -53,7 +52,6 @@ export default function PrivacyFilter({
   children,
   ...props
 }: PrivacyFilterProps) {
-  let privacyModeFeatureFlag = useFeatureFlag('privacyMode');
   let privacyMode = usePrivacyMode();
   // Limit mobile support for now.
   let { isNarrowWidth } = useResponsive();
@@ -67,7 +65,7 @@ export default function PrivacyFilter({
 
   let blurAmount = blurIntensity != null ? `${blurIntensity}px` : '3px';
 
-  return !privacyModeFeatureFlag || !activate ? (
+  return !activate ? (
     <>{Children.toArray(children)}</>
   ) : (
     <BlurredOverlay blurIntensity={blurAmount} {...props}>
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index fab82dbe3ab..a91446e353f 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -296,7 +296,6 @@ export default function Titlebar({ style }) {
     state => state.prefs.global.floatingSidebar,
   );
 
-  let privacyModeFeatureFlag = useFeatureFlag('privacyMode');
   let themesFlag = useFeatureFlag('themes');
 
   return isNarrowWidth ? null : (
@@ -369,7 +368,7 @@ export default function Titlebar({ style }) {
       <View style={{ flex: 1 }} />
       <UncategorizedButton />
       {themesFlag && <ThemeSelector />}
-      {privacyModeFeatureFlag && <PrivacyButton />}
+      <PrivacyButton />
       {serverURL ? <SyncButton style={{ marginLeft: 10 }} /> : null}
       <LoggedInUser style={{ marginLeft: 10 }} />
     </View>
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index 37ea3ac5d89..a2237ff8fcd 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -99,7 +99,6 @@ export default function ExperimentalFeatures() {
               Goal templates
             </FeatureToggle>
 
-            <FeatureToggle flag="privacyMode">Privacy mode</FeatureToggle>
             <FeatureToggle flag="experimentalOfxParser">
               Experimental OFX parser
             </FeatureToggle>
diff --git a/packages/desktop-client/src/hooks/useFeatureFlag.ts b/packages/desktop-client/src/hooks/useFeatureFlag.ts
index 70324fd6a67..84571e1fcbe 100644
--- a/packages/desktop-client/src/hooks/useFeatureFlag.ts
+++ b/packages/desktop-client/src/hooks/useFeatureFlag.ts
@@ -6,7 +6,6 @@ const DEFAULT_FEATURE_FLAG_STATE: Record<FeatureFlag, boolean> = {
   categorySpendingReport: false,
   reportBudget: false,
   goalTemplatesEnabled: false,
-  privacyMode: true,
   themes: false,
   experimentalOfxParser: true,
 };
diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts
index 56ea97a1527..ef97ecf4383 100644
--- a/packages/loot-core/src/types/prefs.d.ts
+++ b/packages/loot-core/src/types/prefs.d.ts
@@ -4,7 +4,6 @@ export type FeatureFlag =
   | 'categorySpendingReport'
   | 'reportBudget'
   | 'goalTemplatesEnabled'
-  | 'privacyMode'
   | 'themes'
   | 'experimentalOfxParser';
 

From 16479fe844212c4139e07bdda47831611f2ab576 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Mon, 11 Sep 2023 20:42:37 +0100
Subject: [PATCH 2/2] Release notes

---
 upcoming-release-notes/1688.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 upcoming-release-notes/1688.md

diff --git a/upcoming-release-notes/1688.md b/upcoming-release-notes/1688.md
new file mode 100644
index 00000000000..76a928360e3
--- /dev/null
+++ b/upcoming-release-notes/1688.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Remove `privacyMode` feature flag as this feature is GA