From 1a821961f30d58ccf44266e3197bdf5a48054bbe Mon Sep 17 00:00:00 2001
From: Gigiaj <gigiaboone@yahoo.com>
Date: Sun, 25 May 2025 22:01:57 -0500
Subject: [PATCH] Fix for cases where you're viewing a lobby and hang up your
 existing call and try to join lobby (was not rendering for the correct room
 id, but was joining the correct call prior)

---
 src/app/pages/client/call/CallProvider.tsx | 26 +++++-----------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index 19bf71bf..f2fddc43 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -313,10 +313,6 @@ export function CallProvider({ children }: CallProviderProps) {
       };
       activeClientWidgetApi?.transport.reply(ev.detail, {});
 
-      if (ev.detail.widgetId === activeClientWidgetApi?.widget.id) {
-        setIsCallActive(true);
-        return;
-      }
       if (activeClientWidgetApi) {
         if (isCallActive && viewedClientWidgetApi && viewedCallRoomId) {
           activeClientWidgetApi?.removeAllListeners();
@@ -328,6 +324,10 @@ export function CallProvider({ children }: CallProviderProps) {
         } else {
           setIsCallActive(true);
         }
+      } else if (viewedCallRoomId !== viewedRoomId) {
+        setViewedCallRoomId(viewedRoomId);
+        setActiveCallRoomIdState(viewedCallRoomId);
+        setIsCallActive(true);
       } else {
         setViewedAsActive();
       }
@@ -347,23 +347,7 @@ export function CallProvider({ children }: CallProviderProps) {
     viewedClientWidgetApi?.on(`action:${WIDGET_TILE_UPDATE}`, handleOnTileLayout);
     viewedClientWidgetApi?.on(`action:${WIDGET_ON_SCREEN_ACTION}`, handleOnScreenStateUpdate);
     viewedClientWidgetApi?.on(`action:${WIDGET_HANGUP_ACTION}`, handleHangup);
-  }, [
-    activeClientWidgetApi,
-    activeCallRoomId,
-    activeClientWidgetApiRoomId,
-    hangUp,
-    isChatOpen,
-    isAudioEnabled,
-    isVideoEnabled,
-    isCallActive,
-    viewedRoomId,
-    viewedClientWidgetApi,
-    isPrimaryIframe,
-    viewedCallRoomId,
-    setViewedClientWidgetApi,
-    setActiveClientWidgetApi,
-    viewedClientWidget,
-  ]);
+  }, [activeClientWidgetApi, activeCallRoomId, activeClientWidgetApiRoomId, hangUp, isChatOpen, isAudioEnabled, isVideoEnabled, isCallActive, viewedRoomId, viewedClientWidgetApi, isPrimaryIframe, viewedCallRoomId, setViewedClientWidgetApi, setActiveClientWidgetApi, viewedClientWidget, setViewedCallRoomId]);
 
   const sendWidgetAction = useCallback(
     async <T = unknown,>(action: WidgetApiToWidgetAction | string, data: T): Promise<void> => {