From 63f8cdab353dbed02d15b18d83419a642edc7c14 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 6 Jul 2021 08:24:36 -0400
Subject: [PATCH] MM-32802 don't display nickname for current user in
 autocomplete (#5492)

---
 .../at_mention_item/at_mention_item.tsx       | 28 +++----------------
 assets/base/i18n/en.json                      |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/app/components/autocomplete/at_mention_item/at_mention_item.tsx b/app/components/autocomplete/at_mention_item/at_mention_item.tsx
index 56aee2b39..3d8a11e22 100644
--- a/app/components/autocomplete/at_mention_item/at_mention_item.tsx
+++ b/app/components/autocomplete/at_mention_item/at_mention_item.tsx
@@ -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;
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index df427376c..0cd22db76 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -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",