From 72706fa55f30cb680aa33162468acd5edbe86c1f Mon Sep 17 00:00:00 2001 From: Mirlan Date: Tue, 2 Feb 2021 19:14:30 +0600 Subject: [PATCH] fix(763): send date start in msc timezone (#284) --- .../HeaderFilters/store/helpers/getMoscowDate/index.tsx | 6 ++++++ src/features/HeaderFilters/store/hooks/index.tsx | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/features/HeaderFilters/store/helpers/getMoscowDate/index.tsx diff --git a/src/features/HeaderFilters/store/helpers/getMoscowDate/index.tsx b/src/features/HeaderFilters/store/helpers/getMoscowDate/index.tsx new file mode 100644 index 00000000..a6bda60b --- /dev/null +++ b/src/features/HeaderFilters/store/helpers/getMoscowDate/index.tsx @@ -0,0 +1,6 @@ +import startOfDay from 'date-fns/startOfDay' + +export const getMoscowDate = (date: Date) => startOfDay(date).toLocaleString( + 'en-GB', + { timeZone: 'Europe/Moscow' }, +) diff --git a/src/features/HeaderFilters/store/hooks/index.tsx b/src/features/HeaderFilters/store/hooks/index.tsx index a376c423..e183474f 100644 --- a/src/features/HeaderFilters/store/hooks/index.tsx +++ b/src/features/HeaderFilters/store/hooks/index.tsx @@ -6,14 +6,12 @@ import { } from 'react' import { useLocation } from 'react-router-dom' -import format from 'date-fns/format' -import startOfDay from 'date-fns/startOfDay' - import { SportTypes } from 'config' import { useQueryParamStore } from 'hooks' import { filterKeys } from '../config' +import { getMoscowDate } from '../helpers/getMoscowDate' import { isValidDate } from '../helpers/isValidDate' import { isValidSportType } from '../helpers/isValidSportType' import { isValidMatchStatus } from '../helpers/isValidMatchStatus' @@ -24,8 +22,6 @@ export enum MatchStatuses { Soon = 1, } -const dateFormat = 'dd/MM/yyyy HH:mm:ss' - export const useFilters = () => { const { search } = useLocation() const [selectedDate, setSelectedDate] = useQueryParamStore({ @@ -90,7 +86,7 @@ export const useFilters = () => { const store = useMemo(() => ({ selectedDate, - selectedDateFormatted: format(startOfDay(selectedDate), dateFormat), + selectedDateFormatted: getMoscowDate(selectedDate), selectedMatchStatus, selectedSportTypeId, selectedTournamentId,