From 43b075a75990fd65ef95d3a306366c7148a516c7 Mon Sep 17 00:00:00 2001
From: sylenien <nikita@openreplay.com>
Date: Mon, 10 Oct 2022 15:28:59 +0200
Subject: [PATCH] change(tracker): review update

---
 .../player/MessageDistributor/managers/AssistManager.ts    | 4 +++-
 tracker/tracker-assist/src/Assist.ts                       | 4 ++--
 tracker/tracker-assist/src/CallWindow.ts                   | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
index 3d3d4236c..06e8adb30 100644
--- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
@@ -205,7 +205,9 @@ export default class AssistManager {
         }
       })
       socket.on('videofeed', ({ streamId, enabled }) => {
-        this.videoStreams[streamId].enabled = enabled
+        if (this.videoStreams[streamId]) {
+          this.videoStreams[streamId].enabled = enabled
+        }
       })
       socket.on('SESSION_DISCONNECTED', e => {
         waitingForMessages = true
diff --git a/tracker/tracker-assist/src/Assist.ts b/tracker/tracker-assist/src/Assist.ts
index 8de908603..f794f59d3 100644
--- a/tracker/tracker-assist/src/Assist.ts
+++ b/tracker/tracker-assist/src/Assist.ts
@@ -249,7 +249,7 @@ export default class Assist {
       updateCallerNames()
     })
     socket.on('videofeed', ({ streamId, enabled, }) => {
-      callUI?.changeVideoFeed({ streamId, enabled, })
+      callUI?.toggleVideoStream({ streamId, enabled, })
     })
 
     const callingAgents: Map<string, string> = new Map() // !! uses socket.io ID
@@ -383,7 +383,7 @@ export default class Assist {
         // UI
         if (!callUI) {
           callUI = new CallWindow(app.debug.error, this.options.callUITemplate)
-          callUI.setVideoCallback(updateVideoFeed)
+          callUI.setVideoToggleCallback(updateVideoFeed)
         }
         callUI.showControls(initiateCallEnd)
 
diff --git a/tracker/tracker-assist/src/CallWindow.ts b/tracker/tracker-assist/src/CallWindow.ts
index 50a782e8d..9adc7a5ae 100644
--- a/tracker/tracker-assist/src/CallWindow.ts
+++ b/tracker/tracker-assist/src/CallWindow.ts
@@ -146,8 +146,7 @@ export default class CallWindow {
 					let enabled = false
 					this.checkRemoteVideoInterval = setInterval(() => {
 						const settings = this.remoteVideo?.getSettings()
-						const isDummyVideoTrack =
-							!!settings && !this.remoteVideo.enabled && (settings.width === 2 || settings.frameRate === 0)
+						const isDummyVideoTrack = !this.remoteVideo.enabled || (!!settings && (settings.width === 2 || settings.frameRate === 0))
 						const shouldBeEnabled = !isDummyVideoTrack
 						if (enabled !== shouldBeEnabled) {
 							this.toggleRemoteVideoUI((enabled = shouldBeEnabled))
@@ -303,7 +302,7 @@ export default class CallWindow {
 		this.adjustIframeSize()
 	}
 
-	public setVideoCallback(cb) {
+	public setVideoToggleCallback(cb) {
 		this.onToggleVideo = cb
 	}
 
@@ -321,7 +320,7 @@ export default class CallWindow {
 		this.localStreams = []
 	}
 
-	changeVideoFeed({ streamId, enabled, }: { streamId: string, enabled: boolean}) {
+	toggleVideoStream({ streamId, enabled, }: { streamId: string, enabled: boolean}) {
 		if (this.remoteVideo.id === streamId) {
 			this.remoteVideo.enabled = enabled
 		}