Fix context check in loadThreadMessages

open-chat-labs · Dec 28, 2023 · 8594d2a · 8594d2a
1 parent 10910fc
commit 8594d2a
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
@@ -2349,9 +2349,9 @@ export class OpenChat extends OpenChatAgentWorker {
             return Promise.resolve();
         }
 
-        const context = this._liveState.selectedMessageContext;
+        const context = { chatId, threadRootMessageIndex };
 
-        if (context?.threadRootMessageIndex === undefined) return;
+        if (!messageContextsEqual(context, this._liveState.selectedMessageContext)) return;
 
         const eventsResponse = await this.sendRequest({
             kind: "chatEvents",
@@ -2364,11 +2364,6 @@ export class OpenChat extends OpenChatAgentWorker {
             latestKnownUpdate: chat.lastUpdated,
         });
 
-        if (!messageContextsEqual(context, this._liveState.selectedMessageContext)) {
-            // the selected thread has changed while we were loading the messages
-            return;
-        }
-
         if (eventsResponse !== undefined && eventsResponse !== "events_failed") {
             if (clearEvents) {
                 threadServerEventsStore.set([]);