From 97210af0902b2587dc276df7fb8a44fc21d7b9c1 Mon Sep 17 00:00:00 2001
From: Julien Tant <785518+JulienTant@users.noreply.github.com>
Date: Wed, 26 Mar 2025 10:37:14 -0700
Subject: [PATCH] turn cross team search ff into a config value (#8694)

---
 app/screens/home/search/index.tsx         | 2 +-
 app/screens/home/search/initial/index.tsx | 2 +-
 types/api/config.d.ts                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/screens/home/search/index.tsx b/app/screens/home/search/index.tsx
index db26ea8c2..a742af02c 100644
--- a/app/screens/home/search/index.tsx
+++ b/app/screens/home/search/index.tsx
@@ -16,7 +16,7 @@ const enhance = withObservables([], ({database}: WithDatabaseArgs) => {
     return {
         teamId: currentTeamId,
         teams: observeSortedJoinedTeams(database),
-        crossTeamSearchEnabled: observeConfigBooleanValue(database, 'FeatureFlagExperimentalCrossTeamSearch'),
+        crossTeamSearchEnabled: observeConfigBooleanValue(database, 'EnableCrossTeamSearch'),
     };
 });
 
diff --git a/app/screens/home/search/initial/index.tsx b/app/screens/home/search/initial/index.tsx
index 10fe9d147..59166dc77 100644
--- a/app/screens/home/search/initial/index.tsx
+++ b/app/screens/home/search/initial/index.tsx
@@ -23,7 +23,7 @@ const enhance = withObservables(['teamId'], ({database, teamId}: EnhanceProps) =
             switchMap((t) => of$(t?.displayName || '')),
             distinctUntilChanged(),
         ),
-        crossTeamSearchEnabled: observeConfigBooleanValue(database, 'FeatureFlagExperimentalCrossTeamSearch'),
+        crossTeamSearchEnabled: observeConfigBooleanValue(database, 'EnableCrossTeamSearch'),
     };
 });
 
diff --git a/types/api/config.d.ts b/types/api/config.d.ts
index 9d8416040..af6b2b040 100644
--- a/types/api/config.d.ts
+++ b/types/api/config.d.ts
@@ -51,6 +51,7 @@ interface ClientConfig {
     EnableCommands: string;
     EnableCompliance: string;
     EnableConfirmNotificationsToChannel: string;
+    EnableCrossTeamSearch: 'true' | 'false';
     EnableCustomBrand: string;
     EnableCustomEmoji: string;
     EnableCustomTermsOfService: string;
@@ -121,7 +122,6 @@ interface ClientConfig {
     FeatureFlagCollapsedThreads?: string;
     FeatureFlagPostPriority?: string;
     FeatureFlagChannelBookmarks?: string;
-    FeatureFlagExperimentalCrossTeamSearch?: string;
     FeatureFlagCustomProfileAttributes?: string;
     ForgotPasswordLink?: string;
     GfycatApiKey: string;