From db0c9f0f49320fa1bb88a66e256dafdba327d405 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Thu, 5 Aug 2021 13:23:50 -0400
Subject: [PATCH] Allows you to turn off announcements only if already on

---
 .../GroupV2Permissions.stories.tsx            | 31 +++++++++++++++++++
 .../GroupV2Permissions.tsx                    |  6 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx
index 65ebc2000..2dfea7caf 100644
--- a/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx
+++ b/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx
@@ -46,3 +46,34 @@ story.add('Basic', () => {
 
   return <GroupV2Permissions {...props} />;
 });
+
+story.add('Not admin', () => (
+  <GroupV2Permissions
+    {...createProps()}
+    conversation={getDefaultConversation({
+      announcementsOnly: true,
+      areWeAdmin: false,
+    })}
+  />
+));
+
+story.add('Admin but not announcement ready', () => (
+  <GroupV2Permissions
+    {...createProps()}
+    conversation={getDefaultConversation({
+      announcementsOnlyReady: false,
+      areWeAdmin: true,
+    })}
+  />
+));
+
+story.add('Admin, not announcement ready, but it was on', () => (
+  <GroupV2Permissions
+    {...createProps()}
+    conversation={getDefaultConversation({
+      announcementsOnly: true,
+      announcementsOnlyReady: false,
+      areWeAdmin: true,
+    })}
+  />
+));
diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
index 18870c643..df3a53804 100644
--- a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
+++ b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
@@ -48,6 +48,10 @@ export const GroupV2Permissions = ({
       : AccessControlEnum.MEMBER
   );
 
+  const showAnnouncementsOnlyPermission =
+    conversation.areWeAdmin &&
+    (conversation.announcementsOnly || conversation.announcementsOnlyReady);
+
   return (
     <PanelSection>
       <PanelRow
@@ -72,7 +76,7 @@ export const GroupV2Permissions = ({
           />
         }
       />
-      {conversation.areWeAdmin && conversation.announcementsOnlyReady && (
+      {showAnnouncementsOnlyPermission && (
         <PanelRow
           label={i18n('ConversationDetails--announcement-label')}
           info={i18n('ConversationDetails--announcement-info')}