Fix for stop button for disappearing for subsequent conversations

ashishrp-aws · ashishrp-aws · commit 80468480b7cc · 2025-04-15T11:59:45.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -525,7 +525,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.31.0-beta.2",
+        "@aws/mynah-ui": "^4.31.0-beta.3",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/src/amazonq/webview/ui/followUps/handler.ts b/packages/core/src/amazonq/webview/ui/followUps/handler.ts
@@ -47,7 +47,6 @@ export class FollowUpInteractionHandler {
         if (followUp.prompt !== undefined) {
             this.mynahUI.updateStore(tabID, {
                 loadingChat: true,
-                cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
             this.mynahUI.addChatItem(tabID, {
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -471,7 +471,6 @@ export const createMynahUI = (
             ) {
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
-                    cancelButtonWhenLoading: false,
                     promptInputDisabledState: true,
                 })
 
diff --git a/packages/core/src/amazonq/webview/ui/messages/controller.ts b/packages/core/src/amazonq/webview/ui/messages/controller.ts
@@ -88,7 +88,6 @@ export class MessageController {
 
             this.mynahUI.updateStore(selectedTab.id, {
                 loadingChat: true,
-                cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
             this.mynahUI.addChatItem(selectedTab.id, message)
@@ -120,7 +119,7 @@ export class MessageController {
 
             this.mynahUI.updateStore(newTabID, {
                 loadingChat: true,
-                cancelButtonWhenLoading: false,
+                // cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
 
diff --git a/packages/core/src/amazonq/webview/ui/messages/handler.ts b/packages/core/src/amazonq/webview/ui/messages/handler.ts
@@ -36,7 +36,6 @@ export class TextMessageHandler {
 
         this.mynahUI.updateStore(tabID, {
             loadingChat: true,
-            cancelButtonWhenLoading: false,
             promptInputDisabledState: true,
         })
 
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
@@ -272,7 +272,6 @@ export class QuickActionHandler {
 
                 this.mynahUI.updateStore(affectedTabId, {
                     loadingChat: true,
-                    cancelButtonWhenLoading: false,
                     promptInputDisabledState: true,
                 })
 
@@ -310,7 +309,6 @@ export class QuickActionHandler {
         if (currentTabType !== 'unknown' && currentTabType !== 'welcome') {
             affectedTabId = this.mynahUI.updateStore('', {
                 loadingChat: true,
-                cancelButtonWhenLoading: false,
             })
         }
 
@@ -335,7 +333,6 @@ export class QuickActionHandler {
             // disable chat prompt
             this.mynahUI.updateStore(affectedTabId, {
                 loadingChat: true,
-                cancelButtonWhenLoading: false,
             })
 
             this.connector.transform(affectedTabId)
diff --git a/packages/core/src/shared/db/chatDb/chatDb.ts b/packages/core/src/shared/db/chatDb/chatDb.ts
@@ -483,7 +483,9 @@ export class Database {
         }
 
         //  Make sure the last stored message is from the assistant (type === 'answer'), else drop
-        if (messages.length > 0 && messages[messages.length - 1].type === ('prompt' as ChatItemType)) {
+        if (messages.length > 0 && messages[messages.length - 1].userInputMessageContext) {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('found the last message to be userInputMessage')
             messages.pop()
             this.logger.debug('Dropped trailing user message')
         }

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,9 @@ export class Database {`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`// Make sure the last stored message is from the assistant (type === 'answer'), else drop`
`486`		`- if (messages.length > 0 && messages[messages.length - 1].type === ('prompt' as ChatItemType)) {`
	`486`	`+ if (messages.length > 0 && messages[messages.length - 1].userInputMessageContext) {`
	`487`	`+ // eslint-disable-next-line aws-toolkits/no-console-log`
	`488`	`+ console.log('found the last message to be userInputMessage')`
`487`	`489`	`messages.pop()`
`488`	`490`	`this.logger.debug('Dropped trailing user message')`
`489`	`491`	`}`