mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix left pane draft display and GV2 typing indicators

Browse source
This commit is contained in:
Scott Nonnenberg 2020-11-03 16:16:20 -08:00 • committed by GitHub
parent ab89c6c704
commit 18c71b291c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ts/components/ConversationListItem.tsx
View file

@ -178,23 +178,14 @@ export class ConversationListItem extends React.PureComponent<Props> {
return null;
}
const messageBody = lastMessage ? lastMessage.text : '';
const withUnread = isNumber(unreadCount) && unreadCount > 0;
const showingDraft = shouldShowDraft && draftPreview;
const deletedForEveryone = Boolean(
lastMessage && lastMessage.deletedForEveryone
);
// Note: instead of re-using showingDraft here we explode it because
// typescript can't tell that draftPreview is truthy otherwise
// Avoiding touching logic to fix linting
/* eslint-disable no-nested-ternary */
const text =
shouldShowDraft && draftPreview
? draftPreview
: lastMessage && lastMessage.text
? lastMessage.text
: '';
return (
<div className="module-conversation-list-item__message">
<div
@ -218,16 +209,24 @@ export class ConversationListItem extends React.PureComponent<Props> {
) : (
<>
{showingDraft ? (
<span className="module-conversation-list-item__message__draft-prefix">
{i18n('ConversationListItem--draft-prefix')}
</span>
<>
<span className="module-conversation-list-item__message__draft-prefix">
{i18n('ConversationListItem--draft-prefix')}
</span>
<MessageBody
text={(draftPreview || '').split('\n')[0]}
disableJumbomoji
disableLinks
i18n={i18n}
/>
</>
) : deletedForEveryone ? (
<span className="module-conversation-list-item__message__deleted-for-everyone">
{i18n('message--deletedForEveryone')}
</span>
) : (
<MessageBody
text={text.split('\n')[0]}
text={(messageBody || '').split('\n')[0]}
disableJumbomoji
disableLinks
i18n={i18n}