From 6a7b519153b3118726f21aa01990d3f9898bc47d Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:56:01 -0800
Subject: [PATCH] on extension, include the authRequestId in the send message

---
 .../extension-auth-request-answering.service.ts             | 6 +++++-
 .../internal/default-server-notifications.service.ts        | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/auth/services/auth-request-answering/extension-auth-request-answering.service.ts b/apps/browser/src/auth/services/auth-request-answering/extension-auth-request-answering.service.ts
index 21b5e61057f..485c442c286 100644
--- a/apps/browser/src/auth/services/auth-request-answering/extension-auth-request-answering.service.ts
+++ b/apps/browser/src/auth/services/auth-request-answering/extension-auth-request-answering.service.ts
@@ -54,7 +54,11 @@ export class ExtensionAuthRequestAnsweringService
 
     if (userIsAvailableToViewDialog) {
       // Send message to open dialog immediately for this request
-      this.messagingService.send("openLoginApproval");
+      this.messagingService.send("openLoginApproval", {
+        // Include the authRequestId so the DeviceManagementComponent can upsert the correct device.
+        // This will only matter if the user is on the /device-management screen when the auth request is received.
+        notificationId: authRequestId,
+      });
     } else {
       // Create a system notification
       const accounts = await firstValueFrom(this.accountService.accounts$);
diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
index b47b2157e9e..05b06068283 100644
--- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
@@ -301,9 +301,11 @@ export class DefaultServerNotificationsService implements ServerNotificationsSer
             notification.payload.id,
           );
         } else {
-          // This call is necessary for Web, which uses a NoopAuthRequstAnsweringService
+          // This call is necessary for Web, which uses a NoopAuthRequestAnsweringService
           // that does not have a recievedPendingAuthRequest() method
           this.messagingService.send("openLoginApproval", {
+            // Include the authRequestId so the DeviceManagementComponent can upsert the correct device.
+            // This will only matter if the user is on the /device-management screen when the auth request is received.
             notificationId: notification.payload.id,
           });
         }