refactor simplify

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

Author: setchy

src/renderer/components/notifications/AccountNotifications.tsx

@@ -129,7 +129,9 @@ export const AccountNotifications: FC<IAccountNotifications> = (
       {showAccountNotifications && (
         <>
           {props.error && <Oops error={props.error} fullHeight={false} />}
+
           {!hasNotifications && !props.error && <AllRead fullHeight={false} />}
+
           {isGroupByRepository(settings)
             ? groupedNotifications.map(([repoSlug, repoNotifications]) => (
                 <RepositoryNotifications

src/renderer/context/App.test.tsx

@@ -51,7 +51,6 @@ describe('renderer/context/App.tsx', () => {
     const markNotificationsAsReadMock = jest.fn();
     const markNotificationsAsDoneMock = jest.fn();
     const unsubscribeNotificationMock = jest.fn();
-    const setTrayIconColorAndTitle = jest.fn();
 
     const mockDefaultState = {
       auth: { accounts: [] },
@@ -64,7 +63,6 @@ describe('renderer/context/App.tsx', () => {
         markNotificationsAsRead: markNotificationsAsReadMock,
         markNotificationsAsDone: markNotificationsAsDoneMock,
         unsubscribeNotification: unsubscribeNotificationMock,
-        setTrayIconColorAndTitle,
       });
     });
 

src/renderer/hooks/useNotifications.ts

@@ -227,10 +227,11 @@ export const useNotifications = (): NotificationsState => {
   return {
     status,
     globalError,
-    notifications,
 
-    removeAccountNotifications,
+    notifications,
     fetchNotifications,
+    removeAccountNotifications,
+
     markNotificationsAsRead,
     markNotificationsAsDone,
     unsubscribeNotification,

src/renderer/utils/notifications/native.ts

@@ -3,9 +3,7 @@ import { APPLICATION } from '../../../shared/constants';
 import type { Notification } from '../../typesGitHub';
 import { generateGitHubWebUrl } from '../helpers';
 
-export const raiseNativeNotification = async (
-  notifications: Notification[],
-) => {
+export async function raiseNativeNotification(notifications: Notification[]) {
   let title: string;
   let body: string;
   let url: string = null;
@@ -23,4 +21,4 @@ export const raiseNativeNotification = async (
   }
 
   return window.gitify.raiseNativeNotification(title, body, url);
-};
+}

src/renderer/utils/notifications/sound.ts

@@ -1,7 +1,7 @@
-export const raiseSoundNotification = async (volume: number) => {
-  const path = await window.gitify.notificationSoundPath();
+export async function raiseSoundNotification(volume: number) {
+  const path = await globalThis.gitify.notificationSoundPath();
 
   const audio = new Audio(path);
   audio.volume = volume;
   audio.play();
-};
+}

src/renderer/utils/notifications/utils.ts

@@ -9,24 +9,24 @@ import { getAccountUUID } from '../auth/utils';
  * @param notification - The notification to find the account index for
  * @returns The index of the account in the allNotifications array
  */
-export const findAccountIndex = (
+export function findAccountIndex(
   allNotifications: AccountNotifications[],
   notification: Notification,
-): number => {
+): number {
   return allNotifications.findIndex(
     (accountNotifications) =>
       getAccountUUID(accountNotifications.account) ===
       getAccountUUID(notification.account),
   );
-};
+}
 
 /**
  * Find notifications that exist in newNotifications but not in previousNotifications
  */
-export const getNewNotifications = (
+export function getNewNotifications(
   previousNotifications: AccountNotifications[],
   newNotifications: AccountNotifications[],
-): Notification[] => {
+): Notification[] {
   return newNotifications.flatMap((accountNotifications) => {
     const accountPreviousNotifications = previousNotifications.find(
       (item) =>
@@ -46,4 +46,4 @@ export const getNewNotifications = (
       (notification) => !previousIds.has(notification.id),
     );
   });
-};
+}

src/renderer/utils/zoom.ts

@@ -6,23 +6,23 @@ const MULTIPLIER = 2;
  * @param percentage 0-150
  * @returns zoomLevel -2 to 0.5
  */
-export const zoomPercentageToLevel = (percentage: number): number => {
+export function zoomPercentageToLevel(percentage: number): number {
   if (percentage === undefined) {
     return 0;
   }
 
   return ((percentage - RECOMMENDED) * MULTIPLIER) / 100;
-};
+}
 
 /**
  * Zoom level to percentage. 0 is the recommended zoom level (100%). If somehow the zoom level is not set, it will return 100, the default zoom percentage.
  * @param zoom -2 to 0.5
  * @returns percentage 0-150
  */
-export const zoomLevelToPercentage = (zoom: number): number => {
+export function zoomLevelToPercentage(zoom: number): number {
   if (zoom === undefined) {
     return 100;
   }
 
   return (zoom / MULTIPLIER) * 100 + RECOMMENDED;
-};
+}