From babd61377b219cb4fb8380585490ca1fd1fd2d87 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 27 Jan 2022 15:50:01 -0600
Subject: [PATCH] Remove floating date header remote config flags

---
 ts/RemoteConfig.ts                      |  2 --
 ts/components/conversation/Timeline.tsx |  5 +----
 ts/state/selectors/items.ts             | 20 --------------------
 ts/state/smart/Timeline.tsx             |  3 ---
 4 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index 19f88d4f36..08eb8944a6 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -10,8 +10,6 @@ export type ConfigKeyType =
   | 'desktop.announcementGroup'
   | 'desktop.clientExpiration'
   | 'desktop.disableGV1'
-  | 'desktop.floatingDateHeaders.beta'
-  | 'desktop.floatingDateHeaders.production'
   | 'desktop.groupCallOutboundRing'
   | 'desktop.groupCalling'
   | 'desktop.gv2'
diff --git a/ts/components/conversation/Timeline.tsx b/ts/components/conversation/Timeline.tsx
index 843b938b2f..f85b08e03b 100644
--- a/ts/components/conversation/Timeline.tsx
+++ b/ts/components/conversation/Timeline.tsx
@@ -120,8 +120,6 @@ type PropsHousekeepingType = {
   i18n: LocalizerType;
   theme: ThemeType;
 
-  areFloatingDateHeadersEnabled?: boolean;
-
   renderItem: (props: {
     actionProps: PropsActionsType;
     containerElementRef: RefObject<HTMLElement>;
@@ -1251,7 +1249,6 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
   public override render(): JSX.Element | null {
     const {
       acknowledgeGroupMemberNameCollisions,
-      areFloatingDateHeadersEnabled = true,
       areWeAdmin,
       clearInvitedUuidsForNewlyCreatedGroup,
       closeContactSpoofingReview,
@@ -1293,7 +1290,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
 
     let floatingHeader: ReactNode;
     const oldestPartiallyVisibleRow = visibleRows?.oldestPartiallyVisible;
-    if (areFloatingDateHeadersEnabled && oldestPartiallyVisibleRow) {
+    if (oldestPartiallyVisibleRow) {
       floatingHeader = (
         <TimelineFloatingHeader
           i18n={i18n}
diff --git a/ts/state/selectors/items.ts b/ts/state/selectors/items.ts
index fd33ee47c5..b57ac77e15 100644
--- a/ts/state/selectors/items.ts
+++ b/ts/state/selectors/items.ts
@@ -15,7 +15,6 @@ import type {
 } from '../../types/Colors';
 import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors';
 import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji';
-import { getIsAlpha, getIsBeta } from './user';
 
 const DEFAULT_PREFERRED_LEFT_PANE_WIDTH = 320;
 
@@ -59,25 +58,6 @@ export const getUsernamesEnabled = createSelector(
     isRemoteConfigFlagEnabled(remoteConfig, 'desktop.usernames')
 );
 
-export const getAreFloatingDateHeadersEnabled = createSelector(
-  getRemoteConfig,
-  getIsAlpha,
-  getIsBeta,
-  (remoteConfig: ConfigMapType, isAlpha, isBeta): boolean => {
-    if (
-      isAlpha ||
-      isRemoteConfigFlagEnabled(remoteConfig, 'desktop.internalUser')
-    ) {
-      return true;
-    }
-
-    const remoteConfigKey: ConfigKeyType = isBeta
-      ? 'desktop.floatingDateHeaders.beta'
-      : 'desktop.floatingDateHeaders.production';
-    return isRemoteConfigFlagEnabled(remoteConfig, remoteConfigKey);
-  }
-);
-
 export const getDefaultConversationColor = createSelector(
   getItems,
   (
diff --git a/ts/state/smart/Timeline.tsx b/ts/state/smart/Timeline.tsx
index b8418e7b66..e4db61b92b 100644
--- a/ts/state/smart/Timeline.tsx
+++ b/ts/state/smart/Timeline.tsx
@@ -18,7 +18,6 @@ import { Timeline } from '../../components/conversation/Timeline';
 import type { StateType } from '../reducer';
 import type { ConversationType } from '../ducks/conversations';
 
-import { getAreFloatingDateHeadersEnabled } from '../selectors/items';
 import { getIntl, getTheme } from '../selectors/user';
 import {
   getConversationByUuidSelector,
@@ -322,8 +321,6 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
     warning: getWarning(conversation, state),
     contactSpoofingReview: getContactSpoofingReview(id, state),
 
-    areFloatingDateHeadersEnabled: getAreFloatingDateHeadersEnabled(state),
-
     getTimestampForMessage,
     getPreferredBadge: getPreferredBadgeSelector(state),
     i18n: getIntl(state),