feat: Update loading screen decyrption message [WPB-18629] (#19556)

Author: thisisamir98

src/i18n/de-DE.json

@@ -1096,7 +1096,12 @@
   "index.welcome": "Willkommen bei {brandName}!",
   "initDecryption": "Entschlüssele Events",
   "initEvents": "Nachrichten werden geladen",
-  "initProgress": "Loading messages from the last {time}",
+  "initProgressDaysPlural": "Lade Nachrichten der letzten {time} Tage",
+  "initProgressDaysSingular": "Lade Nachrichten des letzten {time} Tages",
+  "initProgressHoursPlural": "Lade Nachrichten der letzten {time} Stunden",
+  "initProgressHoursSingular": "Lade Nachrichten der letzten {time} Stunde",
+  "initProgressMinutesPlural": "Lade Nachrichten der letzten {time} Minuten",
+  "initProgressMinutesSingular": "Lade Nachrichten der letzten {time} Minute",
   "initReceivedSelfUser": "Hallo, {user}.",
   "initReceivedUserData": "Suche nach neuen Nachrichten",
   "initUpdatedFromNotifications": "Fast fertig - viel Erfolg mit {brandName}",

src/i18n/en-US.json

@@ -1096,7 +1096,12 @@
   "index.welcome": "Welcome to {brandName}!",
   "initDecryption": "Decrypting messages",
   "initEvents": "Loading messages",
-  "initProgress": "Loading messages from the last {time}",
+  "initProgressDaysPlural": "Loading messages from the last {time} days",
+  "initProgressDaysSingular": "Loading messages from the last {time} day",
+  "initProgressHoursPlural": "Loading messages from the last {time} hours",
+  "initProgressHoursSingular": "Loading messages from the last {time} hour",
+  "initProgressMinutesPlural": "Loading messages from the last {time} minutes",
+  "initProgressMinutesSingular": "Loading messages from the last {time} minute",
   "initReceivedSelfUser": "Hello, {user}.",
   "initReceivedUserData": "Checking for new messages",
   "initUpdatedFromNotifications": "Almost done - Enjoy {brandName}",

src/script/main/app.ts

@@ -563,7 +563,7 @@ export class App {
            * even when app is already loaded and in the main screen view
            */
           const message = this.config.FEATURE.SHOW_LOADING_INFORMATION
-            ? ` ${t('initProgress', {time: formatCoarseDuration(durationFrom(currentProcessingNotificationTimestamp))})}`
+            ? formatCoarseDuration(durationFrom(currentProcessingNotificationTimestamp))
             : '';
 
           totalNotifications++;

src/script/util/DebugUtil.ts

@@ -129,10 +129,9 @@ export class DebugUtil {
       const startTime = performance.now();
 
       for (const notification of notificationResponse.notifications) {
-        const events = this.core.service.notification.handleNotification(
+        const events = this.core.service!.notification.handleNotification(
           notification,
           NotificationSource.NOTIFICATION_STREAM,
-          false,
         );
 
         for await (const event of events) {

src/script/util/TimeUtil.ts

@@ -329,31 +329,30 @@ export const formatDelayTime = (delayTimeInMS: number): string => {
 
 /**
  * Format duration into a coarse, human-readable unit:
- * - ≥ 1 day   → "X days"
- * - ≥ 1 hour  → "X hours"
- * - ≥ 1 min   → "X minutes"
- * - < 1 min   → "1 minute"
+ * update the comments:
+ * - > 1 day   → "Loading messages from the last X days"
+ * - > 24H     → "Loading messages from the last 1 day"
+ * - > 1 hour  → "Loading messages from the last X hours"
+ * - > 60 min  → "Loading messages from the last 1 hour"
+ * - > 1 min   → "Loading messages from the last X minutes"
+ * - > 60 sec  → "Loading messages from the last 1 minute"
  *
  * @param duration - Duration in milliseconds
  * @returns Localized string of the coarsest applicable unit
  */
-export const formatCoarseDuration = (duration: number): string => {
+export const formatCoarseDuration = (duration: number) => {
   if (duration >= TIME_IN_MILLIS.DAY) {
     const days = Math.floor(duration / TIME_IN_MILLIS.DAY);
-    return `${days} ${t(`ephemeralUnitsDay${days === 1 ? '' : 's'}`)}`;
+    return t(`initProgressDays${days === 1 ? 'Singular' : 'Plural'}`, {time: days});
   }
 
   if (duration >= TIME_IN_MILLIS.HOUR) {
     const hours = Math.floor(duration / TIME_IN_MILLIS.HOUR);
-    return `${hours} ${t(`ephemeralUnitsHour${hours === 1 ? '' : 's'}`)}`;
-  }
-
-  if (duration >= TIME_IN_MILLIS.MINUTE) {
-    const minutes = Math.floor(duration / TIME_IN_MILLIS.MINUTE);
-    return `${minutes} ${t(`ephemeralUnitsMinute${minutes === 1 ? '' : 's'}`)}`;
+    return t(`initProgressHours${hours === 1 ? 'Singular' : 'Plural'}`, {time: hours});
   }
 
-  return `1 ${t('ephemeralUnitsMinute')}`;
+  const minutes = Math.max(1, Math.floor(duration / TIME_IN_MILLIS.MINUTE));
+  return t(`initProgressMinutes${minutes === 1 ? 'Singular' : 'Plural'}`, {time: minutes});
 };
 
 /**

src/types/i18n.d.ts

@@ -1095,7 +1095,12 @@ declare module 'I18n/en-US.json' {
     'index.welcome': `Welcome to {brandName}!`;
     'initDecryption': `Decrypting messages`;
     'initEvents': `Loading messages`;
-    'initProgress': `Loading messages from {time} ago`;
+    'initProgressDaysPlural': `Loading messages from the last {time} days`;
+    'initProgressDaysSingular': `Loading messages from the last {time} day`;
+    'initProgressHoursPlural': `Loading messages from the last {time} hours`;
+    'initProgressHoursSingular': `Loading messages from the last {time} hour`;
+    'initProgressMinutesPlural': `Loading messages from the last {time} minutes`;
+    'initProgressMinutesSingular': `Loading messages from the last {time} minute`;
     'initReceivedSelfUser': `Hello, {user}.`;
     'initReceivedUserData': `Checking for new messages`;
     'initUpdatedFromNotifications': `Almost done - Enjoy {brandName}`;

test/unit_tests/util/TimeUtilSpec.js

@@ -24,6 +24,7 @@ import {
   formatDuration,
   formatDurationCaption,
   formatSeconds,
+  formatCoarseDuration,
   isSameDay,
   isSameMonth,
   isThisYear,
@@ -316,6 +317,53 @@ describe('TimeUtil', () => {
     });
   });
 
+  describe('"formatCoarseDuration"', () => {
+    it('formats durations in days (singular & plural)', () => {
+      expect(formatCoarseDuration(ONE_DAY_IN_MILLIS)).toBe(t('initProgressDaysSingular', {time: 1}));
+
+      // Floor should keep it at 1 day
+      expect(formatCoarseDuration(ONE_DAY_IN_MILLIS + 11 * ONE_HOUR_IN_MILLIS)).toBe(
+        t('initProgressDaysSingular', {time: 1}),
+      );
+
+      expect(formatCoarseDuration(2 * ONE_DAY_IN_MILLIS)).toBe(t('initProgressDaysPlural', {time: 2}));
+      expect(formatCoarseDuration(2 * ONE_DAY_IN_MILLIS + 5 * ONE_HOUR_IN_MILLIS)).toBe(
+        t('initProgressDaysPlural', {time: 2}),
+      );
+    });
+
+    it('formats durations in hours (singular & plural)', () => {
+      expect(formatCoarseDuration(ONE_HOUR_IN_MILLIS)).toBe(t('initProgressHoursSingular', {time: 1}));
+
+      // Floor keeps it at 1 hour
+      expect(formatCoarseDuration(ONE_HOUR_IN_MILLIS + 59 * ONE_MINUTE_IN_MILLIS)).toBe(
+        t('initProgressHoursSingular', {time: 1}),
+      );
+
+      expect(formatCoarseDuration(2 * ONE_HOUR_IN_MILLIS)).toBe(t('initProgressHoursPlural', {time: 2}));
+      expect(formatCoarseDuration(2 * ONE_HOUR_IN_MILLIS + 30 * ONE_MINUTE_IN_MILLIS)).toBe(
+        t('initProgressHoursPlural', {time: 2}),
+      );
+    });
+
+    it('formats durations in minutes (singular & plural)', () => {
+      expect(formatCoarseDuration(ONE_MINUTE_IN_MILLIS)).toBe(t('initProgressMinutesSingular', {time: 1}));
+
+      // Floor keeps it at 1 minute
+      expect(formatCoarseDuration(ONE_MINUTE_IN_MILLIS + 59 * ONE_SECOND_IN_MILLIS)).toBe(
+        t('initProgressMinutesSingular', {time: 1}),
+      );
+
+      expect(formatCoarseDuration(2 * ONE_MINUTE_IN_MILLIS)).toBe(t('initProgressMinutesPlural', {time: 2}));
+
+      // Sub-minute durations should be treated as 1 minute (singular)
+      expect(formatCoarseDuration(59 * ONE_SECOND_IN_MILLIS)).toBe(t('initProgressMinutesSingular', {time: 1}));
+
+      // Explicit 30s case
+      expect(formatCoarseDuration(30 * ONE_SECOND_IN_MILLIS)).toBe(t('initProgressMinutesSingular', {time: 1}));
+    });
+  });
+
   describe('"formatSeconds"', () => {
     it('formats seconds', () => {
       expect(formatSeconds(50)).toBe('00:50');