From 59afabb37860a5d8afefe8c2eebd6a79bb754c25 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 30 May 2024 23:03:10 -0400
Subject: [PATCH 01/15] feat: labels indicator

---
 src/components/NotificationRow.tsx        | 12 ++++++++++++
 src/typesGitHub.ts                        | 23 +++++++++++++++++++++++
 src/utils/api/__mocks__/response-mocks.ts | 10 ++++++++++
 src/utils/api/graphql/discussions.ts      |  5 +++++
 src/utils/subject.test.ts                 |  1 +
 src/utils/subject.ts                      |  3 +++
 6 files changed, 54 insertions(+)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index b322f0fe2..4f4449add 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -4,6 +4,7 @@ import {
   CommentIcon,
   FeedPersonIcon,
   ReadIcon,
+  TagIcon,
 } from '@primer/octicons-react';
 import {
   type FC,
@@ -90,6 +91,8 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     notification.subject.comments > 1 ? 'comments' : 'comment'
   }`;
 
+  const labelsLabel = notification.subject?.labels?.join('\n');
+
   return (
     <div
       id={notification.id}
@@ -174,6 +177,15 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
                   />
                 </span>
               )}
+              {notification.subject?.labels?.length > 0 && (
+                <span className="ml-1" title={labelsLabel}>
+                  <TagIcon
+                    size={16}
+                    className={IconColor.PURPLE}
+                    aria-label={labelsLabel}
+                  />
+                </span>
+              )}
             </span>
           </span>
         </div>
diff --git a/src/typesGitHub.ts b/src/typesGitHub.ts
index ea86008b8..84379fc98 100644
--- a/src/typesGitHub.ts
+++ b/src/typesGitHub.ts
@@ -258,6 +258,7 @@ export interface GitifySubject {
   user?: SubjectUser;
   reviews?: GitifyPullRequestReview[];
   comments?: number;
+  labels?: string[];
 }
 
 export interface PullRequest {
@@ -279,6 +280,8 @@ export interface PullRequest {
   closed_at: string | null;
   merged_at: string | null;
   merge_commit_sha: string | null;
+  labels: Labels[];
+  milestone: string | null;
   draft: boolean;
   commits_url: string;
   review_comments_url: string;
@@ -303,6 +306,16 @@ export interface GitifyPullRequestReview {
   users: string[];
 }
 
+export interface Labels {
+  id: number;
+  node_id: string;
+  url: string;
+  name: string;
+  color: string;
+  default: boolean;
+  description: string;
+}
+
 export interface PullRequestReview {
   id: number;
   node_id: string;
@@ -408,6 +421,7 @@ export interface Issue {
   author_association: string;
   body: string;
   state_reason: IssueStateReasonType | null;
+  labels: Labels[];
 }
 
 export interface IssueOrPullRequestComment {
@@ -455,6 +469,15 @@ export interface Discussion {
   url: string;
   author: DiscussionAuthor;
   comments: DiscussionComments;
+  labels: DiscussionLabels;
+}
+
+export interface DiscussionLabels {
+  nodes: DiscussionLabel[];
+}
+
+export interface DiscussionLabel {
+  name: string;
 }
 
 export interface DiscussionComments {
diff --git a/src/utils/api/__mocks__/response-mocks.ts b/src/utils/api/__mocks__/response-mocks.ts
index dcaf441b5..750f96af3 100644
--- a/src/utils/api/__mocks__/response-mocks.ts
+++ b/src/utils/api/__mocks__/response-mocks.ts
@@ -2,6 +2,7 @@ import type {
   Discussion,
   DiscussionAuthor,
   DiscussionComments,
+  DiscussionLabels,
   GraphQLSearch,
   Notification,
   Repository,
@@ -385,6 +386,14 @@ export const mockDiscussionComments: DiscussionComments = {
   totalCount: 2,
 };
 
+export const mockDiscussionLabels: DiscussionLabels = {
+  nodes: [
+    {
+      name: 'enhancement',
+    },
+  ],
+};
+
 export const mockGraphQLResponse: GraphQLSearch<Discussion> = {
   data: {
     search: {
@@ -401,6 +410,7 @@ export const mockGraphQLResponse: GraphQLSearch<Discussion> = {
             type: 'User',
           },
           comments: mockDiscussionComments,
+          labels: mockDiscussionLabels,
         },
       ],
     },
diff --git a/src/utils/api/graphql/discussions.ts b/src/utils/api/graphql/discussions.ts
index 7472f10a0..ab34a9001 100644
--- a/src/utils/api/graphql/discussions.ts
+++ b/src/utils/api/graphql/discussions.ts
@@ -49,6 +49,11 @@ export const QUERY_SEARCH_DISCUSSIONS = gql`
               }
             }
           }
+          labels {
+            nodes {
+              name
+            }
+          }
         }
       }
     }
diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index df8930784..f29beb413 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -1164,5 +1164,6 @@ function mockDiscussionNode(
       nodes: [],
       totalCount: 0,
     },
+    labels: null,
   };
 }
