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

9
ts/components/Avatar.tsx
View file

@ -24,6 +24,7 @@ import { shouldBlurAvatar } from '../util/shouldBlurAvatar';
import { getBadgeImageFileLocalPath } from '../badges/getBadgeImageFileLocalPath';
import { isBadgeVisible } from '../badges/isBadgeVisible';
import { BadgeImageTheme } from '../badges/BadgeImageTheme';
import { shouldShowBadges } from '../badges/shouldShowBadges';
export enum AvatarBlur {
NoBlur,
@ -213,7 +214,13 @@ export const Avatar: FunctionComponent<Props> = ({
}
let badgeNode: ReactNode;
if (badge && theme && !noteToSelf && isBadgeVisible(badge)) {
if (
badge &&
theme &&
!noteToSelf &&
isBadgeVisible(badge) &&
shouldShowBadges()
) {
const badgeSize = Math.ceil(size * 0.425);
const badgeTheme =
theme === ThemeType.light ? BadgeImageTheme.Light : BadgeImageTheme.Dark;