diff --git a/src/components/common/PrivateChatInfo.tsx b/src/components/common/PrivateChatInfo.tsx index f24282dfc..9ac496334 100644 --- a/src/components/common/PrivateChatInfo.tsx +++ b/src/components/common/PrivateChatInfo.tsx @@ -150,7 +150,7 @@ const PrivateChatInfo: FC = ({ const translatedStatus = getUserStatus(lang, user, userStatus); const mainUserNameClassName = buildClassName('handle', translatedStatus && 'withStatus'); return ( - + {mainUsername && {mainUsername}} {translatedStatus && {translatedStatus}} diff --git a/src/global/helpers/users.ts b/src/global/helpers/users.ts index d91baed77..8a6bc85e2 100644 --- a/src/global/helpers/users.ts +++ b/src/global/helpers/users.ts @@ -163,7 +163,7 @@ export function getUserStatus( } } -export function isUserOnline(user: ApiUser, userStatus?: ApiUserStatus) { +export function isUserOnline(user: ApiUser, userStatus?: ApiUserStatus, withSelfOnline = false) { const { id, type } = user; if (!userStatus) { @@ -174,7 +174,7 @@ export function isUserOnline(user: ApiUser, userStatus?: ApiUserStatus) { return false; } - if (user.isSelf) { + if (user.isSelf && !withSelfOnline) { return false; }