Merge master into feature/emr

aws-toolkit-automation · web-flow · commit efa79b015a16 · 2025-04-08T14:10:02.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json b/packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Update chat history icon"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json b/packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -524,7 +524,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.27.0",
+        "@aws/mynah-ui": "^4.30.0",
         "@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/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -970,7 +970,7 @@ export const createMynahUI = (
             tabBarButtons: [
                 {
                     id: 'history_sheet',
-                    icon: MynahIcons.COMMENT,
+                    icon: MynahIcons.HISTORY,
                     description: 'View chat history',
                 },
                 /* Temporarily hide export chat button from tab bar

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q Chat: Update chat history icon"
 +}
Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ export const createMynahUI = (`
`970`	`970`	`tabBarButtons: [`
`971`	`971`	`{`
`972`	`972`	`id: 'history_sheet',`
`973`		`- icon: MynahIcons.COMMENT,`
	`973`	`+ icon: MynahIcons.HISTORY,`
`974`	`974`	`description: 'View chat history',`
`975`	`975`	`},`
`976`	`976`	`/* Temporarily hide export chat button from tab bar`