From 7341f42f862b9da83886c02918cf7a407347ab3b Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Wed, 26 Feb 2025 16:41:45 +0100
Subject: [PATCH] ui fix

---
 src/lib/utils.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 2902e9e7..647eff59 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -163,14 +163,16 @@ export const groupEarnings = (earnings) => {
   return Object?.entries(
     earnings
       ?.reduce((acc, item) => {
-        const dateKey = new Intl.DateTimeFormat('en-US', {
+        const date = new Date(item?.date);
+        const berlinDate = new Intl.DateTimeFormat('en-US', {
           day: '2-digit',
           month: 'short',
           year: 'numeric',
-        }).format(new Date(item?.date));
+          timeZone: 'Europe/Berlin'
+        }).format(date);
 
-        if (!acc[dateKey]) acc[dateKey] = [];
-        acc[dateKey]?.push(item);
+        if (!acc[berlinDate]) acc[berlinDate] = [];
+        acc[berlinDate]?.push(item);
         return acc;
       }, {})
   )
@@ -180,9 +182,13 @@ export const groupEarnings = (earnings) => {
       date,
       // Sort earnings within the date by time
       earnings?.sort((a, b) => {
-        const timeA = new Date(`1970-01-01T${a?.time}`);
-        const timeB = new Date(`1970-01-01T${b?.time}`);
-        return timeB - timeA;
+        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;
       })
     ]);
 };