From 84c70cd2875c658f83573f9602ec373e71878468 Mon Sep 17 00:00:00 2001 From: MuslemRahimi Date: Thu, 16 Jan 2025 10:33:52 +0100 Subject: [PATCH] bugfixing formatDate --- src/lib/utils.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 0ae374dd..9898a4ab 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -748,7 +748,6 @@ export function abbreviateNumber(number, addDollarSign = false) { } } - export function formatDate(dateStr) { try { // Parse the input date string in New York timezone @@ -772,16 +771,18 @@ export function formatDate(dateStr) { const nyDateObj = parseDate(new Date(dateStr)); const nyCurrentObj = parseDate(new Date()); - + // Calculate the time difference in seconds const seconds = Math.floor((nyCurrentObj - nyDateObj) / 1000); - + // Define time intervals in seconds const intervals = [ { unit: 'year', seconds: 31536000 }, { unit: 'month', seconds: 2592000 }, { unit: 'week', seconds: 604800 }, - { unit: 'day', seconds: 86400 } + { unit: 'day', seconds: 86400 }, + { unit: 'hour', seconds: 3600 }, + { unit: 'minute', seconds: 60 }, ]; // Determine the appropriate time interval @@ -791,8 +792,7 @@ export function formatDate(dateStr) { return `${count} ${unit}${count === 1 ? '' : 's'} ago`; } } - - // If less than a day, return "Just now" + // If less than a minute return 'Just now'; } catch (error) { console.error('Error formatting date:', error); @@ -802,6 +802,7 @@ export function formatDate(dateStr) { + export const formatRuleValue = (rule) => { if (["interestIncome", "interestExpenses"].includes(rule.name)) { return `$${rule.value === 1000 ? `${rule.value / 1000} Bn` : `${rule.value} Mio`}`;