From 893b40f16a3c7f602e9b563be82548b0c810b862 Mon Sep 17 00:00:00 2001
From: carocao-msft <96077406+carocao-msft@users.noreply.github.com>
Date: Fri, 28 Feb 2025 10:40:13 -0800
Subject: [PATCH] Fix bug where microphone error shows twice (#5668)

* fix bug where mic error shows twice

* Change files

* update
---
 ...ation-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json | 9 +++++++++
 ...ation-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json | 9 +++++++++
 .../calling-component-bindings/src/errorBarSelector.ts   | 8 ++++----
 .../src/notificationStackSelector.ts                     | 8 ++++----
 4 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 change-beta/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json
 create mode 100644 change/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json

diff --git a/change-beta/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json b/change-beta/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json
new file mode 100644
index 00000000000..648ca275672
--- /dev/null
+++ b/change-beta/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Fix bug where microphone error shows twice",
+  "comment": "Fix bug where microphone error shows twice",
+  "packageName": "@azure/communication-react",
+  "email": "96077406+carocao-msft@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json b/change/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json
new file mode 100644
index 00000000000..648ca275672
--- /dev/null
+++ b/change/@azure-communication-react-4ebc3bfc-2026-4ee9-8d9d-8c0d80bc05a4.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Fix bug where microphone error shows twice",
+  "comment": "Fix bug where microphone error shows twice",
+  "packageName": "@azure/communication-react",
+  "email": "96077406+carocao-msft@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/calling-component-bindings/src/errorBarSelector.ts b/packages/calling-component-bindings/src/errorBarSelector.ts
index 48231c3445a..5a7ebf27a3c 100644
--- a/packages/calling-component-bindings/src/errorBarSelector.ts
+++ b/packages/calling-component-bindings/src/errorBarSelector.ts
@@ -76,13 +76,13 @@ export const errorBarSelector: ErrorBarSelector = createSelector(
     if (deviceManager.deviceAccess?.audio === false && isSafari()) {
       activeErrorMessages.push({ type: 'callMicrophoneAccessDeniedSafari' });
     }
-    if (deviceManager.deviceAccess?.audio === false && !isSafari()) {
-      activeErrorMessages.push({ type: 'callMicrophoneAccessDenied' });
-    }
 
     if (diagnostics?.media.latest.microphonePermissionDenied?.value === true && isMacOS()) {
       activeErrorMessages.push({ type: 'callMacOsMicrophoneAccessDenied' });
-    } else if (diagnostics?.media.latest.microphonePermissionDenied?.value === true) {
+    } else if (
+      (deviceManager.deviceAccess?.audio === false && !isSafari()) ||
+      (diagnostics?.media.latest.microphonePermissionDenied?.value === true && !isMacOS())
+    ) {
       activeErrorMessages.push({ type: 'callMicrophoneAccessDenied' });
     }
 
diff --git a/packages/calling-component-bindings/src/notificationStackSelector.ts b/packages/calling-component-bindings/src/notificationStackSelector.ts
index 00c8ac93b3f..ca1e35824d9 100644
--- a/packages/calling-component-bindings/src/notificationStackSelector.ts
+++ b/packages/calling-component-bindings/src/notificationStackSelector.ts
@@ -109,13 +109,13 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
     if (deviceManager.deviceAccess?.audio === false && isSafari()) {
       activeErrorMessages.push({ type: 'callMicrophoneAccessDeniedSafari' });
     }
-    if (deviceManager.deviceAccess?.audio === false && !isSafari()) {
-      activeErrorMessages.push({ type: 'callMicrophoneAccessDenied' });
-    }
 
     if (diagnostics?.media.latest.microphonePermissionDenied?.value === true && isMacOS()) {
       activeErrorMessages.push({ type: 'callMacOsMicrophoneAccessDenied' });
-    } else if (diagnostics?.media.latest.microphonePermissionDenied?.value === true) {
+    } else if (
+      (deviceManager.deviceAccess?.audio === false && !isSafari()) ||
+      (diagnostics?.media.latest.microphonePermissionDenied?.value === true && !isMacOS())
+    ) {
       activeErrorMessages.push({ type: 'callMicrophoneAccessDenied' });
     }