From 82d969a2d589223fb3f3cdeef1d4308cfb6f039b Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 04:21:55 +0100
Subject: [PATCH 01/16] feat: add 'Show read notifications' setting (#708)

---
 src/renderer/__mocks__/state-mocks.ts         |  1 +
 .../settings/NotificationSettings.test.tsx    | 16 +++++
 .../settings/NotificationSettings.tsx         | 21 +++++++
 src/renderer/context/defaults.ts              |  1 +
 .../__snapshots__/Settings.test.tsx.snap      | 61 +++++++++++++++++--
 src/renderer/types.ts                         |  1 +
 .../notifications/filters/filter.test.ts      | 28 +++++++++
 .../utils/notifications/filters/filter.ts     |  5 ++
 8 files changed, 128 insertions(+), 6 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 63ad1f1c0..9d05eff33 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,6 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
+  showReadNotifications: true,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 7645681ff..326f9f4d4 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -271,6 +271,22 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     );
   });
 
+  it('should toggle the showReadNotifications checkbox', async () => {
+    await act(async () => {
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: updateSettingMock,
+      });
+    });
+
+    await userEvent.click(screen.getByTestId('checkbox-showReadNotifications'));
+
+    expect(updateSettingMock).toHaveBeenCalledTimes(1);
+    expect(updateSettingMock).toHaveBeenCalledWith(
+      'showReadNotifications',
+      false,
+    );
+  });
+
   it('should toggle the markAsDoneOnOpen checkbox', async () => {
     await act(async () => {
       renderWithAppContext(<NotificationSettings />, {
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 66bb02de7..7e1c170c1 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -328,6 +328,27 @@ export const NotificationSettings: FC = () => {
           }
         />
 
+        <Checkbox
+          checked={settings.showReadNotifications}
+          label="Show read notifications"
+          name="showReadNotifications"
+          onChange={(evt) =>
+            updateSetting('showReadNotifications', evt.target.checked)
+          }
+          tooltip={
+            <Stack direction="vertical" gap="condensed">
+              <Text>
+                When <Text as="u">checked</Text>, {APPLICATION.NAME} will
+                display both read and unread notifications.
+              </Text>
+              <Text>
+                When <Text as="u">unchecked</Text>, {APPLICATION.NAME} will only
+                display unread notifications.
+              </Text>
+            </Stack>
+          }
+        />
+
         <Checkbox
           checked={settings.markAsDoneOnOpen}
           label="Mark as done on open"
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index b37fc260a..5ab2ae413 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,6 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
+  showReadNotifications: true,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 57583e3d1..e4c6fe77c 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1098,6 +1098,55 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </svg>
             </button>
           </div>
+          <div
+            class="text-sm prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-showReadNotifications"
+              id="showReadNotifications"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="showReadNotifications"
+            >
+              Show read notifications
+            </label>
+            <button
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="tooltip-showReadNotifications"
+              data-testid="tooltip-tooltip-showReadNotifications"
+              id="tooltip-showReadNotifications"
+              tabindex="0"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-question text-gitify-tooltip-icon"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                />
+              </svg>
+            </button>
+          </div>
           <div
             class="text-sm prc-Stack-Stack-UQ9k6"
             data-align="center"
@@ -1943,7 +1992,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_12_"
+          aria-describedby="_r_13_"
           class="prc-Button-ButtonBase-9n-Xk"
           data-loading="false"
           data-no-visuals="true"
@@ -1971,7 +2020,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="ne"
-          id="_r_12_"
+          id="_r_13_"
           popover="auto"
           role="tooltip"
         >
@@ -1988,7 +2037,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_14_"
+          aria-describedby="_r_15_"
           aria-label="Accounts"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2020,14 +2069,14 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="n"
-          id="_r_14_"
+          id="_r_15_"
           popover="auto"
           role="tooltip"
         >
           Accounts
         </span>
         <button
-          aria-describedby="_r_16_"
+          aria-describedby="_r_17_"
           aria-label="Quit Gitify"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2059,7 +2108,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="nw"
-          id="_r_16_"
+          id="_r_17_"
           popover="auto"
           role="tooltip"
         >
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index bbf6231b9..240f60671 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -109,6 +109,7 @@ export interface NotificationSettingsState {
   showPills: boolean;
   showNumber: boolean;
   participating: boolean;
+  showReadNotifications: boolean;
   markAsDoneOnOpen: boolean;
   markAsDoneOnUnsubscribe: boolean;
   delayNotificationState: boolean;
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 2cc8590f3..ec776367a 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -65,6 +65,34 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
     ];
 
     describe('filterBaseNotifications', () => {
+      it('should show all notifications when showReadNotifications is enabled', () => {
+        const notifications = [
+          { ...mockNotifications[0], unread: true },
+          { ...mockNotifications[1], unread: false },
+        ];
+        const result = filterBaseNotifications(notifications, {
+          ...mockSettings,
+          showReadNotifications: true,
+        });
+
+        expect(result.length).toBe(2);
+        expect(result).toEqual(notifications);
+      });
+
+      it('should filter out read notifications when showReadNotifications is disabled', () => {
+        const notifications = [
+          { ...mockNotifications[0], unread: true },
+          { ...mockNotifications[1], unread: false },
+        ];
+        const result = filterBaseNotifications(notifications, {
+          ...mockSettings,
+          showReadNotifications: false,
+        });
+
+        expect(result.length).toBe(1);
+        expect(result[0].unread).toBe(true);
+      });
+
       it('should filter notifications by subject type when provided', async () => {
         mockNotifications[0].subject.type = 'Issue';
         mockNotifications[1].subject.type = 'PullRequest';
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
index a48619093..bc8b713b0 100644
--- a/src/renderer/utils/notifications/filters/filter.ts
+++ b/src/renderer/utils/notifications/filters/filter.ts
@@ -24,6 +24,11 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
+    // Filter out read notifications if showReadNotifications is disabled
+    if (!settings.showReadNotifications && !notification.unread) {
+      return false;
+    }
+
     // Apply base qualifier include/exclude filters (org, repo, etc.)
     for (const qualifier of BASE_SEARCH_QUALIFIERS) {
       if (!passesFilters) {

From 4eb19a41702e96ac58d11c198fa2b5625777500b Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 14:34:30 +0100
Subject: [PATCH 02/16] fix: hide mark as read button on read notifications

---
 .../notifications/NotificationRow.test.tsx     | 18 ++++++++++++++++++
 .../notifications/NotificationRow.tsx          |  1 +
 2 files changed, 19 insertions(+)

diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index d286d040c..081d6911b 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -154,6 +154,24 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       expect(markNotificationsAsReadMock).toHaveBeenCalledTimes(1);
     });
 
+    it('should hide mark as read button when notification is already read', async () => {
+      const readNotification = {
+        ...mockSingleNotification,
+        unread: false,
+      };
+
+      const props = {
+        notification: readNotification,
+        account: mockGitHubCloudAccount,
+      };
+
+      renderWithAppContext(<NotificationRow {...props} />);
+
+      expect(
+        screen.queryByTestId('notification-mark-as-read'),
+      ).not.toBeInTheDocument();
+    });
+
     it('should mark notifications as done', async () => {
       const markNotificationsAsDoneMock = jest.fn();
 
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index be8fb33e3..da189d8ff 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -147,6 +147,7 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
           <HoverButton
             action={actionMarkAsRead}
+            enabled={!isNotificationRead}
             icon={ReadIcon}
             label="Mark as read"
             testid="notification-mark-as-read"

From da23c07e21ac2204eb0244dc67204bb542ee96c9 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 16:52:49 +0100
Subject: [PATCH 03/16] fix: fetch read notifications from API when setting
 enabled

---
 src/renderer/__mocks__/state-mocks.ts         |  2 +-
 .../NotificationRow.test.tsx.snap             | 58 -------------------
 .../settings/NotificationSettings.test.tsx    |  2 +-
 .../settings/NotificationSettings.tsx         | 10 +++-
 src/renderer/context/defaults.ts              |  2 +-
 src/renderer/utils/api/client.test.ts         | 38 ++++++++++++
 src/renderer/utils/api/client.ts              |  4 ++
 .../notifications/filters/filter.test.ts      |  6 ++
 8 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 9d05eff33..15f057f96 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,7 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: true,
+  showReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 8227203cc..59230905d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -2721,35 +2721,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   />
                 </svg>
               </button>
-              <button
-                aria-label="Mark as read"
-                class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="notification-mark-as-read"
-                data-variant="invisible"
-                title="Mark as read"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-read"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                  />
-                </svg>
-              </button>
               <button
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
@@ -3079,35 +3050,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 />
               </svg>
             </button>
-            <button
-              aria-label="Mark as read"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="notification-mark-as-read"
-              data-variant="invisible"
-              title="Mark as read"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-read"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                />
-              </svg>
-            </button>
             <button
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 326f9f4d4..a6b06a823 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -283,7 +283,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(
       'showReadNotifications',
-      false,
+      true,
     );
   });
 
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 7e1c170c1..a042e08fd 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -338,12 +338,16 @@ export const NotificationSettings: FC = () => {
           tooltip={
             <Stack direction="vertical" gap="condensed">
               <Text>
-                When <Text as="u">checked</Text>, {APPLICATION.NAME} will
-                display both read and unread notifications.
+                When <Text as="u">checked</Text>, {APPLICATION.NAME} will fetch
+                and display both read and unread notifications.
               </Text>
               <Text>
                 When <Text as="u">unchecked</Text>, {APPLICATION.NAME} will only
-                display unread notifications.
+                fetch and display unread notifications.
+              </Text>
+              <Text className="text-gitify-caution">
+                ⚠️ Enabling this setting will increase API usage and may cause
+                rate limiting for users with many notifications.
               </Text>
             </Stack>
           }
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index 5ab2ae413..6b615a99d 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,7 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: true,
+  showReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/utils/api/client.test.ts b/src/renderer/utils/api/client.test.ts
index 917ac9c57..2179911c5 100644
--- a/src/renderer/utils/api/client.test.ts
+++ b/src/renderer/utils/api/client.test.ts
@@ -96,6 +96,44 @@ describe('renderer/utils/api/client.ts', () => {
         data: {},
       });
     });
+
+    it('should include all=true when showReadNotifications is enabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        showReadNotifications: true,
+      };
+
+      await listNotificationsForAuthenticatedUser(
+        mockGitHubCloudAccount,
+        mockSettings as SettingsState,
+      );
+
+      expect(axios).toHaveBeenCalledWith({
+        url: 'https://api.github.com/notifications?participating=false&all=true',
+        headers: mockNonCachedAuthHeaders,
+        method: 'GET',
+        data: {},
+      });
+    });
+
+    it('should not include all parameter when showReadNotifications is disabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        showReadNotifications: false,
+      };
+
+      await listNotificationsForAuthenticatedUser(
+        mockGitHubCloudAccount,
+        mockSettings as SettingsState,
+      );
+
+      expect(axios).toHaveBeenCalledWith({
+        url: 'https://api.github.com/notifications?participating=false',
+        headers: mockNonCachedAuthHeaders,
+        method: 'GET',
+        data: {},
+      });
+    });
   });
 
   it('markNotificationThreadAsRead - should mark notification thread as read', async () => {
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index 18fccfebd..a058c0219 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -72,6 +72,10 @@ export function listNotificationsForAuthenticatedUser(
   url.pathname += 'notifications';
   url.searchParams.append('participating', String(settings.participating));
 
+  if (settings.showReadNotifications) {
+    url.searchParams.append('all', 'true');
+  }
+
   return apiRequestAuth(
     url.toString() as Link,
     'GET',
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index ec776367a..ca3941edb 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -98,6 +98,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         mockNotifications[1].subject.type = 'PullRequest';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterSubjectTypes: ['Issue'],
         });
 
@@ -110,6 +111,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         mockNotifications[1].reason.code = 'manual';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterReasons: ['manual'],
         });
 
@@ -120,6 +122,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match include organization', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
         });
 
@@ -130,6 +133,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match exclude organization', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterExcludeSearchTokens: ['org:github' as SearchToken],
         });
 