diff --git a/src/utils/subject.ts b/src/utils/subject.ts
index d899e7eac..ee53d3eea 100644
--- a/src/utils/subject.ts
+++ b/src/utils/subject.ts
@@ -182,6 +182,7 @@ async function getGitifySubjectForDiscussion(
     state: discussionState,
     user: discussionUser,
     comments: discussion.comments.totalCount,
+    labels: discussion.labels?.nodes.map((label) => label.name),
   };
 }
 
@@ -228,6 +229,7 @@ async function getGitifySubjectForIssue(
       type: issueCommentUser?.type ?? issue.user.type,
     },
     comments: issue.comments,
+    labels: issue.labels.map((label) => label.name),
   };
 }
 
@@ -271,6 +273,7 @@ async function getGitifySubjectForPullRequest(
     },
     reviews: reviews,
     comments: pr.comments,
+    labels: pr.labels.map((label) => label.name),
   };
 }
 

From 20333ec354537ee17f558d8a33f1a9354a12f3c2 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 15:35:21 -0500
Subject: [PATCH 02/15] format as pill

---
 src/components/NotificationRow.tsx | 20 +++++++++++++-------
 src/utils/constants.ts             |  3 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 4f4449add..6fc927b2e 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -18,6 +18,7 @@ import { AppContext } from '../context/App';
 import { IconColor } from '../types';
 import type { Notification } from '../typesGitHub';
 import { openExternalLink } from '../utils/comms';
