From f8a5b488a24c0fee7ac8c9474b7989b2d8ff8696 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sat, 6 Sep 2025 06:57:59 -0400
Subject: [PATCH] test: remove unused memoryrouter

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/AllRead.test.tsx      |  5 +-
 .../components/filters/FilterSection.test.tsx | 55 ++++++++-----------
 .../components/filters/ReasonFilter.test.tsx  |  5 +-
 ...uiresDetailedNotificationsWarning.test.tsx |  5 +-
 .../components/filters/StateFilter.test.tsx   |  5 +-
 .../filters/SubjectTypeFilter.test.tsx        |  5 +-
 .../filters/UserHandleFilter.test.tsx         | 25 ++-------
 .../filters/UserTypeFilter.test.tsx           |  5 +-
 .../settings/AppearanceSettings.test.tsx      | 25 ++-------
 .../settings/NotificationSettings.test.tsx    | 41 ++++----------
 .../settings/SettingsFooter.test.tsx          | 17 ++----
 .../settings/SettingsReset.test.tsx           |  9 +--
 .../settings/SystemSettings.test.tsx          | 45 ++++-----------
 src/renderer/routes/Accounts.test.tsx         | 49 ++++-------------
 src/renderer/routes/Filters.test.tsx          | 13 +----
 src/renderer/routes/Login.test.tsx            | 32 ++---------
 .../routes/LoginWithOAuthApp.test.tsx         | 29 +++-------
 .../LoginWithPersonalAccessToken.test.tsx     | 39 +++----------
 src/renderer/routes/Settings.test.tsx         |  9 +--
 .../utils/notifications/native.test.ts        | 48 ++++++----------
 src/renderer/utils/notifications/native.ts    |  2 +-
 21 files changed, 125 insertions(+), 343 deletions(-)

diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
index 10cc58cb9..743e4d6cf 100644
--- a/src/renderer/components/AllRead.test.tsx
+++ b/src/renderer/components/AllRead.test.tsx
@@ -1,5 +1,4 @@
 import { act, render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockSettings } from '../__mocks__/state-mocks';
 import { ensureStableEmojis } from '../__mocks__/utils';
@@ -44,9 +43,7 @@ describe('renderer/components/AllRead.tsx', () => {
             },
           }}
         >
-          <MemoryRouter>
-            <AllRead />
-          </MemoryRouter>
+          <AllRead />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx
index 1f8332428..0d28d4248 100644
--- a/src/renderer/components/filters/FilterSection.test.tsx
+++ b/src/renderer/components/filters/FilterSection.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
@@ -29,18 +28,16 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             notifications: mockAccountNotifications,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={{
-                ...mockFilter,
-                requiresDetailsNotifications: true,
-              }}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={{
+              ...mockFilter,
+              requiresDetailsNotifications: true,
+            }}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
 
@@ -88,15 +85,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             updateFilter,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={mockFilter}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={mockFilter}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
     });
@@ -123,15 +118,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             updateFilter,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={mockFilter}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={mockFilter}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx
index 9fe104f18..81beb41ce 100644
--- a/src/renderer/components/filters/ReasonFilter.test.tsx
+++ b/src/renderer/components/filters/ReasonFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -15,9 +14,7 @@ describe('renderer/components/filters/ReasonFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <ReasonFilter />
-        </MemoryRouter>
+        <ReasonFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
index f0348091f..cd57cb5f8 100644
--- a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
+++ b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -15,9 +14,7 @@ describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx',
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <RequiresDetailedNotificationWarning />
-        </MemoryRouter>
+        <RequiresDetailedNotificationWarning />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx
index 264bafac3..a924580ac 100644
--- a/src/renderer/components/filters/StateFilter.test.tsx
+++ b/src/renderer/components/filters/StateFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -19,9 +18,7 @@ describe('renderer/components/filters/StateFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <StateFilter />
-        </MemoryRouter>
+        <StateFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
index e6c86b800..1015df381 100644
--- a/src/renderer/components/filters/SubjectTypeFilter.test.tsx
+++ b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -18,9 +17,7 @@ describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <SubjectTypeFilter />
-        </MemoryRouter>
+        <SubjectTypeFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/UserHandleFilter.test.tsx b/src/renderer/components/filters/UserHandleFilter.test.tsx
index 796791cf2..86e5546fe 100644
--- a/src/renderer/components/filters/UserHandleFilter.test.tsx
+++ b/src/renderer/components/filters/UserHandleFilter.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -27,9 +26,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
             notifications: mockAccountNotifications,
           }}
         >
