From 9156ec83a76e136da7cb395834abc97b160ead07 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 17 Jan 2025 13:14:13 +1100
Subject: [PATCH] fix: make inviteAsAdmin a useState and not featureFlag

---
 ts/components/leftpane/overlay/OverlayClosedGroup.tsx | 11 +++++------
 ts/state/ducks/metaGroups.ts                          | 11 ++++-------
 ts/window.d.ts                                        |  1 -
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index f59949021..7ee5e8bbf 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -5,7 +5,7 @@ import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 
 import { concat, isEmpty } from 'lodash';
-import useUpdate from 'react-use/lib/useUpdate';
+import useBoolean from 'react-use/lib/useBoolean';
 import { MemberListItem } from '../../MemberListItem';
 import { SessionButton } from '../../basic/SessionButton';
 
@@ -116,8 +116,8 @@ export const OverlayClosedGroupV2 = () => {
   const privateContactsPubkeys = useContactsToInviteToGroup();
   const isCreatingGroup = useIsCreatingGroupFromUIPending();
   const [groupName, setGroupName] = useState('');
+  const [inviteAsAdmin, setInviteAsAdmin] = useBoolean(false);
   const [groupNameError, setGroupNameError] = useState<string | undefined>();
-  const forceUpdate = useUpdate();
   const {
     uniqueValues: selectedMemberIds,
     addTo: addToSelected,
@@ -166,6 +166,7 @@ export const OverlayClosedGroupV2 = () => {
         members: concat(selectedMemberIds, [us]),
         groupName,
         us,
+        inviteAsAdmin,
       }) as any
     );
   }
@@ -214,11 +215,9 @@ export const OverlayClosedGroupV2 = () => {
             <span style={{ display: 'flex', alignItems: 'center' }}>
               Invite as admin?{'  '}
               <SessionToggle
-                active={window.sessionFeatureFlags.useGroupV2InviteAsAdmin}
+                active={inviteAsAdmin}
                 onClick={() => {
-                  window.sessionFeatureFlags.useGroupV2InviteAsAdmin =
-                    !window.sessionFeatureFlags.useGroupV2InviteAsAdmin;
-                  forceUpdate();
+                  setInviteAsAdmin(!inviteAsAdmin);
                 }}
               />
             </span>
diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts
index 96aecb710..7d156020d 100644
--- a/ts/state/ducks/metaGroups.ts
+++ b/ts/state/ducks/metaGroups.ts
@@ -107,10 +107,12 @@ const initNewGroupInWrapper = createAsyncThunk(
       groupName,
       members,
       us,
+      inviteAsAdmin,
     }: {
       groupName: string;
       members: Array<string>;
       us: string;
+      inviteAsAdmin: boolean;
     },
     { dispatch }
   ): Promise<GroupDetailsUpdate> => {
@@ -250,7 +252,7 @@ const initNewGroupInWrapper = createAsyncThunk(
         groupPk,
         membersFromWrapper.map(m => m.pubkeyHex),
         [],
-        window.sessionFeatureFlags.useGroupV2InviteAsAdmin
+        inviteAsAdmin
       );
 
       await openConversationWithMessages({ conversationKey: groupPk, messageId: null });
@@ -699,12 +701,7 @@ async function handleMemberAddedFromUI({
   }
 
   // schedule send invite details, auth signature, etc. to the new users
-  await scheduleGroupInviteJobs(
-    groupPk,
-    withHistory,
-    withoutHistory,
-    window.sessionFeatureFlags.useGroupV2InviteAsAdmin
-  );
+  await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory, false);
   await LibSessionUtil.saveDumpsToDb(groupPk);
 
   convo.set({
diff --git a/ts/window.d.ts b/ts/window.d.ts
index afb228349..c384cf8e2 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -102,7 +102,6 @@ declare global {
       useTestNet: boolean;
       useClosedGroupV2: boolean;
       useClosedGroupV2QAButtons: boolean;
-      useGroupV2InviteAsAdmin: boolean;
       replaceLocalizedStringsWithKeys: boolean;
       debug: {
         debugLogging: boolean;