From 99daad3f3f16d4bea24ef0c41dfd17b6aa0a66b3 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 9 Sep 2021 16:15:05 -0500
Subject: [PATCH] Fix outbound ring cancelation in lobby

---
 ts/components/CallManager.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ts/components/CallManager.tsx b/ts/components/CallManager.tsx
index 5eb18bb9ec..b890ad35ad 100644
--- a/ts/components/CallManager.tsx
+++ b/ts/components/CallManager.tsx
@@ -382,10 +382,12 @@ export const CallManager: React.FC<PropsType> = props => {
     return noop;
   }, [shouldRing, playRingtone, stopRingtone]);
 
-  const hasActiveCall = Boolean(activeCall);
-  const isGroupCall = activeCall?.callMode === CallMode.Group;
+  const mightBeRingingOutgoingGroupCall =
+    activeCall?.callMode === CallMode.Group &&
+    activeCall.outgoingRing &&
+    activeCall.joinState !== GroupCallJoinState.NotJoined;
   useEffect(() => {
-    if (!hasActiveCall || !isGroupCall) {
+    if (!mightBeRingingOutgoingGroupCall) {
       return noop;
     }
 
@@ -395,7 +397,7 @@ export const CallManager: React.FC<PropsType> = props => {
     return () => {
       clearTimeout(timeout);
     };
-  }, [hasActiveCall, setOutgoingRing, isGroupCall]);
+  }, [mightBeRingingOutgoingGroupCall, setOutgoingRing]);
 
   if (activeCall) {
     // `props` should logically have an `activeCall` at this point, but TypeScript can't