Merge branch 'main' into carocao/A11y

Azure · Feb 11, 2025 · 671aa00 · 671aa00
2 parents ef9de30 + 78eef1f
commit 671aa00
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/change-beta/@azure-communication-react-6ebb0895-7f83-4c53-bb1b-a3dfaa10a46f.json b/change-beta/@azure-communication-react-6ebb0895-7f83-4c53-bb1b-a3dfaa10a46f.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Breakout rooms",
+  "comment": "Fix bug where chat thread is stuck on spinner when immediately returning to main meeting from breakout room",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-6ebb0895-7f83-4c53-bb1b-a3dfaa10a46f.json b/change/@azure-communication-react-6ebb0895-7f83-4c53-bb1b-a3dfaa10a46f.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Breakout rooms",
+  "comment": "Fix bug where chat thread is stuck on spinner when immediately returning to main meeting from breakout room",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/...tes/src/composites/CallWithChatComposite/adapter/AzureCommunicationCallWithChatAdapter.ts b/...tes/src/composites/CallWithChatComposite/adapter/AzureCommunicationCallWithChatAdapter.ts
@@ -206,7 +206,7 @@ export class AzureCommunicationCallWithChatAdapter implements CallWithChatAdapte
         if (!eventData.data || eventData.data.state === 'closed') {
           if (
             this.originCallChatAdapter &&
-            this.originCallChatAdapter?.getState().thread.threadId !== this.chatAdapter?.getState().thread.threadId
+            this.originCallChatAdapter?.getState().thread.threadId !== this.context.getState().chat?.threadId
           ) {
             this.updateChatAdapter(this.originCallChatAdapter);
           }
@@ -222,8 +222,9 @@ export class AzureCommunicationCallWithChatAdapter implements CallWithChatAdapte
         this.chatAdapter?.offStateChange(this.onChatStateChange);
         // Unassign chat adapter
         this.chatAdapter = undefined;
-        // Set chat state to undefined to prevent showing chat thread of origin call
+        // Set chat state to undefined to ensure that the chat thread of the breakout room is not shown
         this.context.unsetChatState();
+        // Update chat state to the origin call chat adapter
         if (this.originCallChatAdapter) {
           this.updateChatAdapter(this.originCallChatAdapter);
         }