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

When showing draft in left pane, don't show last message status

Browse source
This commit is contained in:
Scott Nonnenberg 2019-10-09 06:25:40 -07:00
parent c81c25bb85
commit 2e2c5ebf9a
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/components/ConversationListItem.tsx
View file

@ -149,6 +149,11 @@ export class ConversationListItem extends React.PureComponent<Props> {
if (!lastMessage && !typingContact) { if (!lastMessage && !typingContact) {
return null; return null;
} }
const showingDraft = shouldShowDraft && draftPreview;
// Note: instead of re-using showingDraft here we explode it because
// typescript can't tell that draftPreview is truthy otherwise
const text = const text =
shouldShowDraft && draftPreview shouldShowDraft && draftPreview
? draftPreview ? draftPreview
@ -170,7 +175,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
<TypingAnimation i18n={i18n} /> <TypingAnimation i18n={i18n} />
) : ( ) : (
<> <>
{shouldShowDraft ? ( {showingDraft ? (
<span className="module-conversation-list-item__message__draft-prefix"> <span className="module-conversation-list-item__message__draft-prefix">
{i18n('ConversationListItem--draft-prefix')} {i18n('ConversationListItem--draft-prefix')}
</span> </span>
@ -184,7 +189,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
</> </>
)} )}
</div> </div>
{lastMessage && lastMessage.status ? ( {!showingDraft && lastMessage && lastMessage.status ? (
<div <div
className={classNames( className={classNames(
'module-conversation-list-item__message__status-icon', 'module-conversation-list-item__message__status-icon',