feat: stabilize notification order during notification interactions

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/utils/notifications/group.ts

@@ -1,6 +1,9 @@
 import type { AccountNotifications, SettingsState } from '../../types';
 import type { Notification } from '../../typesGitHub';
 
+/**
+ * Returns true when settings say to group by repository.
+ */
 export function isGroupByRepository(settings: SettingsState) {
   return settings.groupBy === 'REPOSITORY';
 }
@@ -31,8 +34,17 @@ export function groupNotificationsByRepository(
 }
 
 /**
- * Flatten the Map values into a single array, preserving Map insertion order (first-seen repo order).
+ * Returns a flattened, ordered Notification[] according to repository-first-seen order
+ * (when grouped) or the natural account->notification order otherwise.
  */
-export function flattenRepoGroups(repoGroups: Map<string, Notification[]>) {
-  return Array.from(repoGroups.values()).flat();
+export function getFlattenedNotificationsByRepo(
+  accounts: AccountNotifications[],
+  settings: SettingsState,
+): Notification[] {
+  if (isGroupByRepository(settings)) {
+    const repoGroups = groupNotificationsByRepository(accounts);
+    return Array.from(repoGroups.values()).flat();
+  }
+
+  return accounts.flatMap((a) => a.notifications);
 }

src/renderer/utils/notifications/notifications.ts

@@ -12,11 +12,7 @@ import {
   filterBaseNotifications,
   filterDetailedNotifications,
 } from './filters/filter';
-import {
-  flattenRepoGroups,
-  groupNotificationsByRepository,
-  isGroupByRepository,
-} from './group';
+import { getFlattenedNotificationsByRepo } from './group';
 import { createNotificationHandler } from './handlers';
 
 export function setTrayIconColor(notifications: AccountNotifications[]) {
@@ -154,23 +150,14 @@ export function stabilizeNotificationsOrder(
   notifications: AccountNotifications[],
   settings: SettingsState,
 ) {
-  if (isGroupByRepository(settings)) {
-    const repoGroups = groupNotificationsByRepository(notifications);
-    const flattened = flattenRepoGroups(repoGroups);
-
-    let orderIndex = 0;
-
-    for (const n of flattened) {
-      n.order = orderIndex++;
-    }
-  } else {
-    // Non-repository grouping: assign sequential order across all notifications
-    let orderIndex = 0;
-
-    for (const accountNotifications of notifications) {
-      for (const notification of accountNotifications.notifications) {
-        notification.order = orderIndex++;
-      }
-    }
+  const flattenedNotifications = getFlattenedNotificationsByRepo(
+    notifications,
+    settings,
+  );
+
+  let orderIndex = 0;
+
+  for (const n of flattenedNotifications) {
+    n.order = orderIndex++;
   }
 }