-          <MemoryRouter>
-            <UserHandleFilter />
-          </MemoryRouter>
+          <UserHandleFilter />
         </AppContext.Provider>,
       );
 
@@ -47,9 +44,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
             notifications: mockAccountNotifications,
           }}
         >
-          <MemoryRouter>
-            <UserHandleFilter />
-          </MemoryRouter>
+          <UserHandleFilter />
         </AppContext.Provider>,
       );
 
@@ -71,9 +66,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
               updateFilter,
             }}
           >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
+            <UserHandleFilter />
           </AppContext.Provider>,
         );
       });
@@ -103,9 +96,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
               updateFilter,
             }}
           >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
+            <UserHandleFilter />
           </AppContext.Provider>,
         );
       });
@@ -133,9 +124,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
               updateFilter,
             }}
           >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
+            <UserHandleFilter />
           </AppContext.Provider>,
         );
       });
@@ -165,9 +154,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => {
               updateFilter,
             }}
           >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
+            <UserHandleFilter />
           </AppContext.Provider>,
         );
       });
diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx
index c1433500a..fa3009361 100644
--- a/src/renderer/components/filters/UserTypeFilter.test.tsx
+++ b/src/renderer/components/filters/UserTypeFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -19,9 +18,7 @@ describe('renderer/components/filters/UserTypeFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <UserTypeFilter />
-        </MemoryRouter>
+        <UserTypeFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/settings/AppearanceSettings.test.tsx b/src/renderer/components/settings/AppearanceSettings.test.tsx
index 210949b64..9aa4eacd7 100644
--- a/src/renderer/components/settings/AppearanceSettings.test.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import {
   mockAuth,
@@ -28,9 +27,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -56,9 +53,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -81,9 +76,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -111,9 +104,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -166,9 +157,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -191,9 +180,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 23ee6107b..0cdcc13cf 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -24,9 +23,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -47,9 +44,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -70,9 +65,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -93,9 +86,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -116,9 +107,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -139,9 +128,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -166,9 +153,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -200,9 +185,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -223,9 +206,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -248,9 +229,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 35d2fdd89..4fec2ae51 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -35,9 +34,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -58,9 +55,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -82,9 +77,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -105,9 +98,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SettingsReset.test.tsx b/src/renderer/components/settings/SettingsReset.test.tsx
index 471dacbb3..ef058dc2b 100644
--- a/src/renderer/components/settings/SettingsReset.test.tsx
+++ b/src/renderer/components/settings/SettingsReset.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -25,9 +24,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
             resetSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsReset />
-          </MemoryRouter>
+          <SettingsReset />
         </AppContext.Provider>,
       );
     });
@@ -50,9 +47,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
             resetSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsReset />
