From 657a140dbe91e85791cf17d80e8bbe1faa595f5a Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:07:45 +0100 Subject: [PATCH] Fix units of global.safetyNumberAci --- ts/state/selectors/items.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/state/selectors/items.ts b/ts/state/selectors/items.ts index c33a9b467..843862703 100644 --- a/ts/state/selectors/items.ts +++ b/ts/state/selectors/items.ts @@ -18,7 +18,7 @@ import type { AciString } from '../../types/ServiceId'; import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors'; import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji'; import { isBeta } from '../../util/version'; -import { DurationInSeconds } from '../../util/durations'; +import { DurationInSeconds, SECOND } from '../../util/durations'; import { generateUsernameLink } from '../../util/sgnlHref'; import * as Bytes from '../../Bytes'; import { getUserNumber, getUserACI } from './user'; @@ -188,14 +188,14 @@ export const getSafetyNumberMode = createSelector( return SafetyNumberMode.JustE164; } - const timestamp = remoteConfig['global.safetyNumberAci']?.value; - if (typeof timestamp !== 'number') { + const timestampInSeconds = remoteConfig['global.safetyNumberAci']?.value; + if (typeof timestampInSeconds !== 'number') { return SafetyNumberMode.DefaultE164AndThenACI; } // Note: serverTimeSkew is a difference between server time and local time, // so we have to add local time to it to correct it for a skew. - return now + serverTimeSkew >= timestamp + return now + serverTimeSkew >= timestampInSeconds * SECOND ? SafetyNumberMode.DefaultACIAndMaybeE164 : SafetyNumberMode.DefaultE164AndThenACI; }