diff --git a/src/lib/components/Sidecard.svelte b/src/lib/components/Sidecard.svelte index 78eeb51a..1941d686 100644 --- a/src/lib/components/Sidecard.svelte +++ b/src/lib/components/Sidecard.svelte @@ -20,6 +20,7 @@ let numOfAnalyst = 0; let consensusRating = "n/a"; let changesPercentage = 0; + let ipoDate = "n/a"; let showFullText = false; @@ -87,7 +88,16 @@ $: { if ($stockTicker && typeof window !== "undefined") { - info = data?.getStockDeck?.at(0); + info = data?.getStockDeck; + ipoDate = + info?.ipoDate !== null + ? new Date(info?.ipoDate)?.toLocaleString("en-US", { + month: "short", + day: "numeric", + year: "numeric", + daySuffix: "2-digit", + }) + : "n/a"; //ceoName = info?.ceoName?.length !== 0 ? getAbbreviatedName(info?.ceoName) : "-"; sector = info?.sector ?? "-"; @@ -175,7 +185,7 @@
IPO Date - Jan 22, 1999 + {ipoDate}
Employees diff --git a/src/routes/stocks/[tickerID]/+layout.server.ts b/src/routes/stocks/[tickerID]/+layout.server.ts index 32211be8..04a442ac 100644 --- a/src/routes/stocks/[tickerID]/+layout.server.ts +++ b/src/routes/stocks/[tickerID]/+layout.server.ts @@ -93,6 +93,6 @@ export const load = async ({ params, locals }) => { getDividendAnnouncement, getNews, getUserWatchlist, - companyName: cleanString(getStockDeck?.at(0)?.companyName), + companyName: cleanString(getStockDeck?.companyName), }; }; diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte index 5badc813..e78acc2a 100644 --- a/src/routes/stocks/[tickerID]/+layout.svelte +++ b/src/routes/stocks/[tickerID]/+layout.svelte @@ -60,8 +60,6 @@ let displaySection = ""; - let stockDeck; - function shareContent(url) { if (navigator.share) { navigator @@ -294,7 +292,6 @@ function handleTypeOfTrade(state:string) typeof window !== "undefined" ) { // add a check to see if running on client-side - stockDeck = data?.getStockDeck; $currentPortfolioPrice = data?.getStockQuote?.price; } @@ -730,7 +727,7 @@ function handleTypeOfTrade(state:string) : ''}" >
diff --git a/src/routes/stocks/[tickerID]/+page.svelte b/src/routes/stocks/[tickerID]/+page.svelte index 491f48ae..8d9eb934 100644 --- a/src/routes/stocks/[tickerID]/+page.svelte +++ b/src/routes/stocks/[tickerID]/+page.svelte @@ -76,20 +76,11 @@ if (!$isCrosshairMoveActive && $realtimePrice !== null) { change = (($realtimePrice / previousClose - 1) * 100)?.toFixed(2); } else { - change = - displayData === "1D" - ? ( - ((currentDataRow?.close ?? currentDataRow?.value) / - previousClose - - 1) * - 100 - )?.toFixed(2) - : ( - ((currentDataRow?.close ?? currentDataRow?.value) / - displayLastLogicalRangeValue - - 1) * - 100 - )?.toFixed(2); + change = ( + ((currentDataRow?.close ?? currentDataRow?.value) / previousClose - + 1) * + 100 + )?.toFixed(2); } const date = new Date(currentDataRow?.time * 1000); @@ -104,24 +95,14 @@ }; //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 formattedDate = date?.toLocaleString("en-US", options); const safeFormattedDate = formattedDate === "Invalid Date" ? convertTimestamp(data?.getStockQuote?.timestamp) : formattedDate; displayLegend = { - close: - currentDataRow?.value === "-" && currentDataRow?.close === undefined - ? data?.getStockQuote?.price - : (currentDataRow?.close ?? currentDataRow?.value), + close: data?.getStockQuote?.price?.toFixed(2), date: safeFormattedDate, change: change, }; @@ -481,7 +462,6 @@ case 3: // TickMarkType.Time: formatOptions.hour12 = true; // Use 12-hour clock formatOptions.hour = "numeric"; // Use numeric hour without leading zero - formatOptions.minute = "2-digit"; // Always show minutes with leading zero break; case 4: // TickMarkType.TimeWithSeconds: formatOptions.hour12 = true; // Use 12-hour clock @@ -1011,16 +991,18 @@ -
+
{#if dataMapping[displayData]?.length === 0}
-
+
-
+
No {displayData} chart data available
@@ -1039,7 +1021,7 @@