From fe9b3f0432d36fd60e5da4ed16be87cd0470e64b Mon Sep 17 00:00:00 2001
From: dan <dan.abramov@gmail.com>
Date: Tue, 23 Apr 2024 00:54:59 +0100
Subject: [PATCH] Ungate profile scroll fix (#3655)

---
 src/lib/statsig/gates.ts     |  1 -
 src/view/screens/Profile.tsx | 24 ++++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts
index 843c14f0..c41083af 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_gif_player'
-  | 'new_profile_scroll_component'
   | 'show_follow_back_label_v2'
   | 'start_session_with_following_v2'
   | 'use_new_suggestions_endpoint'
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index c7f5a662..9cf2352c 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -25,7 +25,6 @@ import {useAnalytics} from 'lib/analytics/analytics'
 import {useSetTitle} from 'lib/hooks/useSetTitle'
 import {ComposeIcon2} from 'lib/icons'
 import {CommonNavigatorParams, NativeStackScreenProps} from 'lib/routes/types'
-import {useGate} from 'lib/statsig/statsig'
 import {combinedDisplayName} from 'lib/strings/display-names'
 import {isInvalidHandle} from 'lib/strings/handles'
 import {colors, s} from 'lib/styles'
@@ -143,7 +142,6 @@ function ProfileScreenLoaded({
   const setMinimalShellMode = useSetMinimalShellMode()
   const {openComposer} = useComposerControls()
   const {screen, track} = useAnalytics()
-  const gate = useGate()
   const {
     data: labelerInfo,
     error: labelerError,
@@ -317,21 +315,8 @@ function ProfileScreenLoaded({
   // =
 
   const renderHeader = React.useCallback(() => {
-    if (gate('new_profile_scroll_component')) {
-      return (
-        <ExpoScrollForwarderView scrollViewTag={scrollViewTag}>
-          <ProfileHeader
-            profile={profile}
-            labeler={labelerInfo}
-            descriptionRT={hasDescription ? descriptionRT : null}
-            moderationOpts={moderationOpts}
-            hideBackButton={hideBackButton}
-            isPlaceholderProfile={showPlaceholder}
-          />
-        </ExpoScrollForwarderView>
-      )
-    } else {
-      return (
+    return (
+      <ExpoScrollForwarderView scrollViewTag={scrollViewTag}>
         <ProfileHeader
           profile={profile}
           labeler={labelerInfo}
@@ -340,10 +325,9 @@ function ProfileScreenLoaded({
           hideBackButton={hideBackButton}
           isPlaceholderProfile={showPlaceholder}
         />
-      )
-    }
+      </ExpoScrollForwarderView>
+    )
   }, [
-    gate,
     scrollViewTag,
     profile,
     labelerInfo,