From 7b70c45aafb74303cf265e5859890b08787168a6 Mon Sep 17 00:00:00 2001 From: MuslemRahimi Date: Wed, 26 Feb 2025 16:36:41 +0100 Subject: [PATCH] bugfixing --- src/lib/utils.ts | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/lib/utils.ts b/src/lib/utils.ts index b8612d56..2902e9e7 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -163,16 +163,14 @@ export const groupEarnings = (earnings) => { return Object?.entries( earnings ?.reduce((acc, item) => { - const date = new Date(item?.date); - const berlinDate = new Intl.DateTimeFormat('en-US', { + const dateKey = new Intl.DateTimeFormat('en-US', { day: '2-digit', month: 'short', year: 'numeric', - timeZone: 'Europe/Berlin' - }).format(date); + }).format(new Date(item?.date)); - if (!acc[berlinDate]) acc[berlinDate] = []; - acc[berlinDate]?.push(item); + if (!acc[dateKey]) acc[dateKey] = []; + acc[dateKey]?.push(item); return acc; }, {}) ) @@ -182,13 +180,9 @@ export const groupEarnings = (earnings) => { date, // Sort earnings within the date by time earnings?.sort((a, b) => { - const berlinTimeA = new Date( - new Date(`${item.date}T${a?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' }) - ); - const berlinTimeB = new Date( - new Date(`${item.date}T${b?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' }) - ); - return berlinTimeB - berlinTimeA; + const timeA = new Date(`1970-01-01T${a?.time}`); + const timeB = new Date(`1970-01-01T${b?.time}`); + return timeB - timeA; }) ]); };