From 3d39ca0c0c0e9e22c72161885254efa2ef8a66e4 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 7 Sep 2026 10:22:09 +0300
Subject: [PATCH] Remove content visibility + SP search feature flags (#11675)

Co-authored-by: Eric Bailey <git@esb.lol>
---
 src/analytics/features/types.ts               |  2 --
 src/screens/Search/SearchResults.tsx          | 34 ++++++-------------
 .../Settings/PrivacyAndSecuritySettings.tsx   | 15 +++-----
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/src/analytics/features/types.ts b/src/analytics/features/types.ts
index d05a1e59c1..4357e161e1 100644
--- a/src/analytics/features/types.ts
+++ b/src/analytics/features/types.ts
@@ -19,10 +19,8 @@ export enum Features {
   PostFeedKnownLikersEnable = 'post_feed:known_likers:enable',
   PostThreadKnownLikersEnable = 'post_thread:known_likers:enable',
   CustomLogoJapanEnable = 'custom_logo:japan:enable',
-  SearchStarterPacksV2Enable = 'search_starter_packs_v2:enable',
   FollowSortEnable = 'follow_sort:enable',
   OnboardingInterestsRequiredEnable = 'onboarding:interests:required:enable',
-  ContentVisibilitySettingsEnable = 'content_visibility_settings:enable',
   ModerationInboxEnable = 'moderation_inbox:enable',
 
   // values
diff --git a/src/screens/Search/SearchResults.tsx b/src/screens/Search/SearchResults.tsx
index 62a7733c46..7c08a55294 100644
--- a/src/screens/Search/SearchResults.tsx
+++ b/src/screens/Search/SearchResults.tsx
@@ -56,7 +56,6 @@ let SearchResults = ({
   onPageSelected: (page: number) => void
   headerHeight: number
 }): React.ReactNode => {
-  const ax = useAnalytics()
   const {t: l} = useLingui()
   /*
    * People/Feeds visibility keys off post-only filters: a `lang` filter applies
@@ -67,10 +66,6 @@ let SearchResults = ({
   const activePage = hasPostFilters && activeTab > 1 ? 0 : activeTab
   const tabShape = hasPostFilters ? 'filtered' : 'plain'
 
-  const isStarterPacksEnabled = ax.features.enabled(
-    ax.features.SearchStarterPacksV2Enable,
-  )
-
   const sections = useMemo(() => {
     if (!query && !hasFilters) return []
     /*
@@ -115,29 +110,20 @@ let SearchResults = ({
           <SearchScreenFeedsResults query={query} active={activePage === 3} />
         ),
       },
-      noFilters &&
-        isStarterPacksEnabled && {
-          title: l`Starter Packs`,
-          component: (
-            <SearchScreenStarterPackResults
-              query={query}
-              active={activePage === 4}
-            />
-          ),
-        },
+      noFilters && {
+        title: l`Starter Packs`,
+        component: (
+          <SearchScreenStarterPackResults
+            query={query}
+            active={activePage === 4}
+          />
+        ),
+      },
     ].filter(Boolean) as {
       title: string
       component: React.ReactNode
     }[]
-  }, [
-    l,
-    query,
-    filters,
-    hasFilters,
-    hasPostFilters,
-    activePage,
-    isStarterPacksEnabled,
-  ])
+  }, [l, query, filters, hasFilters, hasPostFilters, activePage])
 
   // There may be fewer tabs after changing the search options.
   const selectedPage = activePage > sections.length - 1 ? 0 : activePage
diff --git a/src/screens/Settings/PrivacyAndSecuritySettings.tsx b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
index b0aab2661f..098994d65e 100644
--- a/src/screens/Settings/PrivacyAndSecuritySettings.tsx
+++ b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
@@ -17,7 +17,6 @@ import {MagnifyingGlass_Stroke2_Corner0_Rounded as MagnifyingGlassIcon} from '#/
 import {ShieldCheck_Stroke2_Corner0_Rounded as ShieldIcon} from '#/components/icons/Shield'
 import * as Layout from '#/components/Layout'
 import {InlineLinkText} from '#/components/Link'
-import {useAnalytics} from '#/analytics'
 import {type app} from '#/lexicons'
 import {AlgoVisibilityOptOut} from './components/AlgoVisibilityOptOut'
 import {Email2FAToggle} from './components/Email2FAToggle'
@@ -31,10 +30,6 @@ type Props = NativeStackScreenProps<
 export function PrivacyAndSecuritySettingsScreen({}: Props) {
   const {_} = useLingui()
   const t = useTheme()
-  const ax = useAnalytics()
-  const isContentVisibilityEnabled = ax.features.enabled(
-    ax.features.ContentVisibilitySettingsEnable,
-  )
   const {data: appPasswords} = useAppPasswordsQuery()
   const {currentAccount} = useSession()
   const {
@@ -108,12 +103,10 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
             />
           </SettingsList.LinkItem>
           <SettingsList.Divider />
-          {isContentVisibilityEnabled && (
-            <SettingsList.Item style={[a.align_start]}>
-              <SettingsList.ItemIcon icon={MagnifyingGlassIcon} />
-              <AlgoVisibilityOptOut />
-            </SettingsList.Item>
-          )}
+          <SettingsList.Item style={[a.align_start]}>
+            <SettingsList.ItemIcon icon={MagnifyingGlassIcon} />
+            <AlgoVisibilityOptOut />
+          </SettingsList.Item>
           <SettingsList.Item style={[a.align_start]}>
             <SettingsList.ItemIcon icon={EyeSlashIcon} />
             <PwiOptOut />