From f62cb7a0c7ba8e73907db446f82e9cf824ad968f Mon Sep 17 00:00:00 2001
From: pangrr <pangrr89@gmail.com>
Date: Thu, 28 Apr 2022 18:25:45 -0400
Subject: [PATCH] Fix(multi-stream)  fix an issue where avatar shows up
 occasionally.

* fix occasional unexpected avatar

* fix ss stats popover not shown

* fix linter issue
---
 .../components/web/ConnectionIndicatorIcon.js         |  4 ++--
 .../components/web/FakeScreenShareParticipant.js      | 11 +++++++++--
 react/features/filmstrip/components/web/Thumbnail.js  |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js b/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
index 40ed4cab8..0e6a82487 100644
--- a/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
+++ b/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
@@ -54,8 +54,8 @@ export const ConnectionIndicatorIcon = ({
     const dispatch = useDispatch();
     const sourceName = track?.jitsiTrack?.getSourceName();
 
-    const handleTrackStreamingStatusChanged = streamingStatus => {
-        dispatch(trackStreamingStatusChanged(track.jitsiTrack, streamingStatus));
+    const handleTrackStreamingStatusChanged = (jitsiTrack, streamingStatus) => {
+        dispatch(trackStreamingStatusChanged(jitsiTrack, streamingStatus));
     };
 
     // TODO: replace this with a custom hook to be reused where track streaming status is needed.
diff --git a/react/features/filmstrip/components/web/FakeScreenShareParticipant.js b/react/features/filmstrip/components/web/FakeScreenShareParticipant.js
index b51561920..90451912b 100644
--- a/react/features/filmstrip/components/web/FakeScreenShareParticipant.js
+++ b/react/features/filmstrip/components/web/FakeScreenShareParticipant.js
@@ -77,6 +77,11 @@ type Props = {
      */
     styles: Object,
 
+    /**
+     * The type of thumbnail.
+     */
+    thumbnailType: string,
+
     /**
      * JitsiTrack instance.
      */
@@ -97,7 +102,8 @@ const FakeScreenShareParticipant = ({
     onTouchStart,
     participantId,
     styles,
-    videoTrack
+    videoTrack,
+    thumbnailType
 }: Props) => {
     const currentLayout = useSelector(getCurrentLayout);
     const videoTrackId = videoTrack?.jitsiTrack?.getId();
@@ -137,7 +143,8 @@ const FakeScreenShareParticipant = ({
                     currentLayout = { currentLayout }
                     isFakeScreenShareParticipant = { true }
                     isHovered = { isHovered }
-                    participantId = { participantId } />
+                    participantId = { participantId }
+                    thumbnailType = { thumbnailType } />
             </div>
             <div
                 className = { clsx(classes.indicatorsContainer,
diff --git a/react/features/filmstrip/components/web/Thumbnail.js b/react/features/filmstrip/components/web/Thumbnail.js
index 2521ad645..90563e859 100644
--- a/react/features/filmstrip/components/web/Thumbnail.js
+++ b/react/features/filmstrip/components/web/Thumbnail.js
@@ -1125,7 +1125,7 @@ class Thumbnail extends Component<Props, State> {
 
         if (_isFakeScreenShareParticipant) {
             const { isHovered } = this.state;
-            const { _videoTrack, _isMobile, classes } = this.props;
+            const { _videoTrack, _isMobile, classes, _thumbnailType } = this.props;
 
             return (
                 <FakeScreenShareParticipant
@@ -1142,6 +1142,7 @@ class Thumbnail extends Component<Props, State> {
                     onTouchStart = { this._onTouchStart }
                     participantId = { _participant.id }
                     styles = { this._getStyles() }
+                    thumbnailType = { _thumbnailType }
                     videoTrack = { _videoTrack } />
             );
         }