Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
59 changed files with 411 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import * as expirationTimer from '../../util/expirationTimer';
import { missingCaseError } from '../../util/missingCaseError';
import { isInSystemContacts } from '../../util/isInSystemContacts';
import { isConversationMuted } from '../../util/isConversationMuted';
import { DurationInSeconds } from '../../util/durations';
import {
useStartCallShortcuts,
useKeyboardShortcuts,
@@ -79,7 +80,7 @@ export type PropsDataType = {
export type PropsActionsType = {
onSetMuteNotifications: (seconds: number) => void;
onSetDisappearingMessages: (seconds: number) => void;
onSetDisappearingMessages: (seconds: DurationInSeconds) => void;
onDeleteMessages: () => void;
onSearchInConversation: () => void;
onOutgoingAudioCallInConversation: () => void;
@@ -406,8 +407,8 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
const expireDurations: ReadonlyArray<ReactNode> = [
...expirationTimer.DEFAULT_DURATIONS_IN_SECONDS,
-1,
].map((seconds: number) => {
DurationInSeconds.fromSeconds(-1),
].map(seconds => {
let text: string;
if (seconds === -1) {