ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Passkey: Fix date format (#6844)

Browse Source
This commit is contained in:
zubiden 2026-04-14 14:36:36 +02:00 committed by Alexander Zinchuk
parent dd86466db2
commit 8f5108cac0
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/left/settings/SettingsPasskeys.tsx
View File

@ -9,7 +9,8 @@ import type { ApiPasskey } from '../../../api/types';
import { IS_WEBAUTHN_SUPPORTED } from '../../../util/browser/windowEnvironment';
import buildClassName from '../../../util/buildClassName';
import { formatPastDatetime } from '../../../util/dates/oldDateFormat';
import { type LangFn } from '../../../util/localization';
import { formatDateTime, getCalendarDayDiff, secondsToDate } from '../../../util/localization/dateFormat';
import { getNextArrowReplacement } from '../../../util/localization/format';
import { LOCAL_TGS_PREVIEW_URLS, LOCAL_TGS_URLS } from '../../common/helpers/animatedAssets';
import { REM } from '../../common/helpers/mediaDimensions';
@ -110,12 +111,12 @@ const SettingsPasskeys = ({
)}
>
<div className="multiline-item full-size" dir="auto">
<span className="date">{formatPastDatetime(lang, date)}</span>
<span className="date">{formatDate(lang, secondsToDate(date))}</span>
<span className="title">{name || lang('SettingsPasskeyFallbackTitle')}</span>
{Boolean(lastUsageDate) && (
<span className="subtitle">
{lang('SettingsPasskeyUsedAt', {
date: formatPastDatetime(lang, lastUsageDate),
date: formatDate(lang, secondsToDate(lastUsageDate)),
})}
</span>
)}
@ -176,6 +177,17 @@ const SettingsPasskeys = ({
);
};
function formatDate(
lang: LangFn, date: Date,
) {
const anchorDate = new Date();
const calendarDayDiff = getCalendarDayDiff(date, anchorDate);
if (Math.abs(calendarDayDiff) > 28) {
return formatDateTime(lang, date);
}
return formatDateTime(lang, date, { relative: 'auto' });
}
export default memo(withGlobal<OwnProps>(
(global): Complete<StateProps> => {
return {

20
src/util/localization/dateFormat.ts
View File

@ -28,7 +28,6 @@ export interface FormatDateTimeOptions {
anchorDate?: Date;
includeYear?: boolean;
includeDay?: boolean;
maxRelativeDays?: number;
}
export interface FormatMessageListDateOptions {
@ -51,9 +50,7 @@ export function resetDateFormatCache() {
export function formatDateTime(lang: LangFn, date: Date, options: FormatDateTimeOptions = {}) {
if (options.relative) {
const relative = formatRelativeDateTime(
lang, date, options.anchorDate, options.relative, {
maxRelativeDays: options.maxRelativeDays,
});
lang, date, options.anchorDate, options.relative);
if (relative) {
return relative;
}
@ -118,24 +115,18 @@ function formatRelativeDateTime(
targetDate: Date,
anchorDate: Date = new Date(),
type: RelativeType = 'numeric',
options?: Pick<FormatDateTimeOptions, 'maxRelativeDays'>,
) {
if (type === 'auto' && Math.abs(targetDate.getTime() - anchorDate.getTime()) < 60 * 1000) {
return lang('RightNow');
}
const { maxRelativeDays } = options || {};
const relativePart = getRelativePart(targetDate.getTime(), anchorDate.getTime(), maxRelativeDays);
if (!relativePart) {
return undefined;
}
const relativePart = getRelativePart(targetDate.getTime(), anchorDate.getTime());
const cacheKey = [
'formatRelativeDateTime',
lang.code,
type,
targetDate.getTime() - anchorDate.getTime(),
maxRelativeDays,
relativePart.unit,
relativePart.value,
].join(':');
@ -193,12 +184,9 @@ function buildAbsoluteFormatterOptions(lang: LangFn, options: FormatDateTimeOpti
return formatterOptions;
}
function getRelativePart(targetTime: number, anchorTime: number, maxRelativeDays?: number): RelativePart | undefined {
function getRelativePart(targetTime: number, anchorTime: number): RelativePart {
const diffInSeconds = Math.trunc((targetTime - anchorTime) / 1000);
const absDiffInSeconds = Math.abs(diffInSeconds);
if (maxRelativeDays && absDiffInSeconds >= maxRelativeDays * DAY_IN_SECONDS) {
return undefined;
}
if (absDiffInSeconds < 60 * 60) {
return { unit: 'minute' as const, value: Math.trunc(diffInSeconds / 60) };
@ -280,7 +268,7 @@ export function secondsToDate(seconds: number) {
return new Date(seconds * 1000);
}
function getCalendarDayDiff(targetDate: Date, anchorDate: Date) {
export function getCalendarDayDiff(targetDate: Date, anchorDate: Date) {
return Math.trunc(
(
Date.UTC(targetDate.getFullYear(), targetDate.getMonth(), targetDate.getDate())