mirror of
https://github.com/fluxerapp/fluxer
synced 2026-10-18 05:25:40 +09:00
fix(app): keep the edited marker on attachment-only messages (#1741)
This commit is contained in:
1 parent
ae8e32d809
commit
569abf57b7
1 file changed
+38
@@ -770,8 +770,46 @@ export const UserMessage = observer(() => {
|
|||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
|
{(message.editedTimestamp || message.isEditing) &&
|
||||||
|
(message.isEditing ? (
|
||||||
|
<span className={styles.editedLabel} data-flx="channel.user-message.edited-label--3">
|
||||||
|
{' '}
|
||||||
|
{i18n._(EDITED_DESCRIPTOR)}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<TimestampWithTooltip
|
||||||
|
date={message.editedTimestamp!}
|
||||||
|
className={styles.editedTimestamp}
|
||||||
|
data-flx="channel.user-message.edited-timestamp--2"
|
||||||
|
>
|
||||||
|
<span className={styles.editedLabel} data-flx="channel.user-message.edited-label--4">
|
||||||
|
{' '}
|
||||||
|
{i18n._(EDITED_DESCRIPTOR)}
|
||||||
|
</span>
|
||||||
|
</TimestampWithTooltip>
|
||||||
|
))}
|
||||||
</AuthorHeading>
|
</AuthorHeading>
|
||||||
)}
|
)}
|
||||||
|
{((!message.content && !isEditing) || (shouldHideContent && !isEditing)) &&
|
||||||
|
shouldGroup &&
|
||||||
|
(message.editedTimestamp || message.isEditing) &&
|
||||||
|
(message.isEditing ? (
|
||||||
|
<span className={styles.editedLabel} data-flx="channel.user-message.edited-label--5">
|
||||||
|
{' '}
|
||||||
|
{i18n._(EDITED_DESCRIPTOR)}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<TimestampWithTooltip
|
||||||
|
date={message.editedTimestamp!}
|
||||||
|
className={styles.editedTimestamp}
|
||||||
|
data-flx="channel.user-message.edited-timestamp--3"
|
||||||
|
>
|
||||||
|
<span className={styles.editedLabel} data-flx="channel.user-message.edited-label--6">
|
||||||
|
{' '}
|
||||||
|
{i18n._(EDITED_DESCRIPTOR)}
|
||||||
|
</span>
|
||||||
|
</TimestampWithTooltip>
|
||||||
|
))}
|
||||||
<MessageAttachments data-flx="channel.user-message.message-attachments--3" />
|
<MessageAttachments data-flx="channel.user-message.message-attachments--3" />
|
||||||
{renderFailedFooter()}
|
{renderFailedFooter()}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in new issue
Block a user