+import Constants from '../utils/constants';
 import {
   formatForDisplay,
   formatNotificationUpdatedAt,
@@ -91,7 +92,9 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     notification.subject.comments > 1 ? 'comments' : 'comment'
   }`;
 
-  const labelsLabel = notification.subject?.labels?.join('\n');
+  const labelsPillDescription = `Labels:\n${notification.subject.labels
+    ?.map((label) => `  - ${label}`)
+    .join('\n')}`;
 
   return (
     <div
@@ -178,12 +181,15 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
                 </span>
               )}
               {notification.subject?.labels?.length > 0 && (
-                <span className="ml-1" title={labelsLabel}>
-                  <TagIcon
-                    size={16}
-                    className={IconColor.PURPLE}
-                    aria-label={labelsLabel}
-                  />
+                <span className="ml-1" title={labelsPillDescription}>
+                  <button type="button" className={Constants.PILL_CLASS_NAME}>
+                    <TagIcon
+                      size={12}
+                      className={`mr-1 ${IconColor.GRAY}`}
+                      aria-label={labelsPillDescription}
+                    />
+                    {notification.subject.labels.length}
+                  </button>
                 </span>
               )}
             </span>
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index c6a92a41d..a7295819e 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -24,6 +24,9 @@ export const Constants = {
 
   READ_CLASS_NAME: 'opacity-50 dark:opacity-50',
 
+  PILL_CLASS_NAME:
+    'rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700',
+
   // GitHub Docs
   GITHUB_DOCS: {
     OAUTH_URL:

From 4990f26b99e6c94807ced154f627c6bfb9de02ef Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 15:43:53 -0500
Subject: [PATCH 03/15] update tests

---
 src/utils/subject.test.ts | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index f29beb413..bd9006b22 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -257,6 +257,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
 
@@ -285,6 +286,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
 
@@ -313,6 +315,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
 
@@ -341,6 +344,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
 
@@ -369,6 +373,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
 
@@ -397,6 +402,7 @@ describe('utils/subject.ts', () => {
             type: mockDiscussionAuthor.type,
           },
           comments: 0,
+          labels: [],
         });
       });
     });
@@ -416,7 +422,7 @@ describe('utils/subject.ts', () => {
       it('open issue state', async () => {
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/issues/1')
-          .reply(200, { state: 'open', user: mockAuthor });
+          .reply(200, { state: 'open', user: mockAuthor, labels: [] });
 
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/issues/comments/302888448')
@@ -435,13 +441,14 @@ describe('utils/subject.ts', () => {
             avatar_url: mockCommenter.avatar_url,
             type: mockCommenter.type,
           },
+          labels: [],
         });
       });
 
       it('closed issue state', async () => {
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/issues/1')
-          .reply(200, { state: 'closed', user: mockAuthor });
+          .reply(200, { state: 'closed', user: mockAuthor, labels: [] });
 
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/issues/comments/302888448')
@@ -460,6 +467,7 @@ describe('utils/subject.ts', () => {
             avatar_url: mockCommenter.avatar_url,
             type: mockCommenter.type,
           },
+          labels: [],
         });
       });
 
@@ -470,6 +478,7 @@ describe('utils/subject.ts', () => {
             state: 'closed',
             state_reason: 'completed',
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -489,6 +498,7 @@ describe('utils/subject.ts', () => {
             avatar_url: mockCommenter.avatar_url,
             type: mockCommenter.type,
           },
+          labels: [],
         });
       });
 
@@ -499,6 +509,7 @@ describe('utils/subject.ts', () => {
             state: 'open',
             state_reason: 'not_planned',
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -518,6 +529,7 @@ describe('utils/subject.ts', () => {
             avatar_url: mockCommenter.avatar_url,
             type: mockCommenter.type,
           },
+          labels: [],
         });
       });
 
@@ -528,6 +540,7 @@ describe('utils/subject.ts', () => {
             state: 'open',
             state_reason: 'reopened',
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -547,6 +560,7 @@ describe('utils/subject.ts', () => {
             avatar_url: mockCommenter.avatar_url,
             type: mockCommenter.type,
           },
+          labels: [],
         });
       });
 
@@ -560,6 +574,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         const result = await getGitifySubjectDetails(
@@ -575,6 +590,7 @@ describe('utils/subject.ts', () => {
             avatar_url: mockAuthor.avatar_url,
             type: mockAuthor.type,
           },
+          labels: [],
         });
       });
     });
@@ -600,6 +616,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -624,6 +641,7 @@ describe('utils/subject.ts', () => {
             type: mockCommenter.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -635,6 +653,7 @@ describe('utils/subject.ts', () => {
             draft: true,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -659,6 +678,7 @@ describe('utils/subject.ts', () => {
             type: mockCommenter.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -670,6 +690,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: true,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -694,6 +715,7 @@ describe('utils/subject.ts', () => {
             type: mockCommenter.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -705,6 +727,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -729,6 +752,7 @@ describe('utils/subject.ts', () => {
             type: mockCommenter.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -743,6 +767,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -763,6 +788,7 @@ describe('utils/subject.ts', () => {
             type: mockAuthor.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -776,6 +802,7 @@ describe('utils/subject.ts', () => {
             draft: false,
             merged: false,
             user: mockAuthor,
+            labels: [],
           });
 
         nock('https://api.github.com')
@@ -796,6 +823,7 @@ describe('utils/subject.ts', () => {
             type: mockAuthor.type,
           },
           reviews: null,
+          labels: [],
         });
       });
 
@@ -1164,6 +1192,8 @@ function mockDiscussionNode(
       nodes: [],
       totalCount: 0,
     },
-    labels: null,
+    labels: {
+      nodes: [],
+    },
   };
 }

From 00929be793a010e17951d7e9c2d32989f643aa91 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 15:47:16 -0500
Subject: [PATCH 04/15] update tests

---
 src/utils/subject.test.ts | 4 +---
 src/utils/subject.ts      | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index bd9006b22..8e37f24e6 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -1192,8 +1192,6 @@ function mockDiscussionNode(
       nodes: [],
       totalCount: 0,
     },
-    labels: {
-      nodes: [],
-    },
+    labels: null,
   };
 }
diff --git a/src/utils/subject.ts b/src/utils/subject.ts
index ee53d3eea..77c6f1f04 100644
--- a/src/utils/subject.ts
+++ b/src/utils/subject.ts
@@ -182,7 +182,9 @@ async function getGitifySubjectForDiscussion(
     state: discussionState,
     user: discussionUser,
     comments: discussion.comments.totalCount,
-    labels: discussion.labels?.nodes.map((label) => label.name),
+    labels: discussion.labels
+      ? discussion.labels.nodes.map((label) => label.name)
+      : [],
   };
 }
 

From d7ba8c55f661162a5cb3bc6f348549fe2ea37437 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 15:50:15 -0500
Subject: [PATCH 05/15] update tests

---
 src/components/NotificationRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 6fc927b2e..f05f70201 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -93,7 +93,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   }`;
 
   const labelsPillDescription = `Labels:\n${notification.subject.labels
-    ?.map((label) => `  - ${label}`)
+    ?.map((label) => `  • ${label}`)
     .join('\n')}`;
 
   return (

From 1b93c6aad792f884ff443d755774652e01dc296a Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 15:58:19 -0500
Subject: [PATCH 06/15] update tests

---
 src/components/NotificationRow.test.tsx       |  19 +
 .../NotificationRow.test.tsx.snap             | 535 ++++++++++++++++++
 2 files changed, 554 insertions(+)

diff --git a/src/components/NotificationRow.test.tsx b/src/components/NotificationRow.test.tsx
index 7a2a05484..df2409eaf 100644
--- a/src/components/NotificationRow.test.tsx
+++ b/src/components/NotificationRow.test.tsx
@@ -117,6 +117,25 @@ describe('components/NotificationRow.tsx', () => {
     });
   });
 
