Show expiration timer for incoming messages even if unread
This commit is contained in:
parent
c1682a98cc
commit
f572abf57d
3 changed files with 4 additions and 7 deletions
ts/components/conversation
|
@ -390,7 +390,7 @@ story.add('Will expire but still sending', () => {
|
|||
const props = createProps({
|
||||
status: 'sending',
|
||||
expirationLength: 30 * 1000,
|
||||
text: 'For outgoing messages, we show timer immediately. Incoming, we wait until expirationStartTimestamp is present.',
|
||||
text: 'We always show the timer if a message has an expiration length, even if unread or still sending.',
|
||||
});
|
||||
|
||||
return renderBothDirections(props);
|
||||
|
|
|
@ -599,14 +599,11 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
* because it can reduce layout jumpiness.
|
||||
*/
|
||||
private guessMetadataWidth(): number {
|
||||
const { direction, expirationLength, expirationTimestamp, status } =
|
||||
this.props;
|
||||
const { direction, expirationLength, status } = this.props;
|
||||
|
||||
let result = GUESS_METADATA_WIDTH_TIMESTAMP_SIZE;
|
||||
|
||||
const hasExpireTimer = Boolean(
|
||||
expirationLength && (expirationTimestamp || direction === 'outgoing')
|
||||
);
|
||||
const hasExpireTimer = Boolean(expirationLength);
|
||||
if (hasExpireTimer) {
|
||||
result += GUESS_METADATA_WIDTH_EXPIRE_TIMER_SIZE;
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ export const MessageMetadata = ({
|
|||
const children = (
|
||||
<>
|
||||
{timestampNode}
|
||||
{expirationLength && (expirationTimestamp || direction === 'outgoing') ? (
|
||||
{expirationLength ? (
|
||||
<ExpireTimer
|
||||
direction={metadataDirection}
|
||||
deletedForEveryone={deletedForEveryone}
|
||||
|
|
Loading…
Add table
Reference in a new issue