Chat: fix abort message loading state (#4601)

sourcegraph · Jun 19, 2024 · 4a0f385 · 4a0f385
1 parent 14a9d19
commit 4a0f385
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/vscode/src/chat/chat-view/SimpleChatPanelProvider.ts b/vscode/src/chat/chat-view/SimpleChatPanelProvider.ts
@@ -711,7 +711,8 @@ export class SimpleChatPanelProvider implements vscode.Disposable, ChatSession {
 
     private handleAbort(): void {
         this.cancelSubmitOrEditOperation()
-
+        // Notify the webview there is no message in progress.
+        this.postViewTranscript()
         telemetryService.log('CodyVSCodeExtension:abortButton:clicked', { hasV2Event: true })
         telemetryRecorder.recordEvent('cody.sidebar.abortButton', 'clicked')
     }

diff --git a/vscode/webviews/chat/Transcript.tsx b/vscode/webviews/chat/Transcript.tsx
@@ -49,7 +49,7 @@ export const Transcript: React.FunctionComponent<{
                         i === interactions.length - 2 && interaction.assistantMessage !== null
                     }
                     priorAssistantMessageIsLoading={Boolean(
-                        interactions.at(i - 1)?.assistantMessage?.isLoading
+                        messageInProgress && interactions.at(i - 1)?.assistantMessage?.isLoading
                     )}
                 />
             ))}
@@ -87,6 +87,7 @@ export function transcriptToInteractionPairs(
                           index: i + 1,
                           isLoading:
                               assistantMessage.error === undefined &&
+                              !!assistantMessageInProgress &&
                               (isLastPairInTranscript || assistantMessage.text === undefined),
                       }
                     : null,