From e74bbd81d1a4ce1465c8895be31ceba8ffbb6689 Mon Sep 17 00:00:00 2001
From: Hiep Le <69354317+hieptl@users.noreply.github.com>
Date: Mon, 15 Sep 2025 20:56:16 +0700
Subject: [PATCH] fix(frontend): suppressing event display in the absence of
 user messages (#10955)

---
 .../src/components/features/chat/chat-interface.tsx | 13 ++++++++-----
 .../event-content-helpers/should-render-event.ts    |  5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/features/chat/chat-interface.tsx b/frontend/src/components/features/chat/chat-interface.tsx
index f6482ab79e..ccbc46d406 100644
--- a/frontend/src/components/features/chat/chat-interface.tsx
+++ b/frontend/src/components/features/chat/chat-interface.tsx
@@ -25,7 +25,10 @@ import { displayErrorToast } from "#/utils/custom-toast-handlers";
 import { useOptimisticUserMessage } from "#/hooks/use-optimistic-user-message";
 import { useWSErrorMessage } from "#/hooks/use-ws-error-message";
 import { ErrorMessageBanner } from "./error-message-banner";
-import { shouldRenderEvent } from "./event-content-helpers/should-render-event";
+import {
+  hasUserEvent,
+  shouldRenderEvent,
+} from "./event-content-helpers/should-render-event";
 import { useUploadFiles } from "#/hooks/mutation/use-upload-files";
 import { useConfig } from "#/hooks/query/use-config";
 import { validateFiles } from "#/utils/file-validation";
@@ -168,14 +171,14 @@ export function ChatInterface() {
     onChatBodyScroll,
   };
 
+  const userEventsExist = hasUserEvent(events);
+
   return (
     <ScrollProvider value={scrollProviderValue}>
       <div className="h-full flex flex-col justify-between pr-0 md:pr-4 relative">
         {!hasSubstantiveAgentActions &&
           !optimisticUserMessage &&
-          !events.some(
-            (event) => isOpenHandsAction(event) && event.source === "user",
-          ) && (
+          !userEventsExist && (
             <ChatSuggestions
               onSuggestionsClick={(message) =>
                 dispatch(setMessageToSend(message))
@@ -195,7 +198,7 @@ export function ChatInterface() {
             </div>
           )}
 
-          {!isLoadingMessages && (
+          {!isLoadingMessages && userEventsExist && (
             <Messages
               messages={events}
               isAwaitingUserConfirmation={
diff --git a/frontend/src/components/features/chat/event-content-helpers/should-render-event.ts b/frontend/src/components/features/chat/event-content-helpers/should-render-event.ts
index 0c4a9973a2..e07dc925b3 100644
--- a/frontend/src/components/features/chat/event-content-helpers/should-render-event.ts
+++ b/frontend/src/components/features/chat/event-content-helpers/should-render-event.ts
@@ -45,3 +45,8 @@ export const shouldRenderEvent = (
 
   return true;
 };
+
+export const hasUserEvent = (
+  events: (OpenHandsAction | OpenHandsObservation)[],
+) =>
+  events.some((event) => isOpenHandsAction(event) && event.source === "user");