-          </MemoryRouter>
+          <SettingsReset />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx
index 0a9d7d7d6..3ff4bfc04 100644
--- a/src/renderer/components/settings/SystemSettings.test.tsx
+++ b/src/renderer/components/settings/SystemSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -23,9 +22,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -46,9 +43,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -69,9 +64,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -97,9 +90,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -120,9 +111,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -140,9 +129,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -158,9 +145,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -179,9 +164,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -203,9 +186,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -226,9 +207,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -249,9 +228,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index 1ae325703..a30413c06 100644
--- a/src/renderer/routes/Accounts.test.tsx
+++ b/src/renderer/routes/Accounts.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
@@ -45,9 +44,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -64,9 +61,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -93,9 +88,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -123,9 +116,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -151,9 +142,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -188,9 +177,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -224,9 +211,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -251,9 +236,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -289,9 +272,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               logoutFromAccount: logoutFromAccountMock,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -322,9 +303,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   loginWithGitHubApp: mockLoginWithGitHubApp,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
@@ -348,9 +327,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   settings: mockSettings,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
@@ -380,9 +357,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   settings: mockSettings,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index 25b6ba782..115c26d3e 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
@@ -31,9 +30,7 @@ describe('renderer/routes/Filters.tsx', () => {
               notifications: [],
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
@@ -52,9 +49,7 @@ describe('renderer/routes/Filters.tsx', () => {
               fetchNotifications,
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
@@ -78,9 +73,7 @@ describe('renderer/routes/Filters.tsx', () => {
               clearFilters,
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx
index ebe226cde..df3f75476 100644
--- a/src/renderer/routes/Login.test.tsx
+++ b/src/renderer/routes/Login.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import * as comms from '../utils/comms';
@@ -18,11 +17,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should render itself & its children', () => {
-    const tree = render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    const tree = render(<LoginRoute />);
 
     expect(tree).toMatchSnapshot();
   });
@@ -32,17 +27,13 @@ describe('renderer/routes/Login.tsx', () => {
 
     const { rerender } = render(
       <AppContext.Provider value={{ isLoggedIn: false }}>
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
     rerender(
       <AppContext.Provider value={{ isLoggedIn: true }}>
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
@@ -58,10 +49,7 @@ describe('renderer/routes/Login.tsx', () => {
           loginWithGitHubApp: mockLoginWithGitHubApp,
         }}
       >
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
-        ,
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
@@ -71,11 +59,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with personal access token', async () => {
-    render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-pat'));
 
@@ -86,11 +70,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with oauth app', async () => {
-    render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-oauth-app'));
 
diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx
index 598e8821c..bdad525ea 100644
--- a/src/renderer/routes/LoginWithOAuthApp.test.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import type { AuthState, ClientID, ClientSecret, Hostname } from '../types';
@@ -31,9 +30,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('renders correctly', () => {
     const tree = render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -43,9 +40,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('let us go back', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -85,9 +80,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     it('should be disabled if no hostname configured', async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth }}>
-          <MemoryRouter>
-            <LoginWithOAuthAppRoute />
-          </MemoryRouter>
+          <LoginWithOAuthAppRoute />
         </AppContext.Provider>,
       );
 
@@ -101,9 +94,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     it('should open in browser if hostname configured', async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth }}>
-          <MemoryRouter>
-            <LoginWithOAuthAppRoute />
-          </MemoryRouter>
+          <LoginWithOAuthAppRoute />
         </AppContext.Provider>,
       );
 
@@ -126,9 +117,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
           loginWithOAuthApp: mockLoginWithOAuthApp,
         }}
       >
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -155,9 +144,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('should render the form with errors', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -182,9 +169,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('should open help docs in the browser', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
index 59c54093c..229f4b78e 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import * as comms from '../utils/comms';
@@ -26,21 +25,13 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('renders correctly', () => {
-    const tree = render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    const tree = render(<LoginWithPersonalAccessTokenRoute />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginWithPersonalAccessTokenRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -76,9 +67,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
             loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
           }}
         >
-          <MemoryRouter>
-            <LoginWithPersonalAccessTokenRoute />
-          </MemoryRouter>
+          <LoginWithPersonalAccessTokenRoute />
         </AppContext.Provider>,
       );
 
@@ -96,9 +85,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
             loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
           }}
         >
-          <MemoryRouter>
-            <LoginWithPersonalAccessTokenRoute />
-          </MemoryRouter>
+          <LoginWithPersonalAccessTokenRoute />
         </AppContext.Provider>,
       );
 
@@ -117,9 +104,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
@@ -151,9 +136,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
@@ -177,11 +160,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginWithPersonalAccessTokenRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -203,9 +182,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index cbba9861d..ba03a471a 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
@@ -23,9 +22,7 @@ describe('renderer/routes/Settings.tsx', () => {
     await act(async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth, settings: mockSettings }}>
-          <MemoryRouter>
-            <SettingsRoute />
-          </MemoryRouter>
+          <SettingsRoute />
         </AppContext.Provider>,
       );
     });
@@ -43,9 +40,7 @@ describe('renderer/routes/Settings.tsx', () => {
             fetchNotifications,
           }}
         >
-          <MemoryRouter>
-            <SettingsRoute />
-          </MemoryRouter>
+          <SettingsRoute />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/utils/notifications/native.test.ts b/src/renderer/utils/notifications/native.test.ts
index b1626dd43..37933406f 100644
--- a/src/renderer/utils/notifications/native.test.ts
+++ b/src/renderer/utils/notifications/native.test.ts
@@ -5,11 +5,6 @@ import {
 import { mockAuth } from '../../__mocks__/state-mocks';
 import { defaultSettings } from '../../context/defaults';
 import type { SettingsState } from '../../types';
-import {
-  mockGitHubNotifications,
-  mockSingleNotification,
-} from '../api/__mocks__/response-mocks';
-import * as links from '../links';
 import * as native from './native';
 
 const raiseSoundNotificationMock = jest.spyOn(native, 'raiseSoundNotification');
@@ -33,6 +28,17 @@ describe('renderer/utils/notifications/native.ts', () => {
       });
 
       expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1);
+      expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith(
+        expect.stringContaining(
+          mockSingleAccountNotifications[0].notifications[0].repository
+            .full_name,
+        ),
+        expect.stringContaining(
+          mockSingleAccountNotifications[0].notifications[0].subject.title,
+        ),
+        null,
+      );
+
       expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1);
       expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2);
     });
