Add "should show badges" feature flag

signalapp · Nov 9, 2021 · 65b21be · 65b21be
1 parent c76b5df
commit 65b21be
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
@@ -24,6 +24,7 @@ export type ConfigKeyType =
   | 'desktop.senderKey.send'
   | 'desktop.senderKey.retry'
   | 'desktop.sendSenderKey3'
+  | 'desktop.showUserBadges'
   | 'desktop.storage'
   | 'desktop.storageWrite3'
   | 'desktop.usernames'

diff --git a/ts/badges/shouldShowBadges.ts b/ts/badges/shouldShowBadges.ts
@@ -0,0 +1,16 @@
+// Copyright 2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { isEnabled } from '../RemoteConfig';
+import { getEnvironment, Environment } from '../environment';
+
+export function shouldShowBadges(): boolean {
+  return (
+    isEnabled('desktop.showUserBadges') ||
+    isEnabled('desktop.internalUser') ||
+    getEnvironment() === Environment.Staging ||
+    getEnvironment() === Environment.Development ||
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    Boolean((window as any).STORYBOOK_ENV)
+  );
+}
diff --git a/ts/components/Avatar.tsx b/ts/components/Avatar.tsx
@@ -23,6 +23,7 @@ import { assert } from '../util/assert';
 import { shouldBlurAvatar } from '../util/shouldBlurAvatar';
 import { getBadgeImageFileLocalPath } from '../badges/getBadgeImageFileLocalPath';
 import { BadgeImageTheme } from '../badges/BadgeImageTheme';
+import { shouldShowBadges } from '../badges/shouldShowBadges';
 
 export enum AvatarBlur {
   NoBlur,
@@ -212,7 +213,7 @@ export const Avatar: FunctionComponent<Props> = ({
   }
 
   let badgeNode: ReactNode;
-  if (badge && theme && !isMe) {
+  if (badge && theme && !isMe && shouldShowBadges()) {
     const badgeSize = Math.ceil(size * 0.425);
     const badgeTheme =
       theme === ThemeType.light ? BadgeImageTheme.Light : BadgeImageTheme.Dark;

diff --git a/ts/components/conversation/ContactModal.tsx b/ts/components/conversation/ContactModal.tsx
@@ -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
                 );

diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
@@ -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
         );