From f7d4f84736c81367cef32fdfdb5c90cc19c01030 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:59:10 -0600
Subject: [PATCH] Enable New Group settings for everyone; remove
 desktop.gv2Admin feature flag

---
 ts/RemoteConfig.ts                                | 1 -
 ts/components/conversation/ConversationHeader.tsx | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index 1fc29b3beb..09853316c4 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -10,7 +10,6 @@ export type ConfigKeyType =
   | 'desktop.disableGV1'
   | 'desktop.groupCalling'
   | 'desktop.gv2'
-  | 'desktop.gv2Admin'
   | 'desktop.mandatoryProfileSharing'
   | 'desktop.messageRequests'
   | 'desktop.storage'
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 10b11e53df..92a7a33ff7 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -411,10 +411,7 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
         isMissingMandatoryProfileSharing
     );
 
-    const hasGV2AdminEnabled =
-      isGroup &&
-      groupVersion === 2 &&
-      window.Signal.RemoteConfig.isEnabled('desktop.gv2Admin');
+    const hasGV2AdminEnabled = isGroup && groupVersion === 2;
 
     return (
       <ContextMenu id={triggerId}>
@@ -522,9 +519,7 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
             };
         break;
       case 'group': {
-        const hasGV2AdminEnabled =
-          groupVersion === 2 &&
-          window.Signal.RemoteConfig.isEnabled('desktop.gv2Admin');
+        const hasGV2AdminEnabled = groupVersion === 2;
         onClick = hasGV2AdminEnabled
           ? () => {
               onShowConversationDetails();