From 851cd46877a6946589339b7d233be7e11fbd6daa Mon Sep 17 00:00:00 2001
From: Arthur Dufour <dufourarthur.perso@gmail.com>
Date: Fri, 9 Feb 2024 19:27:08 +0100
Subject: [PATCH 1/2] feat: better notification type icons

---
 src/components/NotificationRow.tsx |  5 ++++-
 src/utils/github-api.test.ts       | 18 ++++++++++++++++++
 src/utils/github-api.ts            | 29 +++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index b5ab10266..732bd5694 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -49,7 +49,10 @@ export const NotificationRow: React.FC<IProps> = ({
   };
 
   const reason = formatReason(notification.reason);
-  const NotificationIcon = getNotificationTypeIcon(notification.subject.type);
+  const NotificationIcon = getNotificationTypeIcon(
+    notification.subject.type,
+    notification.subject.state,
+  );
   const iconColor = getNotificationTypeIconColor(notification.subject.state);
   const realIconColor = settings
     ? (settings.colors && iconColor) || ''
diff --git a/src/utils/github-api.test.ts b/src/utils/github-api.test.ts
index 73a7ef442..5bd581cf5 100644
--- a/src/utils/github-api.test.ts
+++ b/src/utils/github-api.test.ts
@@ -27,9 +27,27 @@ describe('./utils/github-api.ts', () => {
     expect(getNotificationTypeIcon('Issue').displayName).toBe(
       'IssueOpenedIcon',
     );
+    expect(getNotificationTypeIcon('Issue', 'draft').displayName).toBe(
+      'IssueDraftIcon',
+    );
+    expect(getNotificationTypeIcon('Issue', 'closed').displayName).toBe(
+      'IssueClosedIcon',
+    );
+    expect(getNotificationTypeIcon('Issue', 'reopened').displayName).toBe(
+      'IssueReopenedIcon',
+    );
     expect(getNotificationTypeIcon('PullRequest').displayName).toBe(
       'GitPullRequestIcon',
     );
+    expect(getNotificationTypeIcon('PullRequest', 'draft').displayName).toBe(
+      'GitPullRequestDraftIcon',
+    );
+    expect(getNotificationTypeIcon('PullRequest', 'closed').displayName).toBe(
+      'GitPullRequestClosedIcon',
+    );
+    expect(getNotificationTypeIcon('PullRequest', 'merged').displayName).toBe(
+      'GitMergeIcon',
+    );
     expect(getNotificationTypeIcon('Release').displayName).toBe('TagIcon');
     expect(
       getNotificationTypeIcon('RepositoryVulnerabilityAlert').displayName,
diff --git a/src/utils/github-api.ts b/src/utils/github-api.ts
index 8a0a5d760..2594f239a 100644
--- a/src/utils/github-api.ts
+++ b/src/utils/github-api.ts
@@ -2,8 +2,14 @@ import {
   AlertIcon,
   CommentDiscussionIcon,
   GitCommitIcon,
+  GitMergeIcon,
+  GitPullRequestClosedIcon,
+  GitPullRequestDraftIcon,
   GitPullRequestIcon,
+  IssueClosedIcon,
+  IssueDraftIcon,
   IssueOpenedIcon,
+  IssueReopenedIcon,
   MailIcon,
   OcticonProps,
   QuestionIcon,
@@ -66,6 +72,7 @@ export function formatReason(reason: Reason): {
 
 export function getNotificationTypeIcon(
   type: SubjectType,
+  state?: StateType,
 ): React.FC<OcticonProps> {
   switch (type) {
     case 'CheckSuite':
@@ -75,9 +82,27 @@ export function getNotificationTypeIcon(
     case 'Discussion':
       return CommentDiscussionIcon;
     case 'Issue':
-      return IssueOpenedIcon;
+      switch (state) {
+        case 'draft':
+          return IssueDraftIcon;
+        case 'closed':
+          return IssueClosedIcon;
+        case 'reopened':
+          return IssueReopenedIcon;
+        default:
+          return IssueOpenedIcon;
+      }
     case 'PullRequest':
-      return GitPullRequestIcon;
+      switch (state) {
+        case 'draft':
+          return GitPullRequestDraftIcon;
+        case 'closed':
+          return GitPullRequestClosedIcon;
+        case 'merged':
+          return GitMergeIcon;
+        default:
+          return GitPullRequestIcon;
+      }
     case 'Release':
       return TagIcon;
     case 'RepositoryInvitation':

From 50dc95a5c2589289a4a63ba79837170d54c56d6c Mon Sep 17 00:00:00 2001
From: Arthur Dufour <dufourarthur.perso@gmail.com>
Date: Fri, 9 Feb 2024 20:48:09 +0100
Subject: [PATCH 2/2] feat: update issue icon when state is `completed`

---
 src/utils/github-api.test.ts | 3 +++
 src/utils/github-api.ts      | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/utils/github-api.test.ts b/src/utils/github-api.test.ts
index 5bd581cf5..e1de0cee1 100644
--- a/src/utils/github-api.test.ts
+++ b/src/utils/github-api.test.ts
@@ -33,6 +33,9 @@ describe('./utils/github-api.ts', () => {
     expect(getNotificationTypeIcon('Issue', 'closed').displayName).toBe(
       'IssueClosedIcon',
     );
+    expect(getNotificationTypeIcon('Issue', 'completed').displayName).toBe(
+      'IssueClosedIcon',
+    );
     expect(getNotificationTypeIcon('Issue', 'reopened').displayName).toBe(
       'IssueReopenedIcon',
     );
diff --git a/src/utils/github-api.ts b/src/utils/github-api.ts
index 2594f239a..462f39e78 100644
--- a/src/utils/github-api.ts
+++ b/src/utils/github-api.ts
@@ -86,6 +86,7 @@ export function getNotificationTypeIcon(
         case 'draft':
           return IssueDraftIcon;
         case 'closed':
+        case 'completed':
           return IssueClosedIcon;
         case 'reopened':
           return IssueReopenedIcon;