From 02630e206abe2c1e55016203c8690ca05cb12a4f Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 23 Mar 2026 15:40:55 -0400
Subject: [PATCH 1/3] refactor: test renderWithProviders for store
 initialization

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/__helpers__/test-utils.tsx       | 25 ++++++----
 src/renderer/components/AllRead.test.tsx      | 15 +++---
 .../components/GlobalShortcuts.test.tsx       | 50 +++++++++----------
 src/renderer/components/Oops.test.tsx         | 12 ++---
 src/renderer/components/Sidebar.test.tsx      | 43 ++++++++--------
 .../avatars/AvatarWithFallback.test.tsx       | 14 +++---
 .../components/fields/Checkbox.test.tsx       | 16 +++---
 .../components/fields/FieldLabel.test.tsx     |  4 +-
 .../components/fields/RadioGroup.test.tsx     |  6 +--
 .../components/fields/Tooltip.test.tsx        |  8 +--
 .../components/filters/FilterSection.test.tsx | 17 +++----
 .../components/filters/ReasonFilter.test.tsx  |  4 +-
 ...uiresDetailedNotificationsWarning.test.tsx |  4 +-
 .../components/filters/SearchFilter.test.tsx  | 18 +++----
 .../filters/SearchFilterSuggestions.test.tsx  | 12 ++---
 .../components/filters/StateFilter.test.tsx   |  4 +-
 .../filters/SubjectTypeFilter.test.tsx        |  4 +-
 .../filters/UserTypeFilter.test.tsx           |  4 +-
 .../components/icons/LogoIcon.test.tsx        | 14 +++---
 .../components/icons/ScopeStatusIcon.test.tsx | 26 +++++-----
 .../components/layout/AppLayout.test.tsx      |  4 +-
 .../components/layout/Centered.test.tsx       |  6 +--
 .../components/layout/Contents.test.tsx       |  4 +-
 .../components/layout/EmojiSplash.test.tsx    | 10 ++--
 src/renderer/components/layout/Page.test.tsx  |  4 +-
 .../components/metrics/CommentsPill.test.tsx  |  8 +--
 .../components/metrics/LabelsPill.test.tsx    |  6 +--
 .../metrics/LinkedIssuesPill.test.tsx         |  8 +--
 .../components/metrics/MetricGroup.test.tsx   |  6 +--
 .../components/metrics/MetricPill.test.tsx    |  6 +--
 .../components/metrics/MilestonePill.test.tsx |  8 +--
 .../components/metrics/ReactionsPill.test.tsx |  8 +--
 .../components/metrics/ReviewsPill.test.tsx   |  6 +--
 .../AccountNotifications.test.tsx             | 28 +++++------
 .../notifications/NotificationFooter.test.tsx | 12 ++---
 .../notifications/NotificationHeader.test.tsx | 12 ++---
 .../notifications/NotificationRow.test.tsx    | 30 +++++------
 .../notifications/NotificationTitle.test.tsx  | 16 +++---
 .../RepositoryNotifications.test.tsx          | 18 +++----
 .../primitives/CustomCounter.test.tsx         |  4 +-
 .../components/primitives/EmojiText.test.tsx  |  6 +--
 .../components/primitives/Footer.test.tsx     |  6 +--
 .../components/primitives/Header.test.tsx     |  8 +--
 .../primitives/HoverButton.test.tsx           |  6 +--
 .../components/primitives/HoverGroup.test.tsx |  4 +-
 .../components/primitives/Title.test.tsx      |  6 +--
 .../settings/AppearanceSettings.test.tsx      | 12 ++---
 .../settings/NotificationSettings.test.tsx    | 32 ++++++------
 .../settings/SettingsFooter.test.tsx          | 10 ++--
 .../settings/SettingsReset.test.tsx           |  6 +--
 .../settings/SystemSettings.test.tsx          | 22 ++++----
 .../components/settings/TraySettings.test.tsx |  8 +--
 src/renderer/context/App.test.tsx             |  6 +--
 src/renderer/routes/AccountScopes.test.tsx    | 26 +++++-----
 src/renderer/routes/Accounts.test.tsx         | 30 +++++------
 src/renderer/routes/Filters.test.tsx          |  8 +--
 src/renderer/routes/Login.test.tsx            | 12 ++---
 .../routes/LoginWithDeviceFlow.test.tsx       | 14 +++---
 .../routes/LoginWithOAuthApp.test.tsx         | 18 +++----
 .../LoginWithPersonalAccessToken.test.tsx     | 18 +++----
 src/renderer/routes/Notifications.test.tsx    | 18 +++----
 src/renderer/routes/Settings.test.tsx         |  6 +--
 62 files changed, 395 insertions(+), 391 deletions(-)

diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
index b631e63d0..e8c2dec60 100644
--- a/src/renderer/__helpers__/test-utils.tsx
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -7,21 +7,23 @@ import { BaseStyles, ThemeProvider } from '@primer/react';
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 
 import { AppContext, type AppContextState } from '../context/App';
+import { useFiltersStore, type FiltersStore } from '../stores';
 
 export { navigateMock } from './vitest.setup';
 export type DeepPartial<T> = { [K in keyof T]?: DeepPartial<T[K]> };
 
 const EMPTY_APP_CONTEXT: TestAppContext = {};
 
-interface RenderOptions extends Partial<AppContextState> {
-  initialEntries?: string[];
-}
-
 /**
  * Test context
  */
 type TestAppContext = Partial<AppContextState>;
 
+interface RenderOptions extends TestAppContext {
+  initialEntries?: string[];
+  filters?: Partial<FiltersStore>;
+}
+
 /**
  * Props for the AppContextProvider wrapper
  */
