diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 5a42ac94..6ce58233 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -655,15 +655,16 @@ export function abbreviateNumber(number, addDollarSign = false, color = false) { let suffix = suffixes[index]; - if (color) { - if (suffix === "K") { - suffix = 'K'; - } else if (suffix === "M") { - suffix = 'M'; - } else if (suffix === "B") { - suffix = 'B'; - } - } +if (color) { + if (suffix === "K") { + suffix = 'K'; + } else if (suffix === "M") { + suffix = 'M'; + } else if (suffix === "B") { + suffix = 'B'; + } +} + const formattedNumber = abbreviation + suffix; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 4e34018a..aa4dea28 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -727,7 +727,7 @@ {:else} {/if} @@ -793,7 +793,7 @@ {:else} {/if} diff --git a/src/routes/dividends-calendar/+page.svelte b/src/routes/dividends-calendar/+page.svelte index 28989ca6..edb15379 100644 --- a/src/routes/dividends-calendar/+page.svelte +++ b/src/routes/dividends-calendar/+page.svelte @@ -9,7 +9,7 @@ } from "date-fns"; import { screenWidth, numberOfUnreadNotification } from "$lib/store"; import { abbreviateNumber } from "$lib/utils"; - import ArrowLogo from "lucide-svelte/icons/move-up-right"; + import Infobox from "$lib/components/Infobox.svelte"; import TableHeader from "$lib/components/Table/TableHeader.svelte"; import HoverStockChart from "$lib/components/HoverStockChart.svelte"; @@ -348,7 +348,7 @@
-
+

Dividends Calendar @@ -478,16 +478,14 @@ {#each day as item} - + {item?.name.length > 20 ? item?.name.slice(0, 20) + "..." @@ -495,31 +493,35 @@ - {item?.marketCap !== null - ? abbreviateNumber(item?.marketCap) - : "-"} + {@html item?.marketCap !== null + ? abbreviateNumber( + item?.marketCap, + false, + true, + ) + : "n/a"} {item?.revenue !== null ? abbreviateNumber(item?.revenue) - : "-"} + : "n/a"} {item?.adjDividend !== null ? item?.adjDividend?.toFixed(3) - : "-"} + : "n/a"} {item?.paymentDate !== null ? new Date(item?.paymentDate)?.toLocaleString( @@ -531,7 +533,7 @@ daySuffix: "2-digit", }, ) - : "-"} + : "n/a"} {/each} @@ -539,19 +541,8 @@

{:else} -
- - No Dividends available for the day. +
+
{/if} {/if} @@ -559,67 +550,6 @@
- - diff --git a/src/routes/earnings-calendar/+page.svelte b/src/routes/earnings-calendar/+page.svelte index 65ea2b2f..385c8c64 100644 --- a/src/routes/earnings-calendar/+page.svelte +++ b/src/routes/earnings-calendar/+page.svelte @@ -478,16 +478,16 @@ {#each day as item, index} {item?.name.length > 20 ? item?.name?.slice(0, 20) + "..." @@ -495,23 +495,31 @@ - {item?.marketCap !== null - ? abbreviateNumber(item?.marketCap) - : "-"} + {@html item?.marketCap !== null + ? abbreviateNumber( + item?.marketCap, + false, + true, + ) + : "n/a"}
- {item?.revenueEst !== null - ? abbreviateNumber(item?.revenueEst) - : "-"} + {@html item?.revenueEst !== null + ? abbreviateNumber( + item?.revenueEst, + false, + true, + ) + : "n/a"} {#if item?.revenueEst !== null && item?.revenueEst !== null} {#if item?.revenueEst / item?.revenuePrior - 1 >= 0} @@ -538,7 +546,7 @@
{item?.epsEst !== null ? item?.epsEst?.toFixed(2) - : "-"} + : "n/a"} {#if item?.epsEst !== null && item?.epsPrior !== null && item?.epsPrior !== 0} {#if item?.epsEst / item?.epsPrior - 1 >= 0} @@ -569,7 +577,7 @@ {#if item?.release === "amc"} {:else} - - + n/a {/if}