From fe7a40a6529c661d357a0bda50550bf186574505 Mon Sep 17 00:00:00 2001
From: Maxim Hayes <hayemaxi@amazon.com>
Date: Tue, 21 Jan 2025 11:24:48 -0500
Subject: [PATCH] fix(notifications): dismiss command visible in command
 palette

---
 .../Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json         | 4 ++++
 packages/amazonq/package.json                                 | 4 ++--
 .../Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json         | 4 ++++
 packages/toolkit/package.json                                 | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json
 create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json

diff --git a/packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json b/packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json
new file mode 100644
index 00000000000..fd6b57cfecd
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Notifications: 'Dismiss' command visible in command palette."
+}
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
index 1c8f68cf5b2..a40a2157514 100644
--- a/packages/amazonq/package.json
+++ b/packages/amazonq/package.json
@@ -198,7 +198,7 @@
                 {
                     "id": "aws.amazonq.notifications",
                     "name": "%AWS.notifications.title%",
-                    "when": "!isCloud9 && !aws.isSageMaker && aws.amazonq.notifications.show"
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.amazonq.notifications.show"
                 },
                 {
                     "type": "webview",
@@ -493,7 +493,7 @@
                 "command": "_aws.amazonq.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "enablement": "view == aws.amazonq.notifications",
                 "icon": "$(remove-close)"
             },
             {
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json b/packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json
new file mode 100644
index 00000000000..fd6b57cfecd
--- /dev/null
+++ b/packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Notifications: 'Dismiss' command visible in command palette."
+}
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
index 26ca248630a..2020b0daa8b 100644
--- a/packages/toolkit/package.json
+++ b/packages/toolkit/package.json
@@ -732,7 +732,7 @@
                 {
                     "id": "aws.toolkit.notifications",
                     "name": "%AWS.notifications.title%",
-                    "when": "!isCloud9 && !aws.isSageMaker && aws.toolkit.notifications.show"
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.toolkit.notifications.show"
                 },
                 {
                     "id": "aws.amazonq.codewhisperer",
@@ -2231,7 +2231,7 @@
                 "command": "_aws.toolkit.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
                 "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "enablement": "view == aws.toolkit.notifications",
                 "icon": "$(remove-close)"
             },
             {