diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
index 6765591a5..e6cd951e7 100644
--- a/src/renderer/__helpers__/test-utils.tsx
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import { type ReactElement, type ReactNode, useMemo } from 'react';
+import { MemoryRouter } from 'react-router-dom';
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
@@ -7,22 +8,39 @@ import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 
 import { AppContext, type AppContextState } from '../context/App';
 
+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>;
+
 /**
  * Props for the AppContextProvider wrapper
  */
 interface AppContextProviderProps {
   readonly children: ReactNode;
-  readonly value?: Partial<AppContextState>;
+  readonly value?: TestAppContext;
+  readonly initialEntries?: string[];
 }
 
 /**
  * Wrapper component that provides ThemeProvider, BaseStyles, and AppContext
  * with sensible defaults for testing.
  */
-function AppContextProvider({ children, value = {} }: AppContextProviderProps) {
-  const defaultValue: AppContextState = useMemo(() => {
+function AppContextProvider({
+  children,
+  value = EMPTY_APP_CONTEXT,
+  initialEntries,
+}: AppContextProviderProps) {
+  const defaultValue: TestAppContext = useMemo(() => {
     return {
       auth: mockAuth,
       settings: mockSettings,
@@ -58,17 +76,19 @@ function AppContextProvider({ children, value = {} }: AppContextProviderProps) {
       updateFilter: vi.fn(),
 
       ...value,
-    } as AppContextState;
+    } as TestAppContext;
   }, [value]);
 
   return (
-    <ThemeProvider>
-      <BaseStyles>
-        <AppContext.Provider value={defaultValue}>
-          {children}
-        </AppContext.Provider>
-      </BaseStyles>
-    </ThemeProvider>
+    <MemoryRouter initialEntries={initialEntries}>
+      <ThemeProvider>
+        <BaseStyles>
+          <AppContext.Provider value={defaultValue}>
+            {children}
+          </AppContext.Provider>
+        </BaseStyles>
+      </ThemeProvider>
+    </MemoryRouter>
   );
 }
 
@@ -80,11 +100,13 @@ function AppContextProvider({ children, value = {} }: AppContextProviderProps) {
  */
 export function renderWithAppContext(
   ui: ReactElement,
-  context: Partial<AppContextState> = {},
+  { initialEntries, ...context }: RenderOptions = {},
 ) {
   return render(ui, {
     wrapper: ({ children }) => (
-      <AppContextProvider value={context}>{children}</AppContextProvider>
+      <AppContextProvider initialEntries={initialEntries} value={context}>
+        {children}
+      </AppContextProvider>
     ),
   });
 }
diff --git a/src/renderer/__helpers__/vitest.setup.ts b/src/renderer/__helpers__/vitest.setup.ts
index 484651a00..30b4e80a5 100644
--- a/src/renderer/__helpers__/vitest.setup.ts
+++ b/src/renderer/__helpers__/vitest.setup.ts
@@ -2,6 +2,15 @@ import '@testing-library/jest-dom/vitest';
 
 import { useFiltersStore } from '../stores';
 
+/**
+ * Shared navigate mock — import from test-utils in any test that needs to assert on navigation
+ */
+export const navigateMock = vi.fn();
+vi.mock('react-router-dom', async () => ({
+  ...(await vi.importActual('react-router-dom')),
+  useNavigate: () => navigateMock,
+}));
+
 // Sets timezone to UTC for consistent date/time in tests and snapshots
 process.env.TZ = 'UTC';
 
@@ -10,6 +19,7 @@ process.env.TZ = 'UTC';
  */
 beforeEach(() => {
   useFiltersStore.getState().reset();
+  navigateMock.mockReset();
 });
 
 /**
diff --git a/src/renderer/components/GlobalShortcuts.test.tsx b/src/renderer/components/GlobalShortcuts.test.tsx
index b7ac6669b..e46b92a2c 100644
--- a/src/renderer/components/GlobalShortcuts.test.tsx
+++ b/src/renderer/components/GlobalShortcuts.test.tsx
@@ -1,18 +1,11 @@
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/comms';
 import * as links from '../utils/links';
 import { GlobalShortcuts } from './GlobalShortcuts';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('components/GlobalShortcuts.tsx', () => {
   const fetchNotificationsMock = vi.fn();
   const updateSettingMock = vi.fn();
@@ -25,11 +18,7 @@ describe('components/GlobalShortcuts.tsx', () => {
   describe('key bindings', () => {
     describe('ignores keys that are not valid', () => {
       it('ignores B key', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-        );
+        renderWithAppContext(<GlobalShortcuts />);
 
         await userEvent.keyboard('b');
 
@@ -39,11 +28,7 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('home', () => {
       it('navigates home when pressing H key', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-        );
+        renderWithAppContext(<GlobalShortcuts />);
 
         await userEvent.keyboard('h');
 
@@ -57,14 +42,9 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub notifications webpage when pressing N while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('n');
 
@@ -72,14 +52,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub notifications webpage when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('n');
 
@@ -89,15 +64,10 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('focus mode', () => {
       it('toggles focus when pressing W while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            updateSetting: updateSettingMock,
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          updateSetting: updateSettingMock,
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('w');
 
@@ -105,16 +75,11 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle focus mode when loading', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            updateSetting: updateSettingMock,
-            status: 'loading',
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          updateSetting: updateSettingMock,
+          status: 'loading',
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('w');
 
@@ -122,15 +87,10 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle focus mode when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            updateSetting: updateSettingMock,
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          updateSetting: updateSettingMock,
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('w');
 
@@ -140,14 +100,9 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('filters', () => {
       it('toggles filters when pressing F while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('f');
 
@@ -155,14 +110,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle filters when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('f');
 
@@ -176,14 +126,9 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub issues webpage when pressing I while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('i');
 
@@ -191,14 +136,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub issues webpage when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('n');
 
@@ -212,14 +152,9 @@ describe('components/GlobalShortcuts.tsx', () => {
         .mockImplementation(vi.fn());
 
       it('opens primary account GitHub pull requests webpage when pressing N while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('p');
 
@@ -227,14 +162,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not open primary account GitHub pull requests webpage when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('n');
 
@@ -244,14 +174,9 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('refresh', () => {
       it('refreshes notifications when pressing R key', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            fetchNotifications: fetchNotificationsMock,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          fetchNotifications: fetchNotificationsMock,
+        });
 
         await userEvent.keyboard('r');
 
@@ -260,14 +185,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not refresh when status is loading', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            status: 'loading',
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          status: 'loading',
+        });
 
         await userEvent.keyboard('r');
 
@@ -277,14 +197,9 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('settings', () => {
       it('toggles settings when pressing S while logged in', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('s');
 
@@ -292,14 +207,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not toggle settings when logged out', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: false,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: false,
+        });
 
         await userEvent.keyboard('s');
 
@@ -309,14 +219,10 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('accounts', () => {
       it('navigates to accounts when pressing A on settings route', async () => {
-        renderWithAppContext(
-          <MemoryRouter initialEntries={['/settings']}>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          initialEntries: ['/settings'],
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('a');
 
@@ -324,14 +230,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not trigger accounts when not on settings route', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('a');
 
@@ -341,14 +242,10 @@ describe('components/GlobalShortcuts.tsx', () => {
 
     describe('quit app', () => {
       it('quits the app when pressing Q on settings route', async () => {
-        renderWithAppContext(
-          <MemoryRouter initialEntries={['/settings']}>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          initialEntries: ['/settings'],
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('q');
 
@@ -356,14 +253,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('does not quit the app when not on settings route', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         await userEvent.keyboard('q');
 
@@ -374,10 +266,10 @@ describe('components/GlobalShortcuts.tsx', () => {
     describe('modifiers', () => {
       it('ignores shortcuts when typing in an input', async () => {
         renderWithAppContext(
-          <MemoryRouter>
+          <>
             <GlobalShortcuts />
             <input id="test-input" />
-          </MemoryRouter>,
+          </>,
           {
             isLoggedIn: true,
           },
@@ -394,10 +286,10 @@ describe('components/GlobalShortcuts.tsx', () => {
 
       it('ignores shortcuts when typing in a textarea', async () => {
         renderWithAppContext(
-          <MemoryRouter>
+          <>
             <GlobalShortcuts />
             <textarea id="test-textarea" />
-          </MemoryRouter>,
+          </>,
           {
             isLoggedIn: true,
           },
@@ -413,14 +305,9 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
 
       it('ignores shortcuts when modifier keys are pressed', async () => {
-        renderWithAppContext(
-          <MemoryRouter>
-            <GlobalShortcuts />
-          </MemoryRouter>,
-          {
-            isLoggedIn: true,
-          },
-        );
+        renderWithAppContext(<GlobalShortcuts />, {
+          isLoggedIn: true,
+        });
 
         const event = new KeyboardEvent('keydown', { key: 'h', metaKey: true });
         navigateMock.mockClear();
diff --git a/src/renderer/components/Oops.test.tsx b/src/renderer/components/Oops.test.tsx
index bd1970715..4801bfa13 100644
--- a/src/renderer/components/Oops.test.tsx
+++ b/src/renderer/components/Oops.test.tsx
@@ -1,7 +1,11 @@
-import { act } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { PersonIcon } from '@primer/octicons-react';
 
 import {
   ensureStableEmojis,
+  navigateMock,
   renderWithAppContext,
 } from '../__helpers__/test-utils';
 
@@ -37,4 +41,26 @@ describe('renderer/components/Oops.tsx', () => {
 
     expect(tree.container).toMatchSnapshot();
   });
+
+  it('should render action buttons and navigate on click', async () => {
+    const mockError = {
+      title: 'Error title',
+      descriptions: ['Error description'],
+      emojis: ['🔥'],
+      actions: [
+        {
+          label: 'Go somewhere',
+          route: '/somewhere',
+          variant: 'danger' as const,
+          icon: PersonIcon,
+        },
+      ],
+    };
+
+    renderWithAppContext(<Oops error={mockError} />);
+
+    await userEvent.click(screen.getByText('Go somewhere'));
+
+    expect(navigateMock).toHaveBeenCalledWith('/somewhere');
+  });
 });
diff --git a/src/renderer/components/Oops.tsx b/src/renderer/components/Oops.tsx
index 9724eece4..d0b1bae1a 100644
--- a/src/renderer/components/Oops.tsx
+++ b/src/renderer/components/Oops.tsx
@@ -1,4 +1,7 @@
 import { type FC, useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import { Button } from '@primer/react';
 
 import { EmojiSplash } from './layout/EmojiSplash';
 
@@ -16,14 +19,29 @@ export const Oops: FC<OopsProps> = ({
   fullHeight = true,
 }: OopsProps) => {
   const err = error ?? Errors.UNKNOWN;
+  const navigate = useNavigate();
 
   const emoji = useMemo(
     () => err.emojis[Math.floor(Math.random() * err.emojis.length)],
     [err],
   );
 
+  const actions = err.actions?.length
+    ? err.actions.map((action) => (
+        <Button
+          key={action.route}
+          leadingVisual={action.icon}
+          onClick={() => navigate(action.route)}
+          variant={action.variant}
+        >
+          {action.label}
+        </Button>
+      ))
+    : null;
+
   return (
     <EmojiSplash
+      actions={actions}
       emoji={emoji}
       fullHeight={fullHeight}
       heading={err.title}
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index a4a4ed17e..6aa0908e1 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -1,8 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 import { mockMultipleAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 
@@ -10,12 +9,6 @@ import { useFiltersStore } from '../stores';
 import * as comms from '../utils/comms';
 import { Sidebar } from './Sidebar';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/components/Sidebar.tsx', () => {
   const fetchNotificationsMock = vi.fn();
   const updateSettingMock = vi.fn();
@@ -28,37 +21,25 @@ describe('renderer/components/Sidebar.tsx', () => {
   });
 
   it('should render itself & its children (logged in)', () => {
-    const tree = renderWithAppContext(
-      <MemoryRouter initialEntries={['/']}>
-        <Sidebar />
-      </MemoryRouter>,
-      {
-        isLoggedIn: true,
-      },
-    );
+    const tree = renderWithAppContext(<Sidebar />, {
+      initialEntries: ['/'],
+      isLoggedIn: true,
+    });
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should render itself & its children (logged out)', () => {
-    const tree = renderWithAppContext(
-      <MemoryRouter initialEntries={['/landing']}>
-        <Sidebar />
-      </MemoryRouter>,
-      {
-        isLoggedIn: false,
-      },
-    );
+    const tree = renderWithAppContext(<Sidebar />, {
+      initialEntries: ['/landing'],
+      isLoggedIn: false,
+    });
 
     expect(tree.container).toMatchSnapshot();
   });
 
   it('should navigate home when clicking logo', async () => {
-    renderWithAppContext(
-      <MemoryRouter>
-        <Sidebar />
-      </MemoryRouter>,
-    );
+    renderWithAppContext(<Sidebar />);
 
     await userEvent.click(screen.getByTestId('sidebar-home'));
 
@@ -68,11 +49,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('notifications icon', () => {
     it('opens notifications home when clicked', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-notifications'));
 
@@ -83,27 +60,17 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('renders correct icon when there are no notifications', () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          notifications: [],
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        notifications: [],
+      });
 
       expect(screen.getByTestId('sidebar-notifications')).toMatchSnapshot();
     });
 
     it('renders correct icon when there are notifications', () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          notifications: mockMultipleAccountNotifications,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        notifications: mockMultipleAccountNotifications,
+      });
 
       expect(screen.getByTestId('sidebar-notifications')).toMatchSnapshot();
     });
@@ -111,45 +78,30 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Focused mode toggle', () => {
     it('renders the focused mode is off', () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: true,
-          settings: { ...mockSettings, participating: false },
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        isLoggedIn: true,
+        settings: { ...mockSettings, participating: false },
+      });
 
       expect(screen.getByTestId('sidebar-focused-mode')).toBeInTheDocument();
     });
 
     it('renders the focused mode is on', () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: true,
-          settings: { ...mockSettings, participating: true },
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        isLoggedIn: true,
+        settings: { ...mockSettings, participating: true },
+      });
 
       expect(screen.getByTestId('sidebar-focused-mode')).toBeInTheDocument();
     });
 
     it('toggles participating when clicked', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: true,
-          settings: { ...mockSettings, participating: false },
-          updateSetting: updateSettingMock,
-          fetchNotifications: fetchNotificationsMock,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        isLoggedIn: true,
+        settings: { ...mockSettings, participating: false },
+        updateSetting: updateSettingMock,
+        fetchNotifications: fetchNotificationsMock,
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-focused-mode'));
 
@@ -160,11 +112,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Filter notifications', () => {
     it('go to the filters route', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
 
@@ -173,11 +121,7 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if filters path already shown', async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/filters']}>
-          <Sidebar />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<Sidebar />, { initialEntries: ['/filters'] });
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
 
@@ -188,14 +132,9 @@ describe('renderer/components/Sidebar.tsx', () => {
     it('highlight filters sidebar if any are saved', () => {
       useFiltersStore.setState({ reasons: ['assign'] });
 
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          settings: mockSettings,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        settings: mockSettings,
+      });
 
       expect(
         screen.getByTestId('sidebar-filter-notifications'),
@@ -205,14 +144,9 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('quick links', () => {
     it('opens my github issues page', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          notifications: mockMultipleAccountNotifications,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        notifications: mockMultipleAccountNotifications,
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-my-issues'));
 
@@ -223,14 +157,9 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('opens my github pull requests page', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          notifications: mockMultipleAccountNotifications,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        notifications: mockMultipleAccountNotifications,
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-my-pull-requests'));
 
@@ -243,15 +172,10 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Refresh Notifications', () => {
     it('should refresh the notifications when status is not loading', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-          status: 'success',
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        fetchNotifications: fetchNotificationsMock,
+        status: 'success',
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-refresh'));
 
@@ -259,15 +183,10 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('should not refresh the notifications when status is loading', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-          status: 'loading',
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        fetchNotifications: fetchNotificationsMock,
+        status: 'loading',
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-refresh'));
 
@@ -277,11 +196,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Settings', () => {
     it('go to the settings route', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<Sidebar />);
 
       await userEvent.click(screen.getByTestId('sidebar-settings'));
 
@@ -290,14 +205,10 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if settings path already shown', async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-        },
-      );
+      renderWithAppContext(<Sidebar />, {
+        initialEntries: ['/settings'],
+        fetchNotifications: fetchNotificationsMock,
+      });
 
       await userEvent.click(screen.getByTestId('sidebar-settings'));
 
@@ -310,14 +221,9 @@ describe('renderer/components/Sidebar.tsx', () => {
   it('should quit the app', async () => {
     const quitAppSpy = vi.spyOn(comms, 'quitApp').mockImplementation(vi.fn());
 
-    renderWithAppContext(
-      <MemoryRouter>
-        <Sidebar />
-      </MemoryRouter>,
-      {
-        isLoggedIn: false,
-      },
-    );
+    renderWithAppContext(<Sidebar />, {
+      isLoggedIn: false,
+    });
 
     await userEvent.click(screen.getByTestId('sidebar-quit'));
 
diff --git a/src/renderer/components/layout/AppLayout.test.tsx b/src/renderer/components/layout/AppLayout.test.tsx
index ff3a8e618..86f9f7203 100644
--- a/src/renderer/components/layout/AppLayout.test.tsx
+++ b/src/renderer/components/layout/AppLayout.test.tsx
@@ -1,16 +1,10 @@
-import { MemoryRouter } from 'react-router-dom';
-
 import { renderWithAppContext } from '../../__helpers__/test-utils';
 
 import { AppLayout } from './AppLayout';
 
 describe('renderer/components/layout/AppLayout.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = renderWithAppContext(
-      <MemoryRouter>
-        <AppLayout>Test</AppLayout>
-      </MemoryRouter>,
-    );
+    const tree = renderWithAppContext(<AppLayout>Test</AppLayout>);
 
     expect(tree.container).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/EmojiSplash.tsx b/src/renderer/components/layout/EmojiSplash.tsx
index 0a7848126..ee63d87ed 100644
--- a/src/renderer/components/layout/EmojiSplash.tsx
+++ b/src/renderer/components/layout/EmojiSplash.tsx
@@ -1,4 +1,4 @@
-import type { FC } from 'react';
+import type { FC, ReactNode } from 'react';
 
 import { Stack } from '@primer/react';
 
@@ -11,15 +11,12 @@ interface EmojiSplashProps {
   heading: string;
   subHeadings?: string[];
   fullHeight?: boolean;
+  actions?: ReactNode;
 }
 
-export const EmojiSplash: FC<EmojiSplashProps> = ({
-  fullHeight = true,
-  subHeadings = [],
-  ...props
-}: EmojiSplashProps) => {
+export const EmojiSplash: FC<EmojiSplashProps> = (props: EmojiSplashProps) => {
   return (
-    <Centered fullHeight={fullHeight}>
+    <Centered fullHeight={props.fullHeight}>
       <Stack
         align="center"
         direction="vertical"
@@ -31,7 +28,7 @@ export const EmojiSplash: FC<EmojiSplashProps> = ({
           <div className="text-xl font-semibold">{props.heading}</div>
         </Stack>
 
-        {subHeadings.map((description, i) => {
+        {props.subHeadings?.map((description, i) => {
           const key = `error_description_${i}`;
           return (
             <div className="text-center" key={key}>
@@ -39,6 +36,8 @@ export const EmojiSplash: FC<EmojiSplashProps> = ({
             </div>
           );
         })}
+
+        {props.actions && <div className="mt-2">{props.actions}</div>}
       </Stack>
     </Centered>
   );
diff --git a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
index 5dade9fe6..dbae2b13d 100644
--- a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`renderer/components/layout/EmojiSplash.tsx > should render itself & its
       data-portal-root="true"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
         data-justify="center"
@@ -77,7 +77,7 @@ exports[`renderer/components/layout/EmojiSplash.tsx > should render itself & its
       data-portal-root="true"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
         data-justify="center"
diff --git a/src/renderer/components/primitives/Header.test.tsx b/src/renderer/components/primitives/Header.test.tsx
index ec186ea9f..39cd4b904 100644
--- a/src/renderer/components/primitives/Header.test.tsx
+++ b/src/renderer/components/primitives/Header.test.tsx
@@ -3,16 +3,13 @@ import userEvent from '@testing-library/user-event';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import {
+  navigateMock,
+  renderWithAppContext,
+} from '../../__helpers__/test-utils';
 
 import { Header } from './Header';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/components/primitives/Header.tsx', () => {
   const fetchNotificationsMock = vi.fn();
 
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 0f701413c..ff99aa183 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -1,18 +1,14 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import {
+  navigateMock,
+  renderWithAppContext,
+} from '../../__helpers__/test-utils';
 
 import * as comms from '../../utils/comms';
 import { SettingsFooter } from './SettingsFooter';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/components/settings/SettingsFooter.tsx', () => {
   let originalEnv: NodeJS.ProcessEnv;
 
@@ -27,11 +23,9 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should show app version', async () => {
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsFooter />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<SettingsFooter />, {
+        initialEntries: ['/settings'],
+      });
     });
 
     expect(screen.getByTestId('settings-release-notes')).toMatchSnapshot();
@@ -43,11 +37,9 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
       .mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsFooter />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<SettingsFooter />, {
+        initialEntries: ['/settings'],
+      });
     });
 
     await userEvent.click(screen.getByTestId('settings-release-notes'));
@@ -60,11 +52,9 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should open account management', async () => {
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsFooter />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<SettingsFooter />, {
+        initialEntries: ['/settings'],
+      });
     });
 
     await userEvent.click(screen.getByTestId('settings-accounts'));
@@ -76,11 +66,9 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
     const quitAppSpy = vi.spyOn(comms, 'quitApp').mockImplementation(vi.fn());
 
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsFooter />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<SettingsFooter />, {
+        initialEntries: ['/settings'],
+      });
     });
 
     await userEvent.click(screen.getByTestId('settings-quit'));
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index 588a181a2..c56f3d034 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -1,142 +1,59 @@
 import { act, renderHook, waitFor } from '@testing-library/react';
 
-import { RequestError } from '@octokit/request-error';
-
-import type { DeepPartial } from '../__helpers__/test-utils';
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
 } from '../__mocks__/account-mocks';
-import { mockGitifyNotification } from '../__mocks__/notifications-mocks';
+import {
+  mockGitHubCloudGitifyNotifications,
+  mockGitifyNotification,
+  mockMultipleAccountNotifications,
+  mockSingleAccountNotifications,
+} from '../__mocks__/notifications-mocks';
 import { mockAuth, mockSettings, mockState } from '../__mocks__/state-mocks';
 
-import type { ListNotificationsForAuthenticatedUserResponse } from '../utils/api/types';
-
 import * as apiClient from '../utils/api/client';
 import { Errors } from '../utils/errors';
 import * as logger from '../utils/logger';
 import * as native from '../utils/notifications/native';
+import * as notificationsUtils from '../utils/notifications/notifications';
 import * as sound from '../utils/notifications/sound';
 import { useNotifications } from './useNotifications';
 
 describe('renderer/hooks/useNotifications.ts', () => {
-  const rendererLogErrorSpy = vi
-    .spyOn(logger, 'rendererLogError')
-    .mockImplementation(vi.fn());
-
-  const raiseSoundNotificationSpy = vi
-    .spyOn(sound, 'raiseSoundNotification')
-    .mockImplementation(vi.fn());
-
-  const raiseNativeNotificationSpy = vi
-    .spyOn(native, 'raiseNativeNotification')
-    .mockImplementation(vi.fn());
+  let rendererLogErrorSpy: ReturnType<typeof vi.spyOn>;
+  let raiseSoundNotificationSpy: ReturnType<typeof vi.spyOn>;
+  let raiseNativeNotificationSpy: ReturnType<typeof vi.spyOn>;
+  let getAllNotificationsSpy: ReturnType<typeof vi.spyOn>;
 
   beforeEach(() => {
-    vi.clearAllMocks();
+    vi.restoreAllMocks();
+
+    rendererLogErrorSpy = vi
+      .spyOn(logger, 'rendererLogError')
+      .mockImplementation(vi.fn());
+    raiseSoundNotificationSpy = vi
+      .spyOn(sound, 'raiseSoundNotification')
+      .mockImplementation(vi.fn());
+    raiseNativeNotificationSpy = vi
+      .spyOn(native, 'raiseNativeNotification')
+      .mockImplementation(vi.fn());
+    getAllNotificationsSpy = vi
+      .spyOn(notificationsUtils, 'getAllNotifications')
+      .mockResolvedValue([]);
+
     // Reset mock notification state between tests since it's mutated
     // FIXME - isolate test data between tests
     mockGitifyNotification.unread = true;
   });
 
   describe('fetchNotifications', () => {
-    const mockRepository = {
-      name: 'notifications-test',
-      full_name: 'gitify-app/notifications-test',
-      html_url: 'https://github.com/gitify-app/notifications-test',
-      owner: {
-        login: 'gitify-app',
-        avatar_url: 'https://avatar.url',
-        type: 'Organization',
-      },
-    };
-
-    const mockNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-      [
-        {
-          id: '1',
-          unread: true,
-          updated_at: '2024-01-01T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is a check suite workflow.',
-            type: 'CheckSuite',
-            url: null,
-            latest_comment_url: null,
-          },
-          repository: mockRepository,
-        },
-        {
-          id: '2',
-          unread: true,
-          updated_at: '2024-02-26T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is a Discussion.',
-            type: 'Discussion',
-            url: null,
-            latest_comment_url: null,
-          },
-          repository: mockRepository,
-        },
-        {
-          id: '3',
-          unread: true,
-          updated_at: '2024-01-01T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is an Issue.',
-            type: 'Issue',
-            url: 'https://api.github.com/repos/gitify-app/notifications-test/issues/3',
-            latest_comment_url:
-              'https://api.github.com/repos/gitify-app/notifications-test/issues/3/comments',
-          },
-          repository: mockRepository,
-        },
-        {
-          id: '4',
-          unread: true,
-          updated_at: '2024-01-01T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is a Pull Request.',
-            type: 'PullRequest',
-            url: 'https://api.github.com/repos/gitify-app/notifications-test/pulls/4',
-            latest_comment_url:
-              'https://api.github.com/repos/gitify-app/notifications-test/issues/4/comments',
-          },
-          repository: mockRepository,
-        },
-        {
-          id: '5',
-          unread: true,
-          updated_at: '2024-01-01T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is an invitation.',
-            type: 'RepositoryInvitation',
-            url: null,
-            latest_comment_url: null,
-          },
-          repository: mockRepository,
-        },
-        {
-          id: '6',
-          unread: true,
-          updated_at: '2024-01-01T00:00:00Z',
-          reason: 'subscribed',
-          subject: {
-            title: 'This is a workflow run.',
-            type: 'WorkflowRun',
-            url: null,
-            latest_comment_url: null,
-          },
-          repository: mockRepository,
-        },
-      ];
-
     it('should fetch non-detailed notifications with success', async () => {
-      const mockState = {
+      getAllNotificationsSpy.mockResolvedValue(
+        mockMultipleAccountNotifications,
+      );
+
+      const mockStateNonDetailed = {
         auth: mockAuth,
         settings: {
           ...mockSettings,
@@ -144,17 +61,10 @@ describe('renderer/hooks/useNotifications.ts', () => {
         },
       };
 
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
-
       const { result } = renderHook(() => useNotifications());
 
       act(() => {
-        result.current.fetchNotifications(mockState);
+        result.current.fetchNotifications(mockStateNonDetailed);
       });
 
       expect(result.current.status).toBe('loading');
@@ -166,25 +76,16 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications[0].account.hostname).toBe(
         'github.com',
       );
-      expect(result.current.notifications[0].notifications.length).toBe(6);
+      expect(result.current.notifications[0].notifications.length).toBe(2);
 
       expect(result.current.notifications[1].account.hostname).toBe(
         'github.gitify.io',
       );
-      expect(result.current.notifications[1].notifications.length).toBe(6);
+      expect(result.current.notifications[1].notifications.length).toBe(2);
     });
 
     it('should fetch detailed notifications with success', async () => {
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
-
-      vi.spyOn(apiClient, 'fetchNotificationDetailsForList').mockResolvedValue(
-        new Map(),
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       const { result } = renderHook(() => useNotifications());
 
@@ -209,31 +110,22 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications[0].account.hostname).toBe(
         'github.com',
       );
-      expect(result.current.notifications[0].notifications.length).toBe(6);
+      expect(result.current.notifications[0].notifications.length).toBe(1);
     });
 
     it('should fetch notifications with same failures', async () => {
-      const status = 401;
-      const message = 'Bad credentials';
-
-      // Mock listNotificationsForAuthenticatedUser to throw RequestError for both accounts
-      const listNotificationsSpy = vi
-        .spyOn(apiClient, 'listNotificationsForAuthenticatedUser')
-        .mockRejectedValue(
-          new RequestError(message, status, {
-            request: {
-              method: 'GET',
-              url: 'https://api.github.com/notifications',
-              headers: {},
-            },
-            response: {
-              status,
-              url: 'https://api.github.com/notifications',
-              headers: {},
-              data: { message },
-            },
-          }),
-        );
+      getAllNotificationsSpy.mockResolvedValue([
+        {
+          account: mockGitHubCloudAccount,
+          notifications: [],
+          error: Errors.BAD_CREDENTIALS,
+        },
+        {
+          account: mockGitHubEnterpriseServerAccount,
+          notifications: [],
+          error: Errors.BAD_CREDENTIALS,
+        },
+      ]);
 
       const { result } = renderHook(() => useNotifications());
 
@@ -248,49 +140,21 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       expect(result.current.globalError).toBe(Errors.BAD_CREDENTIALS);
-      expect(rendererLogErrorSpy).toHaveBeenCalledTimes(2);
-
-      listNotificationsSpy.mockRestore();
     });
 
     it('should fetch notifications with different failures', async () => {
-      // Mock to throw different errors for each account
-      const listNotificationsSpy = vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      );
-
-      listNotificationsSpy
-        .mockRejectedValueOnce(
-          new RequestError('Oops! Something went wrong.', 400, {
-            request: {
-              method: 'GET',
-              url: 'https://api.github.com/notifications',
-              headers: {},
-            },
-            response: {
-              status: 400,
-              url: 'https://api.github.com/notifications',
-              headers: {},
-              data: { message: 'Oops! Something went wrong.' },
-            },
-          }),
-        )
-        .mockRejectedValueOnce(
-          new RequestError('Bad credentials', 401, {
-            request: {
-              method: 'GET',
-              url: 'https://github.gitify.io/api/v3/notifications',
-              headers: {},
-            },
-            response: {
-              status: 401,
-              url: 'https://github.gitify.io/api/v3/notifications',
-              headers: {},
-              data: { message: 'Bad credentials' },
-            },
-          }),
-        );
+      getAllNotificationsSpy.mockResolvedValue([
+        {
+          account: mockGitHubCloudAccount,
+          notifications: [],
+          error: Errors.UNKNOWN,
+        },
+        {
+          account: mockGitHubEnterpriseServerAccount,
+          notifications: [],
+          error: Errors.BAD_CREDENTIALS,
+        },
+      ]);
 
       const { result } = renderHook(() => useNotifications());
 
@@ -305,18 +169,10 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       expect(result.current.globalError).toBeNull();
-      expect(rendererLogErrorSpy).toHaveBeenCalledTimes(2);
-
-      listNotificationsSpy.mockRestore();
     });
 
     it('should play sound when new notifications arrive and playSound is enabled', async () => {
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       const stateWithSound = {
         auth: {
@@ -345,12 +201,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should show native notification when new notifications arrive and showNotifications is enabled', async () => {
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       const stateWithNotifications = {
         auth: {
@@ -379,12 +230,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should play sound and show notification when both are enabled', async () => {
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       const stateWithBoth = {
         auth: {
@@ -413,13 +259,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should not play sound or show notification when no new notifications', async () => {
-      // Return empty notifications - no new notifications to trigger sound/native
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        [] satisfies Partial<ListNotificationsForAuthenticatedUserResponse>,
-      );
+      getAllNotificationsSpy.mockResolvedValue([]);
 
       const stateWithBoth = {
         auth: {
@@ -491,60 +331,13 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should only mark specific notifications as read while keeping others unread', async () => {
-      const mockNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-        [
-          {
-            id: '1',
-            unread: true,
-            updated_at: '2024-01-01T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'First notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'notifications-test',
-              full_name: 'gitify-app/notifications-test',
-              html_url: 'https://github.com/gitify-app/notifications-test',
-              owner: {
-                login: 'gitify-app',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-          {
-            id: '2',
-            unread: true,
-            updated_at: '2024-01-02T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'Second notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'notifications-test',
-              full_name: 'gitify-app/notifications-test',
-              html_url: 'https://github.com/gitify-app/notifications-test',
-              owner: {
-                login: 'gitify-app',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-        ];
-
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue([
+        {
+          account: mockGitHubCloudAccount,
+          notifications: [...mockGitHubCloudGitifyNotifications],
+          error: null,
+        },
+      ]);
 
       vi.spyOn(apiClient, 'markNotificationThreadAsRead').mockResolvedValue(
         undefined,
@@ -602,65 +395,9 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should only update notifications for the correct account when fetchReadNotifications is enabled', async () => {
-      const mockCloudNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-        [
-          {
-            id: '1',
-            unread: true,
-            updated_at: '2024-01-01T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'Cloud notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'notifications-test',
-              full_name: 'gitify-app/notifications-test',
-              html_url: 'https://github.com/gitify-app/notifications-test',
-              owner: {
-                login: 'gitify-app',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-        ];
-
-      const mockEnterpriseNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-        [
-          {
-            id: '2',
-            unread: true,
-            updated_at: '2024-01-01T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'Enterprise notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'enterprise-test',
-              full_name: 'myorg/enterprise-test',
-              html_url: 'https://github.gitify.io/myorg/enterprise-test',
-              owner: {
-                login: 'myorg',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-        ];
-
-      vi.spyOn(apiClient, 'listNotificationsForAuthenticatedUser')
-        .mockResolvedValueOnce(
-          mockCloudNotifications as ListNotificationsForAuthenticatedUserResponse,
-        )
-        .mockResolvedValueOnce(
-          mockEnterpriseNotifications as ListNotificationsForAuthenticatedUserResponse,
-        );
+      getAllNotificationsSpy.mockResolvedValue(
+        mockMultipleAccountNotifications,
+      );
 
       vi.spyOn(apiClient, 'markNotificationThreadAsRead').mockResolvedValue(
         undefined,
@@ -717,38 +454,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should keep notifications in list when fetchReadNotifications is enabled', async () => {
-      const mockNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-        [
-          {
-            id: mockGitifyNotification.id,
-            unread: true,
-            updated_at: '2024-01-01T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'Test notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'notifications-test',
-              full_name: 'gitify-app/notifications-test',
-              html_url: 'https://github.com/gitify-app/notifications-test',
-              owner: {
-                login: 'gitify-app',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-        ];
-
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       vi.spyOn(apiClient, 'markNotificationThreadAsRead').mockResolvedValue(
         undefined,
@@ -1021,38 +727,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
 
   describe('removeAccountNotifications', () => {
     it('should remove notifications for a specific account', async () => {
-      const mockNotifications: DeepPartial<ListNotificationsForAuthenticatedUserResponse> =
-        [
-          {
-            id: '1',
-            unread: true,
-            updated_at: '2024-01-01T00:00:00Z',
-            reason: 'subscribed',
-            subject: {
-              title: 'Test notification',
-              type: 'Issue',
-              url: null,
-              latest_comment_url: null,
-            },
-            repository: {
-              name: 'notifications-test',
-              full_name: 'gitify-app/notifications-test',
-              html_url: 'https://github.com/gitify-app/notifications-test',
-              owner: {
-                login: 'gitify-app',
-                avatar_url: 'https://avatar.url',
-                type: 'Organization',
-              },
-            },
-          },
-        ];
-
-      vi.spyOn(
-        apiClient,
-        'listNotificationsForAuthenticatedUser',
-      ).mockResolvedValue(
-        mockNotifications as ListNotificationsForAuthenticatedUserResponse,
-      );
+      getAllNotificationsSpy.mockResolvedValue(mockSingleAccountNotifications);
 
       const stateWithSingleAccount = {
         auth: {
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index f2173616c..dc8a48f2d 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 { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 import {
   mockGitHubAppAccount,
   mockOAuthAccount,
@@ -14,12 +14,6 @@ import * as links from '../utils/links';
 import * as storage from '../utils/storage';
 import { AccountsRoute } from './Accounts';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/Accounts.tsx', () => {
   afterEach(() => {
     vi.clearAllMocks();
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index b8dcccfe3..a6b288841 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -1,17 +1,11 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import { type FiltersStore, useFiltersStore } from '../stores';
 import { FiltersRoute } from './Filters';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/Filters.tsx', () => {
   const fetchNotificationsMock = vi.fn();
 
diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx
index 79a6499f1..11de7efe8 100644
--- a/src/renderer/routes/Login.test.tsx
+++ b/src/renderer/routes/Login.test.tsx
@@ -1,17 +1,11 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/comms';
 import { LoginRoute } from './Login';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/Login.tsx', () => {
   afterEach(() => {
     vi.clearAllMocks();
diff --git a/src/renderer/routes/LoginWithDeviceFlow.test.tsx b/src/renderer/routes/LoginWithDeviceFlow.test.tsx
index 776d5384b..37690bd1a 100644
--- a/src/renderer/routes/LoginWithDeviceFlow.test.tsx
+++ b/src/renderer/routes/LoginWithDeviceFlow.test.tsx
@@ -1,17 +1,11 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/comms';
 import { LoginWithDeviceFlowRoute } from './LoginWithDeviceFlow';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
   const copyToClipboardSpy = vi
     .spyOn(comms, 'copyToClipboard')
diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx
index 5696dface..09a6bedbd 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 { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import type { ClientID, ClientSecret, Hostname } from '../types';
 
@@ -13,12 +13,6 @@ import {
   validateForm,
 } from './LoginWithOAuthApp';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   const loginWithOAuthAppMock = vi.fn();
 
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
index 198e4646c..30aff386a 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 { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import type { Hostname, Token } from '../types';
 
@@ -13,12 +13,6 @@ import {
   validateForm,
 } from './LoginWithPersonalAccessToken';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   const loginWithPersonalAccessTokenMock = vi.fn();
   const openExternalLinkSpy = vi
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index 9fd3c8d90..42a0e1f3e 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,17 +1,10 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import { navigateMock, renderWithAppContext } from '../__helpers__/test-utils';
 
 import { SettingsRoute } from './Settings';
 
-const navigateMock = vi.fn();
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual('react-router-dom')),
-  useNavigate: () => navigateMock,
-}));
-
 describe('renderer/routes/Settings.tsx', () => {
   const fetchNotificationsMock = vi.fn();
 
@@ -21,11 +14,9 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should render itself & its children', async () => {
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsRoute />
-        </MemoryRouter>,
-      );
+      renderWithAppContext(<SettingsRoute />, {
+        initialEntries: ['/settings'],
+      });
     });
 
     expect(screen.getByTestId('settings')).toMatchSnapshot();
@@ -33,14 +24,10 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should go back by pressing the icon', async () => {
     await act(async () => {
-      renderWithAppContext(
-        <MemoryRouter initialEntries={['/settings']}>
-          <SettingsRoute />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-        },
-      );
+      renderWithAppContext(<SettingsRoute />, {
+        initialEntries: ['/settings'],
+        fetchNotifications: fetchNotificationsMock,
+      });
     });
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index 3190e642e..f73f4b539 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -1,6 +1,7 @@
 import type { FC } from 'react';
 
 import type { Icon, OcticonProps } from '@primer/octicons-react';
+import type { VariantType } from '@primer/react/dist/Button/types';
 
 import type { AuthMethod, PlatformType } from './utils/auth/types';
 
@@ -178,6 +179,14 @@ export interface GitifyError {
   title: string;
   descriptions: string[];
   emojis: string[];
+  actions?: GitifyErrorAction[];
+}
+
+export interface GitifyErrorAction {
+  label: string;
+  route: string;
+  variant: VariantType;
+  icon: FC<OcticonProps>;
 }
 
 export type ErrorType =
diff --git a/src/renderer/utils/errors.ts b/src/renderer/utils/errors.ts
index 2f719f37e..308f892ff 100644
--- a/src/renderer/utils/errors.ts
+++ b/src/renderer/utils/errors.ts
@@ -1,3 +1,5 @@
+import { PersonIcon } from '@primer/octicons-react';
+
 import { Constants } from '../constants';
 
 import type { AccountNotifications, ErrorType, GitifyError } from '../types';
@@ -7,11 +9,27 @@ export const Errors: Record<ErrorType, GitifyError> = {
     title: 'Bad Credentials',
     descriptions: ['Your credentials are either invalid or expired.'],
     emojis: Constants.EMOJIS.ERRORS.BAD_CREDENTIALS,
+    actions: [
+      {
+        label: 'Manage Accounts',
+        route: '/accounts',
+        variant: 'danger',
+        icon: PersonIcon,
+      },
+    ],
   },
   MISSING_SCOPES: {
     title: 'Missing Scopes',
     descriptions: ['Your credentials are missing a required API scope.'],
     emojis: Constants.EMOJIS.ERRORS.MISSING_SCOPES,
+    actions: [
+      {
+        label: 'Manage Accounts',
+        route: '/accounts',
+        variant: 'danger',
+        icon: PersonIcon,
+      },
+    ],
   },
   NETWORK: {
     title: 'Network Error',