From 7bb94bc99ed77d0dace91c6953c271a487889cb9 Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Tue, 21 Jul 2026 09:46:57 -0500
Subject: [PATCH] Drop username_hash from ConfirmUsernameResponse

---
 .../whispersystems/textsecuregcm/grpc/AccountsGrpcService.java | 1 -
 service/src/main/proto/org/signal/chat/account.proto           | 3 +--
 .../textsecuregcm/grpc/AccountsGrpcServiceTest.java            | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java
index ccbb9b00a..f225120d3 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java
@@ -235,7 +235,6 @@ public class AccountsGrpcService extends SimpleAccountsGrpc.AccountsImplBase {
 
       return ConfirmUsernameHashResponse.newBuilder()
           .setConfirmedUsernameHash(ConfirmUsernameHashResponse.ConfirmedUsernameHash.newBuilder()
-              .setUsernameHash(ByteString.copyFrom(updatedAccount.getUsernameHash().orElseThrow()))
               .setUsernameLinkHandle(UUIDUtil.toByteString(updatedAccount.getUsernameLinkHandle())))
           .build();
     } catch (final UsernameHashNotAvailableException e) {
diff --git a/service/src/main/proto/org/signal/chat/account.proto b/service/src/main/proto/org/signal/chat/account.proto
index 36114b349..b980c81eb 100644
--- a/service/src/main/proto/org/signal/chat/account.proto
+++ b/service/src/main/proto/org/signal/chat/account.proto
@@ -189,8 +189,7 @@ message ConfirmUsernameHashRequest {
 
 message ConfirmUsernameHashResponse {
   message ConfirmedUsernameHash {
-    // The newly-confirmed username hash.
-    bytes username_hash = 1;
+    reserved 1; // username_hash
 
     // The server-generated username link handle for the newly-confirmed username.
     bytes username_link_handle = 2;
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java
index 9649c2d1f..9a7943ee5 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java
@@ -394,7 +394,6 @@ class AccountsGrpcServiceTest extends SimpleBaseGrpcTest<AccountsGrpcService, Ac
 
     final ConfirmUsernameHashResponse expectedResponse = ConfirmUsernameHashResponse.newBuilder()
         .setConfirmedUsernameHash(ConfirmUsernameHashResponse.ConfirmedUsernameHash.newBuilder()
-            .setUsernameHash(ByteString.copyFrom(usernameHash))
             .setUsernameLinkHandle(UUIDUtil.toByteString(linkHandle))
             .build())
         .build();