fix: no confirm modal on direct-link before connection is made

Eyevinn · Dec 16, 2024 · 271cb3a · 271cb3a
1 parent 3a47bb0
commit 271cb3a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/src/components/calls-page/calls-page.tsx b/src/components/calls-page/calls-page.tsx
@@ -74,21 +74,29 @@ export const CallsPage = () => {
   const runExitAllCalls = async () => {
     setProductionId(null);
     navigate("/");
-    Object.entries(calls).forEach(([callId]) => {
-      if (callId) {
-        dispatch({
-          type: "REMOVE_CALL",
-          payload: { id: callId },
-        });
-      }
-    });
+    if (!isEmpty) {
+      Object.entries(calls).forEach(([callId]) => {
+        if (callId) {
+          dispatch({
+            type: "REMOVE_CALL",
+            payload: { id: callId },
+          });
+        }
+      });
+    }
   };
 
   return (
     <Container>
       <ButtonWrapper>
         <NavigateToRootButton
-          resetOnExitRequest={() => setConfirmExitModalOpen(true)}
+          resetOnExitRequest={() => {
+            if (isEmpty) {
+              runExitAllCalls();
+            } else {
+              setConfirmExitModalOpen(true);
+            }
+          }}
         />
         {confirmExitModalOpen && (
           <Modal onClose={() => setConfirmExitModalOpen(false)}>

diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -35,23 +35,28 @@ export const Header: FC = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const { playExitSound } = useAudioCue();
+  const isEmpty = Object.values(calls).length === 0;
 
   const runExitAllCalls = () => {
     setConfirmExitModalOpen(false);
     navigate("/");
     playExitSound();
-    Object.entries(calls).forEach(([callId]) => {
-      if (callId) {
-        dispatch({
-          type: "REMOVE_CALL",
-          payload: { id: callId },
-        });
-      }
-    });
+    if (!isEmpty) {
+      Object.entries(calls).forEach(([callId]) => {
+        if (callId) {
+          dispatch({
+            type: "REMOVE_CALL",
+            payload: { id: callId },
+          });
+        }
+      });
+    }
   };
 
   const returnToRoot = () => {
-    if (location.pathname.includes("/line")) {
+    if (location.pathname.includes("/line") && isEmpty) {
+      runExitAllCalls();
+    } else if (location.pathname.includes("/line")) {
       setConfirmExitModalOpen(true);
     } else {
       navigate("/");