From 5a9adcca2c763dfc1c6d632d394982f9b950d2da Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:06:34 -0800
Subject: [PATCH] Add feature flag for binary service id use

---
 ts/RemoteConfig.dom.ts                      | 2 ++
 ts/util/isProtoBinaryEncodingEnabled.dom.ts | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ts/RemoteConfig.dom.ts b/ts/RemoteConfig.dom.ts
index a2e2932f87..1280b7a080 100644
--- a/ts/RemoteConfig.dom.ts
+++ b/ts/RemoteConfig.dom.ts
@@ -48,6 +48,8 @@ const SemverKeys = [
   'desktop.retireAccessKeyGroupSend.prod',
   'desktop.keyTransparency.beta',
   'desktop.keyTransparency.prod',
+  'desktop.binaryServiceId.beta',
+  'desktop.binaryServiceId.prod',
 ] as const;
 
 export type SemverKeyType = ArrayValues<typeof SemverKeys>;
diff --git a/ts/util/isProtoBinaryEncodingEnabled.dom.ts b/ts/util/isProtoBinaryEncodingEnabled.dom.ts
index 73f1298db5..43c7a5347b 100644
--- a/ts/util/isProtoBinaryEncodingEnabled.dom.ts
+++ b/ts/util/isProtoBinaryEncodingEnabled.dom.ts
@@ -3,6 +3,7 @@
 
 import { isTestOrMockEnvironment } from '../environment.std.js';
 import { isStagingServer } from './isStagingServer.dom.js';
+import { isFeaturedEnabledNoRedux } from './isFeatureEnabled.dom.js';
 
 export function isProtoBinaryEncodingEnabled(): boolean {
   if (isTestOrMockEnvironment()) {
@@ -13,6 +14,8 @@ export function isProtoBinaryEncodingEnabled(): boolean {
     return true;
   }
 
-  // TODO: DESKTOP-8938
-  return false;
+  return isFeaturedEnabledNoRedux({
+    betaKey: 'desktop.binaryServiceId.beta',
+    prodKey: 'desktop.binaryServiceId.prod',
+  });
 }