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

Use DurationInSeconds for expireTimer

Browse source
This commit is contained in:
Fedor Indutny 2022-11-16 12:18:02 -08:00 • committed by GitHub
parent cf57c7aaf0
commit 6be69a7ba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 411 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/components/conversation/MessageDetail.tsx
View file

@ -24,6 +24,7 @@ import { SendStatus } from '../../messages/MessageSendState';
import { WidthBreakpoint } from '../_util';
import * as log from '../../logging/log';
import { formatDateTimeLong } from '../../util/timestamp';
import { DurationInSeconds } from '../../util/durations';
import { format as formatRelativeTime } from '../../util/expirationTimer';
export type Contact = Pick<
@ -302,7 +303,7 @@ export class MessageDetail extends React.Component<Props> {
} = this.props;
const timeRemaining = expirationTimestamp
? expirationTimestamp - Date.now()
? DurationInSeconds.fromMillis(expirationTimestamp - Date.now())
: undefined;
return (
@ -422,7 +423,7 @@ export class MessageDetail extends React.Component<Props> {
{i18n('MessageDetail--disappears-in')}
</td>
<td>
{formatRelativeTime(i18n, timeRemaining / 1000, {
{formatRelativeTime(i18n, timeRemaining, {
largest: 2,
})}
</td>