Merge branch 'main' into feat/error-page-actions

Author: setchy

src/renderer/hooks/useNotifications.ts

@@ -14,6 +14,7 @@ import {
   markNotificationThreadAsDone,
   markNotificationThreadAsRead,
 } from '../utils/api/client';
+import { getAccountUUID } from '../utils/auth/utils';
 import {
   areAllAccountErrorsSame,
   doesAllAccountsHaveErrors,
@@ -83,8 +84,9 @@ export const useNotifications = (): NotificationsState => {
     async (account: Account) => {
       setStatus('loading');
 
+      const accountUUID = getAccountUUID(account);
       const updatedNotifications = notifications.filter(
-        (notification) => notification.account !== account,
+        (notification) => getAccountUUID(notification.account) !== accountUUID,
       );
 
       setNotifications(updatedNotifications);

src/renderer/utils/auth/utils.test.ts

@@ -67,7 +67,7 @@ describe('renderer/utils/auth/utils.ts', () => {
 
   beforeEach(() => {
     // Mock OAUTH_DEVICE_FLOW_CLIENT_ID value
-    Constants.OAUTH_DEVICE_FLOW_CLIENT_ID = 'mock-oauth-client-id' as ClientID;
+    Constants.OAUTH_DEVICE_FLOW_CLIENT_ID = 'FAKE_CLIENT_ID_123' as ClientID;
   });
 
   afterEach(() => {
@@ -432,7 +432,7 @@ describe('renderer/utils/auth/utils.ts', () => {
         method: 'GitHub App',
       } as Account),
     ).toBe(
-      'https://github.com/settings/connections/applications/mock-oauth-client-id',
+      'https://github.com/settings/connections/applications/FAKE_CLIENT_ID_123',
     );
 
     expect(