Merge branch 'main' of https://github.com/gitify-app/gitify

Author: setchy

src/renderer/components/avatars/AvatarWithFallback.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 
 import { type Link, Size } from '../../types';
 import {
@@ -47,8 +47,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });
@@ -59,8 +59,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });

src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap

@@ -1,5 +1,7 @@
 import { AxiosError, type AxiosResponse } from 'axios';
 
+import { EVENTS } from '../../../shared/events';
+
 import type { Link } from '../../types';
 import type { GitHubRESTError } from '../../typesGitHub';
 import { Errors } from '../errors';
@@ -93,6 +95,18 @@ describe('renderer/utils/api/errors.ts', () => {
     });
   });
 
+  it('bad credentials - safe storage', async () => {
+    const mockError: Partial<AxiosError<GitHubRESTError>> = {
+      message: `Error invoking remote method '${EVENTS.SAFE_STORAGE_DECRYPT}': Error: Error while decrypting the ciphertext provided to safeStorage.decryptString. Ciphertext does not appear to be encrypted.`,
+    };
+
+    const result = determineFailureType(
+      mockError as AxiosError<GitHubRESTError>,
+    );
+
+    expect(result).toBe(Errors.BAD_CREDENTIALS);
+  });
+
   it('unknown error', async () => {
     const mockError: Partial<AxiosError<GitHubRESTError>> = {
       code: 'anything',

src/renderer/utils/api/errors.test.ts

@@ -13,6 +13,10 @@ export function determineFailureType(
     return Errors.NETWORK;
   }
 
+  if (err.message?.includes('safeStorage')) {
+    return Errors.BAD_CREDENTIALS;
+  }
+
   if (code !== AxiosError.ERR_BAD_REQUEST) {
     return Errors.UNKNOWN;
   }