From fded959b5e5f142caffe700fbecaea4af4eb0ead Mon Sep 17 00:00:00 2001
From: Michael Chihlas <michael@resolutionflow.com>
Date: Thu, 16 Apr 2026 03:40:31 +0000
Subject: [PATCH] fix(tickets): guard linkedTicket fetch with currentChatRef to
 prevent race condition

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 frontend/src/pages/AssistantChatPage.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/AssistantChatPage.tsx b/frontend/src/pages/AssistantChatPage.tsx
index 2b0892d7..6246ab0b 100644
--- a/frontend/src/pages/AssistantChatPage.tsx
+++ b/frontend/src/pages/AssistantChatPage.tsx
@@ -247,7 +247,10 @@ export default function AssistantChatPage() {
       setActivePsaTicketId(detail.psa_ticket_id)
       if (detail.psa_ticket_id) {
         integrationsApi.getTicket(detail.psa_ticket_id)
-          .then(setLinkedTicket)
+          .then(ticket => {
+            if (currentChatRef.current !== chatId) return
+            setLinkedTicket(ticket)
+          })
           .catch(() => {})
       } else {
         setLinkedTicket(null)