@@ -50,6 +56,12 @@ describe('renderer/utils/notifications/native.ts', () => {
       });
 
       expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1);
+      expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith(
+        'Gitify',
+        'You have 4 notifications',
+        null,
+      );
+
       expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1);
       expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2);
     });
@@ -104,30 +116,4 @@ describe('renderer/utils/notifications/native.ts', () => {
       expect(window.gitify.raiseNativeNotification).not.toHaveBeenCalled();
     });
   });
-
-  describe.skip('raiseNativeNotification', () => {
-    it('should click on a native notification (with 1 notification)', () => {
-      jest.spyOn(links, 'openNotification');
-
-      const nativeNotification: Notification = native.raiseNativeNotification([
-        mockSingleNotification,
-      ]);
-      nativeNotification.onclick(null);
-
-      expect(links.openNotification).toHaveBeenCalledTimes(1);
-      expect(links.openNotification).toHaveBeenLastCalledWith(
-        mockSingleNotification,
-      );
-      expect(window.gitify.app.hide).toHaveBeenCalledTimes(1);
-    });
-
-    it('should click on a native notification (with more than 1 notification)', () => {
-      const nativeNotification = native.raiseNativeNotification(
-        mockGitHubNotifications,
-      );
-      nativeNotification.onclick(null);
-
-      expect(window.gitify.app.show).toHaveBeenCalledTimes(1);
-    });
-  });
 });
diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts
index fcf804c4c..cee3e8638 100644
--- a/src/renderer/utils/notifications/native.ts
+++ b/src/renderer/utils/notifications/native.ts
@@ -65,7 +65,7 @@ export const raiseNativeNotification = (notifications: Notification[]) => {
     // TODO FIXME = set url to notification url
   } else {
     title = APPLICATION.NAME;
-    body = `You have ${notifications.length} notifications.`;
+    body = `You have ${notifications.length} notifications`;
   }
 
   return window.gitify.raiseNativeNotification(title, body, url);