From 8f7829ea90ab8b716466369e6cf7d2f4a8e330d1 Mon Sep 17 00:00:00 2001
From: Christopher Ng <chrng8@gmail.com>
Date: Wed, 14 Feb 2024 17:05:38 -0800
Subject: [PATCH] fix(files_reminders): Add year to date string if not in the
 same year

Signed-off-by: Christopher Ng <chrng8@gmail.com>
---
 apps/files_reminders/src/shared/utils.ts | 43 +++++++++++++++++-------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts
index 86182ba5106..07142888e51 100644
--- a/apps/files_reminders/src/shared/utils.ts
+++ b/apps/files_reminders/src/shared/utils.ts
@@ -120,19 +120,36 @@ export const getDateString = (dueDate: Date): string => {
 		}
 	}
 
-	return dueDate.toLocaleString(
-		getCanonicalLocale(),
-		formatOptions,
-	)
-}
-
-export const getVerboseDateString = (dueDate: Date): string => {
-	const formatOptions: Intl.DateTimeFormatOptions = {
-		weekday: 'long',
-		hour: 'numeric',
-		minute: '2-digit',
-		month: 'long',
-		day: 'numeric',
+	if (!dueDateMoment.isSame(today, 'year')) {
+		formatOptions = {
+			...formatOptions,
+			year: 'numeric',
+		}
+	}
+
+	return dueDate.toLocaleString(
+		getCanonicalLocale(),
+		formatOptions,
+	)
+}
+
+export const getVerboseDateString = (dueDate: Date): string => {
+	let formatOptions: Intl.DateTimeFormatOptions = {
+		month: 'long',
+		day: 'numeric',
+		weekday: 'long',
+		hour: 'numeric',
+		minute: '2-digit',
+	}
+
+	const dueDateMoment = moment(dueDate)
+	const today = moment()
+
+	if (!dueDateMoment.isSame(today, 'year')) {
+		formatOptions = {
+			...formatOptions,
+			year: 'numeric',
+		}
 	}
 
 	return dueDate.toLocaleString(