From b1279e8d4dbd08aa5617331841f851078fc2be9d Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Wed, 27 Nov 2019 14:53:07 +0700 Subject: [PATCH] fixed getPrettyDate for closest dates --- src/utils/dom.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/dom.ts b/src/utils/dom.ts index 941c18d1..cc866b6b 100644 --- a/src/utils/dom.ts +++ b/src/utils/dom.ts @@ -2,6 +2,7 @@ import { IFile, ValueOf } from '~/redux/types'; import formatDistanceToNow from 'date-fns/formatDistanceToNow'; import isAfter from 'date-fns/isAfter'; import differenceInMonths from 'date-fns/differenceInMonths'; +import differenceInMinutes from 'date-fns/differenceInMinutes'; import ru from 'date-fns/locale/ru'; import Axios from 'axios'; import { PRESETS } from '~/constants/urls'; @@ -128,7 +129,8 @@ export const getPrettyDate = (date: string): string => { return format(new Date(date), 'd MMMM yyyy', { locale: ru }); } - return isAfter(new Date(date), new Date()) + return isAfter(new Date(date), new Date()) || + differenceInMinutes(new Date(), new Date(date)) <= 30 ? 'Только что' : formatDistanceToNow(new Date(date), { locale: ru,