mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Enable New Group settings for everyone; remove desktop.gv2Admin feature flag

Browse source
This commit is contained in:
Evan Hahn 2021-03-11 16:59:10 -06:00 • committed by Josh Perez
parent b81a52bbdd
commit f7d4f84736
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ts/RemoteConfig.ts
View file

@ -10,7 +10,6 @@ export type ConfigKeyType =
| 'desktop.disableGV1' | 'desktop.disableGV1'
| 'desktop.groupCalling' | 'desktop.groupCalling'
| 'desktop.gv2' | 'desktop.gv2'
| 'desktop.gv2Admin'
| 'desktop.mandatoryProfileSharing' | 'desktop.mandatoryProfileSharing'
| 'desktop.messageRequests' | 'desktop.messageRequests'
| 'desktop.storage' | 'desktop.storage'

9
ts/components/conversation/ConversationHeader.tsx
View file

@ -411,10 +411,7 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
isMissingMandatoryProfileSharing isMissingMandatoryProfileSharing
); );
const hasGV2AdminEnabled = const hasGV2AdminEnabled = isGroup && groupVersion === 2;
isGroup &&
groupVersion === 2 &&
window.Signal.RemoteConfig.isEnabled('desktop.gv2Admin');
return ( return (
<ContextMenu id={triggerId}> <ContextMenu id={triggerId}>
@ -522,9 +519,7 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
}; };
break; break;
case 'group': { case 'group': {
const hasGV2AdminEnabled = const hasGV2AdminEnabled = groupVersion === 2;
groupVersion === 2 &&
window.Signal.RemoteConfig.isEnabled('desktop.gv2Admin');
onClick = hasGV2AdminEnabled onClick = hasGV2AdminEnabled
? () => { ? () => {
onShowConversationDetails(); onShowConversationDetails();