diff --git a/_locales/en/messages.json b/_locales/en/messages.json index eb6301a56c0e..77a72ee89e35 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2190,15 +2190,5 @@ "Reactions--error": { "message": "Failed to send reaction. Please try again.", "description": "Shown when a reaction fails to send" - }, - "ContactName--you": { - "message": "$name$ (you)", - "descriptions": "Indicates that a name represents the current user", - "placeholders": { - "name": { - "content": "$1", - "example": "Captain Jack Sparrow" - } - } } } diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx index c2ea4fcbfeb1..1a88c146ccae 100644 --- a/ts/components/conversation/ContactName.tsx +++ b/ts/components/conversation/ContactName.tsx @@ -1,21 +1,17 @@ import React from 'react'; import { Emojify } from './Emojify'; -import { Intl } from '../Intl'; -import { LocalizerType } from '../../types/Util'; interface Props { phoneNumber?: string; name?: string; profileName?: string; module?: string; - isMe?: boolean; - i18n?: LocalizerType; } export class ContactName extends React.Component { public render() { - const { phoneNumber, name, profileName, module, isMe, i18n } = this.props; + const { phoneNumber, name, profileName, module } = this.props; const prefix = module ? module : 'module-contact-name'; const title = name ? name : phoneNumber; @@ -26,21 +22,11 @@ export class ContactName extends React.Component { ) : null; - const fragment = ( - <> + return ( + {shouldShowProfile ? ' ' : null} {profileElement} - - ); - - return ( - - {isMe ? ( - - ) : ( - fragment - )} ); } diff --git a/ts/components/conversation/ReactionViewer.tsx b/ts/components/conversation/ReactionViewer.tsx index 4a377f7e3676..eaed7e5e8acb 100644 --- a/ts/components/conversation/ReactionViewer.tsx +++ b/ts/components/conversation/ReactionViewer.tsx @@ -143,11 +143,9 @@ export const ReactionViewer = React.forwardRef( ))}