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 = ({ phoneNumber, isSelf, } = user || {}; - const { - id: chatId, - username: chatUsername, - } = chat || {}; + const { id: chatId } = chat || {}; const lang = useLang(); useEffect(() => { @@ -81,8 +78,6 @@ const ChatExtra: FC = ({ 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 = ({ {lang('Phone')} )} - {printedUsername && ( + {username && ( copy(`@${printedUsername}`, lang('Username'))} + onClick={() => copy(`@${username}`, lang('Username'))} > - {renderText(printedUsername)} + {renderText(username)} {lang('Username')} )} @@ -118,10 +113,10 @@ const ChatExtra: FC = ({ {lang(userId ? 'UserBio' : 'Info')} )} - {canInviteUsers && !printedUsername && !!link.length && ( + {(canInviteUsers || !username) && !!link.length && ( copy(link, lang('SetUrlPlaceholder'))}>
- +
{lang('SetUrlPlaceholder')}
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(