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

Add "should show badges" feature flag

Browse source
This commit is contained in:
Evan Hahn 2021-11-09 09:51:56 -06:00 • committed by GitHub
parent dd342e1f22
commit ab543aea93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ts/components/conversation/ContactModal.tsx
View file

@ -14,6 +14,7 @@ import { BadgeDialog } from '../BadgeDialog';
import type { BadgeType } from '../../badges/types';
import { SharedGroupNames } from '../SharedGroupNames';
import { ConfirmationDialog } from '../ConfirmationDialog';
import { shouldShowBadges } from '../../badges/shouldShowBadges';
export type PropsDataType = {
areWeAdmin: boolean;
@ -105,7 +106,7 @@ export const ContactModal = ({
unblurredAvatarPath={contact.unblurredAvatarPath}
onClick={() => {
setView(
preferredBadge
preferredBadge && shouldShowBadges()
? ContactModalView.ShowingBadges
: ContactModalView.ShowingAvatar
);

3
ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
View file

@ -15,6 +15,7 @@ import type { LocalizerType, ThemeType } from '../../../types/Util';
import { bemGenerator } from './util';
import { BadgeDialog } from '../../BadgeDialog';
import type { BadgeType } from '../../../badges/types';
import { shouldShowBadges } from '../../../badges/shouldShowBadges';
export type Props = {
badges?: ReadonlyArray<BadgeType>;
@ -92,7 +93,7 @@ export const ConversationDetailsHeader: React.ComponentType<Props> = ({
noteToSelf={isMe}
onClick={() => {
setActiveModal(
preferredBadge
preferredBadge && shouldShowBadges()
? ConversationDetailsHeaderActiveModal.ShowingBadges
: ConversationDetailsHeaderActiveModal.ShowingAvatar
);