refactor: use state

gitify-app · Jun 6, 2024 · 814e711 · 814e711
1 parent ff317cc
commit 814e711
Show file tree

Hide file tree

Showing 7 changed files with 464 additions and 819 deletions.
diff --git a/src/__mocks__/state-mocks.ts b/src/__mocks__/state-mocks.ts
@@ -1,6 +1,7 @@
 import {
   type Account,
   type AuthState,
+  type GitifyState,
   type GitifyUser,
   type SettingsState,
   Theme,
@@ -72,3 +73,8 @@ export const mockSettings: SettingsState = {
   showAccountHostname: false,
   delayNotificationState: false,
 };
+
+export const mockState: GitifyState = {
+  auth: mockAuth,
+  settings: mockSettings,
+};
diff --git a/src/context/App.test.tsx b/src/context/App.test.tsx
@@ -48,6 +48,11 @@ describe('context/App.tsx', () => {
     const markRepoNotificationsMock = jest.fn();
     const markRepoNotificationsDoneMock = jest.fn();
 
+    const mockDefaultState = {
+      auth: { accounts: [], enterpriseAccounts: [], token: null, user: null },
+      settings: mockSettings,
+    };
+
     beforeEach(() => {
       (useNotifications as jest.Mock).mockReturnValue({
         fetchNotifications: fetchNotificationsMock,
@@ -131,13 +136,7 @@ describe('context/App.tsx', () => {
 
       expect(markNotificationReadMock).toHaveBeenCalledTimes(1);
       expect(markNotificationReadMock).toHaveBeenCalledWith(
-        {
-          accounts: [],
-          enterpriseAccounts: [],
-          token: null,
-          user: null,
-        },
-        mockSettings,
+        mockDefaultState,
         '123-456',
         'github.com',
       );
@@ -165,8 +164,7 @@ describe('context/App.tsx', () => {
 
       expect(markNotificationDoneMock).toHaveBeenCalledTimes(1);
       expect(markNotificationDoneMock).toHaveBeenCalledWith(
-        { accounts: [], enterpriseAccounts: [], token: null, user: null },
-        mockSettings,
+        mockDefaultState,
         '123-456',
         'github.com',
       );
@@ -194,8 +192,7 @@ describe('context/App.tsx', () => {
 
       expect(unsubscribeNotificationMock).toHaveBeenCalledTimes(1);
       expect(unsubscribeNotificationMock).toHaveBeenCalledWith(
-        { accounts: [], enterpriseAccounts: [], token: null, user: null },
-        mockSettings,
+        mockDefaultState,
         '123-456',
         'github.com',
       );
@@ -228,8 +225,7 @@ describe('context/App.tsx', () => {
 
       expect(markRepoNotificationsMock).toHaveBeenCalledTimes(1);
       expect(markRepoNotificationsMock).toHaveBeenCalledWith(
-        { accounts: [], enterpriseAccounts: [], token: null, user: null },
-        mockSettings,
+        mockDefaultState,
         'gitify-app/notifications-test',
         'github.com',
       );
@@ -262,8 +258,15 @@ describe('context/App.tsx', () => {
 
       expect(markRepoNotificationsDoneMock).toHaveBeenCalledTimes(1);
       expect(markRepoNotificationsDoneMock).toHaveBeenCalledWith(
-        { accounts: [], enterpriseAccounts: [], token: null, user: null },
-        mockSettings,
+        {
+          auth: {
+            accounts: [],
+            enterpriseAccounts: [],
+            token: null,
+            user: null,
+          },
+          settings: mockSettings,
+        },
         'gitify-app/notifications-test',
         'github.com',
       );

diff --git a/src/context/App.tsx b/src/context/App.tsx
@@ -113,7 +113,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: We only want fetchNotifications to be called for certain account or setting changes.
   useEffect(() => {
-    fetchNotifications(auth, settings);
+    fetchNotifications({ auth, settings });
   }, [
     settings.participating,
     settings.showBots,
@@ -122,7 +122,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   ]);
 
   useInterval(() => {
-    fetchNotifications(auth, settings);
+    fetchNotifications({ auth, settings });
   }, Constants.FETCH_INTERVAL);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: We need to update tray title when settings or notifications changes.
@@ -213,37 +213,37 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   }, []);
 
   const fetchNotificationsWithAccounts = useCallback(
-    async () => await fetchNotifications(auth, settings),
+    async () => await fetchNotifications({ auth, settings }),
     [auth, settings, notifications],
   );
 
   const markNotificationReadWithAccounts = useCallback(
     async (id: string, hostname: string) =>
-      await markNotificationRead(auth, settings, id, hostname),
+      await markNotificationRead({ auth, settings }, id, hostname),
     [auth, notifications],
   );
 
   const markNotificationDoneWithAccounts = useCallback(
     async (id: string, hostname: string) =>
-      await markNotificationDone(auth, settings, id, hostname),
+      await markNotificationDone({ auth, settings }, id, hostname),
     [auth, notifications],
   );
 
   const unsubscribeNotificationWithAccounts = useCallback(
     async (id: string, hostname: string) =>
-      await unsubscribeNotification(auth, settings, id, hostname),
+      await unsubscribeNotification({ auth, settings }, id, hostname),
     [auth, notifications],
   );
 
   const markRepoNotificationsWithAccounts = useCallback(
     async (repoSlug: string, hostname: string) =>
-      await markRepoNotifications(auth, settings, repoSlug, hostname),
+      await markRepoNotifications({ auth, settings }, repoSlug, hostname),
     [auth, notifications],
   );
 
   const markRepoNotificationsDoneWithAccounts = useCallback(
     async (repoSlug: string, hostname: string) =>
-      await markRepoNotificationsDone(auth, settings, repoSlug, hostname),
+      await markRepoNotificationsDone({ auth, settings }, repoSlug, hostname),
     [auth, notifications],
   );