From 22c9b98da1695d2e0c39fd801351f532d1e609f8 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Wed, 6 Nov 2024 11:40:59 +0100
Subject: [PATCH] bugfixing date

---
 src/routes/stocks/[tickerID]/+page.svelte | 28 +++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/routes/stocks/[tickerID]/+page.svelte b/src/routes/stocks/[tickerID]/+page.svelte
index 22e1a0ce..b915dd40 100644
--- a/src/routes/stocks/[tickerID]/+page.svelte
+++ b/src/routes/stocks/[tickerID]/+page.svelte
@@ -115,21 +115,31 @@
       }
 
       // Format date
-      const date = new Date(currentDataRow?.time);
+      const date = new Date(currentDataRow?.time * 1000);
+
       const options = {
         day: "2-digit",
-        month:
-          displayData === "1D" || displayData === "1W" || displayData === "1M"
-            ? "short"
-            : "numeric",
+        month: "short",
         year: "numeric",
         hour: "numeric",
         minute: "2-digit",
+        timeZone: "UTC",
       };
 
-      const formattedDate = !isNaN(date)
-        ? date.toLocaleString("en-US", options)
-        : convertTimestamp(data?.getStockQuote?.timestamp);
+      //const formattedDate = (displayData === '1D' || displayData === '1W' || displayData === '1M') ? date.toLocaleString('en-GB', options).replace(/\//g, '.') : date.toLocaleDateString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric' }).replace(/\//g, '.');
+      const formattedDate =
+        displayData === "1D" || displayData === "1W" || displayData === "1M"
+          ? date.toLocaleString("en-US", options)
+          : date.toLocaleDateString("en-US", {
+              day: "2-digit",
+              month: "short",
+              year: "numeric",
+            });
+
+      const safeFormattedDate =
+        formattedDate === "Invalid Date"
+          ? convertTimestamp(data?.getStockQuote?.timestamp)
+          : formattedDate;
 
       // Set display legend
       displayLegend = {
@@ -137,7 +147,7 @@
           currentDataRow?.value ??
           currentDataRow?.close ??
           data?.getStockQuote?.price,
-        date: formattedDate,
+        date: safeFormattedDate,
         change,
       };
     }