From 1783645108b8bff48b6b3782b189f7cbe9913f17 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Mon, 9 May 2022 10:22:45 -0400
Subject: [PATCH] Avoid flashing the 'join conference' button at the user in
 video rooms (#22120)

---
 src/vector/jitsi/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
index fc3f78e20e1..f9cab16099f 100644
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -241,7 +241,9 @@ function switchVisibleContainers() {
 
 function toggleConferenceVisibility(inConference: boolean) {
     document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';
-    document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset';
+    // Video rooms have a separate UI for joining, so they should never show our join button
+    document.getElementById("joinButtonContainer").style.visibility =
+        (inConference || isVideoChannel) ? 'hidden' : 'unset';
 }
 
 function skipToJitsiSplashScreen() {