@@ -83,7 +85,7 @@ function AppContextProvider({
     <MemoryRouter initialEntries={initialEntries}>
       <ThemeProvider>
         <BaseStyles>
-          <AppContext.Provider value={defaultValue}>
+          <AppContext.Provider value={defaultValue as AppContextState}>
             {children}
           </AppContext.Provider>
         </BaseStyles>
@@ -93,15 +95,20 @@ function AppContextProvider({
 }
 
 /**
- * Custom render that wraps components with AppContextProvider by default.
+ * Custom render that wraps components with all providers needed for testing:
+ * MemoryRouter, AppContext, and Zustand stores.
  *
  * Usage:
- *   renderWithAppContext(<MyComponent />, { auth, settings, ... })
+ *   renderWithProviders(<MyComponent />, { notifications, accounts, settings, filters, ... })
  */
-export function renderWithAppContext(
+export function renderWithProviders(
   ui: ReactElement,
-  { initialEntries, ...context }: RenderOptions = {},
+  { initialEntries, filters, ...context }: RenderOptions = {},
 ) {
+  if (filters) {
+    useFiltersStore.setState(filters);
+  }
+
   return render(ui, {
     wrapper: ({ children }) => (
       <AppContextProvider initialEntries={initialEntries} value={context}>
diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
index 1f474a42e..b0d58ac17 100644
--- a/src/renderer/components/AllRead.test.tsx
+++ b/src/renderer/components/AllRead.test.tsx
@@ -1,6 +1,6 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { renderWithProviders } from '../__helpers__/test-utils';
 import { mockSettings } from '../__mocks__/state-mocks';
 
 import { useFiltersStore } from '../stores';
@@ -8,10 +8,10 @@ import { AllRead } from './AllRead';
 
 describe('renderer/components/AllRead.tsx', () => {
   it('should render itself & its children - no filters', async () => {
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<AllRead />, {
+      tree = renderWithProviders(<AllRead />, {
         settings: {
           ...mockSettings,
         },
@@ -22,15 +22,16 @@ describe('renderer/components/AllRead.tsx', () => {
   });
 
   it('should render itself & its children - with filters', async () => {
-    useFiltersStore.setState({ reasons: ['author'] });
-
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<AllRead />, {
+      tree = renderWithProviders(<AllRead />, {
         settings: {
           ...mockSettings,
         },
+        filters: {
+          reasons: ['author'],
+        },
       });
     });
 
diff --git a/src/renderer/components/GlobalShortcuts.test.tsx b/src/renderer/components/GlobalShortcuts.test.tsx
index 360aec5fe..921111603 100644
--- a/src/renderer/components/GlobalShortcuts.test.tsx
+++ b/src/renderer/components/GlobalShortcuts.test.tsx
@@ -1,6 +1,6 @@
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/system/comms';
 import * as links from '../utils/system/links';
@@ -14,7 +14,7 @@ describe('components/GlobalShortcuts.tsx', () => {
   describe('key bindings', () => {
     describe('ignores keys that are not valid', () => {
       it('ignores B key', async () => {
-        renderWithAppContext(<GlobalShortcuts />);
+        renderWithProviders(<GlobalShortcuts />);
 
         await userEvent.keyboard('b');
 
@@ -24,7 +24,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('home', () => {
       it('navigates home when pressing H key', async () => {
-        renderWithAppContext(<GlobalShortcuts />);
+        renderWithProviders(<GlobalShortcuts />);
 
         await userEvent.keyboard('h');
 
@@ -38,7 +38,7 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub notifications webpage when pressing N while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -48,7 +48,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub notifications webpage when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: false,
         });
 
@@ -60,7 +60,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('focus mode', () => {
       it('toggles focus when pressing W while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           updateSetting: updateSettingMock,
           isLoggedIn: true,
         });
@@ -71,7 +71,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle focus mode when loading', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           updateSetting: updateSettingMock,
           status: 'loading',
           isLoggedIn: true,
@@ -83,7 +83,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle focus mode when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           updateSetting: updateSettingMock,
           isLoggedIn: false,
         });
@@ -96,7 +96,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('filters', () => {
       it('toggles filters when pressing F while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -106,7 +106,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle filters when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: false,
         });
 
@@ -122,7 +122,7 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub issues webpage when pressing I while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -132,7 +132,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub issues webpage when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: false,
         });
 
@@ -148,7 +148,7 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub pull requests webpage when pressing N while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -158,7 +158,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub pull requests webpage when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: false,
         });
 
@@ -170,7 +170,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('refresh', () => {
       it('refreshes notifications when pressing R key', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           fetchNotifications: fetchNotificationsMock,
         });
 
@@ -181,7 +181,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not refresh when status is loading', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           status: 'loading',
         });
 
@@ -193,7 +193,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('settings', () => {
       it('toggles settings when pressing S while logged in', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -203,7 +203,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle settings when logged out', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: false,
         });
 
@@ -215,7 +215,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('accounts', () => {
       it('navigates to accounts when pressing A on settings route', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           initialEntries: ['/settings'],
           isLoggedIn: true,
         });
@@ -226,7 +226,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not trigger accounts when not on settings route', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -238,7 +238,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('quit app', () => {
       it('quits the app when pressing Q on settings route', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           initialEntries: ['/settings'],
           isLoggedIn: true,
         });
@@ -249,7 +249,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not quit the app when not on settings route', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
@@ -261,7 +261,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('modifiers', () => {
       it('ignores shortcuts when typing in an input', async () => {
-        renderWithAppContext(
+        renderWithProviders(
           <>
             <GlobalShortcuts />
             <input id="test-input" />
@@ -281,7 +281,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('ignores shortcuts when typing in a textarea', async () => {
-        renderWithAppContext(
+        renderWithProviders(
           <>
             <GlobalShortcuts />
             <textarea id="test-textarea" />
@@ -301,7 +301,7 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('ignores shortcuts when modifier keys are pressed', async () => {
-        renderWithAppContext(<GlobalShortcuts />, {
+        renderWithProviders(<GlobalShortcuts />, {
           isLoggedIn: true,
         });
 
diff --git a/src/renderer/components/Oops.test.tsx b/src/renderer/components/Oops.test.tsx
index a7c79f8ae..c0c5ca20a 100644
--- a/src/renderer/components/Oops.test.tsx
+++ b/src/renderer/components/Oops.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 
 import { PersonIcon } from '@primer/octicons-react';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import { Oops } from './Oops';
 
@@ -15,20 +15,20 @@ describe('renderer/components/Oops.tsx', () => {
       emojis: ['🔥'],
     };
 
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<Oops error={mockError} />);
+      tree = renderWithProviders(<Oops error={mockError} />);
     });
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render itself & its children - fallback to unknown error', async () => {
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<Oops error={null} />);
+      tree = renderWithProviders(<Oops error={null} />);
     });
 
     expect(tree.container).toMatchSnapshot();
@@ -49,7 +49,7 @@ describe('renderer/components/Oops.tsx', () => {
       ],
     };
 
-    renderWithAppContext(<Oops error={mockError} />);
+    renderWithProviders(<Oops error={mockError} />);
 
     await userEvent.click(screen.getByText('Go somewhere'));
 
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 89c1c77f9..1563aaaa7 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 
@@ -17,7 +17,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     .mockImplementation(vi.fn());
 
   it('should render itself & its children (logged in)', () => {
-    const tree = renderWithAppContext(<Sidebar />, {
+    const tree = renderWithProviders(<Sidebar />, {
       initialEntries: ['/'],
       isLoggedIn: true,
     });
@@ -26,7 +26,7 @@ describe('renderer/components/Sidebar.tsx', () => {
   });
 
   it('should render itself & its children (logged out)', () => {
-    const tree = renderWithAppContext(<Sidebar />, {
+    const tree = renderWithProviders(<Sidebar />, {
       initialEntries: ['/landing'],
       isLoggedIn: false,
     });
@@ -35,7 +35,7 @@ describe('renderer/components/Sidebar.tsx', () => {
   });
 
   it('should navigate home when clicking logo', async () => {
-    renderWithAppContext(<Sidebar />);
+    renderWithProviders(<Sidebar />);
 
     await userEvent.click(screen.getByTestId('sidebar-home'));
 
@@ -45,7 +45,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('notifications icon', () => {
     it('opens notifications home when clicked', async () => {
-      renderWithAppContext(<Sidebar />);
+      renderWithProviders(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-notifications'));
 
@@ -56,7 +56,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('renders correct icon when there are no notifications', () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         notifications: [],
       });
 
@@ -64,7 +64,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('renders correct icon when there are notifications', () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         notifications: mockMultipleAccountNotifications,
       });
 
@@ -74,7 +74,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Focused mode toggle', () => {
     it('renders the focused mode is off', () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         isLoggedIn: true,
         settings: { ...mockSettings, participating: false },
       });
@@ -83,7 +83,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('renders the focused mode is on', () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         isLoggedIn: true,
         settings: { ...mockSettings, participating: true },
       });
@@ -92,7 +92,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('toggles participating when clicked', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         isLoggedIn: true,
         settings: { ...mockSettings, participating: false },
         updateSetting: updateSettingMock,
@@ -108,7 +108,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Filter notifications', () => {
     it('go to the filters route', async () => {
-      renderWithAppContext(<Sidebar />);
+      renderWithProviders(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
 
@@ -117,7 +117,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if filters path already shown', async () => {
-      renderWithAppContext(<Sidebar />, { initialEntries: ['/filters'] });
+      renderWithProviders(<Sidebar />, { initialEntries: ['/filters'] });
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
 
@@ -126,10 +126,9 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('highlight filters sidebar if any are saved', () => {
-      useFiltersStore.setState({ reasons: ['assign'] });
-
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         settings: mockSettings,
+        filters: { reasons: ['assign'] },
       });
 
       expect(
@@ -140,7 +139,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('quick links', () => {
     it('opens my github issues page', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         notifications: mockMultipleAccountNotifications,
       });
 
@@ -153,7 +152,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('opens my github pull requests page', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         notifications: mockMultipleAccountNotifications,
       });
 
@@ -168,7 +167,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Refresh Notifications', () => {
     it('should refresh the notifications when status is not loading', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         fetchNotifications: fetchNotificationsMock,
         status: 'success',
       });
@@ -179,7 +178,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('should not refresh the notifications when status is loading', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         fetchNotifications: fetchNotificationsMock,
         status: 'loading',
       });
@@ -192,7 +191,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Settings', () => {
     it('go to the settings route', async () => {
-      renderWithAppContext(<Sidebar />);
+      renderWithProviders(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-settings'));
 
@@ -201,7 +200,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if settings path already shown', async () => {
-      renderWithAppContext(<Sidebar />, {
+      renderWithProviders(<Sidebar />, {
         initialEntries: ['/settings'],
         fetchNotifications: fetchNotificationsMock,
       });
@@ -217,7 +216,7 @@ describe('renderer/components/Sidebar.tsx', () => {
   it('should quit the app', async () => {
     const quitAppSpy = vi.spyOn(comms, 'quitApp').mockImplementation(vi.fn());
 
-    renderWithAppContext(<Sidebar />, {
+    renderWithProviders(<Sidebar />, {
       isLoggedIn: false,
     });
 
diff --git a/src/renderer/components/avatars/AvatarWithFallback.test.tsx b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
index 5d20fff6f..ca34744f5 100644
--- a/src/renderer/components/avatars/AvatarWithFallback.test.tsx
+++ b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, screen } from '@testing-library/react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { type Link, Size } from '../../types';
 
@@ -19,19 +19,19 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   };
 
   it('should render avatar - human user', () => {
-    const tree = renderWithAppContext(<AvatarWithFallback {...props} />);
+    const tree = renderWithProviders(<AvatarWithFallback {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render avatar - non-human user', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <AvatarWithFallback {...props} userType={'Organization'} />,
     );
     expect(tree.container).toMatchSnapshot();
   });
 
   it('renders the fallback icon when no src url - human user', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <AvatarWithFallback {...props} src={null} />,
     );
 
@@ -39,7 +39,7 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   });
 
   it('renders the fallback icon when no src url - non human user', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <AvatarWithFallback {...props} src={null} userType="Bot" />,
     );
 
@@ -47,7 +47,7 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   });
 
   it('renders the fallback icon when the image fails to load (isBroken = true) - human user', () => {
-    renderWithAppContext(<AvatarWithFallback {...props} />);
+    renderWithProviders(<AvatarWithFallback {...props} />);
 
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app');
@@ -59,7 +59,7 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   });
 
   it('renders the fallback icon when the image fails to load (isBroken = true) - non human user', () => {
-    renderWithAppContext(<AvatarWithFallback {...props} userType={'Bot'} />);
+    renderWithProviders(<AvatarWithFallback {...props} userType={'Bot'} />);
 
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app');
diff --git a/src/renderer/components/fields/Checkbox.test.tsx b/src/renderer/components/fields/Checkbox.test.tsx
index 654203c3c..0b5ab5e60 100644
--- a/src/renderer/components/fields/Checkbox.test.tsx
+++ b/src/renderer/components/fields/Checkbox.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Checkbox, type CheckboxProps } from './Checkbox';
 
@@ -11,43 +11,43 @@ describe('renderer/components/fields/Checkbox.tsx', () => {
   };
 
   it('should render - visible', () => {
-    const tree = renderWithAppContext(<Checkbox {...props} />);
+    const tree = renderWithProviders(<Checkbox {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - not visible', () => {
-    const tree = renderWithAppContext(<Checkbox visible={false} {...props} />);
+    const tree = renderWithProviders(<Checkbox visible={false} {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - disabled', () => {
-    const tree = renderWithAppContext(<Checkbox disabled={true} {...props} />);
+    const tree = renderWithProviders(<Checkbox disabled={true} {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - tooltip', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Checkbox {...props} tooltip={<div>Hello world</div>} />,
     );
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - positive counter unselected', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Checkbox {...props} checked={false} counter={5} />,
     );
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - positive counter selected', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Checkbox {...props} checked={true} counter={5} />,
     );
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render - zero counter', () => {
-    const tree = renderWithAppContext(<Checkbox {...props} counter={0} />);
+    const tree = renderWithProviders(<Checkbox {...props} counter={0} />);
     expect(tree.container).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/FieldLabel.test.tsx b/src/renderer/components/fields/FieldLabel.test.tsx
index 51af6c46d..2b14563ee 100644
--- a/src/renderer/components/fields/FieldLabel.test.tsx
+++ b/src/renderer/components/fields/FieldLabel.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { FieldLabel, type FieldLabelProps } from './FieldLabel';
 
@@ -9,7 +9,7 @@ describe('renderer/components/fields/FieldLabel.tsx', () => {
   };
 
   it('should render', () => {
-    const tree = renderWithAppContext(<FieldLabel {...props} />);
+    const tree = renderWithProviders(<FieldLabel {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/RadioGroup.test.tsx b/src/renderer/components/fields/RadioGroup.test.tsx
index a7fe0497a..a2c279545 100644
--- a/src/renderer/components/fields/RadioGroup.test.tsx
+++ b/src/renderer/components/fields/RadioGroup.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { RadioGroup, type RadioGroupProps } from './RadioGroup';
 
@@ -15,14 +15,14 @@ describe('renderer/components/fields/RadioGroup.tsx', () => {
   };
 
   it('should render', () => {
-    const tree = renderWithAppContext(<RadioGroup {...props} />);
+    const tree = renderWithProviders(<RadioGroup {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render as disabled', () => {
     const mockProps = { ...props, disabled: true };
 
-    const tree = renderWithAppContext(<RadioGroup {...mockProps} />);
+    const tree = renderWithProviders(<RadioGroup {...mockProps} />);
     expect(tree.container).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/Tooltip.test.tsx b/src/renderer/components/fields/Tooltip.test.tsx
index 7262768d5..46aa76de0 100644
--- a/src/renderer/components/fields/Tooltip.test.tsx
+++ b/src/renderer/components/fields/Tooltip.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Tooltip, type TooltipProps } from './Tooltip';
 
@@ -12,14 +12,14 @@ describe('renderer/components/fields/Tooltip.tsx', () => {
   };
 
   it('should render', () => {
-    renderWithAppContext(<Tooltip {...props} />);
+    renderWithProviders(<Tooltip {...props} />);
 
     expect(screen.getByTestId('tooltip-icon-test')).toBeInTheDocument();
     expect(screen.queryByText(props.tooltip as string)).not.toBeInTheDocument();
   });
 
   it('should toggle (show/hide) tooltip on clicking tooltip icon', async () => {
-    renderWithAppContext(<Tooltip {...props} />);
+    renderWithProviders(<Tooltip {...props} />);
 
     const tooltipIconElement = screen.getByTestId('tooltip-icon-test');
 
@@ -33,7 +33,7 @@ describe('renderer/components/fields/Tooltip.tsx', () => {
   });
 
   it('should hide tooltip when clicking outside', async () => {
-    renderWithAppContext(<Tooltip {...props} />);
+    renderWithProviders(<Tooltip {...props} />);
 
     const tooltipIconElement = screen.getByTestId('tooltip-icon-test');
 
diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx
index bcf5833cd..31e993af9 100644
--- a/src/renderer/components/filters/FilterSection.test.tsx
+++ b/src/renderer/components/filters/FilterSection.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
@@ -23,7 +23,7 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
 
   describe('should render itself & its children', () => {
     it('with detailed notifications enabled', () => {
-      const tree = renderWithAppContext(
+      const tree = renderWithProviders(
         <FilterSection
           filter={{
             ...mockFilter,
@@ -47,7 +47,7 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
     });
 
     it('with detailed notifications disabled', () => {
-      const tree = renderWithAppContext(
+      const tree = renderWithProviders(
         <FilterSection
           filter={{
             ...mockFilter,
@@ -73,7 +73,7 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
 
   it('should be able to toggle filter value - none already set', async () => {
     await act(async () => {
-      renderWithAppContext(
+      renderWithProviders(
         <FilterSection
           filter={mockFilter}
           filterSetting={mockFilterSetting}
@@ -97,12 +97,8 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
   });
 
   it('should be able to toggle filter value - some filters already set', async () => {
-    useFiltersStore.setState({
-      states: ['open'],
-    });
-
     await act(async () => {
-      renderWithAppContext(
+      renderWithProviders(
         <FilterSection
           filter={mockFilter}
           filterSetting={mockFilterSetting}
@@ -112,6 +108,9 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
         />,
         {
           settings: mockSettings,
+          filters: {
+            states: ['open'],
+          },
         },
       );
     });
diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx
index 26c44a388..ae2e7278b 100644
--- a/src/renderer/components/filters/ReasonFilter.test.tsx
+++ b/src/renderer/components/filters/ReasonFilter.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../../__mocks__/notifications-mocks';
 
 import { ReasonFilter } from './ReasonFilter';
 
 describe('renderer/components/filters/ReasonFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<ReasonFilter />, {
+    const tree = renderWithProviders(<ReasonFilter />, {
       notifications: mockMultipleAccountNotifications,
     });
 
diff --git a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
index 9d2862811..440690ca1 100644
--- a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
+++ b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
 describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<RequiresDetailedNotificationWarning />);
+    const tree = renderWithProviders(<RequiresDetailedNotificationWarning />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/SearchFilter.test.tsx b/src/renderer/components/filters/SearchFilter.test.tsx
index c4c09828f..cea4d9bbb 100644
--- a/src/renderer/components/filters/SearchFilter.test.tsx
+++ b/src/renderer/components/filters/SearchFilter.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, screen } from '@testing-library/react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { useFiltersStore } from '../../stores';
 import { SearchFilter } from './SearchFilter';
@@ -14,7 +14,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
 
   describe('Include Search Tokens', () => {
     it('adds include actor token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
@@ -28,7 +28,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds include org token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, { target: { value: 'org:gitify-app' } });
@@ -42,7 +42,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds include repo token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, {
@@ -58,7 +58,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('prevent unrecognized include prefixes', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, {
@@ -72,7 +72,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
 
   describe('Exclude Search Tokens', () => {
     it('adds exclude actor token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const includeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
@@ -86,7 +86,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds exclude org token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, { target: { value: 'org:gitify-app' } });
@@ -100,7 +100,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds exclude repo token with prefix', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, {
@@ -116,7 +116,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('prevent unrecognized exclude prefixes', () => {
-      renderWithAppContext(<SearchFilter />);
+      renderWithProviders(<SearchFilter />);
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, {
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.test.tsx b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
index 95e96fa72..fff77c4a3 100644
--- a/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
+++ b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
 import { SearchFilterSuggestions } from './SearchFilterSuggestions';
 
 describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   it('should render itself & its children - closed', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <SearchFilterSuggestions inputValue={''} open={false} />,
     );
 
@@ -13,7 +13,7 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   });
 
   it('should render itself & its children - open without detailed notifications enabled', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <SearchFilterSuggestions inputValue={''} open={true} />,
       {
         settings: {
@@ -27,7 +27,7 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   });
 
   it('should render itself & its children - open with detailed notifications enabled', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <SearchFilterSuggestions inputValue={''} open={true} />,
       {
         settings: {
@@ -41,7 +41,7 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   });
 
   it('should render itself & its children - input token invalid', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <SearchFilterSuggestions inputValue={'invalid'} open={true} />,
       {
         settings: {
@@ -55,7 +55,7 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   });
 
   it('should render itself & its children - input token valid', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <SearchFilterSuggestions inputValue={'repo:'} open={true} />,
       {
         settings: {
diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx
index 010d50a88..3406afd82 100644
--- a/src/renderer/components/filters/StateFilter.test.tsx
+++ b/src/renderer/components/filters/StateFilter.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../../__mocks__/notifications-mocks';
 
 import { StateFilter } from './StateFilter';
 
 describe('renderer/components/filters/StateFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<StateFilter />, {
+    const tree = renderWithProviders(<StateFilter />, {
       notifications: mockMultipleAccountNotifications,
     });
 
diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
index 85a9a4de0..dd393fadd 100644
--- a/src/renderer/components/filters/SubjectTypeFilter.test.tsx
+++ b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../../__mocks__/notifications-mocks';
 
 import { SubjectTypeFilter } from './SubjectTypeFilter';
 
 describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<SubjectTypeFilter />, {
+    const tree = renderWithProviders(<SubjectTypeFilter />, {
       notifications: mockMultipleAccountNotifications,
     });
 
diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx
index 6cc9ec2f1..4f4a5001b 100644
--- a/src/renderer/components/filters/UserTypeFilter.test.tsx
+++ b/src/renderer/components/filters/UserTypeFilter.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../../__mocks__/notifications-mocks';
 
 import { UserTypeFilter } from './UserTypeFilter';
 
 describe('renderer/components/filters/UserTypeFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<UserTypeFilter />, {
+    const tree = renderWithProviders(<UserTypeFilter />, {
       notifications: mockMultipleAccountNotifications,
     });
 
diff --git a/src/renderer/components/icons/LogoIcon.test.tsx b/src/renderer/components/icons/LogoIcon.test.tsx
index dbb828cd8..b8eccb010 100644
--- a/src/renderer/components/icons/LogoIcon.test.tsx
+++ b/src/renderer/components/icons/LogoIcon.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Size } from '../../types';
 
@@ -9,20 +9,20 @@ import { LogoIcon } from './LogoIcon';
 
 describe('renderer/components/icons/LogoIcon.tsx', () => {
   it('renders correctly (light)', () => {
-    const tree = renderWithAppContext(<LogoIcon size={Size.SMALL} />);
+    const tree = renderWithProviders(<LogoIcon size={Size.SMALL} />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('renders correctly (dark)', () => {
-    const tree = renderWithAppContext(<LogoIcon isDark size={Size.SMALL} />);
+    const tree = renderWithProviders(<LogoIcon isDark size={Size.SMALL} />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should click on the logo', async () => {
     const onClickMock = vi.fn();
-    renderWithAppContext(<LogoIcon onClick={onClickMock} size={Size.SMALL} />);
+    renderWithProviders(<LogoIcon onClick={onClickMock} size={Size.SMALL} />);
 
     await userEvent.click(screen.getByLabelText('Gitify Logo'));
 
@@ -30,19 +30,19 @@ describe('renderer/components/icons/LogoIcon.tsx', () => {
   });
 
   it('should render small size', () => {
-    const tree = renderWithAppContext(<LogoIcon size={Size.SMALL} />);
+    const tree = renderWithProviders(<LogoIcon size={Size.SMALL} />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render medium size', () => {
-    const tree = renderWithAppContext(<LogoIcon size={Size.MEDIUM} />);
+    const tree = renderWithProviders(<LogoIcon size={Size.MEDIUM} />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render large size', () => {
-    const tree = renderWithAppContext(<LogoIcon size={Size.LARGE} />);
+    const tree = renderWithProviders(<LogoIcon size={Size.LARGE} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/icons/ScopeStatusIcon.test.tsx b/src/renderer/components/icons/ScopeStatusIcon.test.tsx
index cd4405f30..e87b8123e 100644
--- a/src/renderer/components/icons/ScopeStatusIcon.test.tsx
+++ b/src/renderer/components/icons/ScopeStatusIcon.test.tsx
@@ -1,27 +1,25 @@
 import { screen } from '@testing-library/react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { ScopeStatusIcon } from './ScopeStatusIcon';
 
 describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
   describe('granted state', () => {
     it('renders a success icon when granted', () => {
-      const tree = renderWithAppContext(<ScopeStatusIcon granted={true} />);
+      const tree = renderWithProviders(<ScopeStatusIcon granted={true} />);
       expect(tree.container).toMatchSnapshot();
     });
 
     it('renders a success icon with test id when withTestId is true', () => {
-      renderWithAppContext(
-        <ScopeStatusIcon granted={true} withTestId={true} />,
-      );
+      renderWithProviders(<ScopeStatusIcon granted={true} withTestId={true} />);
       expect(
         screen.getByTestId('account-scopes-scope-granted'),
       ).toBeInTheDocument();
     });
 
     it('does not render a test id by default', () => {
-      renderWithAppContext(<ScopeStatusIcon granted={true} />);
+      renderWithProviders(<ScopeStatusIcon granted={true} />);
       expect(
         screen.queryByTestId('account-scopes-scope-granted'),
       ).not.toBeInTheDocument();
@@ -30,12 +28,12 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
 
   describe('missing state', () => {
     it('renders a danger icon when not granted', () => {
-      const tree = renderWithAppContext(<ScopeStatusIcon granted={false} />);
+      const tree = renderWithProviders(<ScopeStatusIcon granted={false} />);
       expect(tree.container).toMatchSnapshot();
     });
 
     it('renders a danger icon with test id when withTestId is true', () => {
-      renderWithAppContext(
+      renderWithProviders(
         <ScopeStatusIcon granted={false} withTestId={true} />,
       );
       expect(
@@ -44,7 +42,7 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
     });
 
     it('does not render a test id by default', () => {
-      renderWithAppContext(<ScopeStatusIcon granted={false} />);
+      renderWithProviders(<ScopeStatusIcon granted={false} />);
       expect(
         screen.queryByTestId('account-scopes-scope-missing'),
       ).not.toBeInTheDocument();
@@ -53,14 +51,14 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
 
   describe('notApplicable state', () => {
     it('renders a dash icon when notApplicable', () => {
-      const tree = renderWithAppContext(
+      const tree = renderWithProviders(
         <ScopeStatusIcon granted={false} notApplicable={true} />,
       );
       expect(tree.container).toMatchSnapshot();
     });
 
     it('renders a dash icon with test id when withTestId is true', () => {
-      renderWithAppContext(
+      renderWithProviders(
         <ScopeStatusIcon
           granted={false}
           notApplicable={true}
@@ -71,7 +69,7 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
     });
 
     it('does not render a test id by default', () => {
-      renderWithAppContext(
+      renderWithProviders(
         <ScopeStatusIcon granted={false} notApplicable={true} />,
       );
       expect(
@@ -80,7 +78,7 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
     });
 
     it('ignores granted=true when notApplicable is true', () => {
-      renderWithAppContext(
+      renderWithProviders(
         <ScopeStatusIcon
           granted={true}
           notApplicable={true}
@@ -96,7 +94,7 @@ describe('renderer/components/icons/ScopeStatusIcon.tsx', () => {
 
   describe('size prop', () => {
     it('renders correctly with a custom size', () => {
-      const tree = renderWithAppContext(
+      const tree = renderWithProviders(
         <ScopeStatusIcon granted={true} size={20} />,
       );
       expect(tree.container).toMatchSnapshot();
diff --git a/src/renderer/components/layout/AppLayout.test.tsx b/src/renderer/components/layout/AppLayout.test.tsx
index 86f9f7203..79402a23b 100644
--- a/src/renderer/components/layout/AppLayout.test.tsx
+++ b/src/renderer/components/layout/AppLayout.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { AppLayout } from './AppLayout';
 
 describe('renderer/components/layout/AppLayout.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<AppLayout>Test</AppLayout>);
+    const tree = renderWithProviders(<AppLayout>Test</AppLayout>);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/Centered.test.tsx b/src/renderer/components/layout/Centered.test.tsx
index f5eb4b731..cc4fc538a 100644
--- a/src/renderer/components/layout/Centered.test.tsx
+++ b/src/renderer/components/layout/Centered.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Centered } from './Centered';
 
 describe('renderer/components/layout/Centered.tsx', () => {
   it('should render itself & its children - full height true', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Centered fullHeight={true}>Test</Centered>,
     );
 
@@ -12,7 +12,7 @@ describe('renderer/components/layout/Centered.tsx', () => {
   });
 
   it('should render itself & its children - full height false', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Centered fullHeight={false}>Test</Centered>,
     );
 
diff --git a/src/renderer/components/layout/Contents.test.tsx b/src/renderer/components/layout/Contents.test.tsx
index e58e3b9c5..c13251831 100644
--- a/src/renderer/components/layout/Contents.test.tsx
+++ b/src/renderer/components/layout/Contents.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Contents } from './Contents';
 
 describe('renderer/components/layout/Contents.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<Contents>Test</Contents>);
+    const tree = renderWithProviders(<Contents>Test</Contents>);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/EmojiSplash.test.tsx b/src/renderer/components/layout/EmojiSplash.test.tsx
index 50dba483a..5c0654eac 100644
--- a/src/renderer/components/layout/EmojiSplash.test.tsx
+++ b/src/renderer/components/layout/EmojiSplash.test.tsx
@@ -1,16 +1,16 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { EmojiSplash } from './EmojiSplash';
 
 describe('renderer/components/layout/EmojiSplash.tsx', () => {
   it('should render itself & its children - heading only', async () => {
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
       tree = await act(async () => {
-        return renderWithAppContext(
+        return renderWithProviders(
           <EmojiSplash emoji="🍺" heading="Test Heading" />,
         );
       });
@@ -20,11 +20,11 @@ describe('renderer/components/layout/EmojiSplash.tsx', () => {
   });
 
   it('should render itself & its children - heading and sub-heading', async () => {
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
       tree = await act(async () => {
-        return renderWithAppContext(
+        return renderWithProviders(
           <EmojiSplash
             emoji="🍺"
             heading="Test Heading"
diff --git a/src/renderer/components/layout/Page.test.tsx b/src/renderer/components/layout/Page.test.tsx
index cff853e07..6a89215b1 100644
--- a/src/renderer/components/layout/Page.test.tsx
+++ b/src/renderer/components/layout/Page.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Page } from './Page';
 
 describe('renderer/components/layout/Page.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<Page testId="test">Test</Page>);
+    const tree = renderWithProviders(<Page testId="test">Test</Page>);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/CommentsPill.test.tsx b/src/renderer/components/metrics/CommentsPill.test.tsx
index be1924991..79313869c 100644
--- a/src/renderer/components/metrics/CommentsPill.test.tsx
+++ b/src/renderer/components/metrics/CommentsPill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { CommentsPill, type CommentsPillProps } from './CommentsPill';
 
@@ -6,7 +6,7 @@ describe('renderer/components/metrics/CommentsPill.tsx', () => {
   it('renders with no comments (null)', () => {
     const props: CommentsPillProps = null;
 
-    const tree = renderWithAppContext(<CommentsPill {...props} />);
+    const tree = renderWithProviders(<CommentsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -16,7 +16,7 @@ describe('renderer/components/metrics/CommentsPill.tsx', () => {
       commentCount: 1,
     };
 
-    const tree = renderWithAppContext(<CommentsPill {...props} />);
+    const tree = renderWithProviders(<CommentsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -26,7 +26,7 @@ describe('renderer/components/metrics/CommentsPill.tsx', () => {
       commentCount: 2,
     };
 
-    const tree = renderWithAppContext(<CommentsPill {...props} />);
+    const tree = renderWithProviders(<CommentsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/LabelsPill.test.tsx b/src/renderer/components/metrics/LabelsPill.test.tsx
index 29a6d0ff5..f5ca1f674 100644
--- a/src/renderer/components/metrics/LabelsPill.test.tsx
+++ b/src/renderer/components/metrics/LabelsPill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { LabelsPill, type LabelsPillProps } from './LabelsPill';
 
@@ -6,7 +6,7 @@ describe('renderer/components/metrics/LabelsPill.tsx', () => {
   it('renders without labels', () => {
     const props: LabelsPillProps = { labels: [] };
 
-    const tree = renderWithAppContext(<LabelsPill {...props} />);
+    const tree = renderWithProviders(<LabelsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -19,7 +19,7 @@ describe('renderer/components/metrics/LabelsPill.tsx', () => {
       ],
     };
 
-    const tree = renderWithAppContext(<LabelsPill {...props} />);
+    const tree = renderWithProviders(<LabelsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/LinkedIssuesPill.test.tsx b/src/renderer/components/metrics/LinkedIssuesPill.test.tsx
index d031ed020..ad53cd97c 100644
--- a/src/renderer/components/metrics/LinkedIssuesPill.test.tsx
+++ b/src/renderer/components/metrics/LinkedIssuesPill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import {
   LinkedIssuesPill,
@@ -9,7 +9,7 @@ describe('renderer/components/metrics/LinkedIssuesPill.tsx', () => {
   it('renders when no linked issues/prs', () => {
     const props: LinkedIssuesPillProps = { linkedIssues: [] };
 
-    const tree = renderWithAppContext(<LinkedIssuesPill {...props} />);
+    const tree = renderWithProviders(<LinkedIssuesPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -17,7 +17,7 @@ describe('renderer/components/metrics/LinkedIssuesPill.tsx', () => {
   it('renders when linked to one issue/pr', () => {
     const props: LinkedIssuesPillProps = { linkedIssues: ['#1'] };
 
-    const tree = renderWithAppContext(<LinkedIssuesPill {...props} />);
+    const tree = renderWithProviders(<LinkedIssuesPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -25,7 +25,7 @@ describe('renderer/components/metrics/LinkedIssuesPill.tsx', () => {
   it('renders when linked to multiple issues/prs', () => {
     const props: LinkedIssuesPillProps = { linkedIssues: ['#1', '#2'] };
 
-    const tree = renderWithAppContext(<LinkedIssuesPill {...props} />);
+    const tree = renderWithProviders(<LinkedIssuesPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/MetricGroup.test.tsx b/src/renderer/components/metrics/MetricGroup.test.tsx
index af210a453..c7a041e96 100644
--- a/src/renderer/components/metrics/MetricGroup.test.tsx
+++ b/src/renderer/components/metrics/MetricGroup.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
@@ -11,7 +11,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       notification: mockNotification,
     };
 
-    const tree = renderWithAppContext(<MetricGroup {...props} />, {
+    const tree = renderWithProviders(<MetricGroup {...props} />, {
       settings: { ...mockSettings, showPills: false },
     });
 
@@ -24,7 +24,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       notification: mockNotification,
     };
 
-    const tree = renderWithAppContext(<MetricGroup {...props} />, {
+    const tree = renderWithProviders(<MetricGroup {...props} />, {
       settings: { ...mockSettings, showPills: true },
     });
 
diff --git a/src/renderer/components/metrics/MetricPill.test.tsx b/src/renderer/components/metrics/MetricPill.test.tsx
index c9aeb7ca9..81279bb3f 100644
--- a/src/renderer/components/metrics/MetricPill.test.tsx
+++ b/src/renderer/components/metrics/MetricPill.test.tsx
@@ -1,6 +1,6 @@
 import { MarkGithubIcon } from '@primer/octicons-react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { IconColor } from '../../types';
 
@@ -15,7 +15,7 @@ describe('renderer/components/metrics/MetricPill.tsx', () => {
       color: IconColor.GREEN,
     };
 
-    const tree = renderWithAppContext(<MetricPill {...props} />);
+    const tree = renderWithProviders(<MetricPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -27,7 +27,7 @@ describe('renderer/components/metrics/MetricPill.tsx', () => {
       color: IconColor.GREEN,
     };
 
-    const tree = renderWithAppContext(<MetricPill {...props} />);
+    const tree = renderWithProviders(<MetricPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/MilestonePill.test.tsx b/src/renderer/components/metrics/MilestonePill.test.tsx
index 79f9e485f..fa508d688 100644
--- a/src/renderer/components/metrics/MilestonePill.test.tsx
+++ b/src/renderer/components/metrics/MilestonePill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { MilestonePill, type MilestonePillProps } from './MilestonePill';
 
@@ -6,7 +6,7 @@ describe('renderer/components/metrics/MilestonePill.tsx', () => {
   it('renders with no milestone', () => {
     const props: MilestonePillProps = { milestone: null };
 
-    const tree = renderWithAppContext(<MilestonePill {...props} />);
+    const tree = renderWithProviders(<MilestonePill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -19,7 +19,7 @@ describe('renderer/components/metrics/MilestonePill.tsx', () => {
       },
     };
 
-    const tree = renderWithAppContext(<MilestonePill {...props} />);
+    const tree = renderWithProviders(<MilestonePill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -32,7 +32,7 @@ describe('renderer/components/metrics/MilestonePill.tsx', () => {
       },
     };
 
-    const tree = renderWithAppContext(<MilestonePill {...props} />);
+    const tree = renderWithProviders(<MilestonePill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/ReactionsPill.test.tsx b/src/renderer/components/metrics/ReactionsPill.test.tsx
index b9a59e151..da07582be 100644
--- a/src/renderer/components/metrics/ReactionsPill.test.tsx
+++ b/src/renderer/components/metrics/ReactionsPill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { ReactionsPill, type ReactionsPillProps } from './ReactionsPill';
 
@@ -6,7 +6,7 @@ describe('renderer/components/metrics/ReactionsPill.tsx', () => {
   it('renders with no reactions', () => {
     const props: ReactionsPillProps = { reactionGroups: [], reactionsCount: 0 };
 
-    const tree = renderWithAppContext(<ReactionsPill {...props} />);
+    const tree = renderWithProviders(<ReactionsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -22,7 +22,7 @@ describe('renderer/components/metrics/ReactionsPill.tsx', () => {
       reactionsCount: 1,
     };
 
-    const tree = renderWithAppContext(<ReactionsPill {...props} />);
+    const tree = renderWithProviders(<ReactionsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -42,7 +42,7 @@ describe('renderer/components/metrics/ReactionsPill.tsx', () => {
       reactionsCount: 54,
     };
 
-    const tree = renderWithAppContext(<ReactionsPill {...props} />);
+    const tree = renderWithProviders(<ReactionsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/metrics/ReviewsPill.test.tsx b/src/renderer/components/metrics/ReviewsPill.test.tsx
index eb5ec9c49..10fb9c59b 100644
--- a/src/renderer/components/metrics/ReviewsPill.test.tsx
+++ b/src/renderer/components/metrics/ReviewsPill.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
 
 import { ReviewsPill, type ReviewsPillProps } from './ReviewsPill';
@@ -9,7 +9,7 @@ describe('renderer/components/metrics/ReviewsPill.tsx', () => {
       reviews: mockGitifyNotification.subject.reviews,
     };
 
-    const tree = renderWithAppContext(<ReviewsPill {...props} />);
+    const tree = renderWithProviders(<ReviewsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -19,7 +19,7 @@ describe('renderer/components/metrics/ReviewsPill.tsx', () => {
       reviews: [],
     };
 
-    const tree = renderWithAppContext(<ReviewsPill {...props} />);
+    const tree = renderWithProviders(<ReviewsPill {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/notifications/AccountNotifications.test.tsx b/src/renderer/components/notifications/AccountNotifications.test.tsx
index 0d10e7060..4e28c5c8f 100644
--- a/src/renderer/components/notifications/AccountNotifications.test.tsx
+++ b/src/renderer/components/notifications/AccountNotifications.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
 import { mockGitHubCloudGitifyNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -27,7 +27,7 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    const tree = renderWithAppContext(<AccountNotifications {...props} />, {
+    const tree = renderWithProviders(<AccountNotifications {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
     });
 
@@ -42,7 +42,7 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    const tree = renderWithAppContext(<AccountNotifications {...props} />, {
+    const tree = renderWithProviders(<AccountNotifications {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.DATE },
     });
 
@@ -57,10 +57,10 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<AccountNotifications {...props} />);
+      tree = renderWithProviders(<AccountNotifications {...props} />);
     });
 
     expect(tree.container).toMatchSnapshot();
@@ -78,10 +78,10 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       showAccountHeader: true,
     };
 
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<AccountNotifications {...props} />, {
+      tree = renderWithProviders(<AccountNotifications {...props} />, {
         auth: { accounts: [mockGitHubCloudAccount] },
       });
     });
@@ -101,10 +101,10 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       showAccountHeader: true,
     };
 
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<AccountNotifications {...props} />);
+      tree = renderWithProviders(<AccountNotifications {...props} />);
     });
 
     expect(tree.container).toMatchSnapshot();
@@ -122,7 +122,7 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    renderWithAppContext(<AccountNotifications {...props} />);
+    renderWithProviders(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-profile'));
 
@@ -142,7 +142,7 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    renderWithAppContext(<AccountNotifications {...props} />);
+    renderWithProviders(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-issues'));
 
@@ -164,7 +164,7 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    renderWithAppContext(<AccountNotifications {...props} />);
+    renderWithProviders(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-pull-requests'));
 
@@ -182,11 +182,11 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    renderWithAppContext(<AccountNotifications {...props} />);
+    renderWithProviders(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-toggle'));
 
-    const tree = renderWithAppContext(<AccountNotifications {...props} />);
+    const tree = renderWithProviders(<AccountNotifications {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/notifications/NotificationFooter.test.tsx b/src/renderer/components/notifications/NotificationFooter.test.tsx
index 67e21f9c4..5d8863705 100644
--- a/src/renderer/components/notifications/NotificationFooter.test.tsx
+++ b/src/renderer/components/notifications/NotificationFooter.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
 
 import type { GitifyNotificationUser, Link } from '../../types';
@@ -22,7 +22,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       notification: mockGitifyNotification,
     };
 
-    const tree = renderWithAppContext(<NotificationFooter {...props} />);
+    const tree = renderWithProviders(<NotificationFooter {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -36,7 +36,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = renderWithAppContext(<NotificationFooter {...props} />);
+      const tree = renderWithProviders(<NotificationFooter {...props} />);
 
       expect(tree.container).toMatchSnapshot();
     });
@@ -49,7 +49,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = renderWithAppContext(<NotificationFooter {...props} />);
+      const tree = renderWithProviders(<NotificationFooter {...props} />);
 
       expect(tree.container).toMatchSnapshot();
     });
@@ -63,7 +63,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       notification: mockNotification,
     };
 
-    const tree = renderWithAppContext(<NotificationFooter {...props} />);
+    const tree = renderWithProviders(<NotificationFooter {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -90,7 +90,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       },
     };
 
-    renderWithAppContext(<NotificationFooter {...props} />);
+    renderWithProviders(<NotificationFooter {...props} />);
 
     await userEvent.click(screen.getByTestId('view-profile'));
 
diff --git a/src/renderer/components/notifications/NotificationHeader.test.tsx b/src/renderer/components/notifications/NotificationHeader.test.tsx
index 21f07cef0..10320c940 100644
--- a/src/renderer/components/notifications/NotificationHeader.test.tsx
+++ b/src/renderer/components/notifications/NotificationHeader.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
@@ -19,7 +19,7 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
       notification: mockGitifyNotification,
     };
 
-    const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+    const tree = renderWithProviders(<NotificationHeader {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
     });
 
@@ -32,7 +32,7 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         notification: mockGitifyNotification,
       };
 
-      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+      const tree = renderWithProviders(<NotificationHeader {...props} />, {
         settings: { ...mockSettings, groupBy: GroupBy.DATE },
       });
 
@@ -44,7 +44,7 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         notification: mockGitifyNotification,
       };
 
-      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+      const tree = renderWithProviders(<NotificationHeader {...props} />, {
         settings: {
           ...mockSettings,
           showNumber: false,
@@ -63,7 +63,7 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         },
       };
 
-      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+      const tree = renderWithProviders(<NotificationHeader {...props} />, {
         settings: { ...mockSettings, groupBy: GroupBy.DATE },
       });
 
@@ -80,7 +80,7 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
       notification: mockGitifyNotification,
     };
 
-    renderWithAppContext(<NotificationHeader {...props} />, {
+    renderWithProviders(<NotificationHeader {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.DATE },
     });
 
diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index f949ac6e6..0e81a211b 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
@@ -24,7 +24,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       isRepositoryAnimatingExit: false,
     };
 
-    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+    const tree = renderWithProviders(<NotificationRow {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.DATE },
     });
 
@@ -37,7 +37,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       isRepositoryAnimatingExit: false,
     };
 
-    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+    const tree = renderWithProviders(<NotificationRow {...props} />, {
       settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
     });
 
@@ -50,7 +50,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       isRepositoryAnimatingExit: false,
     };
 
-    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+    const tree = renderWithProviders(<NotificationRow {...props} />, {
       settings: { ...mockSettings, showNumber: false },
     });
 
@@ -63,7 +63,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       isRepositoryAnimatingExit: false,
     };
 
-    const tree = renderWithAppContext(<NotificationRow {...props} />);
+    const tree = renderWithProviders(<NotificationRow {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -77,7 +77,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: { ...mockSettings, markAsDoneOnOpen: false },
         markNotificationsAsRead: markNotificationsAsReadMock,
       });
@@ -96,7 +96,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: {
           ...mockSettings,
           markAsDoneOnOpen: false,
@@ -119,7 +119,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: { ...mockSettings, markAsDoneOnOpen: true },
         markNotificationsAsDone: markNotificationsAsDoneMock,
       });
@@ -139,7 +139,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: {
           ...mockSettings,
           markAsDoneOnOpen: true,
@@ -164,7 +164,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: { ...mockSettings, markAsDoneOnOpen: false },
         markNotificationsAsRead: markNotificationsAsReadMock,
       });
@@ -183,7 +183,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />);
+      renderWithProviders(<NotificationRow {...props} />);
 
       expect(
         screen.queryByTestId('notification-mark-as-read'),
@@ -198,7 +198,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: mockSettings,
         markNotificationsAsDone: markNotificationsAsDoneMock,
       });
@@ -217,7 +217,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />);
+      renderWithProviders(<NotificationRow {...props} />);
 
       expect(
         screen.queryByTestId('notification-mark-as-done'),
@@ -230,7 +230,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         settings: { ...mockSettings, fetchReadNotifications: true },
       });
 
@@ -250,7 +250,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         isRepositoryAnimatingExit: false,
       };
 
-      renderWithAppContext(<NotificationRow {...props} />, {
+      renderWithProviders(<NotificationRow {...props} />, {
         unsubscribeNotification: unsubscribeNotificationMock,
       });
 
diff --git a/src/renderer/components/notifications/NotificationTitle.test.tsx b/src/renderer/components/notifications/NotificationTitle.test.tsx
index da1a56c4e..daa082193 100644
--- a/src/renderer/components/notifications/NotificationTitle.test.tsx
+++ b/src/renderer/components/notifications/NotificationTitle.test.tsx
@@ -1,11 +1,11 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
 import { NotificationTitle } from './NotificationTitle';
 
 describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   it('should render plain text without code blocks', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="Simple notification title" />,
     );
 
@@ -13,7 +13,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should render text with single inline code block', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="refactor: migrate deprecated atlaskit `xcss`" />,
     );
 
@@ -21,7 +21,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should render text with multiple inline code blocks', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="Replace `foo` with `bar` in config" />,
     );
 
@@ -29,7 +29,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should render text with code block at the start', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="`useState` hook implementation" />,
     );
 
@@ -37,7 +37,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should render text with code block at the end', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="Fix issue with `render`" />,
     );
 
@@ -45,7 +45,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should apply truncate className when wrapNotificationTitle is false', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="refactor: migrate deprecated atlaskit `xcss`" />,
       {
         settings: {
@@ -59,7 +59,7 @@ describe('renderer/components/notifications/NotificationTitle.tsx', () => {
   });
 
   it('should not apply truncate className when wrapNotificationTitle is true', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <NotificationTitle title="refactor: migrate deprecated atlaskit `xcss`" />,
       {
         settings: {
diff --git a/src/renderer/components/notifications/RepositoryNotifications.test.tsx b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
index 21104a5ab..fac0efa56 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.test.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitHubCloudGitifyNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
@@ -27,7 +27,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       repoNotifications: mockGitHubCloudGitifyNotifications,
     };
 
-    const tree = renderWithAppContext(<RepositoryNotifications {...props} />);
+    const tree = renderWithProviders(<RepositoryNotifications {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -41,7 +41,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       })),
     };
 
-    const tree = renderWithAppContext(<RepositoryNotifications {...props} />);
+    const tree = renderWithProviders(<RepositoryNotifications {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -56,7 +56,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       .spyOn(comms, 'openExternalLink')
       .mockImplementation(vi.fn());
 
-    renderWithAppContext(<RepositoryNotifications {...props} />);
+    renderWithProviders(<RepositoryNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('open-repository'));
 
@@ -72,7 +72,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       repoNotifications: mockGitHubCloudGitifyNotifications,
     };
 
-    renderWithAppContext(<RepositoryNotifications {...props} />, {
+    renderWithProviders(<RepositoryNotifications {...props} />, {
       settings: { ...mockSettings },
       markNotificationsAsRead: markNotificationsAsReadMock,
     });
@@ -90,7 +90,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       repoNotifications: mockGitHubCloudGitifyNotifications,
     };
 
-    renderWithAppContext(<RepositoryNotifications {...props} />, {
+    renderWithProviders(<RepositoryNotifications {...props} />, {
       settings: { ...mockSettings },
       markNotificationsAsDone: markNotificationsAsDoneMock,
     });
@@ -110,7 +110,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
 
     props.repoNotifications[0].repository.owner.avatarUrl = '' as Link;
 
-    const tree = renderWithAppContext(<RepositoryNotifications {...props} />);
+    const tree = renderWithProviders(<RepositoryNotifications {...props} />);
 
     expect(tree.container).toMatchSnapshot();
   });
@@ -122,12 +122,12 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
     };
 
     await act(async () => {
-      renderWithAppContext(<RepositoryNotifications {...props} />);
+      renderWithProviders(<RepositoryNotifications {...props} />);
     });
 
     await userEvent.click(screen.getByTestId('repository-toggle'));
 
-    const tree = renderWithAppContext(<RepositoryNotifications {...props} />);
+    const tree = renderWithProviders(<RepositoryNotifications {...props} />);
     expect(tree.container).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/primitives/CustomCounter.test.tsx b/src/renderer/components/primitives/CustomCounter.test.tsx
index 9dd3eb681..31baff62a 100644
--- a/src/renderer/components/primitives/CustomCounter.test.tsx
+++ b/src/renderer/components/primitives/CustomCounter.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { CustomCounter } from './CustomCounter';
 
 describe('renderer/components/primitives/CustomCounter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<CustomCounter value={100} />);
+    const tree = renderWithProviders(<CustomCounter value={100} />);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/primitives/EmojiText.test.tsx b/src/renderer/components/primitives/EmojiText.test.tsx
index 98f079ee2..7cc893d80 100644
--- a/src/renderer/components/primitives/EmojiText.test.tsx
+++ b/src/renderer/components/primitives/EmojiText.test.tsx
@@ -1,6 +1,6 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { EmojiText, type IEmojiText } from './EmojiText';
 
@@ -10,10 +10,10 @@ describe('renderer/components/primitives/EmojiText.tsx', () => {
       text: '🍺',
     };
 
-    let tree: ReturnType<typeof renderWithAppContext> | null = null;
+    let tree: ReturnType<typeof renderWithProviders> | null = null;
 
     await act(async () => {
-      tree = renderWithAppContext(<EmojiText {...props} />);
+      tree = renderWithProviders(<EmojiText {...props} />);
     });
 
     expect(tree.container).toMatchSnapshot();
diff --git a/src/renderer/components/primitives/Footer.test.tsx b/src/renderer/components/primitives/Footer.test.tsx
index 1637a7d87..82533dad5 100644
--- a/src/renderer/components/primitives/Footer.test.tsx
+++ b/src/renderer/components/primitives/Footer.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Footer } from './Footer';
 
 describe('renderer/components/primitives/Footer.tsx', () => {
   it('should render itself & its children - space-between', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Footer justify="space-between">Test</Footer>,
     );
 
@@ -12,7 +12,7 @@ describe('renderer/components/primitives/Footer.tsx', () => {
   });
 
   it('should render itself & its children - end', () => {
-    const tree = renderWithAppContext(<Footer justify="end">Test</Footer>);
+    const tree = renderWithProviders(<Footer justify="end">Test</Footer>);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/primitives/Header.test.tsx b/src/renderer/components/primitives/Header.test.tsx
index 0b0c605c6..b603942e8 100644
--- a/src/renderer/components/primitives/Header.test.tsx
+++ b/src/renderer/components/primitives/Header.test.tsx
@@ -5,7 +5,7 @@ import { MarkGithubIcon } from '@primer/octicons-react';
 
 import {
   navigateMock,
-  renderWithAppContext,
+  renderWithProviders,
 } from '../../__helpers__/test-utils';
 
 import { Header } from './Header';
@@ -14,7 +14,7 @@ describe('renderer/components/primitives/Header.tsx', () => {
   const fetchNotificationsMock = vi.fn();
 
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <Header icon={MarkGithubIcon}>Test Header</Header>,
     );
 
@@ -22,7 +22,7 @@ describe('renderer/components/primitives/Header.tsx', () => {
   });
 
   it('should navigate back', async () => {
-    renderWithAppContext(<Header icon={MarkGithubIcon}>Test Header</Header>);
+    renderWithProviders(<Header icon={MarkGithubIcon}>Test Header</Header>);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -31,7 +31,7 @@ describe('renderer/components/primitives/Header.tsx', () => {
   });
 
   it('should navigate back and fetch notifications', async () => {
-    renderWithAppContext(
+    renderWithProviders(
       <Header fetchOnBack icon={MarkGithubIcon}>
         Test Header
       </Header>,
diff --git a/src/renderer/components/primitives/HoverButton.test.tsx b/src/renderer/components/primitives/HoverButton.test.tsx
index 1ac6b060a..019978e68 100644
--- a/src/renderer/components/primitives/HoverButton.test.tsx
+++ b/src/renderer/components/primitives/HoverButton.test.tsx
@@ -1,6 +1,6 @@
 import { MarkGithubIcon } from '@primer/octicons-react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { HoverButton } from './HoverButton';
 
@@ -8,7 +8,7 @@ describe('renderer/components/primitives/HoverButton.tsx', () => {
   it('should render', () => {
     const actionMock = vi.fn();
 
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <HoverButton
         action={actionMock}
         icon={MarkGithubIcon}
@@ -22,7 +22,7 @@ describe('renderer/components/primitives/HoverButton.tsx', () => {
   it('should render - disabled', () => {
     const actionMock = vi.fn();
 
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <HoverButton
         action={actionMock}
         enabled={false}
diff --git a/src/renderer/components/primitives/HoverGroup.test.tsx b/src/renderer/components/primitives/HoverGroup.test.tsx
index f734caef6..ff04ecf18 100644
--- a/src/renderer/components/primitives/HoverGroup.test.tsx
+++ b/src/renderer/components/primitives/HoverGroup.test.tsx
@@ -1,10 +1,10 @@
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { HoverGroup } from './HoverGroup';
 
 describe('renderer/components/primitives/HoverGroup.tsx', () => {
   it('should render', () => {
-    const tree = renderWithAppContext(
+    const tree = renderWithProviders(
       <HoverGroup bgColor="group-hover:bg-gitify-repository">
         Hover Group
       </HoverGroup>,
diff --git a/src/renderer/components/primitives/Title.test.tsx b/src/renderer/components/primitives/Title.test.tsx
index ce9b1f3a3..27b5961da 100644
--- a/src/renderer/components/primitives/Title.test.tsx
+++ b/src/renderer/components/primitives/Title.test.tsx
@@ -1,12 +1,12 @@
 import { PersonFillIcon } from '@primer/octicons-react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { Title } from './Title';
 
 describe('renderer/routes/components/primitives/Title.tsx', () => {
   it('should render the title - default size', async () => {
-    const { container } = renderWithAppContext(
+    const { container } = renderWithProviders(
       <Title icon={PersonFillIcon}>Legend</Title>,
     );
 
@@ -14,7 +14,7 @@ describe('renderer/routes/components/primitives/Title.tsx', () => {
   });
 
   it('should render the title - specific size', async () => {
-    const { container } = renderWithAppContext(
+    const { container } = renderWithProviders(
       <Title icon={PersonFillIcon} size={4}>
         Legend
       </Title>,
diff --git a/src/renderer/components/settings/AppearanceSettings.test.tsx b/src/renderer/components/settings/AppearanceSettings.test.tsx
index 9bfe89cd7..e32408a22 100644
--- a/src/renderer/components/settings/AppearanceSettings.test.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockGitHubAppAccount } from '../../__mocks__/account-mocks';
 
 import * as zoom from '../../utils/ui/zoom';
@@ -12,7 +12,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
 
   it('should change the theme mode dropdown', async () => {
     await act(async () => {
-      renderWithAppContext(<AppearanceSettings />, {
+      renderWithProviders(<AppearanceSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -28,7 +28,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
 
   it('should toggle increase contrast checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<AppearanceSettings />, {
+      renderWithProviders(<AppearanceSettings />, {
         auth: {
           accounts: [mockGitHubAppAccount],
         },
@@ -54,7 +54,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
       .mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(<AppearanceSettings />, {
+      renderWithProviders(<AppearanceSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -77,7 +77,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
 
   it('should toggle account header checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<AppearanceSettings />, {
+      renderWithProviders(<AppearanceSettings />, {
         auth: {
           accounts: [mockGitHubAppAccount],
         },
@@ -93,7 +93,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
 
   it('should toggle wrap notification title checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<AppearanceSettings />, {
+      renderWithProviders(<AppearanceSettings />, {
         auth: {
           accounts: [mockGitHubAppAccount],
         },
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 97413b20f..e77ae4804 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
 import { Constants } from '../../constants';
@@ -14,7 +14,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should change the groupBy radio group', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -27,7 +27,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should change the fetchType radio group', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -41,7 +41,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
   describe('fetch interval settings', () => {
     it('should update the fetch interval values when using the buttons', async () => {
       await act(async () => {
-        renderWithAppContext(<NotificationSettings />, {
+        renderWithProviders(<NotificationSettings />, {
           updateSetting: updateSettingMock,
         });
       });
@@ -104,7 +104,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
     it('should prevent going lower than minimum interval', async () => {
       await act(async () => {
-        renderWithAppContext(<NotificationSettings />, {
+        renderWithProviders(<NotificationSettings />, {
           settings: {
             ...mockSettings,
             fetchInterval:
@@ -136,7 +136,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
     it('should prevent going above maximum interval', async () => {
       await act(async () => {
-        renderWithAppContext(<NotificationSettings />, {
+        renderWithProviders(<NotificationSettings />, {
           settings: {
             ...mockSettings,
             fetchInterval:
@@ -172,7 +172,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the fetchAllNotifications checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -188,7 +188,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle detailed notifications checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -204,7 +204,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle metric pills checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -217,7 +217,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle show number checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -230,7 +230,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the showOnlyParticipating checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -247,7 +247,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
       .mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -271,7 +271,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the fetchReadNotifications checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -289,7 +289,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the markAsDoneOnOpen checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -302,7 +302,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the markAsDoneOnUnsubscribe checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -320,7 +320,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should toggle the delayNotificationState checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<NotificationSettings />, {
+      renderWithProviders(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 9da5b114e..9130c29c7 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 
 import {
   navigateMock,
-  renderWithAppContext,
+  renderWithProviders,
 } from '../../__helpers__/test-utils';
 
 import * as comms from '../../utils/system/comms';
@@ -22,7 +22,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should show app version', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />, {
+      renderWithProviders(<SettingsFooter />, {
         initialEntries: ['/settings'],
       });
     });
@@ -36,7 +36,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
       .mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />, {
+      renderWithProviders(<SettingsFooter />, {
         initialEntries: ['/settings'],
       });
     });
@@ -51,7 +51,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should open account management', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />, {
+      renderWithProviders(<SettingsFooter />, {
         initialEntries: ['/settings'],
       });
     });
@@ -65,7 +65,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
     const quitAppSpy = vi.spyOn(comms, 'quitApp').mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />, {
+      renderWithProviders(<SettingsFooter />, {
         initialEntries: ['/settings'],
       });
     });
diff --git a/src/renderer/components/settings/SettingsReset.test.tsx b/src/renderer/components/settings/SettingsReset.test.tsx
index 049c4bc04..235498da5 100644
--- a/src/renderer/components/settings/SettingsReset.test.tsx
+++ b/src/renderer/components/settings/SettingsReset.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import * as logger from '../../utils/core/logger';
 import { SettingsReset } from './SettingsReset';
@@ -17,7 +17,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
     globalThis.confirm = vi.fn(() => true); // always click 'OK'
 
     await act(async () => {
-      renderWithAppContext(<SettingsReset />, {
+      renderWithProviders(<SettingsReset />, {
         resetSettings: resetSettingsMock,
       });
     });
@@ -33,7 +33,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
     globalThis.confirm = vi.fn(() => false); // always click 'cancel'
 
     await act(async () => {
-      renderWithAppContext(<SettingsReset />, {
+      renderWithProviders(<SettingsReset />, {
         resetSettings: resetSettingsMock,
       });
     });
diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx
index b64228a40..42aa48452 100644
--- a/src/renderer/components/settings/SystemSettings.test.tsx
+++ b/src/renderer/components/settings/SystemSettings.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
 
 import type { Percentage } from '../../types';
@@ -13,7 +13,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   it('should change the open links radio group', async () => {
     await act(async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -26,7 +26,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   it('should toggle the keyboardShortcut checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -39,7 +39,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   it('should toggle the showNotifications checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -52,7 +52,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   describe('playSound', () => {
     it('should toggle the playSound checkbox', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
 
@@ -63,7 +63,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
     });
 
     it('volume controls should not be shown if playSound checkbox is false', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
         settings: { ...mockSettings, playSound: false },
       });
@@ -72,7 +72,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
     });
 
     it('volume controls should be shown if playSound checkbox is true', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
         settings: { ...mockSettings, playSound: true },
       });
@@ -81,7 +81,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
     });
 
     it('should increase notification volume', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
 
@@ -92,7 +92,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
     });
 
     it('should decrease notification volume', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
 
@@ -103,7 +103,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
     });
 
     it('should reset notification volume', async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         settings: { ...mockSettings, notificationVolume: 30 as Percentage },
         updateSetting: updateSettingMock,
       });
@@ -117,7 +117,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   it('should toggle the openAtStartup checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<SystemSettings />, {
+      renderWithProviders(<SystemSettings />, {
         updateSetting: updateSettingMock,
       });
     });
diff --git a/src/renderer/components/settings/TraySettings.test.tsx b/src/renderer/components/settings/TraySettings.test.tsx
index 97ecae83a..21c01d38e 100644
--- a/src/renderer/components/settings/TraySettings.test.tsx
+++ b/src/renderer/components/settings/TraySettings.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { renderWithProviders } from '../../__helpers__/test-utils';
 
 import { TraySettings } from './TraySettings';
 
@@ -10,7 +10,7 @@ describe('renderer/components/settings/TraySettings.tsx', () => {
 
   it('should toggle the showNotificationsCountInTray checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<TraySettings />, {
+      renderWithProviders(<TraySettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -28,7 +28,7 @@ describe('renderer/components/settings/TraySettings.tsx', () => {
 
   it('should toggle the useUnreadActiveIcon checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<TraySettings />, {
+      renderWithProviders(<TraySettings />, {
         updateSetting: updateSettingMock,
       });
     });
@@ -44,7 +44,7 @@ describe('renderer/components/settings/TraySettings.tsx', () => {
 
   it('should toggle the useAlternateIdleIcon checkbox', async () => {
     await act(async () => {
-      renderWithAppContext(<TraySettings />, {
+      renderWithProviders(<TraySettings />, {
         updateSetting: updateSettingMock,
       });
     });
diff --git a/src/renderer/context/App.test.tsx b/src/renderer/context/App.test.tsx
index 098ceccbf..5420ecaab 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -1,6 +1,6 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { renderWithProviders } from '../__helpers__/test-utils';
 import { mockGitHubCloudAccount } from '../__mocks__/account-mocks';
 import { mockGitifyNotification } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
@@ -37,7 +37,7 @@ const renderWithContext = () => {
     return null;
   };
 
-  renderWithAppContext(
+  renderWithProviders(
     <AppProvider>
       <CaptureContext />
     </AppProvider>,
@@ -92,7 +92,7 @@ describe('renderer/context/App.tsx', () => {
     };
 
     it('fetch notifications each interval', async () => {
-      renderWithAppContext(<AppProvider>{null}</AppProvider>);
+      renderWithProviders(<AppProvider>{null}</AppProvider>);
 
       // Initial fetch happens on mount - advance timers to ensure it runs
       await act(async () => {
diff --git a/src/renderer/routes/AccountScopes.test.tsx b/src/renderer/routes/AccountScopes.test.tsx
index 4b945dcb6..4ff0d02ef 100644
--- a/src/renderer/routes/AccountScopes.test.tsx
+++ b/src/renderer/routes/AccountScopes.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { renderWithProviders } from '../__helpers__/test-utils';
 import {
   mockGitHubAppAccount,
   mockOAuthAccount,
@@ -41,7 +41,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
 
   it('should render itself & its children', async () => {
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     expect(screen.getByTestId('account-scopes')).toBeInTheDocument();
@@ -49,7 +49,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
 
   it('should show all-granted status when account has all recommended scopes', async () => {
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     // notifications + read:user (required) + repo (detailed) = 3 granted; public_repo = N/A (covered by repo)
@@ -64,7 +64,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
 
   it('should show required-scope row with granted/missing indicators', async () => {
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     const rows = screen.getAllByTestId('account-scopes-required-scope');
@@ -75,7 +75,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
 
   it('should show Detailed Notifications section with repo and public_repo rows', async () => {
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     expect(screen.getByText('Detailed Notifications')).toBeInTheDocument();
@@ -98,7 +98,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
     };
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     // notifications + read:user (required) + public_repo (detailed) = 3 granted; repo = 1 missing
@@ -117,7 +117,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
     };
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     // Both repo rows show missing
@@ -137,7 +137,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
     };
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     // Required scope (notifications) is missing
@@ -159,7 +159,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
     };
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     expect(
@@ -173,7 +173,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
     mockLocationAccount = { ...mockGitHubAppAccount, scopes: undefined };
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     expect(screen.getByTestId('account-scopes-no-scopes')).toBeInTheDocument();
@@ -185,7 +185,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
       .mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     await userEvent.click(screen.getByTestId('account-scopes-manage-link'));
@@ -195,7 +195,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
 
   it('should go back when pressing the back icon', async () => {
     await act(async () => {
-      renderWithAppContext(<AccountScopesRoute />);
+      renderWithProviders(<AccountScopesRoute />);
     });
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
@@ -215,7 +215,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
       };
 
       await act(async () => {
-        renderWithAppContext(<AccountScopesRoute />);
+        renderWithProviders(<AccountScopesRoute />);
       });
 
       expect(screen.getByTestId('account-scopes')).toBeInTheDocument();
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index eb23a4934..1eb4462d1 100644
--- a/src/renderer/routes/Accounts.test.tsx
+++ b/src/renderer/routes/Accounts.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 import {
   mockGitHubAppAccount,
   mockOAuthAccount,
@@ -18,7 +18,7 @@ describe('renderer/routes/Accounts.tsx', () => {
   describe('General', () => {
     it('should render itself & its children', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: {
             accounts: [
               mockPersonalAccessTokenAccount,
@@ -35,7 +35,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should go back by pressing the icon', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />);
+        renderWithProviders(<AccountsRoute />);
       });
 
       await userEvent.click(screen.getByTestId('header-nav-back'));
@@ -56,7 +56,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         .mockImplementation(vi.fn());
 
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
@@ -71,7 +71,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('open host in external browser', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
@@ -84,7 +84,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('open developer settings in external browser', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
@@ -99,7 +99,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should render with PAT scopes warning', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: {
             accounts: [
               {
@@ -135,7 +135,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         .mockImplementation(vi.fn());
 
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: {
             accounts: [
               mockPersonalAccessTokenAccount,
@@ -161,7 +161,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         .mockImplementation(vi.fn());
 
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
@@ -179,7 +179,7 @@ describe('renderer/routes/Accounts.tsx', () => {
       const logoutFromAccountMock = vi.fn();
 
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
           logoutFromAccount: logoutFromAccountMock,
         });
@@ -192,7 +192,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should show view-scopes button for all auth methods', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: {
             accounts: [
               mockPersonalAccessTokenAccount,
@@ -208,7 +208,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should navigate to account-scopes when clicking view-scopes', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
@@ -224,7 +224,7 @@ describe('renderer/routes/Accounts.tsx', () => {
   describe('Add new accounts', () => {
     it('should show login with github app', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockOAuthAccount] },
         });
       });
@@ -240,7 +240,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should show login with personal access token', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockOAuthAccount] },
         });
       });
@@ -259,7 +259,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should show login with oauth app', async () => {
       await act(async () => {
-        renderWithAppContext(<AccountsRoute />, {
+        renderWithProviders(<AccountsRoute />, {
           auth: { accounts: [mockPersonalAccessTokenAccount] },
         });
       });
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index 6ebe65386..653a6e7a0 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import { type FiltersStore, useFiltersStore } from '../stores';
 import { FiltersRoute } from './Filters';
@@ -19,7 +19,7 @@ describe('renderer/routes/Filters.tsx', () => {
   describe('General', () => {
     it('should render itself & its children', async () => {
       await act(async () => {
-        renderWithAppContext(<FiltersRoute />);
+        renderWithProviders(<FiltersRoute />);
       });
 
       expect(screen.getByTestId('filters')).toMatchSnapshot();
@@ -27,7 +27,7 @@ describe('renderer/routes/Filters.tsx', () => {
 
     it('should go back by pressing the icon', async () => {
       await act(async () => {
-        renderWithAppContext(<FiltersRoute />, {
+        renderWithProviders(<FiltersRoute />, {
           fetchNotifications: fetchNotificationsMock,
         });
       });
@@ -43,7 +43,7 @@ describe('renderer/routes/Filters.tsx', () => {
   describe('Footer section', () => {
     it('should clear filters', async () => {
       await act(async () => {
-        renderWithAppContext(<FiltersRoute />);
+        renderWithProviders(<FiltersRoute />);
       });
 
       await userEvent.click(screen.getByTestId('filters-clear'));
diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx
index ff5906a41..2bbd0de35 100644
--- a/src/renderer/routes/Login.test.tsx
+++ b/src/renderer/routes/Login.test.tsx
@@ -1,14 +1,14 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/system/comms';
 import { LoginRoute } from './Login';
 
 describe('renderer/routes/Login.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(<LoginRoute />, { isLoggedIn: false });
+    const tree = renderWithProviders(<LoginRoute />, { isLoggedIn: false });
 
     expect(tree.container).toMatchSnapshot();
 
@@ -18,7 +18,7 @@ describe('renderer/routes/Login.tsx', () => {
   it('should redirect to notifications once logged in', () => {
     const showWindowSpy = vi.spyOn(comms, 'showWindow');
 
-    renderWithAppContext(<LoginRoute />, {
+    renderWithProviders(<LoginRoute />, {
       isLoggedIn: true,
     });
 
@@ -28,7 +28,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should login with github', async () => {
-    renderWithAppContext(<LoginRoute />, {
+    renderWithProviders(<LoginRoute />, {
       isLoggedIn: false,
     });
 
@@ -39,7 +39,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with personal access token', async () => {
-    renderWithAppContext(<LoginRoute />, { isLoggedIn: false });
+    renderWithProviders(<LoginRoute />, { isLoggedIn: false });
 
     await userEvent.click(screen.getByTestId('login-pat'));
 
@@ -48,7 +48,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with oauth app', async () => {
-    renderWithAppContext(<LoginRoute />, { isLoggedIn: false });
+    renderWithProviders(<LoginRoute />, { isLoggedIn: false });
 
     await userEvent.click(screen.getByTestId('login-oauth-app'));
 
diff --git a/src/renderer/routes/LoginWithDeviceFlow.test.tsx b/src/renderer/routes/LoginWithDeviceFlow.test.tsx
index 97f7b406e..2d20bf1c7 100644
--- a/src/renderer/routes/LoginWithDeviceFlow.test.tsx
+++ b/src/renderer/routes/LoginWithDeviceFlow.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/system/comms';
 import { LoginWithDeviceFlowRoute } from './LoginWithDeviceFlow';
@@ -25,7 +25,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       expiresAt: Date.now() + 900000,
     });
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
@@ -48,7 +48,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       expiresAt: Date.now() + 900000,
     });
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
@@ -81,7 +81,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       expiresAt: Date.now() + 900000,
     });
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
@@ -107,7 +107,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       expiresAt: Date.now() + 900000,
     });
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
@@ -127,7 +127,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       .fn()
       .mockRejectedValueOnce(new Error('Network error'));
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
@@ -147,7 +147,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
       expiresAt: Date.now() + 900000,
     });
 
-    renderWithAppContext(<LoginWithDeviceFlowRoute />, {
+    renderWithProviders(<LoginWithDeviceFlowRoute />, {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx
index 0cf494460..e20d2d63b 100644
--- a/src/renderer/routes/LoginWithOAuthApp.test.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import type { ClientID, ClientSecret, Hostname } from '../types';
 
@@ -21,13 +21,13 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     .mockImplementation(vi.fn());
 
   it('renders correctly', () => {
-    const tree = renderWithAppContext(<LoginWithOAuthAppRoute />);
+    const tree = renderWithProviders(<LoginWithOAuthAppRoute />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    renderWithAppContext(<LoginWithOAuthAppRoute />);
+    renderWithProviders(<LoginWithOAuthAppRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -67,7 +67,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
 
   describe("'Create new OAuth App' button", () => {
     it('should be disabled if no hostname configured', async () => {
-      renderWithAppContext(<LoginWithOAuthAppRoute />);
+      renderWithProviders(<LoginWithOAuthAppRoute />);
 
       await userEvent.clear(screen.getByTestId('login-hostname'));
 
@@ -77,7 +77,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     });
 
     it('should open in browser if hostname configured', async () => {
-      renderWithAppContext(<LoginWithOAuthAppRoute />);
+      renderWithProviders(<LoginWithOAuthAppRoute />);
 
       const hostname = screen.getByTestId('login-hostname');
       await userEvent.clear(hostname);
@@ -92,7 +92,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('should login using a token - success', async () => {
     loginWithOAuthAppMock.mockResolvedValueOnce(null);
 
-    renderWithAppContext(<LoginWithOAuthAppRoute />, {
+    renderWithProviders(<LoginWithOAuthAppRoute />, {
       loginWithOAuthApp: loginWithOAuthAppMock,
     });
 
@@ -123,7 +123,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
       .mockImplementation(vi.fn());
     loginWithOAuthAppMock.mockRejectedValueOnce(null);
 
-    renderWithAppContext(<LoginWithOAuthAppRoute />, {
+    renderWithProviders(<LoginWithOAuthAppRoute />, {
       loginWithOAuthApp: loginWithOAuthAppMock,
     });
 
@@ -151,7 +151,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    renderWithAppContext(<LoginWithOAuthAppRoute />);
+    renderWithProviders(<LoginWithOAuthAppRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -171,7 +171,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   });
 
   it('should open help docs in the browser', async () => {
-    renderWithAppContext(<LoginWithOAuthAppRoute />);
+    renderWithProviders(<LoginWithOAuthAppRoute />);
 
     await userEvent.click(screen.getByTestId('login-docs'));
 
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
index 6cfd9b32d..6b570facd 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import type { Hostname, Token } from '../types';
 
@@ -20,13 +20,13 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
     .mockImplementation(vi.fn());
 
   it('renders correctly', () => {
-    const tree = renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
+    const tree = renderWithProviders(<LoginWithPersonalAccessTokenRoute />);
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
+    renderWithProviders(<LoginWithPersonalAccessTokenRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -57,7 +57,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
 
   describe("'Generate a PAT' button", () => {
     it('should be disabled if no hostname configured', async () => {
-      renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+      renderWithProviders(<LoginWithPersonalAccessTokenRoute />, {
         loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
       });
 
@@ -69,7 +69,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
     });
 
     it('should open in browser if hostname configured', async () => {
-      renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+      renderWithProviders(<LoginWithPersonalAccessTokenRoute />, {
         loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
       });
 
@@ -82,7 +82,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   it('should login using a token - success', async () => {
     loginWithPersonalAccessTokenMock.mockResolvedValueOnce(null);
 
-    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+    renderWithProviders(<LoginWithPersonalAccessTokenRoute />, {
       loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
     });
 
@@ -110,7 +110,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
       .mockImplementation(vi.fn());
     loginWithPersonalAccessTokenMock.mockRejectedValueOnce(null);
 
-    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+    renderWithProviders(<LoginWithPersonalAccessTokenRoute />, {
       loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
     });
 
@@ -133,7 +133,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
+    renderWithProviders(<LoginWithPersonalAccessTokenRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -148,7 +148,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should open help docs in the browser', async () => {
-    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+    renderWithProviders(<LoginWithPersonalAccessTokenRoute />, {
       loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
     });
 
diff --git a/src/renderer/routes/Notifications.test.tsx b/src/renderer/routes/Notifications.test.tsx
index 265478b53..d30f6346e 100644
--- a/src/renderer/routes/Notifications.test.tsx
+++ b/src/renderer/routes/Notifications.test.tsx
@@ -1,4 +1,4 @@
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { renderWithProviders } from '../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 
@@ -19,7 +19,7 @@ vi.mock('../components/Oops', () => ({
 
 describe('renderer/routes/Notifications.tsx', () => {
   it('should render itself & its children (with notifications)', () => {
-    const tree = renderWithAppContext(<NotificationsRoute />, {
+    const tree = renderWithProviders(<NotificationsRoute />, {
       notifications: mockMultipleAccountNotifications,
     });
 
@@ -27,12 +27,12 @@ describe('renderer/routes/Notifications.tsx', () => {
   });
 
   it('should render itself & its children (all read notifications)', () => {
-    const tree = renderWithAppContext(<NotificationsRoute />);
+    const tree = renderWithProviders(<NotificationsRoute />);
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render itself & its children (show account header)', () => {
-    const tree = renderWithAppContext(<NotificationsRoute />, {
+    const tree = renderWithProviders(<NotificationsRoute />, {
       notifications: [mockMultipleAccountNotifications[0]],
       settings: { ...mockSettings, showAccountHeader: true },
     });
@@ -41,7 +41,7 @@ describe('renderer/routes/Notifications.tsx', () => {
 
   describe('should render itself & its children (error conditions - oops)', () => {
     it('bad credentials', () => {
-      const tree = renderWithAppContext(<NotificationsRoute />, {
+      const tree = renderWithProviders(<NotificationsRoute />, {
         status: 'error',
         globalError: Errors.BAD_CREDENTIALS,
       });
@@ -50,7 +50,7 @@ describe('renderer/routes/Notifications.tsx', () => {
     });
 
     it('missing scopes', () => {
-      const tree = renderWithAppContext(<NotificationsRoute />, {
+      const tree = renderWithProviders(<NotificationsRoute />, {
         status: 'error',
         globalError: Errors.MISSING_SCOPES,
       });
@@ -59,7 +59,7 @@ describe('renderer/routes/Notifications.tsx', () => {
     });
 
     it('rate limited', () => {
-      const tree = renderWithAppContext(<NotificationsRoute />, {
+      const tree = renderWithProviders(<NotificationsRoute />, {
         status: 'error',
         globalError: Errors.RATE_LIMITED,
       });
@@ -68,7 +68,7 @@ describe('renderer/routes/Notifications.tsx', () => {
     });
 
     it('unknown error', () => {
-      const tree = renderWithAppContext(<NotificationsRoute />, {
+      const tree = renderWithProviders(<NotificationsRoute />, {
         status: 'error',
         globalError: Errors.UNKNOWN,
       });
@@ -77,7 +77,7 @@ describe('renderer/routes/Notifications.tsx', () => {
     });
 
     it('default error', () => {
-      const tree = renderWithAppContext(<NotificationsRoute />, {
+      const tree = renderWithProviders(<NotificationsRoute />, {
         status: 'error',
         globalError: null,
       });
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index 7155cd58a..b6152c483 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,7 +1,7 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 
 import { SettingsRoute } from './Settings';
 
@@ -10,7 +10,7 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should render itself & its children', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsRoute />, {
+      renderWithProviders(<SettingsRoute />, {
         initialEntries: ['/settings'],
       });
     });
@@ -20,7 +20,7 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should go back by pressing the icon', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsRoute />, {
+      renderWithProviders(<SettingsRoute />, {
         initialEntries: ['/settings'],
         fetchNotifications: fetchNotificationsMock,
       });

From 9d3f7739b9dea1eda8608507e78e3c42811bb2b5 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 23 Mar 2026 15:44:47 -0400
Subject: [PATCH 2/3] refactor: test renderWithProviders for store
 initialization

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/__helpers__/test-utils.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
index e8c2dec60..248081d0f 100644
--- a/src/renderer/__helpers__/test-utils.tsx
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -7,7 +7,8 @@ import { BaseStyles, ThemeProvider } from '@primer/react';
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 
 import { AppContext, type AppContextState } from '../context/App';
-import { useFiltersStore, type FiltersStore } from '../stores';
+
+import { type FiltersStore, useFiltersStore } from '../stores';
 
 export { navigateMock } from './vitest.setup';
 export type DeepPartial<T> = { [K in keyof T]?: DeepPartial<T[K]> };

From 6611cb0d51a173340af4e574511715f17d8a101d Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 23 Mar 2026 15:48:23 -0400
Subject: [PATCH 3/3] refactor: test renderWithProviders for store
 initialization

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/AllRead.test.tsx | 1 -
 src/renderer/components/Sidebar.test.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
index b0d58ac17..3b2fc8af6 100644
--- a/src/renderer/components/AllRead.test.tsx
+++ b/src/renderer/components/AllRead.test.tsx
@@ -3,7 +3,6 @@ import { act } from '@testing-library/react';
 import { renderWithProviders } from '../__helpers__/test-utils';
 import { mockSettings } from '../__mocks__/state-mocks';
 
-import { useFiltersStore } from '../stores';
 import { AllRead } from './AllRead';
 
 describe('renderer/components/AllRead.tsx', () => {
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 1563aaaa7..ae7339107 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -5,7 +5,6 @@ import { navigateMock, renderWithProviders } from '../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 
-import { useFiltersStore } from '../stores';
 import * as comms from '../utils/system/comms';
 import { Sidebar } from './Sidebar';