fix: make inviteAsAdmin a useState and not featureFlag

pull/3281/head
Audric Ackermann 4 months ago
parent bc680a39f6
commit 9156ec83a7
No known key found for this signature in database

@ -5,7 +5,7 @@ import useKey from 'react-use/lib/useKey';
import styled from 'styled-components'; import styled from 'styled-components';
import { concat, isEmpty } from 'lodash'; import { concat, isEmpty } from 'lodash';
import useUpdate from 'react-use/lib/useUpdate'; import useBoolean from 'react-use/lib/useBoolean';
import { MemberListItem } from '../../MemberListItem'; import { MemberListItem } from '../../MemberListItem';
import { SessionButton } from '../../basic/SessionButton'; import { SessionButton } from '../../basic/SessionButton';
@ -116,8 +116,8 @@ export const OverlayClosedGroupV2 = () => {
const privateContactsPubkeys = useContactsToInviteToGroup(); const privateContactsPubkeys = useContactsToInviteToGroup();
const isCreatingGroup = useIsCreatingGroupFromUIPending(); const isCreatingGroup = useIsCreatingGroupFromUIPending();
const [groupName, setGroupName] = useState(''); const [groupName, setGroupName] = useState('');
const [inviteAsAdmin, setInviteAsAdmin] = useBoolean(false);
const [groupNameError, setGroupNameError] = useState<string | undefined>(); const [groupNameError, setGroupNameError] = useState<string | undefined>();
const forceUpdate = useUpdate();
const { const {
uniqueValues: selectedMemberIds, uniqueValues: selectedMemberIds,
addTo: addToSelected, addTo: addToSelected,
@ -166,6 +166,7 @@ export const OverlayClosedGroupV2 = () => {
members: concat(selectedMemberIds, [us]), members: concat(selectedMemberIds, [us]),
groupName, groupName,
us, us,
inviteAsAdmin,
}) as any }) as any
); );
} }
@ -214,11 +215,9 @@ export const OverlayClosedGroupV2 = () => {
<span style={{ display: 'flex', alignItems: 'center' }}> <span style={{ display: 'flex', alignItems: 'center' }}>
Invite as admin?{' '} Invite as admin?{' '}
<SessionToggle <SessionToggle
active={window.sessionFeatureFlags.useGroupV2InviteAsAdmin} active={inviteAsAdmin}
onClick={() => { onClick={() => {
window.sessionFeatureFlags.useGroupV2InviteAsAdmin = setInviteAsAdmin(!inviteAsAdmin);
!window.sessionFeatureFlags.useGroupV2InviteAsAdmin;
forceUpdate();
}} }}
/> />
</span> </span>

@ -107,10 +107,12 @@ const initNewGroupInWrapper = createAsyncThunk(
groupName, groupName,
members, members,
us, us,
inviteAsAdmin,
}: { }: {
groupName: string; groupName: string;
members: Array<string>; members: Array<string>;
us: string; us: string;
inviteAsAdmin: boolean;
}, },
{ dispatch } { dispatch }
): Promise<GroupDetailsUpdate> => { ): Promise<GroupDetailsUpdate> => {
@ -250,7 +252,7 @@ const initNewGroupInWrapper = createAsyncThunk(
groupPk, groupPk,
membersFromWrapper.map(m => m.pubkeyHex), membersFromWrapper.map(m => m.pubkeyHex),
[], [],
window.sessionFeatureFlags.useGroupV2InviteAsAdmin inviteAsAdmin
); );
await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); await openConversationWithMessages({ conversationKey: groupPk, messageId: null });
@ -699,12 +701,7 @@ async function handleMemberAddedFromUI({
} }
// schedule send invite details, auth signature, etc. to the new users // schedule send invite details, auth signature, etc. to the new users
await scheduleGroupInviteJobs( await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory, false);
groupPk,
withHistory,
withoutHistory,
window.sessionFeatureFlags.useGroupV2InviteAsAdmin
);
await LibSessionUtil.saveDumpsToDb(groupPk); await LibSessionUtil.saveDumpsToDb(groupPk);
convo.set({ convo.set({

1
ts/window.d.ts vendored

@ -102,7 +102,6 @@ declare global {
useTestNet: boolean; useTestNet: boolean;
useClosedGroupV2: boolean; useClosedGroupV2: boolean;
useClosedGroupV2QAButtons: boolean; useClosedGroupV2QAButtons: boolean;
useGroupV2InviteAsAdmin: boolean;
replaceLocalizedStringsWithKeys: boolean; replaceLocalizedStringsWithKeys: boolean;
debug: { debug: {
debugLogging: boolean; debugLogging: boolean;

Loading…
Cancel
Save