about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/lib/statsig/gates.ts1
-rw-r--r--src/view/screens/Search/Search.tsx105
2 files changed, 38 insertions, 68 deletions
diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts
index d540cde10..301746fb2 100644
--- a/src/lib/statsig/gates.ts
+++ b/src/lib/statsig/gates.ts
@@ -5,7 +5,6 @@ export type Gate =
   | 'disable_poll_on_discover_v2'
   | 'hide_vertical_scroll_indicators'
   | 'new_profile_scroll_component'
-  | 'new_search'
   | 'receive_updates'
   | 'show_follow_back_label_v2'
   | 'start_session_with_following_v2'
diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx
index 0b11ff767..36e780c77 100644
--- a/src/view/screens/Search/Search.tsx
+++ b/src/view/screens/Search/Search.tsx
@@ -407,7 +407,6 @@ export function SearchScreenInner({
   const {isDesktop} = useWebMediaQueries()
   const [activeTab, setActiveTab] = React.useState(0)
   const {_} = useLingui()
-  const gate = useGate()
 
   const onPageSelected = React.useCallback(
     (index: number) => {
@@ -420,74 +419,46 @@ export function SearchScreenInner({
 
   const sections = React.useMemo(() => {
     if (!query) return []
-    if (gate('new_search')) {
-      if (hasSession) {
-        return [
-          {
-            title: _(msg`Top`),
-            component: (
-              <SearchScreenPostResults
-                query={query}
-                sort="top"
-                active={activeTab === 0}
-              />
-            ),
-          },
-          {
-            title: _(msg`Latest`),
-            component: (
-              <SearchScreenPostResults
-                query={query}
-                sort="latest"
-                active={activeTab === 1}
-              />
-            ),
-          },
-          {
-            title: _(msg`People`),
-            component: (
-              <SearchScreenUserResults query={query} active={activeTab === 2} />
-            ),
-          },
-        ]
-      } else {
-        return [
-          {
-            title: _(msg`People`),
-            component: (
-              <SearchScreenUserResults query={query} active={activeTab === 0} />
-            ),
-          },
-        ]
-      }
+    if (hasSession) {
+      return [
+        {
+          title: _(msg`Top`),
+          component: (
+            <SearchScreenPostResults
+              query={query}
+              sort="top"
+              active={activeTab === 0}
+            />
+          ),
+        },
+        {
+          title: _(msg`Latest`),
+          component: (
+            <SearchScreenPostResults
+              query={query}
+              sort="latest"
+              active={activeTab === 1}
+            />
+          ),
+        },
+        {
+          title: _(msg`People`),
+          component: (
+            <SearchScreenUserResults query={query} active={activeTab === 2} />
+          ),
+        },
+      ]
     } else {
-      if (hasSession) {
-        return [
-          {
-            title: _(msg`Posts`),
-            component: (
-              <SearchScreenPostResults query={query} active={activeTab === 0} />
-            ),
-          },
-          {
-            title: _(msg`Users`),
-            component: (
-              <SearchScreenUserResults query={query} active={activeTab === 1} />
-            ),
-          },
-        ]
-      } else {
-        return [
-          {
-            title: _(msg`Users`),
-            component: (
-              <SearchScreenUserResults query={query} active={activeTab === 0} />
-            ),
-          },
-        ]
-      }
+      return [
+        {
+          title: _(msg`People`),
+          component: (
+            <SearchScreenUserResults query={query} active={activeTab === 0} />
+          ),
+        },
+      ]
     }
-  }, [hasSession, gate, _, query, activeTab])
+  }, [hasSession, _, query, activeTab])
 
   if (hasSession) {
     return query ? (