From 58781de03b37e1057a2010ac48dffb3440b6e7b9 Mon Sep 17 00:00:00 2001
From: Soroush <sorgh@microsoft.com>
Date: Tue, 6 Apr 2021 10:44:24 -0700
Subject: [PATCH 1/2] fix 6676

---
 .../packages/client/src/pages/publish/Notifications.tsx  | 9 ++++++++-
 Composer/packages/server/src/locales/en-US.json          | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Composer/packages/client/src/pages/publish/Notifications.tsx b/Composer/packages/client/src/pages/publish/Notifications.tsx
index 8802db9da7..ae19861462 100644
--- a/Composer/packages/client/src/pages/publish/Notifications.tsx
+++ b/Composer/packages/client/src/pages/publish/Notifications.tsx
@@ -71,7 +71,14 @@ export const getPublishedNotificationCardProps = (item: BotStatus): CardProps =>
 export const getPendingNotificationCardProps = (items: BotStatus[]): CardProps => {
   return {
     title: '',
-    description: formatMessage(`Publishing {count} bots`, { count: items.length }),
+    description: formatMessage(
+      `Publishing {
+      count, plural,
+        =1 {one bot}
+        other {# bots}
+    }`,
+      { count: items.length }
+    ),
     type: 'pending',
     onRenderCardContent: (props) => (
       <div css={cardContent}>
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index ccd4b2af30..98e1fc5938 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -2840,8 +2840,8 @@
   "published_4bb5209e": {
     "message": "Published"
   },
-  "publishing_count_bots_b2a7f564": {
-    "message": "Publishing { count } bots"
+  "publishing_count_plural_1_one_bot_other_bots_11edc1e9": {
+    "message": "Publishing { count, plural,\n     =1 {one bot}\n  other {# bots}\n}"
   },
   "publishing_d63a8f2d": {
     "message": "Publishing"

From 07635f627c561cc45d584866ec1ae86b29d82df1 Mon Sep 17 00:00:00 2001
From: Soroush <sorgh@microsoft.com>
Date: Tue, 6 Apr 2021 13:48:43 -0700
Subject: [PATCH 2/2] fix 6474

---
 .../client/src/components/ErrorPopup/ErrorPopup.tsx        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/components/ErrorPopup/ErrorPopup.tsx b/Composer/packages/client/src/components/ErrorPopup/ErrorPopup.tsx
index 8774f92026..78c0ae19c0 100644
--- a/Composer/packages/client/src/components/ErrorPopup/ErrorPopup.tsx
+++ b/Composer/packages/client/src/components/ErrorPopup/ErrorPopup.tsx
@@ -27,7 +27,12 @@ const formatErrorTitle = (error: StateError): string => {
 const formatErrorDetail = (error: StateError): React.ReactElement => {
   const helpText = formatMessage.rich('If this problem persists, please file an issue on <a>GitHub</a>', {
     a: ({ children }) => (
-      <a href={'https://github.com/microsoft/BotFramework-Composer/issues'} rel="noopener noreferrer" target="_blank">
+      <a
+        key="composer-github-issues-page"
+        href={'https://github.com/microsoft/BotFramework-Composer/issues'}
+        rel="noopener noreferrer"
+        target="_blank"
+      >
         {children}
       </a>
     ),