From 7311ae7dac5f20712459d8321bda87ab518d047e Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Tue, 1 Oct 2024 11:46:34 +0200
Subject: [PATCH] bugfixing

---
 src/routes/crypto/[tickerID]/+page.svelte |  8 +++-----
 src/routes/etf/[tickerID]/+page.svelte    | 13 +++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/routes/crypto/[tickerID]/+page.svelte b/src/routes/crypto/[tickerID]/+page.svelte
index 99b33284..f0e88397 100644
--- a/src/routes/crypto/[tickerID]/+page.svelte
+++ b/src/routes/crypto/[tickerID]/+page.svelte
@@ -50,8 +50,6 @@
             break;
           }
         }
-      } else if (displayData === "6M") {
-        currentDataRow = sixMonthPrice?.slice(-1)?.at(0);
       }
 
       //currentDataRow = oneWeekPrice.slice(-1)[0]
@@ -701,11 +699,11 @@ afterUpdate(async () => {
                                       
                                       <div class="text-2xl md:text-3xl font-bold text-white flex flex-row items-center w-full">
                                           {#if $isCrosshairMoveActive }
-                                          ${displayLegend?.close}
+                                          {displayLegend?.close}
                                           {:else if !$isCrosshairMoveActive && $realtimePrice !== null}
-                                          ${$realtimePrice}
+                                          {$realtimePrice}
                                           {:else}
-                                          ${displayLegend?.close}
+                                          {displayLegend?.close}
                                           
                                           {/if}
                                             
diff --git a/src/routes/etf/[tickerID]/+page.svelte b/src/routes/etf/[tickerID]/+page.svelte
index e8086f33..e07254c8 100644
--- a/src/routes/etf/[tickerID]/+page.svelte
+++ b/src/routes/etf/[tickerID]/+page.svelte
@@ -392,9 +392,6 @@ async function initializePrice() {
           }
         }
       }
-      else if (displayData === '6M') {
-        lastValue = sixMonthPrice?.slice(-1)?.at(0)?.close
-      }
       
 
       displayLastLogicalRangeValue = oneDayPrice?.length  === 0 && sixMonthPrice?.length !== 0 ? sixMonthPrice?.at(0)?.close : oneDayPrice?.at(0)?.close //previousClose;
@@ -674,7 +671,7 @@ async function initializePrice() {
   
         
         geographicList = data?.getCountryWeighting;
-        sectorList = data?.getETFProfile[0]?.sectorsList;
+        sectorList = data?.getETFProfile?.at(0)?.sectorsList;
         sectorList = sectorList?.sort(function(a,b) {
           return b?.exposure - a?.exposure;
         })
@@ -816,11 +813,11 @@ async function exportData() {
                                       
                                       <div class="text-2xl md:text-3xl font-bold text-white flex flex-row items-center w-full">
                                           {#if $isCrosshairMoveActive }
-                                          {$etfTicker?.includes('.DE') || $etfTicker?.includes('.F') ? `${displayLegend?.close}€` : ` $${displayLegend?.close}`}
+                                          {displayLegend?.close}
                                           {:else if !$isCrosshairMoveActive && $realtimePrice !== null}
-                                          {$etfTicker?.includes('.DE') || $etfTicker?.includes('.F') ? `${$realtimePrice}€` : ` $${$realtimePrice}`}
+                                          {$realtimePrice}
                                           {:else}
-                                          {$etfTicker?.includes('.DE') || $etfTicker?.includes('.F') ? `${displayLegend?.close}€` : ` $${displayLegend?.close}`}
+                                          {displayLegend?.close}
                                           
                                           {/if}
                                             
@@ -857,7 +854,7 @@ async function exportData() {
                                       <div class="ml-auto flex flex-col justify-end items-end ">
                                         <div class="flex flex-row items-center justify-end">
                                         <span class="text-white text-2xl font-bold">
-                                          ${prePostData?.price}
+                                          {prePostData?.price}
                                         </span>
                                         {#if prePostData?.changesPercentage >= 0}
                                         <span class="ml-1 items-center justify-start text-[#37C97D] font-medium text-xs sm:text-sm">({prePostData?.changesPercentage}%)</span>