From 3d75a29fa2ade6f9a0c7c5ba125bff68bcd823a8 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 21 Mar 2022 17:18:36 -0700
Subject: [PATCH] Remove desktop.stories feature flag since it's not yet ready

---
 ts/RemoteConfig.ts               | 1 -
 ts/state/selectors/items.ts      | 3 +--
 ts/textsecure/MessageReceiver.ts | 6 ++----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index 910c43bb7..cf7feefaf 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -24,7 +24,6 @@ export type ConfigKeyType =
   | 'desktop.sendSenderKey3'
   | 'desktop.showUserBadges.beta'
   | 'desktop.showUserBadges2'
-  | 'desktop.stories'
   | 'desktop.usernames'
   | 'global.calling.maxGroupCallRingSize'
   | 'global.groupsv2.groupSizeHardLimit'
diff --git a/ts/state/selectors/items.ts b/ts/state/selectors/items.ts
index 1da1acd4a..d3d1eea9c 100644
--- a/ts/state/selectors/items.ts
+++ b/ts/state/selectors/items.ts
@@ -61,8 +61,7 @@ export const getUsernamesEnabled = createSelector(
 export const getStoriesEnabled = createSelector(
   getRemoteConfig,
   (remoteConfig: ConfigMapType): boolean =>
-    isRemoteConfigFlagEnabled(remoteConfig, 'desktop.internalUser') ||
-    isRemoteConfigFlagEnabled(remoteConfig, 'desktop.stories')
+    isRemoteConfigFlagEnabled(remoteConfig, 'desktop.internalUser')
 );
 
 export const getDefaultConversationColor = createSelector(
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index 12794d9ea..dff5e0542 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1860,8 +1860,7 @@ export default class MessageReceiver
     const logId = this.getEnvelopeId(envelope);
     log.info('MessageReceiver.handleDataMessage', logId);
 
-    const isStoriesEnabled =
-      isEnabled('desktop.stories') && isEnabled('desktop.internalUser');
+    const isStoriesEnabled = isEnabled('desktop.internalUser');
     if (!isStoriesEnabled && msg.storyContext) {
       log.info(
         `MessageReceiver.handleDataMessage/${logId}: Dropping incoming dataMessage with storyContext field`
@@ -2061,8 +2060,7 @@ export default class MessageReceiver
       return;
     }
 
-    const isStoriesEnabled =
-      isEnabled('desktop.stories') && isEnabled('desktop.internalUser');
+    const isStoriesEnabled = isEnabled('desktop.internalUser');
     if (content.storyMessage) {
       if (isStoriesEnabled) {
         await this.handleStoryMessage(envelope, content.storyMessage);