@@ -140,6 +144,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match include repository', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
         });
 
@@ -150,6 +155,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match exclude repository', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterExcludeSearchTokens: ['repo:github/github' as SearchToken],
         });
 

From 197c0c0a17ab6d11a5518b7a3042bb972089a326 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Wed, 31 Dec 2025 02:39:58 +0100
Subject: [PATCH 04/16] test: update Settings snapshot for
 showReadNotifications default

---
 src/renderer/routes/__snapshots__/Settings.test.tsx.snap | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index e4c6fe77c..fe35d1c88 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1108,7 +1108,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             data-wrap="nowrap"
           >
             <input
-              checked=""
               class="size-4 rounded-sm cursor-pointer"
               data-testid="checkbox-showReadNotifications"
               id="showReadNotifications"

From 6d61440dceaaacd02e3353bbb88628c4651c587a Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 14:45:17 +0100
Subject: [PATCH 05/16] refactor: address PR feedback for showReadNotifications

---
 src/renderer/components/Sidebar.tsx           |   2 +-
 .../notifications/NotificationRow.tsx         |  16 +--
 .../NotificationRow.test.tsx.snap             | 120 +++++++++---------
 .../settings/NotificationSettings.tsx         |   2 +-
 .../__snapshots__/Settings.test.tsx.snap      |   2 +-
 .../notifications/filters/filter.test.ts      |  44 +------
 .../utils/notifications/filters/filter.ts     |   5 -
 7 files changed, 76 insertions(+), 115 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 0be792987..38259db63 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -89,7 +89,7 @@ export const Sidebar: FC = () => {
         <IconButton
           aria-label="Notifications"
           data-testid="sidebar-notifications"
-          description={`${unreadNotificationCount} unread notifications ↗`}
+          description={`${unreadNotificationCount} ${settings.showReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
           size="small"
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index da189d8ff..1f20aeb73 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -137,14 +137,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
       {!animateExit && (
         <HoverGroup bgColor="group-hover:bg-gitify-notification-hover">
-          <HoverButton
-            action={actionMarkAsDone}
-            enabled={isMarkAsDoneFeatureSupported(notification.account)}
-            icon={CheckIcon}
-            label="Mark as done"
-            testid="notification-mark-as-done"
-          />
-
           <HoverButton
             action={actionMarkAsRead}
             enabled={!isNotificationRead}
@@ -153,6 +145,14 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
+          <HoverButton
+            action={actionMarkAsDone}
+            enabled={isMarkAsDoneFeatureSupported(notification.account)}
+            icon={CheckIcon}
+            label="Mark as done"
+            testid="notification-mark-as-done"
+          />
+
           <HoverButton
             action={actionUnsubscribeFromThread}
             icon={BellSlashIcon}
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 59230905d..cf0f804e6 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -322,20 +322,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -346,25 +346,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,7 +375,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -732,20 +732,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -756,25 +756,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,7 +785,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1147,20 +1147,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1171,25 +1171,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,7 +1200,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1505,20 +1505,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1529,25 +1529,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,7 +1558,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1920,20 +1920,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1944,25 +1944,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,7 +1973,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -2278,20 +2278,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2302,25 +2302,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,7 +2331,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index a042e08fd..7f2e52a7d 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -330,7 +330,7 @@ export const NotificationSettings: FC = () => {
 
         <Checkbox
           checked={settings.showReadNotifications}
-          label="Show read notifications"
+          label="Fetch read notifications"
           name="showReadNotifications"
           onChange={(evt) =>
             updateSetting('showReadNotifications', evt.target.checked)
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index fe35d1c88..73bf409ca 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1117,7 +1117,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               class="font-medium text-gitify-font cursor-pointer"
               for="showReadNotifications"
             >
-              Show read notifications
+              Fetch read notifications
             </label>
             <button
               aria-expanded="false"
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index ca3941edb..51eba6d64 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -65,40 +65,11 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
     ];
 
     describe('filterBaseNotifications', () => {
-      it('should show all notifications when showReadNotifications is enabled', () => {
-        const notifications = [
-          { ...mockNotifications[0], unread: true },
-          { ...mockNotifications[1], unread: false },
-        ];
-        const result = filterBaseNotifications(notifications, {
-          ...mockSettings,
-          showReadNotifications: true,
-        });
-
-        expect(result.length).toBe(2);
-        expect(result).toEqual(notifications);
-      });
-
-      it('should filter out read notifications when showReadNotifications is disabled', () => {
-        const notifications = [
-          { ...mockNotifications[0], unread: true },
-          { ...mockNotifications[1], unread: false },
-        ];
-        const result = filterBaseNotifications(notifications, {
-          ...mockSettings,
-          showReadNotifications: false,
-        });
-
-        expect(result.length).toBe(1);
-        expect(result[0].unread).toBe(true);
-      });
-
-      it('should filter notifications by subject type when provided', async () => {
+      it('should filter notifications by subject type when provided', () => {
         mockNotifications[0].subject.type = 'Issue';
         mockNotifications[1].subject.type = 'PullRequest';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterSubjectTypes: ['Issue'],
         });
 
@@ -111,7 +82,6 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         mockNotifications[1].reason.code = 'manual';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterReasons: ['manual'],
         });
 
@@ -119,10 +89,9 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[1]]);
       });
 
-      it('should filter notifications that match include organization', async () => {
+      it('should filter notifications that match include organization', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
         });
 
@@ -130,10 +99,9 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match exclude organization', async () => {
+      it('should filter notifications that match exclude organization', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterExcludeSearchTokens: ['org:github' as SearchToken],
         });
 
@@ -141,10 +109,9 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match include repository', async () => {
+      it('should filter notifications that match include repository', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
         });
 
@@ -152,10 +119,9 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match exclude repository', async () => {
+      it('should filter notifications that match exclude repository', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
-          showReadNotifications: true,
           filterExcludeSearchTokens: ['repo:github/github' as SearchToken],
         });
 
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
index bc8b713b0..a48619093 100644
--- a/src/renderer/utils/notifications/filters/filter.ts
+++ b/src/renderer/utils/notifications/filters/filter.ts
@@ -24,11 +24,6 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
-    // Filter out read notifications if showReadNotifications is disabled
-    if (!settings.showReadNotifications && !notification.unread) {
-      return false;
-    }
-
     // Apply base qualifier include/exclude filters (org, repo, etc.)
     for (const qualifier of BASE_SEARCH_QUALIFIERS) {
       if (!passesFilters) {

From 3262c200aa2ff85f7b67e83b6452c7957be9bdc1 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 14:51:12 +0100
Subject: [PATCH 06/16] refactor: move mark as done button to far right

---
 .../notifications/NotificationRow.tsx         |  14 +-
 .../AccountNotifications.test.tsx.snap        | 120 ++++++-------
 .../NotificationRow.test.tsx.snap             | 160 +++++++++---------
 3 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 1f20aeb73..3f99a4963 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -145,6 +145,13 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
+          <HoverButton
+            action={actionUnsubscribeFromThread}
+            icon={BellSlashIcon}
+            label="Unsubscribe from thread"
+            testid="notification-unsubscribe-from-thread"
+          />
+
           <HoverButton
             action={actionMarkAsDone}
             enabled={isMarkAsDoneFeatureSupported(notification.account)}
@@ -152,13 +159,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             label="Mark as done"
             testid="notification-mark-as-done"
           />
-
-          <HoverButton
-            action={actionUnsubscribeFromThread}
-            icon={BellSlashIcon}
-            label="Unsubscribe from thread"
-            testid="notification-unsubscribe-from-thread"
-          />
         </HoverGroup>
       )}
     </div>
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 920504776..2e932725f 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -1588,20 +1588,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1612,25 +1612,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1641,25 +1641,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1670,7 +1670,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1878,20 +1878,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1902,25 +1902,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1931,25 +1931,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1960,7 +1960,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -2468,20 +2468,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2492,25 +2492,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as read"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2521,25 +2521,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2550,7 +2550,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -2758,20 +2758,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2782,25 +2782,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as read"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2811,25 +2811,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2840,7 +2840,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index cf0f804e6..f73d7918d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -351,20 +351,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,25 +375,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -404,7 +404,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -761,20 +761,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,25 +785,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -814,7 +814,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1176,20 +1176,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,25 +1200,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1229,7 +1229,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1534,20 +1534,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,25 +1558,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1587,7 +1587,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1949,20 +1949,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,25 +1973,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2002,7 +2002,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -2307,20 +2307,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,25 +2331,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2360,7 +2360,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -2693,20 +2693,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2717,25 +2717,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2746,7 +2746,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -3022,20 +3022,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3046,25 +3046,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3075,7 +3075,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>

From fe0b00ea63fb9a3b773e24dfbc10c67de42793a4 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 19:57:58 +0100
Subject: [PATCH 07/16] refactor: address PR review feedback from setchy

---
 src/renderer/__mocks__/state-mocks.ts         |   2 +-
 src/renderer/components/Sidebar.tsx           |   4 +-
 .../RepositoryNotifications.test.tsx          |   7 +
 .../notifications/RepositoryNotifications.tsx |  21 +-
 .../RepositoryNotifications.test.tsx.snap     | 318 +++++++-----------
 .../settings/NotificationSettings.test.tsx    |   6 +-
 .../settings/NotificationSettings.tsx         |   6 +-
 src/renderer/context/App.tsx                  |   2 +-
 src/renderer/context/defaults.ts              |   2 +-
 src/renderer/hooks/useNotifications.test.ts   | 210 +++++++++++-
 .../__snapshots__/Settings.test.tsx.snap      |  12 +-
 src/renderer/types.ts                         |   2 +-
 src/renderer/utils/api/client.test.ts         |  16 +-
 src/renderer/utils/api/client.ts              |   5 +-
 14 files changed, 380 insertions(+), 233 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 15f057f96..529aa94c5 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,7 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: false,
+  fetchReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 38259db63..b3d41a2a1 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -35,7 +35,7 @@ export const Sidebar: FC = () => {
     status,
     settings,
     auth,
-    unreadNotificationCount,
+    notificationCount,
     hasUnreadNotifications,
   } = useAppContext();
 
@@ -89,7 +89,7 @@ export const Sidebar: FC = () => {
         <IconButton
           aria-label="Notifications"
           data-testid="sidebar-notifications"
-          description={`${unreadNotificationCount} ${settings.showReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
+          description={`${notificationCount} ${settings.fetchReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
           size="small"
diff --git a/src/renderer/components/notifications/RepositoryNotifications.test.tsx b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
index b92b19c2d..c2d6fea24 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.test.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
@@ -23,6 +23,13 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
     repoNotifications: mockGitHubCloudGitifyNotifications,
   };
 
+  beforeEach(() => {
+    // Reset mock notification state between tests since it's mutated
+    for (const n of mockGitHubNotifications) {
+      n.unread = true;
+    }
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index 7f2f3ce0d..f1266f453 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -91,18 +91,9 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
 
         {!animateExit && (
           <HoverGroup bgColor="group-hover:bg-gitify-repository">
-            <HoverButton
-              action={actionMarkAsDone}
-              enabled={isMarkAsDoneFeatureSupported(
-                repoNotifications[0].account,
-              )}
-              icon={CheckIcon}
-              label="Mark repository as done"
-              testid="repository-mark-as-done"
-            />
-
             <HoverButton
               action={actionMarkAsRead}
+              enabled={!areAllRepoNotificationsRead}
               icon={ReadIcon}
               label="Mark repository as read"
               testid="repository-mark-as-read"
@@ -114,6 +105,16 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               label={Chevron.label}
               testid="repository-toggle"
             />
+
+            <HoverButton
+              action={actionMarkAsDone}
+              enabled={isMarkAsDoneFeatureSupported(
+                repoNotifications[0].account,
+              )}
+              icon={CheckIcon}
+              label="Mark repository as done"
+              testid="repository-mark-as-done"
+            />
           </HoverGroup>
         )}
       </Stack>
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index ccebe1f4b..d5ba93f08 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -103,49 +103,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
-                class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="repository-mark-as-done"
-                data-variant="invisible"
-                title="Mark repository as done"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-              </button>
-              <button
-                aria-label="Mark repository as read"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -156,25 +127,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -185,7 +156,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -300,49 +271,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="repository-mark-as-done"
-              data-variant="invisible"
-              title="Mark repository as done"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-            </button>
-            <button
-              aria-label="Mark repository as read"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -353,25 +295,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -382,7 +324,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -554,20 +496,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -578,25 +520,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -607,25 +549,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -636,7 +578,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -751,20 +693,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -775,25 +717,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -804,25 +746,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -833,7 +775,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -917,7 +859,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1012,20 +954,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1036,25 +978,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Show repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Show repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-right"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1065,25 +1007,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Show repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Show repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-right"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1094,7 +1036,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1114,7 +1056,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1209,20 +1151,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1233,25 +1175,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1262,25 +1204,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1291,7 +1233,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1318,7 +1260,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
         data-portal-root="true"
       >
         <div
-          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+          class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
           data-align="stretch"
           data-direction="horizontal"
           data-justify="start"
@@ -1413,20 +1355,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1437,25 +1379,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1466,25 +1408,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1495,7 +1437,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1579,7 +1521,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1674,20 +1616,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1698,25 +1640,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1727,25 +1669,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1756,7 +1698,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1783,7 +1725,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
         data-portal-root="true"
       >
         <div
-          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+          class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
           data-align="stretch"
           data-direction="horizontal"
           data-justify="start"
@@ -1878,20 +1820,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1902,25 +1844,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1931,25 +1873,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1960,7 +1902,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index a6b06a823..8e9c92c44 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -271,18 +271,18 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     );
   });
 
-  it('should toggle the showReadNotifications checkbox', async () => {
+  it('should toggle the fetchReadNotifications checkbox', async () => {
     await act(async () => {
       renderWithAppContext(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
 
-    await userEvent.click(screen.getByTestId('checkbox-showReadNotifications'));
+    await userEvent.click(screen.getByTestId('checkbox-fetchReadNotifications'));
 
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(
-      'showReadNotifications',
+      'fetchReadNotifications',
       true,
     );
   });
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 7f2e52a7d..102e53843 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -329,11 +329,11 @@ export const NotificationSettings: FC = () => {
         />
 
         <Checkbox
-          checked={settings.showReadNotifications}
+          checked={settings.fetchReadNotifications}
           label="Fetch read notifications"
-          name="showReadNotifications"
+          name="fetchReadNotifications"
           onChange={(evt) =>
-            updateSetting('showReadNotifications', evt.target.checked)
+            updateSetting('fetchReadNotifications', evt.target.checked)
           }
           tooltip={
             <Stack direction="vertical" gap="condensed">
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 14b085815..1e475f4bf 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -303,7 +303,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
 
-    const trayCount = status === 'error' ? -1 : unreadNotificationCount;
+    const trayCount = status === 'error' ? -1 : notificationCount;
     setTrayIconColorAndTitle(trayCount, settings);
   }, [
     settings.showNotificationsCountInTray,
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index 6b615a99d..e26199f98 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,7 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: false,
+  fetchReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index 1d7824232..38970b30d 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -84,11 +84,11 @@ describe('renderer/hooks/useNotifications.ts', () => {
       ];
 
       nock('https://api.github.com')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .reply(200, notifications);
 
       nock('https://github.gitify.io/api/v3')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .reply(200, notifications);
 
       const { result } = renderHook(() => useNotifications());
@@ -114,13 +114,211 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications[1].notifications.length).toBe(2);
     });
 
+    it('should fetch detailed notifications with success', async () => {
+      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 = [
+        {
+          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,
+        },
+      ];
+
+      nock('https://api.github.com')
+        .get('/notifications?participating=false&all=false')
+        .reply(200, mockNotifications);
+
+      nock('https://api.github.com')
+        .post('/graphql')
+        .reply(200, {
+          data: {
+            search: {
+              nodes: [
+                {
+                  title: 'This is a Discussion.',
+                  stateReason: null,
+                  isAnswered: true,
+                  url: 'https://github.com/gitify-app/notifications-test/discussions/612',
+                  author: {
+                    login: 'discussion-creator',
+                    url: 'https://github.com/discussion-creator',
+                    avatar_url:
+                      'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+                    type: 'User',
+                  },
+                  comments: {
+                    nodes: [
+                      {
+                        databaseId: 2297637,
+                        createdAt: '2022-03-04T20:39:44Z',
+                        author: {
+                          login: 'comment-user',
+                          url: 'https://github.com/comment-user',
+                          avatar_url:
+                            'https://avatars.githubusercontent.com/u/1?v=4',
+                          type: 'User',
+                        },
+                        replies: {
+                          nodes: [],
+                        },
+                      },
+                    ],
+                  },
+                  labels: null,
+                },
+              ],
+            },
+          },
+        });
+
+      nock('https://api.github.com')
+        .get('/repos/gitify-app/notifications-test/issues/3')
+        .reply(200, {
+          state: 'closed',
+          merged: true,
+          user: mockNotificationUser,
+          labels: [],
+        });
+      nock('https://api.github.com')
+        .get('/repos/gitify-app/notifications-test/issues/3/comments')
+        .reply(200, {
+          user: mockNotificationUser,
+        });
+      nock('https://api.github.com')
+        .get('/repos/gitify-app/notifications-test/pulls/4')
+        .reply(200, {
+          state: 'closed',
+          merged: false,
+          user: mockNotificationUser,
+          labels: [],
+        });
+      nock('https://api.github.com')
+        .get('/repos/gitify-app/notifications-test/pulls/4/reviews')
+        .reply(200, {});
+      nock('https://api.github.com')
+        .get('/repos/gitify-app/notifications-test/issues/4/comments')
+        .reply(200, {
+          user: mockNotificationUser,
+        });
+
+      const { result } = renderHook(() => useNotifications());
+
+      act(() => {
+        result.current.fetchNotifications({
+          auth: {
+            accounts: [mockGitHubCloudAccount],
+          },
+          settings: {
+            ...mockSettings,
+            detailedNotifications: true,
+          },
+        });
+      });
+
+      expect(result.current.status).toBe('loading');
+
+      await waitFor(() => {
+        expect(result.current.status).toBe('success');
+      });
+
+      expect(result.current.notifications[0].account.hostname).toBe(
+        'github.com',
+      );
+      expect(result.current.notifications[0].notifications.length).toBe(6);
+    });
+
     it('should fetch notifications with same failures', async () => {
       const code = AxiosError.ERR_BAD_REQUEST;
       const status = 401;
       const message = 'Bad credentials';
 
       nock('https://api.github.com/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -132,7 +330,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
         });
 
       nock('https://github.gitify.io/api/v3/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -163,7 +361,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
       const code = AxiosError.ERR_BAD_REQUEST;
 
       nock('https://api.github.com/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -175,7 +373,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
         });
 
       nock('https://github.gitify.io/api/v3/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 73bf409ca..792e01bb6 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1109,22 +1109,22 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           >
             <input
               class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-showReadNotifications"
-              id="showReadNotifications"
+              data-testid="checkbox-fetchReadNotifications"
+              id="fetchReadNotifications"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="showReadNotifications"
+              for="fetchReadNotifications"
             >
               Fetch read notifications
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-showReadNotifications"
-              data-testid="tooltip-tooltip-showReadNotifications"
-              id="tooltip-showReadNotifications"
+              aria-label="tooltip-fetchReadNotifications"
+              data-testid="tooltip-tooltip-fetchReadNotifications"
+              id="tooltip-fetchReadNotifications"
               tabindex="0"
               type="button"
             >
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index 240f60671..aa9832674 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -109,7 +109,7 @@ export interface NotificationSettingsState {
   showPills: boolean;
   showNumber: boolean;
   participating: boolean;
-  showReadNotifications: boolean;
+  fetchReadNotifications: boolean;
   markAsDoneOnOpen: boolean;
   markAsDoneOnUnsubscribe: boolean;
   delayNotificationState: boolean;
diff --git a/src/renderer/utils/api/client.test.ts b/src/renderer/utils/api/client.test.ts
index 2179911c5..524c76288 100644
--- a/src/renderer/utils/api/client.test.ts
+++ b/src/renderer/utils/api/client.test.ts
@@ -64,6 +64,7 @@ describe('renderer/utils/api/client.ts', () => {
     it('should list only participating notifications for user', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: true,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -72,7 +73,7 @@ describe('renderer/utils/api/client.ts', () => {
       );
 
       expect(axios).toHaveBeenCalledWith({
-        url: 'https://api.github.com/notifications?participating=true',
+        url: 'https://api.github.com/notifications?participating=true&all=false',
         headers: mockNonCachedAuthHeaders,
         method: 'GET',
         data: {},
@@ -82,6 +83,7 @@ describe('renderer/utils/api/client.ts', () => {
     it('should list participating and watching notifications for user', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -90,17 +92,17 @@ describe('renderer/utils/api/client.ts', () => {
       );
 
       expect(axios).toHaveBeenCalledWith({
-        url: 'https://api.github.com/notifications?participating=false',
+        url: 'https://api.github.com/notifications?participating=false&all=false',
         headers: mockNonCachedAuthHeaders,
         method: 'GET',
         data: {},
       });
     });
 
-    it('should include all=true when showReadNotifications is enabled', async () => {
+    it('should include all=true when fetchReadNotifications is enabled', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
-        showReadNotifications: true,
+        fetchReadNotifications: true,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -116,10 +118,10 @@ describe('renderer/utils/api/client.ts', () => {
       });
     });
 
-    it('should not include all parameter when showReadNotifications is disabled', async () => {
+    it('should include all=false when fetchReadNotifications is disabled', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
-        showReadNotifications: false,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -128,7 +130,7 @@ describe('renderer/utils/api/client.ts', () => {
       );
 
       expect(axios).toHaveBeenCalledWith({
-        url: 'https://api.github.com/notifications?participating=false',
+        url: 'https://api.github.com/notifications?participating=false&all=false',
         headers: mockNonCachedAuthHeaders,
         method: 'GET',
         data: {},
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index a058c0219..c77ddbc80 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -71,10 +71,7 @@ export function listNotificationsForAuthenticatedUser(
   const url = getGitHubAPIBaseUrl(account.hostname);
   url.pathname += 'notifications';
   url.searchParams.append('participating', String(settings.participating));
-
-  if (settings.showReadNotifications) {
-    url.searchParams.append('all', 'true');
-  }
+  url.searchParams.append('all', String(settings.fetchReadNotifications));
 
   return apiRequestAuth(
     url.toString() as Link,

From 2071c6b63e842b6154b89fde79b39e0a39289498 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 20:03:35 +0100
Subject: [PATCH 08/16] style: fix formatting in NotificationSettings test

---
 .../components/settings/NotificationSettings.test.tsx         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 8e9c92c44..1aa168199 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -278,7 +278,9 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
       });
     });
 
-    await userEvent.click(screen.getByTestId('checkbox-fetchReadNotifications'));
+    await userEvent.click(
+      screen.getByTestId('checkbox-fetchReadNotifications'),
+    );
 
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(

From 3c2d9bb65c15496cc7c155038dbb7fec035a5097 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 1 Jan 2026 10:24:27 -1000
Subject: [PATCH 09/16] refactor: reorder hover group buttons to keep chevron
 as right-most item

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../notifications/NotificationRow.tsx         |  14 +-
 .../notifications/RepositoryNotifications.tsx |  14 +-
 .../AccountNotifications.test.tsx.snap        |  80 ++++----
 .../NotificationRow.test.tsx.snap             | 160 ++++++++--------
 .../RepositoryNotifications.test.tsx.snap     | 180 +++++++++---------
 5 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 3f99a4963..1f20aeb73 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -145,13 +145,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
-          <HoverButton
-            action={actionUnsubscribeFromThread}
-            icon={BellSlashIcon}
-            label="Unsubscribe from thread"
-            testid="notification-unsubscribe-from-thread"
-          />
-
           <HoverButton
             action={actionMarkAsDone}
             enabled={isMarkAsDoneFeatureSupported(notification.account)}
@@ -159,6 +152,13 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             label="Mark as done"
             testid="notification-mark-as-done"
           />
+
+          <HoverButton
+            action={actionUnsubscribeFromThread}
+            icon={BellSlashIcon}
+            label="Unsubscribe from thread"
+            testid="notification-unsubscribe-from-thread"
+          />
         </HoverGroup>
       )}
     </div>
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index f1266f453..a0e2a363f 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -99,13 +99,6 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               testid="repository-mark-as-read"
             />
 
-            <HoverButton
-              action={actionToggleRepositoryNotifications}
-              icon={Chevron.icon}
-              label={Chevron.label}
-              testid="repository-toggle"
-            />
-
             <HoverButton
               action={actionMarkAsDone}
               enabled={isMarkAsDoneFeatureSupported(
@@ -115,6 +108,13 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               label="Mark repository as done"
               testid="repository-mark-as-done"
             />
+
+            <HoverButton
+              action={actionToggleRepositoryNotifications}
+              icon={Chevron.icon}
+              label={Chevron.label}
+              testid="repository-toggle"
+            />
           </HoverGroup>
         )}
       </Stack>
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 2e932725f..e49f20bc6 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -1617,20 +1617,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1641,25 +1641,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1670,7 +1670,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -1907,20 +1907,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1931,25 +1931,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1960,7 +1960,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -2497,20 +2497,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2521,25 +2521,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2550,7 +2550,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -2787,20 +2787,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2811,25 +2811,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2840,7 +2840,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index f73d7918d..cf0f804e6 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -351,20 +351,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,25 +375,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -404,7 +404,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -761,20 +761,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,25 +785,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -814,7 +814,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -1176,20 +1176,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,25 +1200,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1229,7 +1229,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -1534,20 +1534,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,25 +1558,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1587,7 +1587,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -1949,20 +1949,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,25 +1973,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2002,7 +2002,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -2307,20 +2307,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,25 +2331,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2360,7 +2360,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -2693,20 +2693,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Unsubscribe from thread"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2717,25 +2717,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2746,7 +2746,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -3022,20 +3022,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Unsubscribe from thread"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3046,25 +3046,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3075,7 +3075,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index d5ba93f08..e70eee124 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -103,20 +103,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -127,25 +127,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -156,7 +156,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -271,20 +271,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -295,25 +295,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -324,7 +324,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -525,20 +525,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -549,25 +549,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -578,7 +578,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -722,20 +722,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -746,25 +746,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -775,7 +775,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -983,20 +983,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-label="Show repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Show repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-right"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1007,25 +1007,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Show repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Show repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-right"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1036,7 +1036,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
                   />
                 </svg>
               </button>
@@ -1180,20 +1180,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1204,25 +1204,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1233,7 +1233,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1384,20 +1384,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1408,25 +1408,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1437,7 +1437,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1645,20 +1645,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1669,25 +1669,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1698,7 +1698,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1849,20 +1849,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1873,25 +1873,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1902,7 +1902,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>

From 736bf2c2722f6448baa4b91fe211d15f9f96803b Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Fri, 9 Jan 2026 10:42:35 +0100
Subject: [PATCH 10/16] refactor: handle mark as done limitation when fetching
 read notifications

---
 .../notifications/NotificationRow.tsx         | 21 +++++++++++++++----
 .../notifications/RepositoryNotifications.tsx | 13 ++++++++----
 .../settings/NotificationSettings.tsx         | 14 ++++++-------
 src/renderer/hooks/useNotifications.ts        |  7 ++++++-
 .../__snapshots__/Settings.test.tsx.snap      |  2 +-
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 1f20aeb73..7ee2637bc 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -33,10 +33,16 @@ export const NotificationRow: FC<NotificationRowProps> = ({
   const [animateExit, setAnimateExit] = useState(false);
 
   const handleNotification = useCallback(() => {
-    setAnimateExit(!settings.delayNotificationState);
+    // Don't animate exit when fetchReadNotifications is enabled
+    // as notifications will stay in the list with reduced opacity
+    const shouldAnimateExit =
+      !settings.delayNotificationState && !settings.fetchReadNotifications;
+    setAnimateExit(shouldAnimateExit);
     openNotification(notification);
 
-    if (settings.markAsDoneOnOpen) {
+    // Fall back to mark as read when fetchReadNotifications is enabled
+    // since marking as done won't work correctly (API limitation)
+    if (settings.markAsDoneOnOpen && !settings.fetchReadNotifications) {
       markNotificationsAsDone([notification]);
     } else {
       markNotificationsAsRead([notification]);
@@ -54,7 +60,11 @@ export const NotificationRow: FC<NotificationRowProps> = ({
   };
 
   const actionMarkAsRead = () => {
-    setAnimateExit(!settings.delayNotificationState);
+    // Don't animate exit when fetchReadNotifications is enabled
+    // as the notification will stay in the list with reduced opacity
+    if (!settings.fetchReadNotifications) {
+      setAnimateExit(!settings.delayNotificationState);
+    }
     markNotificationsAsRead([notification]);
   };
 
@@ -147,7 +157,10 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
           <HoverButton
             action={actionMarkAsDone}
-            enabled={isMarkAsDoneFeatureSupported(notification.account)}
+            enabled={
+              isMarkAsDoneFeatureSupported(notification.account) &&
+              !settings.fetchReadNotifications
+            }
             icon={CheckIcon}
             label="Mark as done"
             testid="notification-mark-as-done"
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index a0e2a363f..60d622ef1 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -37,7 +37,11 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
   };
 
   const actionMarkAsRead = () => {
-    setAnimateExit(!settings.delayNotificationState);
+    // Don't animate exit when fetchReadNotifications is enabled
+    // as the notifications will stay in the list with reduced opacity
+    if (!settings.fetchReadNotifications) {
+      setAnimateExit(!settings.delayNotificationState);
+    }
     markNotificationsAsRead(repoNotifications);
   };
 
@@ -101,9 +105,10 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
 
             <HoverButton
               action={actionMarkAsDone}
-              enabled={isMarkAsDoneFeatureSupported(
-                repoNotifications[0].account,
-              )}
+              enabled={
+                isMarkAsDoneFeatureSupported(repoNotifications[0].account) &&
+                !settings.fetchReadNotifications
+              }
               icon={CheckIcon}
               label="Mark repository as done"
               testid="repository-mark-as-done"
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 102e53843..1507ea1cd 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -330,20 +330,18 @@ export const NotificationSettings: FC = () => {
 
         <Checkbox
           checked={settings.fetchReadNotifications}
-          label="Fetch read notifications"
+          label="Fetch read & done notifications"
           name="fetchReadNotifications"
           onChange={(evt) =>
             updateSetting('fetchReadNotifications', evt.target.checked)
           }
           tooltip={
             <Stack direction="vertical" gap="condensed">
-              <Text>
-                When <Text as="u">checked</Text>, {APPLICATION.NAME} will fetch
-                and display both read and unread notifications.
-              </Text>
-              <Text>
-                When <Text as="u">unchecked</Text>, {APPLICATION.NAME} will only
-                fetch and display unread notifications.
+              <Text>Fetch all notifications including read and done.</Text>
+              <Text className="text-gitify-caution">
+                ⚠️ GitHub's API does not distinguish between read and done
+                states, so 'Mark as done' actions will be unavailable when this
+                setting is enabled.
               </Text>
               <Text className="text-gitify-caution">
                 ⚠️ Enabling this setting will increase API usage and may cause
diff --git a/src/renderer/hooks/useNotifications.ts b/src/renderer/hooks/useNotifications.ts
index a13d287d5..e2c885e88 100644
--- a/src/renderer/hooks/useNotifications.ts
+++ b/src/renderer/hooks/useNotifications.ts
@@ -222,7 +222,12 @@ export const useNotifications = (): NotificationsState => {
           notification.account.token,
         );
 
-        if (state.settings.markAsDoneOnUnsubscribe) {
+        // Fall back to mark as read when fetchReadNotifications is enabled
+        // since marking as done won't work correctly (API limitation)
+        if (
+          state.settings.markAsDoneOnUnsubscribe &&
+          !state.settings.fetchReadNotifications
+        ) {
           await markNotificationsAsDone(state, [notification]);
         } else {
           await markNotificationsAsRead(state, [notification]);
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 792e01bb6..3605497b4 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1117,7 +1117,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               class="font-medium text-gitify-font cursor-pointer"
               for="fetchReadNotifications"
             >
-              Fetch read notifications
+              Fetch read & done notifications
             </label>
             <button
               aria-expanded="false"

From 18f64130b5ec2b98b4a2f9147db4929c6ac16f14 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Sat, 10 Jan 2026 21:28:13 +0100
Subject: [PATCH 11/16] fix: provide complete AppContextState defaults in test
 utils

---
 src/renderer/__helpers__/test-utils.tsx       | 26 +++++++++++++++++--
 .../__snapshots__/Sidebar.test.tsx.snap       |  8 +++---
 .../__snapshots__/AppLayout.test.tsx.snap     |  4 +--
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
index 8e6f874ff..c22cd8699 100644
--- a/src/renderer/__helpers__/test-utils.tsx
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -22,19 +22,41 @@ export function AppContextProvider({
   children,
   value = {},
 }: AppContextProviderProps) {
-  const defaultValue: Partial<AppContextState> = useMemo(() => {
+  const defaultValue: AppContextState = useMemo(() => {
     return {
       auth: mockAuth,
       settings: mockSettings,
       isLoggedIn: true,
 
       notifications: [],
+      notificationCount: 0,
+      unreadNotificationCount: 0,
+      hasNotifications: false,
+      hasUnreadNotifications: false,
 
       status: 'success',
       globalError: null,
 
+      // Default mock implementations for all required methods
+      loginWithGitHubApp: jest.fn(),
+      loginWithOAuthApp: jest.fn(),
+      loginWithPersonalAccessToken: jest.fn(),
+      logoutFromAccount: jest.fn(),
+
+      fetchNotifications: jest.fn(),
+      removeAccountNotifications: jest.fn(),
+
+      markNotificationsAsRead: jest.fn(),
+      markNotificationsAsDone: jest.fn(),
+      unsubscribeNotification: jest.fn(),
+
+      clearFilters: jest.fn(),
+      resetSettings: jest.fn(),
+      updateSetting: jest.fn(),
+      updateFilter: jest.fn(),
+
       ...value,
-    } as Partial<AppContextState>;
+    } as AppContextState;
   }, [value]);
 
   return (
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 58b56b976..11981260c 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -231,7 +231,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 popover="auto"
                 role="tooltip"
               >
-                undefined unread notifications ↗
+                0 unread notifications ↗
               </span>
               <button
                 aria-describedby="_r_5_"
@@ -572,7 +572,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               popover="auto"
               role="tooltip"
             >
-              undefined unread notifications ↗
+              0 unread notifications ↗
             </span>
             <button
               aria-describedby="_r_5_"
@@ -970,7 +970,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 popover="auto"
                 role="tooltip"
               >
-                undefined unread notifications ↗
+                0 unread notifications ↗
               </span>
               <button
                 aria-labelledby="_r_k_"
@@ -1233,7 +1233,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               popover="auto"
               role="tooltip"
             >
-              undefined unread notifications ↗
+              0 unread notifications ↗
             </span>
             <button
               aria-labelledby="_r_k_"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 963d1468c..e8c77f187 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -145,7 +145,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   popover="auto"
                   role="tooltip"
                 >
-                  undefined unread notifications ↗
+                  0 unread notifications ↗
                 </span>
                 <button
                   aria-describedby="_r_5_"
@@ -502,7 +502,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 popover="auto"
                 role="tooltip"
               >
-                undefined unread notifications ↗
+                0 unread notifications ↗
               </span>
               <button
                 aria-describedby="_r_5_"

From 904e04c905295a0cb33612864c6fb71a84123802 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Sun, 11 Jan 2026 21:34:39 +0100
Subject: [PATCH 12/16] fix: correct mock variable references in tests after
 rebase

---
 .../components/notifications/NotificationRow.test.tsx     | 2 +-
 .../notifications/RepositoryNotifications.test.tsx        | 2 +-
 src/renderer/hooks/useNotifications.test.ts               | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index 081d6911b..f9f1643db 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -156,7 +156,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
     it('should hide mark as read button when notification is already read', async () => {
       const readNotification = {
-        ...mockSingleNotification,
+        ...mockGitifyNotification,
         unread: false,
       };
 
diff --git a/src/renderer/components/notifications/RepositoryNotifications.test.tsx b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
index c2d6fea24..e886f2d71 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.test.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
@@ -25,7 +25,7 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
 
   beforeEach(() => {
     // Reset mock notification state between tests since it's mutated
-    for (const n of mockGitHubNotifications) {
+    for (const n of mockGitHubCloudGitifyNotifications) {
       n.unread = true;
     }
   });
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index 38970b30d..ac7727b68 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -3,6 +3,7 @@ import { act, renderHook, waitFor } from '@testing-library/react';
 import axios, { AxiosError } from 'axios';
 import nock from 'nock';
 
+import { mockGitHubCloudAccount } from '../__mocks__/account-mocks';
 import { mockGitifyNotification } from '../__mocks__/notifications-mocks';
 import { mockAuth, mockSettings, mockState } from '../__mocks__/state-mocks';
 import { Errors } from '../utils/errors';
@@ -115,6 +116,13 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should fetch detailed notifications with success', async () => {
+      const mockNotificationUser = {
+        login: 'test-user',
+        html_url: 'https://github.com/test-user',
+        avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4',
+        type: 'User',
+      };
+
       const mockRepository = {
         name: 'notifications-test',
         full_name: 'gitify-app/notifications-test',

From e8433aa62953156139a1c7d2a38ce8769dc4be3a Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Sun, 11 Jan 2026 21:51:26 +0100
Subject: [PATCH 13/16] test: update Settings snapshot for tooltip testid
 change

---
 src/renderer/routes/__snapshots__/Settings.test.tsx.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 3605497b4..ca833823f 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1123,7 +1123,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-fetchReadNotifications"
-              data-testid="tooltip-tooltip-fetchReadNotifications"
+              data-testid="tooltip-icon-tooltip-fetchReadNotifications"
               id="tooltip-fetchReadNotifications"
               tabindex="0"
               type="button"

From a2fd0fd59e2f1c4ea25e0aa91888c184293877f2 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Sun, 11 Jan 2026 22:32:18 +0100
Subject: [PATCH 14/16] test: update login route snapshots for primer ID
 changes

---
 .../LoginWithOAuthApp.test.tsx.snap           | 32 +++++++++----------
 ...LoginWithPersonalAccessToken.test.tsx.snap | 32 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 5fefe358c..b0642180d 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -227,7 +227,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 >
                   <label
                     class="prc-components-Label-2mrqP"
-                    for="_r_9_"
+                    for="_r_7_"
                   >
                     <span
                       class="prc-components-RequiredText-7UsHS"
@@ -251,7 +251,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       class="prc-components-Input-IwWrt"
                       data-component="input"
                       data-testid="login-clientId"
-                      id="_r_9_"
+                      id="_r_7_"
                       name="clientId"
                       placeholder="Your generated client id (20 characters)"
                       type="text"
@@ -265,7 +265,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 >
                   <label
                     class="prc-components-Label-2mrqP"
-                    for="_r_f_"
+                    for="_r_b_"
                   >
                     <span
                       class="prc-components-RequiredText-7UsHS"
@@ -290,7 +290,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       class="prc-components-Input-IwWrt"
                       data-component="input"
                       data-testid="login-clientSecret"
-                      id="_r_f_"
+                      id="_r_b_"
                       name="clientSecret"
                       placeholder="Your generated client secret (40 characters)"
                       type="password"
@@ -300,7 +300,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       class="TextInput-action prc-components-TextInputAction-CjGDX"
                     >
                       <button
-                        aria-labelledby="_r_l_"
+                        aria-labelledby="_r_f_"
                         class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                         data-component="IconButton"
                         data-loading="false"
@@ -330,7 +330,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                         aria-hidden="true"
                         class="prc-TooltipV2-Tooltip-tLeuB"
                         data-direction="s"
-                        id="_r_l_"
+                        id="_r_f_"
                         popover="auto"
                       >
                         Show token
@@ -352,7 +352,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_n_"
+                  aria-describedby="_r_h_"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="small"
@@ -398,7 +398,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="s"
-                  id="_r_n_"
+                  id="_r_h_"
                   popover="auto"
                   role="tooltip"
                 >
@@ -680,7 +680,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
               >
                 <label
                   class="prc-components-Label-2mrqP"
-                  for="_r_9_"
+                  for="_r_7_"
                 >
                   <span
                     class="prc-components-RequiredText-7UsHS"
@@ -704,7 +704,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     class="prc-components-Input-IwWrt"
                     data-component="input"
                     data-testid="login-clientId"
-                    id="_r_9_"
+                    id="_r_7_"
                     name="clientId"
                     placeholder="Your generated client id (20 characters)"
                     type="text"
@@ -718,7 +718,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
               >
                 <label
                   class="prc-components-Label-2mrqP"
-                  for="_r_f_"
+                  for="_r_b_"
                 >
                   <span
                     class="prc-components-RequiredText-7UsHS"
@@ -743,7 +743,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     class="prc-components-Input-IwWrt"
                     data-component="input"
                     data-testid="login-clientSecret"
-                    id="_r_f_"
+                    id="_r_b_"
                     name="clientSecret"
                     placeholder="Your generated client secret (40 characters)"
                     type="password"
@@ -753,7 +753,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     class="TextInput-action prc-components-TextInputAction-CjGDX"
                   >
                     <button
-                      aria-labelledby="_r_l_"
+                      aria-labelledby="_r_f_"
                       class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                       data-component="IconButton"
                       data-loading="false"
@@ -783,7 +783,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       aria-hidden="true"
                       class="prc-TooltipV2-Tooltip-tLeuB"
                       data-direction="s"
-                      id="_r_l_"
+                      id="_r_f_"
                       popover="auto"
                     >
                       Show token
@@ -805,7 +805,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_n_"
+                aria-describedby="_r_h_"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="small"
@@ -851,7 +851,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="s"
-                id="_r_n_"
+                id="_r_h_"
                 popover="auto"
                 role="tooltip"
               >
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index eb258154f..0ca013fcb 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -230,7 +230,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     The
                      
                     <button
-                      aria-describedby="_r_9_"
+                      aria-describedby="_r_7_"
                       type="button"
                     >
                       <u
@@ -243,7 +243,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       aria-hidden="true"
                       class="prc-TooltipV2-Tooltip-tLeuB"
                       data-direction="se"
-                      id="_r_9_"
+                      id="_r_7_"
                       popover="auto"
                       role="tooltip"
                     >
@@ -259,7 +259,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 >
                   <label
                     class="prc-components-Label-2mrqP"
-                    for="_r_a_"
+                    for="_r_8_"
                   >
                     <span
                       class="prc-components-RequiredText-7UsHS"
@@ -284,7 +284,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       class="prc-components-Input-IwWrt"
                       data-component="input"
                       data-testid="login-token"
-                      id="_r_a_"
+                      id="_r_8_"
                       name="token"
                       placeholder="Your generated token (40 characters)"
                       type="password"
@@ -294,7 +294,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       class="TextInput-action prc-components-TextInputAction-CjGDX"
                     >
                       <button
-                        aria-labelledby="_r_g_"
+                        aria-labelledby="_r_c_"
                         class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                         data-component="IconButton"
                         data-loading="false"
@@ -324,7 +324,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                         aria-hidden="true"
                         class="prc-TooltipV2-Tooltip-tLeuB"
                         data-direction="s"
-                        id="_r_g_"
+                        id="_r_c_"
                         popover="auto"
                       >
                         Show token
@@ -346,7 +346,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_i_"
+                  aria-describedby="_r_e_"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="small"
@@ -392,7 +392,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="ne"
-                  id="_r_i_"
+                  id="_r_e_"
                   popover="auto"
                   role="tooltip"
                 >
@@ -677,7 +677,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   The
                    
                   <button
-                    aria-describedby="_r_9_"
+                    aria-describedby="_r_7_"
                     type="button"
                   >
                     <u
@@ -690,7 +690,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     aria-hidden="true"
                     class="prc-TooltipV2-Tooltip-tLeuB"
                     data-direction="se"
-                    id="_r_9_"
+                    id="_r_7_"
                     popover="auto"
                     role="tooltip"
                   >
@@ -706,7 +706,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
               >
                 <label
                   class="prc-components-Label-2mrqP"
-                  for="_r_a_"
+                  for="_r_8_"
                 >
                   <span
                     class="prc-components-RequiredText-7UsHS"
@@ -731,7 +731,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     class="prc-components-Input-IwWrt"
                     data-component="input"
                     data-testid="login-token"
-                    id="_r_a_"
+                    id="_r_8_"
                     name="token"
                     placeholder="Your generated token (40 characters)"
                     type="password"
@@ -741,7 +741,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     class="TextInput-action prc-components-TextInputAction-CjGDX"
                   >
                     <button
-                      aria-labelledby="_r_g_"
+                      aria-labelledby="_r_c_"
                       class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                       data-component="IconButton"
                       data-loading="false"
@@ -771,7 +771,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       aria-hidden="true"
                       class="prc-TooltipV2-Tooltip-tLeuB"
                       data-direction="s"
-                      id="_r_g_"
+                      id="_r_c_"
                       popover="auto"
                     >
                       Show token
@@ -793,7 +793,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_i_"
+                aria-describedby="_r_e_"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="small"
@@ -839,7 +839,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="ne"
-                id="_r_i_"
+                id="_r_e_"
                 popover="auto"
                 role="tooltip"
               >

From e8ebb68cb44db82662ae012921d8d04e8b74dc37 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Sun, 11 Jan 2026 22:50:52 +0100
Subject: [PATCH 15/16] test: add coverage for fetchReadNotifications fallback
 behavior

---
 .../notifications/NotificationRow.test.tsx    | 44 +++++++++++++++++++
 src/renderer/hooks/useNotifications.test.ts   | 34 ++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index f9f1643db..9329a3a77 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -136,6 +136,32 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       expect(markNotificationsAsDoneMock).toHaveBeenCalledTimes(1);
     });
 
+    it('should mark as read (not done) when markAsDoneOnOpen is true but fetchReadNotifications is enabled', async () => {
+      const markNotificationsAsReadMock = jest.fn();
+      const markNotificationsAsDoneMock = jest.fn();
+
+      const props = {
+        notification: mockGitifyNotification,
+        account: mockGitHubCloudAccount,
+      };
+
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: {
+          ...mockSettings,
+          markAsDoneOnOpen: true,
+          fetchReadNotifications: true,
+        },
+        markNotificationsAsRead: markNotificationsAsReadMock,
+        markNotificationsAsDone: markNotificationsAsDoneMock,
+      });
+
+      await userEvent.click(screen.getByTestId('notification-row'));
+
+      expect(links.openNotification).toHaveBeenCalledTimes(1);
+      expect(markNotificationsAsReadMock).toHaveBeenCalledTimes(1);
+      expect(markNotificationsAsDoneMock).not.toHaveBeenCalled();
+    });
+
     it('should mark notifications as read', async () => {
       const markNotificationsAsReadMock = jest.fn();
 
@@ -190,6 +216,24 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       expect(markNotificationsAsDoneMock).toHaveBeenCalledTimes(1);
     });
 
+    it('should hide mark as done button when fetchReadNotifications is enabled', async () => {
+      const props = {
+        notification: mockGitifyNotification,
+        account: mockGitHubCloudAccount,
+      };
+
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: { ...mockSettings, fetchReadNotifications: true },
+      });
+
+      expect(
+        screen.queryByTestId('notification-mark-as-done'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.getByTestId('notification-mark-as-read'),
+      ).toBeInTheDocument();
+    });
+
     it('should unsubscribe from a notification thread', async () => {
       const unsubscribeNotificationMock = jest.fn();
 
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index ac7727b68..dfca14c32 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -585,5 +585,39 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications.length).toBe(0);
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
     });
+
+    it('should mark as read (not done) when markAsDoneOnUnsubscribe is true but fetchReadNotifications is enabled', async () => {
+      // The unsubscribe endpoint call.
+      nock('https://api.github.com/')
+        .put(`/notifications/threads/${id}/subscription`)
+        .reply(200);
+
+      // The mark read endpoint call (NOT mark done).
+      nock('https://api.github.com/')
+        .patch(`/notifications/threads/${id}`)
+        .reply(200);
+
+      const { result } = renderHook(() => useNotifications());
+
+      act(() => {
+        result.current.unsubscribeNotification(
+          {
+            ...mockState,
+            settings: {
+              ...mockState.settings,
+              markAsDoneOnUnsubscribe: true,
+              fetchReadNotifications: true,
+            },
+          },
+          mockGitifyNotification,
+        );
+      });
+
+      await waitFor(() => {
+        expect(result.current.status).toBe('success');
+      });
+
+      expect(result.current.notifications.length).toBe(0);
+    });
   });
 });

From 3b22b96b60dd77d13eab26718da1fde1da14daba Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Mon, 12 Jan 2026 00:21:20 +0100
Subject: [PATCH 16/16] fix: keep notifications in list when
 fetchReadNotifications is enabled

---
 src/renderer/hooks/useNotifications.test.ts | 83 +++++++++++++++++++++
 src/renderer/hooks/useNotifications.ts      | 30 ++++++--
 2 files changed, 107 insertions(+), 6 deletions(-)

diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index dfca14c32..2ce0423a3 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -450,6 +450,89 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications.length).toBe(0);
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
     });
+
+    it('should keep notifications in list when fetchReadNotifications is enabled', async () => {
+      const mockNotifications = [
+        {
+          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',
+            },
+          },
+        },
+      ];
+
+      // First fetch notifications to populate the state
+      nock('https://api.github.com')
+        .get('/notifications?participating=false&all=true')
+        .reply(200, mockNotifications);
+
+      // Mock the mark as read endpoint
+      nock('https://api.github.com/')
+        .patch(`/notifications/threads/${id}`)
+        .reply(200);
+
+      const stateWithFetchRead = {
+        auth: {
+          accounts: [mockGitHubCloudAccount],
+        },
+        settings: {
+          ...mockSettings,
+          detailedNotifications: false,
+          fetchReadNotifications: true,
+        },
+      };
+
+      const { result } = renderHook(() => useNotifications());
+
+      // First fetch notifications to populate the state
+      act(() => {
+        result.current.fetchNotifications(stateWithFetchRead);
+      });
+
+      await waitFor(() => {
+        expect(result.current.status).toBe('success');
+      });
+
+      expect(result.current.notifications.length).toBe(1);
+      expect(result.current.notifications[0].notifications[0].unread).toBe(
+        true,
+      );
+
+      // Now mark as read with fetchReadNotifications enabled
+      act(() => {
+        result.current.markNotificationsAsRead(
+          stateWithFetchRead,
+          result.current.notifications[0].notifications,
+        );
+      });
+
+      await waitFor(() => {
+        expect(result.current.status).toBe('success');
+      });
+
+      // Notifications should still be in the list but marked as read
+      expect(result.current.notifications.length).toBe(1);
+      expect(result.current.notifications[0].notifications.length).toBe(1);
+      expect(result.current.notifications[0].notifications[0].unread).toBe(
+        false,
+      );
+    });
   });
 
   describe('markNotificationsAsDone', () => {
diff --git a/src/renderer/hooks/useNotifications.ts b/src/renderer/hooks/useNotifications.ts
index e2c885e88..fe6980d41 100644
--- a/src/renderer/hooks/useNotifications.ts
+++ b/src/renderer/hooks/useNotifications.ts
@@ -13,6 +13,7 @@ import {
   markNotificationThreadAsDone,
   markNotificationThreadAsRead,
 } from '../utils/api/client';
+import { getAccountUUID } from '../utils/auth/utils';
 import {
   areAllAccountErrorsSame,
   doesAllAccountsHaveErrors,
@@ -150,12 +151,29 @@ export const useNotifications = (): NotificationsState => {
           ),
         );
 
-        const updatedNotifications = removeNotificationsForAccount(
-          readNotifications[0].account,
-          state.settings,
-          readNotifications,
-          notifications,
-        );
+        // When fetchReadNotifications is enabled, keep notifications in list
+        // but mark them as read locally (they'll show with reduced opacity)
+        const updatedNotifications = state.settings.fetchReadNotifications
+          ? notifications.map((accountNotifications) =>
+              getAccountUUID(accountNotifications.account) ===
+              getAccountUUID(readNotifications[0].account)
+                ? {
+                    ...accountNotifications,
+                    notifications: accountNotifications.notifications.map(
+                      (n) =>
+                        readNotifications.some((rn) => rn.id === n.id)
+                          ? { ...n, unread: false }
+                          : n,
+                    ),
+                  }
+                : accountNotifications,
+            )
+          : removeNotificationsForAccount(
+              readNotifications[0].account,
+              state.settings,
+              readNotifications,
+              notifications,
+            );
 
         setNotifications(updatedNotifications);
       } catch (err) {