From d5b8e17b7c0e67be2e6e3b9b18a8b7ae5d5e8a9f Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Wed, 28 Aug 2024 15:53:20 +0200
Subject: [PATCH] [MM-60291] Fix rendering of live captions (#8185) (#8187)

* Load jobs state from call state

* Fix rendering of live captions overlay

(cherry picked from commit 13ca3461556c2677edef7182c8e393b060a8489d)

Co-authored-by: Claudio Costa <cstcld91@gmail.com>
---
 app/products/calls/components/captions.tsx                | 6 +++++-
 app/products/calls/connection/websocket_event_handlers.ts | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/products/calls/components/captions.tsx b/app/products/calls/components/captions.tsx
index 47bffee4197..dff6410d0b3 100644
--- a/app/products/calls/components/captions.tsx
+++ b/app/products/calls/components/captions.tsx
@@ -21,11 +21,15 @@ const styles = StyleSheet.create({
     captionContainer: {
         display: 'flex',
         height: 400,
-        bottom: -352, // 48-400, to place the bottoms at the same place
+        bottom: 400 - 48, // to place the bottoms at the same place
         gap: 8,
         alignItems: 'center',
         flexDirection: 'column-reverse',
         overflow: 'hidden',
+
+        // needed so that events (e.g., long press on participants)
+        // still work when the captions overlay is rendered on top
+        pointerEvents: 'none',
     },
     caption: {
         paddingTop: 1,
diff --git a/app/products/calls/connection/websocket_event_handlers.ts b/app/products/calls/connection/websocket_event_handlers.ts
index 9a0693ddac5..5c1c9aac003 100644
--- a/app/products/calls/connection/websocket_event_handlers.ts
+++ b/app/products/calls/connection/websocket_event_handlers.ts
@@ -250,5 +250,13 @@ export const handleCallState = (serverUrl: string, msg: WebSocketMessage<CallSta
     const call = createCallAndAddToIds(msg.data.channel_id, callState);
 
     setCallForChannel(serverUrl, msg.data.channel_id, call);
+
+    if (callState.recording) {
+        setRecordingState(serverUrl, msg.data.channel_id, callState.recording);
+    }
+
+    if (callState.live_captions) {
+        setCaptioningState(serverUrl, msg.data.channel_id, callState.live_captions);
+    }
 };