Show (you) suffix only for current session (#560)

mattermost · Nov 10, 2023 · a200fc6 · a200fc6
1 parent bd08b79
commit a200fc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/webapp/src/components/call_widget/component.tsx b/webapp/src/components/call_widget/component.tsx
@@ -956,7 +956,7 @@ export default class CallWidget extends React.PureComponent<Props, State> {
                             style={{padding: '0', lineHeight: '20px', fontSize: '14px'}}
                         >
                             {getUserDisplayName(profile)}
-                            {session.user_id === this.props.currentUserID &&
+                            {session.session_id === this.props.currentSession?.session_id &&
                                 <span
                                     style={{
                                         color: 'rgba(var(--center-channel-color-rgb), 0.56)',

diff --git a/webapp/src/components/expanded_view/component.tsx b/webapp/src/components/expanded_view/component.tsx
@@ -804,7 +804,7 @@ export default class ExpandedView extends React.PureComponent<Props, State> {
             return (
                 <CallParticipant
                     key={session.session_id}
-                    name={`${getUserDisplayName(profile)} ${profile.id === this.props.currentUserID ? formatMessage({defaultMessage: '(you)'}) : ''}`}
+                    name={`${getUserDisplayName(profile)} ${session.session_id === this.props.currentSession?.session_id ? formatMessage({defaultMessage: '(you)'}) : ''}`}
                     pictureURL={Client4.getProfilePictureUrl(profile.id, profile.last_picture_update)}
                     isMuted={isMuted}
                     isSpeaking={isSpeaking}
@@ -844,7 +844,7 @@ export default class ExpandedView extends React.PureComponent<Props, State> {
                     />
 
                     <span style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
-                        {getUserDisplayName(profile)} {profile.id === this.props.currentUserID && formatMessage({defaultMessage: '(you)'})}
+                        {getUserDisplayName(profile)} {session.session_id === this.props.currentSession?.session_id && formatMessage({defaultMessage: '(you)'})}
                     </span>
 
                     <div