jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show expiration timer for incoming messages even if unread

This commit is contained in:
Scott Nonnenberg 2022-04-14 11:06:37 -07:00 committed by GitHub
parent c1682a98cc
commit f572abf57d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/components/conversation/Message.stories.tsx
View File

@ -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);

7
ts/components/conversation/Message.tsx
View File

@ -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;
}

2
ts/components/conversation/MessageMetadata.tsx
View File

@ -126,7 +126,7 @@ export const MessageMetadata = ({
const children = (
<>
{timestampNode}
{expirationLength && (expirationTimestamp || direction === 'outgoing') ? (
{expirationLength ? (
<ExpireTimer
direction={metadataDirection}
deletedForEveryone={deletedForEveryone}