From 9f3b3328b37144ad5ea53655237fdae16c8c1921 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 20 Mar 2024 20:38:36 -0400
Subject: [PATCH 1/2] fix(avatar): add default icon when no repository avatar
 available

---
 src/components/Repository.test.tsx            |  11 ++
 src/components/Repository.tsx                 |   8 +-
 .../AccountNotifications.test.tsx.snap        |   2 +
 .../NotificationRow.test.tsx.snap             |   4 +
 .../__snapshots__/Repository.test.tsx.snap    | 115 ++++++++++++++++++
 .../__snapshots__/Sidebar.test.tsx.snap       |   4 +
 .../LoginEnterprise.test.tsx.snap             |   1 +
 .../LoginWithToken.test.tsx.snap              |   1 +
 .../__snapshots__/Settings.test.tsx.snap      |   4 +
 9 files changed, 148 insertions(+), 2 deletions(-)

diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
index 9eaa7aec5..9e4726708 100644
--- a/src/components/Repository.test.tsx
+++ b/src/components/Repository.test.tsx
@@ -81,4 +81,15 @@ describe('components/Repository.tsx', () => {
       'github.com',
     );
   });
+
+  it('should use default repository icon when avatar is not available', () => {
+    props.repoNotifications[0].repository.owner.avatar_url = '';
+
+    const tree = TestRenderer.create(
+      <AppContext.Provider value={{}}>
+        <RepositoryNotifications {...props} />
+      </AppContext.Provider>,
+    );
+    expect(tree).toMatchSnapshot();
+  });
 });
diff --git a/src/components/Repository.tsx b/src/components/Repository.tsx
index 2ece71241..6c7a4ce56 100644
--- a/src/components/Repository.tsx
+++ b/src/components/Repository.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useContext } from 'react';
-import { ReadIcon, CheckIcon } from '@primer/octicons-react';
+import { ReadIcon, CheckIcon, MarkGithubIcon } from '@primer/octicons-react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 
 import { AppContext } from '../context/App';
