From aadd41939c93e8ccaa679e7505623999e6f0aafb Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:42:29 -0800
Subject: [PATCH] Show badges in beta (behind a new feature flag)

Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
---
 ts/RemoteConfig.ts            |  1 +
 ts/badges/shouldShowBadges.ts | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index a2e037767a9..087829f9018 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -25,6 +25,7 @@ export type ConfigKeyType =
   | 'desktop.senderKey.retry'
   | 'desktop.sendSenderKey3'
   | 'desktop.showUserBadges'
+  | 'desktop.showUserBadges.beta'
   | 'desktop.storage'
   | 'desktop.storageWrite3'
   | 'desktop.usernames'
diff --git a/ts/badges/shouldShowBadges.ts b/ts/badges/shouldShowBadges.ts
index 2c21126473f..912ce88f8b9 100644
--- a/ts/badges/shouldShowBadges.ts
+++ b/ts/badges/shouldShowBadges.ts
@@ -3,14 +3,23 @@
 
 import { isEnabled } from '../RemoteConfig';
 import { getEnvironment, Environment } from '../environment';
+import { isBeta } from '../util/version';
 
 export function shouldShowBadges(): boolean {
-  return (
+  if (
     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)
-  );
+  ) {
+    return true;
+  }
+
+  if (isEnabled('desktop.showUserBadges.beta') && isBeta(window.getVersion())) {
+    return true;
+  }
+
+  return false;
 }