forked from Ivasoft/mattermost-mobile
MM-32802 don't display nickname for current user in autocomplete (#5492)
This commit is contained in:
@@ -66,23 +66,9 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
|
||||
};
|
||||
});
|
||||
|
||||
const AtMentionItem = (props: AtMentionItemProps) => {
|
||||
const AtMentionItem = ({firstName = '', isBot, isCurrentUser, isGuest, isShared, lastName = '', nickname = '',
|
||||
onPress, showFullName, testID, theme, userId, username}: AtMentionItemProps) => {
|
||||
const insets = useSafeAreaInsets();
|
||||
const {
|
||||
firstName,
|
||||
isBot,
|
||||
isCurrentUser,
|
||||
isGuest,
|
||||
isShared,
|
||||
lastName,
|
||||
nickname,
|
||||
onPress,
|
||||
showFullName,
|
||||
testID,
|
||||
theme,
|
||||
userId,
|
||||
username,
|
||||
} = props;
|
||||
|
||||
const completeMention = () => {
|
||||
onPress(username);
|
||||
@@ -96,7 +82,7 @@ const AtMentionItem = (props: AtMentionItemProps) => {
|
||||
name += `${firstName} ${lastName} `;
|
||||
}
|
||||
|
||||
if (hasNickname) {
|
||||
if (hasNickname && !isCurrentUser) {
|
||||
name += name.length > 0 ? `(${nickname})` : nickname;
|
||||
}
|
||||
|
||||
@@ -152,7 +138,7 @@ const AtMentionItem = (props: AtMentionItemProps) => {
|
||||
{isCurrentUser &&
|
||||
<FormattedText
|
||||
id='suggestion.mention.you'
|
||||
defaultMessage='(you)'
|
||||
defaultMessage=' (you)'
|
||||
/>}
|
||||
{` @${username}`}
|
||||
</Text>
|
||||
@@ -174,10 +160,4 @@ const AtMentionItem = (props: AtMentionItemProps) => {
|
||||
);
|
||||
};
|
||||
|
||||
AtMentionItem.defaultProps = {
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
nickname: '',
|
||||
};
|
||||
|
||||
export default AtMentionItem;
|
||||
|
||||
@@ -664,7 +664,7 @@
|
||||
"suggestion.mention.morechannels": "Other Channels",
|
||||
"suggestion.mention.nonmembers": "Not in Channel",
|
||||
"suggestion.mention.special": "Special Mentions",
|
||||
"suggestion.mention.you": "(you)",
|
||||
"suggestion.mention.you": " (you)",
|
||||
"suggestion.search.direct": "Direct Messages",
|
||||
"suggestion.search.private": "Private Channels",
|
||||
"suggestion.search.public": "Public Channels",
|
||||
|
||||
Reference in New Issue
Block a user