Merge branch 'main' into dmceachernmsft/long-name-screenshare-mobile

Azure · Feb 28, 2025 · be96db5 · be96db5
2 parents 6dda8e8 + 893b40f
commit be96db5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
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
@@ -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": "[email protected]",
+  "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
@@ -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": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git 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
@@ -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' });
     }