From 4d97ac396ebbd8efc40e2d82e96739f797520244 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Wed, 14 Jul 2021 19:57:50 +0300
Subject: [PATCH] Profile: Channel link should be displayed instead of username
 (#1272)

---
 src/components/right/ChatExtra.tsx | 17 ++++++-----------
 src/modules/helpers/chats.ts       |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/components/right/ChatExtra.tsx b/src/components/right/ChatExtra.tsx
index 13dba7c0b..44c2389df 100644
--- a/src/components/right/ChatExtra.tsx
+++ b/src/components/right/ChatExtra.tsx
@@ -54,10 +54,7 @@ const ChatExtra: FC<OwnProps & StateProps & DispatchProps> = ({
     phoneNumber,
     isSelf,
   } = user || {};
-  const {
-    id: chatId,
-    username: chatUsername,
-  } = chat || {};
+  const { id: chatId } = chat || {};
   const lang = useLang();
 
   useEffect(() => {
@@ -81,8 +78,6 @@ const ChatExtra: FC<OwnProps & StateProps & DispatchProps> = ({
 
   const formattedNumber = phoneNumber && formatPhoneNumberWithCode(phoneNumber);
   const link = getChatLink(chat);
-  const url = link.indexOf('http') === 0 ? link : `http://${link}`;
-  const printedUsername = username || chatUsername;
   const description = (fullInfo && fullInfo.bio) || getChatDescription(chat);
 
   return (
@@ -93,15 +88,15 @@ const ChatExtra: FC<OwnProps & StateProps & DispatchProps> = ({
           <span className="subtitle">{lang('Phone')}</span>
         </ListItem>
       )}
-      {printedUsername && (
+      {username && (
         <ListItem
           icon="mention"
           multiline
           narrow
           ripple
-          onClick={() => copy(`@${printedUsername}`, lang('Username'))}
+          onClick={() => copy(`@${username}`, lang('Username'))}
         >
-          <span className="title" dir="auto">{renderText(printedUsername)}</span>
+          <span className="title" dir="auto">{renderText(username)}</span>
           <span className="subtitle">{lang('Username')}</span>
         </ListItem>
       )}
@@ -118,10 +113,10 @@ const ChatExtra: FC<OwnProps & StateProps & DispatchProps> = ({
           <span className="subtitle">{lang(userId ? 'UserBio' : 'Info')}</span>
         </ListItem>
       )}
-      {canInviteUsers && !printedUsername && !!link.length && (
+      {(canInviteUsers || !username) && !!link.length && (
         <ListItem icon="mention" multiline narrow ripple onClick={() => copy(link, lang('SetUrlPlaceholder'))}>
           <div className="title">
-            <SafeLink url={url} className="title" text={link} />
+            <SafeLink url={link} className="title" text={link} />
           </div>
           <span className="subtitle">{lang('SetUrlPlaceholder')}</span>
         </ListItem>
diff --git a/src/modules/helpers/chats.ts b/src/modules/helpers/chats.ts
index 67f40c8f9..6b7a9e2fd 100644
--- a/src/modules/helpers/chats.ts
+++ b/src/modules/helpers/chats.ts
@@ -84,7 +84,7 @@ export function getChatLink(chat: ApiChat) {
     return inviteLink;
   }
 
-  return username ? `t.me/${username}` : '';
+  return username ? `https://t.me/${username}` : '';
 }
 
 export function getChatAvatarHash(