ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Left Search: Delete terminated comma for all user without status (#4015)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-12-04 14:38:46 +01:00
parent 9ee146f083
commit 65b7fd3e38
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/GroupChatInfo.tsx
View File

@ -170,7 +170,7 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
return ( return (
<span className="status"> <span className="status">
{mainUsername && <span className="handle">{mainUsername}</span>} {mainUsername && <span className="handle withStatus">{mainUsername}</span>}
<span className="group-status">{groupStatus}</span> <span className="group-status">{groupStatus}</span>
{onlineStatus && <span className="online-status">{onlineStatus}</span>} {onlineStatus && <span className="online-status">{onlineStatus}</span>}
</span> </span>

6
src/components/common/PrivateChatInfo.tsx
View File

@ -142,10 +142,12 @@ const PrivateChatInfo: FC<OwnProps & StateProps> = ({
return <TypingStatus typingStatus={typingStatus} />; return <TypingStatus typingStatus={typingStatus} />;
} }
const translatedStatus = getUserStatus(lang, user, userStatus);
const mainUserNameClassName = buildClassName('handle', translatedStatus && 'withStatus');
return ( return (
<span className={buildClassName('status', isUserOnline(user, userStatus) && 'online')}> <span className={buildClassName('status', isUserOnline(user, userStatus) && 'online')}>
{mainUsername && <span className="handle">{mainUsername}</span>} {mainUsername && <span className={mainUserNameClassName}>{mainUsername}</span>}
<span className="user-status" dir="auto">{getUserStatus(lang, user, userStatus)}</span> {translatedStatus && <span className="user-status" dir="auto">{translatedStatus}</span>}
</span> </span>
); );
} }

2
src/components/left/search/LeftSearch.scss
View File

@ -133,7 +133,7 @@
} }
} }
&::after { &.withStatus::after {
content: ", "; content: ", ";
color: var(--color-text-secondary); color: var(--color-text-secondary);