enh: shorten date string if same day

Signed-off-by: Christopher Ng <chrng8@gmail.com>

diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts
index 41b252a3910b4ae65f9a2f1af7da0d07ae250419..358ca09aa25abaa6512109e85f66aaa6adf9c330 100644 (file)
--- a/apps/files_reminders/src/shared/utils.ts
+++ b/apps/files_reminders/src/shared/utils.ts
@@ -89,17 +89,24 @@ export const getDateTime = (dateTime: DateTimePreset): Date => {
 }
 
 export const getDateString = (dueDate: Date): string => {
-       let localeOptions: Intl.DateTimeFormatOptions = {
-               weekday: 'short',
+       let formatOptions: Intl.DateTimeFormatOptions = {
                hour: 'numeric',
                minute: '2-digit',
        }
 
-       const today = moment()
        const dueDateMoment = moment(dueDate)
+       const today = moment()
+
+       if (!dueDateMoment.isSame(today, 'date')) {
+               formatOptions = {
+                       ...formatOptions,
+                       weekday: 'short',
+               }
+       }
+
        if (!dueDateMoment.isSame(today, 'week')) {
-               localeOptions = {
-                       ...localeOptions,
+               formatOptions = {
+                       ...formatOptions,
                        month: 'short',
                        day: 'numeric',
                }
@@ -107,7 +114,7 @@ export const getDateString = (dueDate: Date): string => {
 
        return dueDate.toLocaleString(
                getCanonicalLocale(),
-               localeOptions,
+               formatOptions,
        )
 }