+  describe('notification labels', () => {
+    it('should render labels metric when available', async () => {
+      jest
+        .spyOn(global.Date, 'now')
+        .mockImplementation(() => new Date('2024').valueOf());
+
+      const mockNotification = mockSingleNotification;
+      mockNotification.subject.labels = ['enhancement', 'good-first-issue'];
+
+      const props = {
+        notification: mockNotification,
+        hostname: 'github.com',
+      };
+
+      const tree = render(<NotificationRow {...props} />);
+      expect(tree).toMatchSnapshot();
+    });
+  });
+
   describe('notification interactions', () => {
     it('should open a notification in the browser - click', () => {
       const removeNotificationFromState = jest.fn();
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index 6b24aaae0..f11befe9c 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -1,5 +1,540 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`components/NotificationRow.tsx notification labels should render labels metric when available 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="flex space-x-3 py-2 px-3 bg-white dark:bg-gray-dark dark:text-white hover:bg-gray-100 dark:hover:bg-gray-darker border-b border-gray-100 dark:border-gray-darker group"
+        id="138661096"
+      >
+        <div
+          class="flex justify-center items-center w-5 text-green-500"
+          title="Open Issue"
+        >
+          <svg
+            aria-label="Issue"
+            class="octicon octicon-issue-opened"
+            fill="currentColor"
+            focusable="false"
+            height="18"
+            role="img"
+            style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+            viewBox="0 0 16 16"
+            width="18"
+          >
+            <path
+              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+            />
+            <path
+              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+            />
+          </svg>
+        </div>
+        <div
+          class="flex-1 overflow-hidden"
+        >
+          <div
+            class="mb-1 text-sm whitespace-nowrap overflow-ellipsis overflow-hidden cursor-pointer"
+            role="main"
+            title="I am a robot and this is a test!"
+          >
+            I am a robot and this is a test!
+          </div>
+          <div
+            class="text-xs text-capitalize whitespace-nowrap overflow-ellipsis overflow-hidden"
+          >
+            <span
+              class="flex items-center"
+            >
+              <span
+                class="flex"
+                title="Updated over 6 years ago"
+              >
+                <span>
+                  <svg
+                    aria-hidden="true"
+                    class="text-gray-500 dark:text-gray-300"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
+                </span>
+                <span
+                  class="ml-1"
+                  title="You're watching the repository."
+                >
+                  Updated
+                </span>
+                <span
+                  class="ml-1"
+                >
+                  over 6 years ago
+                </span>
+                <span
+                  class="ml-1"
+                  title="octocat approved these changes"
+                >
+                  <svg
+                    aria-label="octocat approved these changes"
+                    class="text-green-500"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    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>
+                </span>
+                <span
+                  class="ml-1"
+                  title="gitify-app requested changes"
+                >
+                  <svg
+                    aria-label="gitify-app requested changes"
+                    class="text-red-500"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                </span>
+                <span
+                  class="ml-1"
+                  title="2 comments"
+                >
+                  <svg
+                    aria-label="2 comments"
+                    class="text-gray-500 dark:text-gray-300"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                </span>
+                <span
+                  class="ml-1"
+                  title="Labels:
+  • enhancement
+  • good-first-issue"
+                >
+                  <button
+                    class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                    type="button"
+                  >
+                    <svg
+                      aria-label="Labels:
+  • enhancement
+  • good-first-issue"
+                      class="mr-1 text-gray-500 dark:text-gray-300"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      role="img"
+                      style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                      />
+                    </svg>
+                    2
+                  </button>
+                </span>
+              </span>
+            </span>
+          </div>
+        </div>
+        <div
+          class="flex justify-center items-center gap-2 opacity-0 group-hover:opacity-80 transition-opacity"
+        >
+          <button
+            class="focus:outline-none h-full hover:text-green-500"
+            title="Mark as Done"
+            type="button"
+          >
+            <svg
+              aria-label="Mark as Done"
+              class="octicon octicon-check"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              role="img"
+              style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+              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
+            class="focus:outline-none h-full hover:text-red-500"
+            title="Unsubscribe from Thread"
+            type="button"
+          >
+            <svg
+              aria-label="Unsubscribe from Thread"
+              class="octicon octicon-bell-slash"
+              fill="currentColor"
+              focusable="false"
+              height="14"
+              role="img"
+              style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+              viewBox="0 0 16 16"
+              width="14"
+            >
+              <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"
+              />
+            </svg>
+          </button>
+          <button
+            class="focus:outline-none h-full hover:text-green-500"
+            title="Mark as Read"
+            type="button"
+          >
+            <svg
+              aria-label="Mark as Read"
+              class="octicon octicon-read"
+              fill="currentColor"
+              focusable="false"
+              height="14"
+              role="img"
+              style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+              viewBox="0 0 16 16"
+              width="14"
+            >
+              <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>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="flex space-x-3 py-2 px-3 bg-white dark:bg-gray-dark dark:text-white hover:bg-gray-100 dark:hover:bg-gray-darker border-b border-gray-100 dark:border-gray-darker group"
+      id="138661096"
+    >
+      <div
+        class="flex justify-center items-center w-5 text-green-500"
+        title="Open Issue"
+      >
+        <svg
+          aria-label="Issue"
+          class="octicon octicon-issue-opened"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          role="img"
+          style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </div>
+      <div
+        class="flex-1 overflow-hidden"
+      >
+        <div
+          class="mb-1 text-sm whitespace-nowrap overflow-ellipsis overflow-hidden cursor-pointer"
+          role="main"
+          title="I am a robot and this is a test!"
+        >
+          I am a robot and this is a test!
+        </div>
+        <div
+          class="text-xs text-capitalize whitespace-nowrap overflow-ellipsis overflow-hidden"
+        >
+          <span
+            class="flex items-center"
+          >
+            <span
+              class="flex"
+              title="Updated over 6 years ago"
+            >
+              <span>
+                <svg
+                  aria-hidden="true"
+                  class="text-gray-500 dark:text-gray-300"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  />
+                </svg>
+              </span>
+              <span
+                class="ml-1"
+                title="You're watching the repository."
+              >
+                Updated
+              </span>
+              <span
+                class="ml-1"
+              >
+                over 6 years ago
+              </span>
+              <span
+                class="ml-1"
+                title="octocat approved these changes"
+              >
+                <svg
+                  aria-label="octocat approved these changes"
+                  class="text-green-500"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                  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>
+              </span>
+              <span
+                class="ml-1"
+                title="gitify-app requested changes"
+              >
+                <svg
+                  aria-label="gitify-app requested changes"
+                  class="text-red-500"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+              </span>
+              <span
+                class="ml-1"
+                title="2 comments"
+              >
+                <svg
+                  aria-label="2 comments"
+                  class="text-gray-500 dark:text-gray-300"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+              </span>
+              <span
+                class="ml-1"
+                title="Labels:
+  • enhancement
+  • good-first-issue"
+              >
+                <button
+                  class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                  type="button"
+                >
+                  <svg
+                    aria-label="Labels:
+  • enhancement
+  • good-first-issue"
+                    class="mr-1 text-gray-500 dark:text-gray-300"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                    />
+                  </svg>
+                  2
+                </button>
+              </span>
+            </span>
+          </span>
+        </div>
+      </div>
+      <div
+        class="flex justify-center items-center gap-2 opacity-0 group-hover:opacity-80 transition-opacity"
+      >
+        <button
+          class="focus:outline-none h-full hover:text-green-500"
+          title="Mark as Done"
+          type="button"
+        >
+          <svg
+            aria-label="Mark as Done"
+            class="octicon octicon-check"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            role="img"
+            style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+            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
+          class="focus:outline-none h-full hover:text-red-500"
+          title="Unsubscribe from Thread"
+          type="button"
+        >
+          <svg
+            aria-label="Unsubscribe from Thread"
+            class="octicon octicon-bell-slash"
+            fill="currentColor"
+            focusable="false"
+            height="14"
+            role="img"
+            style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+            viewBox="0 0 16 16"
+            width="14"
+          >
+            <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"
+            />
+          </svg>
+        </button>
+        <button
+          class="focus:outline-none h-full hover:text-green-500"
+          title="Mark as Read"
+          type="button"
+        >
+          <svg
+            aria-label="Mark as Read"
+            class="octicon octicon-read"
+            fill="currentColor"
+            focusable="false"
+            height="14"
+            role="img"
+            style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+            viewBox="0 0 16 16"
+            width="14"
+          >
+            <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>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
 exports[`components/NotificationRow.tsx rendering for notification comments count should render when 1 comment 1`] = `
 {
   "asFragment": [Function],

From e20b3ae0164e1105c8e44962439fcbb624a04ad2 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 17:10:15 -0500
Subject: [PATCH 07/15] update tests

---
 src/utils/subject.test.ts | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index 8e37f24e6..c3ef32f18 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -405,6 +405,43 @@ describe('utils/subject.ts', () => {
           labels: [],
         });
       });
+
+      it('discussion with labels', async () => {
+        const mockDiscussion = mockDiscussionNode(null, true);
+        mockDiscussion.labels = {
+          nodes: [
+            {
+              name: 'enhancement',
+            },
+          ],
+        };
+        nock('https://api.github.com')
+          .post('/graphql')
+          .reply(200, {
+            data: {
+              search: {
+                nodes: [mockDiscussion],
+              },
+            },
+          });
+
+        const result = await getGitifySubjectDetails(
+          mockNotification,
+          mockAuth.token,
+        );
+
+        expect(result).toEqual({
+          state: 'ANSWERED',
+          user: {
+            login: mockDiscussionAuthor.login,
+            html_url: mockDiscussionAuthor.url,
+            avatar_url: mockDiscussionAuthor.avatar_url,
+            type: mockDiscussionAuthor.type,
+          },
+          comments: 0,
+          labels: ['enhancement'],
+        });
+      });
     });
 
     describe('Issues', () => {

From c0cb825130ed3f33049870d4e01c814eaece16e1 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 17:13:25 -0500
Subject: [PATCH 08/15] update tests

---
 src/components/NotificationRow.tsx               |  2 +-
 .../__snapshots__/NotificationRow.test.tsx.snap  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index f05f70201..289e06176 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -93,7 +93,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   }`;
 
   const labelsPillDescription = `Labels:\n${notification.subject.labels
-    ?.map((label) => `  • ${label}`)
+    ?.map((label) => `🏷️ ${label}`)
     .join('\n')}`;
 
   return (
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index f11befe9c..7f92e1343 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -142,8 +142,8 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                 <span
                   class="ml-1"
                   title="Labels:
-  • enhancement
-  • good-first-issue"
+🏷️ enhancement
+🏷️ good-first-issue"
                 >
                   <button
                     class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
@@ -151,8 +151,8 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                   >
                     <svg
                       aria-label="Labels:
-  • enhancement
-  • good-first-issue"
+🏷️ enhancement
+🏷️ good-first-issue"
                       class="mr-1 text-gray-500 dark:text-gray-300"
                       fill="currentColor"
                       focusable="false"
@@ -381,8 +381,8 @@ exports[`components/NotificationRow.tsx notification labels should render labels
               <span
                 class="ml-1"
                 title="Labels:
-  • enhancement
-  • good-first-issue"
+🏷️ enhancement
+🏷️ good-first-issue"
               >
                 <button
                   class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
@@ -390,8 +390,8 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                 >
                   <svg
                     aria-label="Labels:
-  • enhancement
-  • good-first-issue"
+🏷️ enhancement
+🏷️ good-first-issue"
                     class="mr-1 text-gray-500 dark:text-gray-300"
                     fill="currentColor"
                     focusable="false"

From a6b92de6b8abfd3d87b60f9e95f43dc3b27447ca Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 17:16:48 -0500
Subject: [PATCH 09/15] update tests

---
 src/utils/subject.test.ts | 67 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index c3ef32f18..18026368d 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -630,6 +630,36 @@ describe('utils/subject.ts', () => {
           labels: [],
         });
       });
