From a0ac6350c7df96a5eff77dcd60ff5baf4f0869c7 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 10 Jan 2025 15:39:28 +0100
Subject: [PATCH] ui fix

---
 src/routes/market-flow/+page.svelte           | 20 +++++++++++++++----
 .../market-flow/sector-flow/+page.svelte      | 20 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/routes/market-flow/+page.svelte b/src/routes/market-flow/+page.svelte
index a9773104..9b8d1e30 100644
--- a/src/routes/market-flow/+page.svelte
+++ b/src/routes/market-flow/+page.svelte
@@ -46,6 +46,18 @@
   let originalTopTickers = [...topSectorTickers[selectedSector]];
   let displayTopTickers = topSectorTickers[selectedSector];
 
+  function findLastNonNull(dataArray, key) {
+    for (let i = dataArray.length - 1; i >= 0; i--) {
+      if (
+        dataArray[i]?.net_call_premium !== null &&
+        dataArray[i]?.net_call_premium !== undefined
+      ) {
+        return dataArray[i][key];
+      }
+    }
+    return null; // Return null if no non-null value is found.
+  }
+
   function formatDate(dateStr) {
     // Parse the input date string
     var date = new Date(dateStr);
@@ -568,7 +580,7 @@
                     <div
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
-                      {formatDate(marketTideData?.at(-1)?.timestamp)}
+                      {formatDate(findLastNonNull(marketTideData, "timestamp"))}
                     </div>
                   </div>
                 </div>
@@ -580,7 +592,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_volume,
+                        findLastNonNull(marketTideData, "net_volume"),
                         false,
                         true,
                       )}
@@ -596,7 +608,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_call_premium,
+                        findLastNonNull(marketTideData, "net_call_premium"),
                         false,
                         true,
                       )}
@@ -612,7 +624,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_put_premium,
+                        findLastNonNull(marketTideData, "net_put_premium"),
                         false,
                         true,
                       )}
diff --git a/src/routes/market-flow/sector-flow/+page.svelte b/src/routes/market-flow/sector-flow/+page.svelte
index e12cb854..f8a38362 100644
--- a/src/routes/market-flow/sector-flow/+page.svelte
+++ b/src/routes/market-flow/sector-flow/+page.svelte
@@ -59,6 +59,18 @@
   let originalTopTickers = [...topSectorTickers[selectedSector]];
   let displayTopTickers = topSectorTickers[selectedSector];
 
+  function findLastNonNull(dataArray, key) {
+    for (let i = dataArray.length - 1; i >= 0; i--) {
+      if (
+        dataArray[i]?.net_call_premium !== null &&
+        dataArray[i]?.net_call_premium !== undefined
+      ) {
+        return dataArray[i][key];
+      }
+    }
+    return null; // Return null if no non-null value is found.
+  }
+
   function formatDate(dateStr) {
     // Parse the input date string
     var date = new Date(dateStr);
@@ -626,7 +638,7 @@
                     <div
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
-                      {formatDate(marketTideData?.at(-1)?.timestamp)}
+                      {formatDate(findLastNonNull(marketTideData, "timestamp"))}
                     </div>
                   </div>
                 </div>
@@ -638,7 +650,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_volume,
+                        findLastNonNull(marketTideData, "net_volume"),
                         false,
                         true,
                       )}
@@ -654,7 +666,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_call_premium,
+                        findLastNonNull(marketTideData, "net_call_premium"),
                         false,
                         true,
                       )}
@@ -670,7 +682,7 @@
                       class="mt-1 break-words font-semibold leading-8 text-white text-sm sm:text-[1rem]"
                     >
                       {@html abbreviateNumberWithColor(
-                        marketTideData?.at(-1)?.net_put_premium,
+                        findLastNonNull(marketTideData, "net_put_premium"),
                         false,
                         true,
                       )}