@@ -42,7 +42,11 @@ export const RepositoryNotifications: React.FC<IProps> = ({
     <>
       <div className="flex py-2 px-3 bg-gray-100 dark:bg-gray-darker dark:text-white group">
         <div className="flex flex-1 space-x-3 items-center mt-0 text-sm font-medium overflow-hidden overflow-ellipsis whitespace-nowrap">
-          <img className="rounded w-5 h-5" src={avatarUrl} />
+          {avatarUrl ? (
+            <img className="rounded w-5 h-5" src={avatarUrl} />
+          ) : (
+            <MarkGithubIcon size={18} />
+          )}
           <span onClick={openBrowser}>{repoName}</span>
         </div>
 
diff --git a/src/components/__snapshots__/AccountNotifications.test.tsx.snap b/src/components/__snapshots__/AccountNotifications.test.tsx.snap
index 7bb967d17..1e14664e4 100644
--- a/src/components/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/components/__snapshots__/AccountNotifications.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`components/AccountNotifications.tsx should render itself (github.com wi
       fill="currentColor"
       focusable="false"
       height={20}
+      role="img"
       style={
         {
           "display": "inline-block",
@@ -45,6 +46,7 @@ exports[`components/AccountNotifications.tsx should render itself (github.com wi
     fill="currentColor"
     focusable="false"
     height={20}
+    role="img"
     style={
       {
         "display": "inline-block",
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index b671daa41..dfa20ba0c 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
     title="Open Issue"
   >
     <svg
+      aria-hidden="false"
       aria-label="Issue"
       className="octicon octicon-issue-opened"
       fill="currentColor"
@@ -71,6 +72,7 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Mark as Done"
     >
       <svg
+        aria-hidden="false"
         aria-label="Mark as Done"
         className="octicon octicon-check"
         fill="currentColor"
@@ -99,6 +101,7 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Unsubscribe"
     >
       <svg
+        aria-hidden="false"
         aria-label="Unsubscribe"
         className="octicon octicon-bell-slash"
         fill="currentColor"
@@ -127,6 +130,7 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Mark as Read"
     >
       <svg
+        aria-hidden="false"
         aria-label="Mark as Read"
         className="octicon octicon-read"
         fill="currentColor"
diff --git a/src/components/__snapshots__/Repository.test.tsx.snap b/src/components/__snapshots__/Repository.test.tsx.snap
index cacb209b0..6631c1e09 100644
--- a/src/components/__snapshots__/Repository.test.tsx.snap
+++ b/src/components/__snapshots__/Repository.test.tsx.snap
@@ -27,6 +27,7 @@ exports[`components/Repository.tsx should render itself & its children 1`] = `
         title="Mark Repository as Done"
       >
         <svg
+          aria-hidden="false"
           aria-label="Mark Repository as Done"
           className="octicon octicon-check"
           fill="currentColor"
@@ -58,6 +59,120 @@ exports[`components/Repository.tsx should render itself & its children 1`] = `
         title="Mark Repository as Read"
       >
         <svg
+          aria-hidden="false"
+          aria-label="Mark Repository as Read"
+          className="octicon octicon-read"
+          fill="currentColor"
+          focusable="false"
+          height={14}
+          role="img"
+          style={
+            {
+              "display": "inline-block",
+              "overflow": "visible",
+              "userSelect": "none",
+              "verticalAlign": "text-bottom",
+            }
+          }
+          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>
+    <div>
+      NotificationRow
+    </div>
+    <div>
+      NotificationRow
+    </div>
+  </div>,
+]
+`;
+
+exports[`components/Repository.tsx should use default repository icon when avatar is not available 1`] = `
+[
+  <div
+    className="flex py-2 px-3 bg-gray-100 dark:bg-gray-darker dark:text-white group"
+  >
+    <div
+      className="flex flex-1 space-x-3 items-center mt-0 text-sm font-medium overflow-hidden overflow-ellipsis whitespace-nowrap"
+    >
+      <svg
+        aria-hidden="true"
+        className="octicon octicon-mark-github"
+        fill="currentColor"
+        focusable="false"
+        height={18}
+        role="img"
+        style={
+          {
+            "display": "inline-block",
+            "overflow": "visible",
+            "userSelect": "none",
+            "verticalAlign": "text-bottom",
+          }
+        }
+        viewBox="0 0 16 16"
+        width={18}
+      >
+        <path
+          d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+        />
+      </svg>
+      <span
+        onClick={[Function]}
+      >
+        manosim/gitify
+      </span>
+    </div>
+    <div
+      className="flex justify-center items-center gap-2 opacity-0 group-hover:opacity-80 transition-opacity"
+    >
+      <button
+        className="focus:outline-none h-full hover:text-green-500"
+        onClick={[Function]}
+        title="Mark Repository as Done"
+      >
+        <svg
+          aria-hidden="false"
+          aria-label="Mark Repository as Done"
+          className="octicon octicon-check"
+          fill="currentColor"
+          focusable="false"
+          height={16}
+          role="img"
+          style={
+            {
+              "display": "inline-block",
+              "overflow": "visible",
+              "userSelect": "none",
+              "verticalAlign": "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>
+      <div
+        className="w-[14px]"
+      />
+      <button
+        className="focus:outline-none h-full hover:text-green-500"
+        onClick={[Function]}
+        title="Mark Repository as Read"
+      >
+        <svg
+          aria-hidden="false"
           aria-label="Mark Repository as Read"
           className="octicon octicon-read"
           fill="currentColor"
diff --git a/src/components/__snapshots__/Sidebar.test.tsx.snap b/src/components/__snapshots__/Sidebar.test.tsx.snap
index 3382febd4..38ca088c5 100644
--- a/src/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/components/__snapshots__/Sidebar.test.tsx.snap
@@ -65,6 +65,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
       title="4 Unread Notifications"
     >
       <svg
+        aria-hidden="false"
         aria-label="4 Unread Notifications"
         className="octicon octicon-bell"
         fill="currentColor"
@@ -99,6 +100,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
       title="Quit Gitify"
     >
       <svg
+        aria-hidden="false"
         aria-label="Quit Gitify"
         className="octicon octicon-x-circle"
         fill="currentColor"
@@ -190,6 +192,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
       title="4 Unread Notifications"
     >
       <svg
+        aria-hidden="false"
         aria-label="4 Unread Notifications"
         className="octicon octicon-bell"
         fill="currentColor"
@@ -224,6 +227,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
       title="Quit Gitify"
     >
       <svg
+        aria-hidden="false"
         aria-label="Quit Gitify"
         className="octicon octicon-x-circle"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap b/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
index 43d74e232..b58b055ed 100644
--- a/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
+++ b/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
@@ -13,6 +13,7 @@ exports[`routes/LoginEnterprise.tsx renders correctly 1`] = `
       title="Go Back"
     >
       <svg
+        aria-hidden="false"
         aria-label="Go Back"
         className="hover:text-gray-400"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/LoginWithToken.test.tsx.snap b/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
index 8be1db86c..050725cbe 100644
--- a/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
+++ b/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
@@ -13,6 +13,7 @@ exports[`routes/LoginWithToken.tsx renders correctly 1`] = `
       title="Go Back"
     >
       <svg
+        aria-hidden="false"
         aria-label="Go Back"
         className="hover:text-gray-400"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/Settings.test.tsx.snap b/src/routes/__snapshots__/Settings.test.tsx.snap
index 0ed966e75..fecd55268 100644
--- a/src/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/routes/__snapshots__/Settings.test.tsx.snap
@@ -41,6 +41,7 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
       title="Go Back"
     >
       <svg
+        aria-hidden="false"
         aria-label="Go Back"
         class="hover:text-gray-400"
         fill="currentColor"
@@ -292,6 +293,7 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Login with GitHub Enterprise"
       >
         <svg
+          aria-hidden="false"
           aria-label="Login with GitHub Enterprise"
           class="octicon octicon-person-add"
           fill="currentColor"
@@ -312,6 +314,7 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Logout"
       >
         <svg
+          aria-hidden="false"
           aria-label="Logout"
           class="octicon octicon-sign-out"
           fill="currentColor"
@@ -332,6 +335,7 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Quit Gitify"
       >
         <svg
+          aria-hidden="false"
           aria-label="Quit Gitify"
           class="octicon octicon-x-circle"
           fill="currentColor"

From 9eaf2af44e4d18a79fa156ffe24124776abf5643 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 20 Mar 2024 21:31:03 -0400
Subject: [PATCH 2/2] fix(avatar): add default icon when no repository avatar
 available

---
 .../__snapshots__/AccountNotifications.test.tsx.snap         | 2 --
 src/components/__snapshots__/NotificationRow.test.tsx.snap   | 4 ----
 src/components/__snapshots__/Repository.test.tsx.snap        | 5 -----
 src/components/__snapshots__/Sidebar.test.tsx.snap           | 4 ----
 src/routes/__snapshots__/LoginEnterprise.test.tsx.snap       | 1 -
 src/routes/__snapshots__/LoginWithToken.test.tsx.snap        | 1 -
 src/routes/__snapshots__/Settings.test.tsx.snap              | 4 ----
 7 files changed, 21 deletions(-)

diff --git a/src/components/__snapshots__/AccountNotifications.test.tsx.snap b/src/components/__snapshots__/AccountNotifications.test.tsx.snap
index 1e14664e4..7bb967d17 100644
--- a/src/components/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/components/__snapshots__/AccountNotifications.test.tsx.snap
@@ -12,7 +12,6 @@ exports[`components/AccountNotifications.tsx should render itself (github.com wi
       fill="currentColor"
       focusable="false"
       height={20}
-      role="img"
       style={
         {
           "display": "inline-block",
@@ -46,7 +45,6 @@ exports[`components/AccountNotifications.tsx should render itself (github.com wi
     fill="currentColor"
     focusable="false"
     height={20}
-    role="img"
     style={
       {
         "display": "inline-block",
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index dfa20ba0c..b671daa41 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
     title="Open Issue"
   >
     <svg
-      aria-hidden="false"
       aria-label="Issue"
       className="octicon octicon-issue-opened"
       fill="currentColor"
@@ -72,7 +71,6 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Mark as Done"
     >
       <svg
-        aria-hidden="false"
         aria-label="Mark as Done"
         className="octicon octicon-check"
         fill="currentColor"
@@ -101,7 +99,6 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Unsubscribe"
     >
       <svg
-        aria-hidden="false"
         aria-label="Unsubscribe"
         className="octicon octicon-bell-slash"
         fill="currentColor"
@@ -130,7 +127,6 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       title="Mark as Read"
     >
       <svg
-        aria-hidden="false"
         aria-label="Mark as Read"
         className="octicon octicon-read"
         fill="currentColor"
diff --git a/src/components/__snapshots__/Repository.test.tsx.snap b/src/components/__snapshots__/Repository.test.tsx.snap
index 6631c1e09..a47cf4cbd 100644
--- a/src/components/__snapshots__/Repository.test.tsx.snap
+++ b/src/components/__snapshots__/Repository.test.tsx.snap
@@ -27,7 +27,6 @@ exports[`components/Repository.tsx should render itself & its children 1`] = `
         title="Mark Repository as Done"
       >
         <svg
-          aria-hidden="false"
           aria-label="Mark Repository as Done"
           className="octicon octicon-check"
           fill="currentColor"
@@ -59,7 +58,6 @@ exports[`components/Repository.tsx should render itself & its children 1`] = `
         title="Mark Repository as Read"
       >
         <svg
-          aria-hidden="false"
           aria-label="Mark Repository as Read"
           className="octicon octicon-read"
           fill="currentColor"
@@ -109,7 +107,6 @@ exports[`components/Repository.tsx should use default repository icon when avata
         fill="currentColor"
         focusable="false"
         height={18}
-        role="img"
         style={
           {
             "display": "inline-block",
@@ -140,7 +137,6 @@ exports[`components/Repository.tsx should use default repository icon when avata
         title="Mark Repository as Done"
       >
         <svg
-          aria-hidden="false"
           aria-label="Mark Repository as Done"
           className="octicon octicon-check"
           fill="currentColor"
@@ -172,7 +168,6 @@ exports[`components/Repository.tsx should use default repository icon when avata
         title="Mark Repository as Read"
       >
         <svg
-          aria-hidden="false"
           aria-label="Mark Repository as Read"
           className="octicon octicon-read"
           fill="currentColor"
diff --git a/src/components/__snapshots__/Sidebar.test.tsx.snap b/src/components/__snapshots__/Sidebar.test.tsx.snap
index 38ca088c5..3382febd4 100644
--- a/src/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/components/__snapshots__/Sidebar.test.tsx.snap
@@ -65,7 +65,6 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
       title="4 Unread Notifications"
     >
       <svg
-        aria-hidden="false"
         aria-label="4 Unread Notifications"
         className="octicon octicon-bell"
         fill="currentColor"
@@ -100,7 +99,6 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
       title="Quit Gitify"
     >
       <svg
-        aria-hidden="false"
         aria-label="Quit Gitify"
         className="octicon octicon-x-circle"
         fill="currentColor"
@@ -192,7 +190,6 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
       title="4 Unread Notifications"
     >
       <svg
-        aria-hidden="false"
         aria-label="4 Unread Notifications"
         className="octicon octicon-bell"
         fill="currentColor"
@@ -227,7 +224,6 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
       title="Quit Gitify"
     >
       <svg
-        aria-hidden="false"
         aria-label="Quit Gitify"
         className="octicon octicon-x-circle"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap b/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
index b58b055ed..43d74e232 100644
--- a/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
+++ b/src/routes/__snapshots__/LoginEnterprise.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`routes/LoginEnterprise.tsx renders correctly 1`] = `
       title="Go Back"
     >
       <svg
-        aria-hidden="false"
         aria-label="Go Back"
         className="hover:text-gray-400"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/LoginWithToken.test.tsx.snap b/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
index 050725cbe..8be1db86c 100644
--- a/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
+++ b/src/routes/__snapshots__/LoginWithToken.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`routes/LoginWithToken.tsx renders correctly 1`] = `
       title="Go Back"
     >
       <svg
-        aria-hidden="false"
         aria-label="Go Back"
         className="hover:text-gray-400"
         fill="currentColor"
diff --git a/src/routes/__snapshots__/Settings.test.tsx.snap b/src/routes/__snapshots__/Settings.test.tsx.snap
index fecd55268..0ed966e75 100644
--- a/src/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/routes/__snapshots__/Settings.test.tsx.snap
@@ -41,7 +41,6 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
       title="Go Back"
     >
       <svg
-        aria-hidden="false"
         aria-label="Go Back"
         class="hover:text-gray-400"
         fill="currentColor"
@@ -293,7 +292,6 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Login with GitHub Enterprise"
       >
         <svg
-          aria-hidden="false"
           aria-label="Login with GitHub Enterprise"
           class="octicon octicon-person-add"
           fill="currentColor"
@@ -314,7 +312,6 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Logout"
       >
         <svg
-          aria-hidden="false"
           aria-label="Logout"
           class="octicon octicon-sign-out"
           fill="currentColor"
@@ -335,7 +332,6 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = `
         title="Quit Gitify"
       >
         <svg
-          aria-hidden="false"
           aria-label="Quit Gitify"
           class="octicon octicon-x-circle"
           fill="currentColor"