+
+      it('issue with labels', async () => {
+        nock('https://api.github.com')
+          .get('/repos/gitify-app/notifications-test/issues/1')
+          .reply(200, {
+            state: 'open',
+            user: mockAuthor,
+            labels: [{ name: 'enhancement' }],
+          });
+
+        nock('https://api.github.com')
+          .get('/repos/gitify-app/notifications-test/issues/comments/302888448')
+          .reply(200, { user: mockCommenter });
+
+        const result = await getGitifySubjectDetails(
+          mockNotification,
+          mockAuth.token,
+        );
+
+        expect(result).toEqual({
+          state: 'open',
+          user: {
+            login: mockCommenter.login,
+            html_url: mockCommenter.html_url,
+            avatar_url: mockCommenter.avatar_url,
+            type: mockCommenter.type,
+          },
+          labels: ['enhancement'],
+        });
+      });
     });
 
     describe('Pull Requests', () => {
@@ -930,6 +960,43 @@ describe('utils/subject.ts', () => {
           expect(result).toBeNull();
         });
       });
+
+      it('pull request with labels', async () => {
+        nock('https://api.github.com')
+          .get('/repos/gitify-app/notifications-test/pulls/1')
+          .reply(200, {
+            state: 'open',
+            draft: false,
+            merged: false,
+            user: mockAuthor,
+            labels: [{ name: 'enhancement' }],
+          });
+
+        nock('https://api.github.com')
+          .get('/repos/gitify-app/notifications-test/issues/comments/302888448')
+          .reply(200, { user: mockCommenter });
+
+        nock('https://api.github.com')
+          .get('/repos/gitify-app/notifications-test/pulls/1/reviews')
+          .reply(200, []);
+
+        const result = await getGitifySubjectDetails(
+          mockNotification,
+          mockAuth.token,
+        );
+
+        expect(result).toEqual({
+          state: 'open',
+          user: {
+            login: mockCommenter.login,
+            html_url: mockCommenter.html_url,
+            avatar_url: mockCommenter.avatar_url,
+            type: mockCommenter.type,
+          },
+          reviews: null,
+          labels: ['enhancement'],
+        });
+      });
     });
 
     describe('Releases', () => {

From 6320d068e3d6e2d8e05d4c805fbec6276995d6f0 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 17:18:37 -0500
Subject: [PATCH 10/15] update tests

---
 src/components/NotificationRow.tsx                   |  4 ++--
 .../__snapshots__/NotificationRow.test.tsx.snap      | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 289e06176..a84fc71c3 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -92,9 +92,9 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     notification.subject.comments > 1 ? 'comments' : 'comment'
   }`;
 
-  const labelsPillDescription = `Labels:\n${notification.subject.labels
+  const labelsPillDescription = notification.subject.labels
     ?.map((label) => `🏷️ ${label}`)
-    .join('\n')}`;
+    .join('\n');
 
   return (
     <div
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index 7f92e1343..b6f393a97 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -141,8 +141,7 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                 </span>
                 <span
                   class="ml-1"
-                  title="Labels:
-🏷️ enhancement
+                  title="🏷️ enhancement
 🏷️ good-first-issue"
                 >
                   <button
@@ -150,8 +149,7 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                     type="button"
                   >
                     <svg
-                      aria-label="Labels:
-🏷️ enhancement
+                      aria-label="🏷️ enhancement
 🏷️ good-first-issue"
                       class="mr-1 text-gray-500 dark:text-gray-300"
                       fill="currentColor"
@@ -380,8 +378,7 @@ exports[`components/NotificationRow.tsx notification labels should render labels
               </span>
               <span
                 class="ml-1"
-                title="Labels:
-🏷️ enhancement
+                title="🏷️ enhancement
 🏷️ good-first-issue"
               >
                 <button
@@ -389,8 +386,7 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                   type="button"
                 >
                   <svg
-                    aria-label="Labels:
-🏷️ enhancement
+                    aria-label="🏷️ enhancement
 🏷️ good-first-issue"
                     class="mr-1 text-gray-500 dark:text-gray-300"
                     fill="currentColor"

From 60b8f193343200f16987d9ff622217b244f48d0c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 2 Jun 2024 22:43:56 -0400
Subject: [PATCH 11/15] fix merge

---
 .../NotificationRow.test.tsx.snap             | 204 ++++++++++--------
 src/utils/subject.test.ts                     |  15 +-
 2 files changed, 123 insertions(+), 96 deletions(-)

diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index a0aafdf0a..9e457069d 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -83,61 +83,79 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                   class="ml-1"
                   title="octocat approved these changes"
                 >
-                  <svg
-                    aria-label="octocat approved these changes"
-                    class="text-green-500"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <button
+                    class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                    type="button"
                   >
-                    <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>
+                    <svg
+                      aria-label="octocat approved these changes"
+                      class="mr-1 text-green-500"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      role="img"
+                      style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <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>
+                    1
+                  </button>
                 </span>
                 <span
                   class="ml-1"
                   title="gitify-app requested changes"
                 >
-                  <svg
-                    aria-label="gitify-app requested changes"
-                    class="text-red-500"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <button
+                    class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                    type="button"
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
+                    <svg
+                      aria-label="gitify-app requested changes"
+                      class="mr-1 text-red-500"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      role="img"
+                      style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    1
+                  </button>
                 </span>
                 <span
                   class="ml-1"
                   title="2 comments"
                 >
-                  <svg
-                    aria-label="2 comments"
-                    class="text-gray-500 dark:text-gray-300"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <button
+                    class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                    type="button"
                   >
-                    <path
-                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                    />
-                  </svg>
+                    <svg
+                      aria-label="2 comments"
+                      class="mr-1 text-gray-500 dark:text-gray-300"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      role="img"
+                      style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                      />
+                    </svg>
+                    2
+                  </button>
                 </span>
                 <span
                   class="ml-1"
@@ -320,61 +338,79 @@ exports[`components/NotificationRow.tsx notification labels should render labels
                 class="ml-1"
                 title="octocat approved these changes"
               >
-                <svg
-                  aria-label="octocat approved these changes"
-                  class="text-green-500"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <button
+                  class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                  type="button"
                 >
-                  <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>
+                  <svg
+                    aria-label="octocat approved these changes"
+                    class="mr-1 text-green-500"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <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>
+                  1
+                </button>
               </span>
               <span
                 class="ml-1"
                 title="gitify-app requested changes"
               >
-                <svg
-                  aria-label="gitify-app requested changes"
-                  class="text-red-500"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <button
+                  class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                  type="button"
                 >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
+                  <svg
+                    aria-label="gitify-app requested changes"
+                    class="mr-1 text-red-500"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  1
+                </button>
               </span>
               <span
                 class="ml-1"
                 title="2 comments"
               >
-                <svg
-                  aria-label="2 comments"
-                  class="text-gray-500 dark:text-gray-300"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <button
+                  class="rounded-full text-xs px-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+                  type="button"
                 >
-                  <path
-                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                  />
-                </svg>
+                  <svg
+                    aria-label="2 comments"
+                    class="mr-1 text-gray-500 dark:text-gray-300"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    role="img"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  2
+                </button>
               </span>
               <span
                 class="ml-1"
diff --git a/src/utils/subject.test.ts b/src/utils/subject.test.ts
index 81a22c284..b56267453 100644
--- a/src/utils/subject.test.ts
+++ b/src/utils/subject.test.ts
@@ -379,10 +379,7 @@ describe('utils/subject.ts', () => {
             },
           });
 
-        const result = await getGitifySubjectDetails(
-          mockNotification,
-          mockAuth.token,
-        );
+        const result = await getGitifySubjectDetails(mockNotification);
 
         expect(result).toEqual({
           state: 'ANSWERED',
@@ -580,10 +577,7 @@ describe('utils/subject.ts', () => {
           .get('/repos/gitify-app/notifications-test/issues/comments/302888448')
           .reply(200, { user: mockCommenter });
 
-        const result = await getGitifySubjectDetails(
-          mockNotification,
-          mockAuth.token,
-        );
+        const result = await getGitifySubjectDetails(mockNotification);
 
         expect(result).toEqual({
           state: 'open',
@@ -889,10 +883,7 @@ describe('utils/subject.ts', () => {
           .get('/repos/gitify-app/notifications-test/pulls/1/reviews')
           .reply(200, []);
 
-        const result = await getGitifySubjectDetails(
-          mockNotification,
-          mockAuth.token,
-        );
+        const result = await getGitifySubjectDetails(mockNotification);
 
         expect(result).toEqual({
           state: 'open',

From 24438432da86906f3f5bcc363f0ed7eaf22d4ae9 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 3 Jun 2024 19:59:30 -0400
Subject: [PATCH 12/15] Merge remote-tracking branch 'origin/main' into
 feature/labels-indicator

---
 src/typesGitHub.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/typesGitHub.ts b/src/typesGitHub.ts
index ceb3acd6b..cf4c7177f 100644
--- a/src/typesGitHub.ts
+++ b/src/typesGitHub.ts
@@ -289,7 +289,6 @@ export interface PullRequest {
   merged_at: string | null;
   merge_commit_sha: string | null;
   labels: Labels[];
-  milestone: string | null;
   draft: boolean;
   commits_url: string;
   review_comments_url: string;

From a4b89bd94bcbae6e1489e43bda62f13358a43fac Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 3 Jun 2024 20:34:12 -0400
Subject: [PATCH 13/15] add null handling

---
 src/utils/subject.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/utils/subject.ts b/src/utils/subject.ts
index 451c13307..ffbc3736d 100644
--- a/src/utils/subject.ts
+++ b/src/utils/subject.ts
@@ -184,9 +184,7 @@ async function getGitifySubjectForDiscussion(
     state: discussionState,
     user: discussionUser,
     comments: discussion.comments.totalCount,
-    labels: discussion.labels
-      ? discussion.labels.nodes.map((label) => label.name)
-      : [],
+    labels: discussion.labels?.nodes.map((label) => label.name) ?? [],
   };
 }
 
@@ -234,7 +232,7 @@ async function getGitifySubjectForIssue(
       type: issueCommentUser?.type ?? issue.user.type,
     },
     comments: issue.comments,
-    labels: issue.labels.map((label) => label.name),
+    labels: issue.labels?.map((label) => label.name) ?? [],
   };
 }
 
@@ -280,7 +278,7 @@ async function getGitifySubjectForPullRequest(
     },
     reviews: reviews,
     comments: pr.comments,
-    labels: pr.labels.map((label) => label.name),
+    labels: pr.labels?.map((label) => label.name) ?? [],
     linkedIssues: linkedIssues,
   };
 }

From 7f512287e3db98db24aa9ff3a81c6e1ff58df8c5 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 3 Jun 2024 20:40:14 -0400
Subject: [PATCH 14/15] update mocks

---
 src/hooks/useNotifications.test.ts | 3 +++
 src/typesGitHub.ts                 | 2 +-
 src/utils/subject.ts               | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useNotifications.test.ts b/src/hooks/useNotifications.test.ts
index 7d55d3325..cf33a3b79 100644
--- a/src/hooks/useNotifications.test.ts
+++ b/src/hooks/useNotifications.test.ts
@@ -225,6 +225,7 @@ describe('hooks/useNotifications.ts', () => {
                         },
                       ],
                     },
+                    labels: null,
                   },
                 ],
               },
@@ -237,6 +238,7 @@ describe('hooks/useNotifications.ts', () => {
             state: 'closed',
             merged: true,
             user: mockNotificationUser,
+            labels: [],
           });
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/issues/3/comments')
@@ -249,6 +251,7 @@ describe('hooks/useNotifications.ts', () => {
             state: 'closed',
             merged: false,
             user: mockNotificationUser,
+            labels: [],
           });
         nock('https://api.github.com')
           .get('/repos/gitify-app/notifications-test/pulls/4/reviews')
diff --git a/src/typesGitHub.ts b/src/typesGitHub.ts
index cf4c7177f..316baee7c 100644
--- a/src/typesGitHub.ts
+++ b/src/typesGitHub.ts
@@ -476,7 +476,7 @@ export interface Discussion {
   url: string;
   author: DiscussionAuthor;
   comments: DiscussionComments;
-  labels: DiscussionLabels;
+  labels: DiscussionLabels | null;
 }
 
 export interface DiscussionLabels {
diff --git a/src/utils/subject.ts b/src/utils/subject.ts
index ffbc3736d..0f294d044 100644
--- a/src/utils/subject.ts
+++ b/src/utils/subject.ts
@@ -232,7 +232,7 @@ async function getGitifySubjectForIssue(
       type: issueCommentUser?.type ?? issue.user.type,
     },
     comments: issue.comments,
-    labels: issue.labels?.map((label) => label.name) ?? [],
+    labels: issue.labels.map((label) => label.name),
   };
 }
 
@@ -278,7 +278,7 @@ async function getGitifySubjectForPullRequest(
     },
     reviews: reviews,
     comments: pr.comments,
-    labels: pr.labels?.map((label) => label.name) ?? [],
+    labels: pr.labels.map((label) => label.name),
     linkedIssues: linkedIssues,
   };
 }

From c9ba9e0b551d1b13af761587034cf7eb6901fd05 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 3 Jun 2024 20:41:24 -0400
Subject: [PATCH 15/15] add null handling

---
 src/utils/subject.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/subject.ts b/src/utils/subject.ts
index 0f294d044..ffbc3736d 100644
--- a/src/utils/subject.ts
+++ b/src/utils/subject.ts
@@ -232,7 +232,7 @@ async function getGitifySubjectForIssue(
       type: issueCommentUser?.type ?? issue.user.type,
     },
     comments: issue.comments,
-    labels: issue.labels.map((label) => label.name),
+    labels: issue.labels?.map((label) => label.name) ?? [],
   };
 }
 
@@ -278,7 +278,7 @@ async function getGitifySubjectForPullRequest(
     },
     reviews: reviews,
     comments: pr.comments,
-    labels: pr.labels.map((label) => label.name),
+    labels: pr.labels?.map((label) => label.name) ?? [],
     linkedIssues: linkedIssues,
   };
 }