From 3416e80468d872fd30ca98dc8761fe0f0c536d11 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 17 Apr 2024 11:28:55 -0400
Subject: [PATCH 1/7] refactor: introduce GitifyNotification type

---
 src/components/NotificationRow.tsx | 45 ++++++++--------
 src/components/Repository.tsx      |  6 +--
 src/hooks/useNotifications.ts      | 83 ++++++++++++++++++++++++------
 src/types.ts                       | 42 ++++++++++++++-
 src/utils/notifications.ts         | 15 ++++--
 5 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 79b2449b8..0ed6ee4ec 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -14,6 +14,7 @@ import {
 } from 'react';
 
 import { AppContext } from '../context/App';
+import type { GitifyNotification } from '../types';
 import type { Notification } from '../typesGithub';
 import { openExternalLink } from '../utils/comms';
 import {
@@ -25,7 +26,7 @@ import { formatForDisplay, openInBrowser } from '../utils/helpers';
 
 interface IProps {
   hostname: string;
-  notification: Notification;
+  notification: GitifyNotification;
 }
 
 export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
@@ -50,7 +51,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   }, [settings]);
 
   const openBrowser = useCallback(
-    () => openInBrowser(notification, accounts),
+    () => openExternalLink(notification.url),
     [notification],
   );
 
@@ -67,22 +68,22 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     // Don't trigger onClick of parent element.
     event.stopPropagation();
 
-    openExternalLink(notification.subject.user.html_url);
+    openExternalLink(notification.user.html_url);
   };
 
-  const reason = formatReason(notification.reason);
-  const NotificationIcon = getNotificationTypeIcon(notification.subject);
-  const iconColor = getNotificationTypeIconColor(notification.subject);
-  const updatedAt = formatDistanceToNow(parseISO(notification.updated_at), {
-    addSuffix: true,
-  });
+  const reason = notification.reason; //formatReason(notification.reason);
+  const NotificationIcon = notification.icon.type; //getNotificationTypeIcon(notification.subject);
+  const iconColor = notification.icon.color; // getNotificationTypeIconColor(notification.subject);
+  // const updatedAt = formatDistanceToNow(parseISO(notification.updated_at), {
+  //   addSuffix: true,
+  // });
 
-  const updatedLabel = notification.subject.user
-    ? `${notification.subject.user.login} updated ${updatedAt}`
-    : `Updated ${updatedAt}`;
+  const updatedLabel = notification.user
+    ? `${notification.user.login} updated ${notification.updated_at.formatted}`
+    : `Updated ${notification.updated_at.formatted}`;
   const notificationTitle = formatForDisplay([
-    notification.subject.state,
-    notification.subject.type,
+    notification.state,
+    notification.type,
   ]);
 
   return (
@@ -91,7 +92,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
         className={`flex justify-center items-center w-5 ${iconColor}`}
         title={notificationTitle}
       >
-        <NotificationIcon size={18} aria-label={notification.subject.type} />
+        <NotificationIcon size={18} aria-label={notification.type} />
       </div>
 
       <div
@@ -102,15 +103,15 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
         <div
           className="mb-1 text-sm whitespace-nowrap overflow-ellipsis overflow-hidden cursor-pointer"
           role="main"
-          title={notification.subject.title}
+          title={notification.title}
         >
-          {notification.subject.title}
+          {notification.title}
         </div>
 
         <div className="text-xs text-capitalize whitespace-nowrap overflow-ellipsis overflow-hidden">
           <span className="flex items-center">
             <span title={updatedLabel} className="flex">
-              {notification.subject.user ? (
+              {notification.user ? (
                 <span
                   title="View User Profile"
                   onClick={openUserProfile}
@@ -118,9 +119,9 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
                 >
                   <img
                     className="rounded-full w-4 h-4 cursor-pointer"
-                    src={notification.subject.user.avatar_url}
-                    title={notification.subject.user.login}
-                    alt={`${notification.subject.user.login}'s avatar`}
+                    src={notification.user.avatar_url}
+                    title={notification.user.login}
+                    alt={`${notification.user.login}'s avatar`}
                   />
                 </span>
               ) : (
@@ -134,7 +135,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
               <span className="ml-1" title={reason.description}>
                 {reason.type}
               </span>
-              <span className="ml-1">{updatedAt}</span>
+              <span className="ml-1">{notification.updated_at.formatted}</span>
             </span>
           </span>
         </div>
diff --git a/src/components/Repository.tsx b/src/components/Repository.tsx
index 28bef678f..0b8d76cc2 100644
--- a/src/components/Repository.tsx
+++ b/src/components/Repository.tsx
@@ -4,13 +4,13 @@ import { type FC, useCallback, useContext } from 'react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 
 import { AppContext } from '../context/App';
-import type { Notification } from '../typesGithub';
+import type { GitifyNotification } from '../types';
 import { openExternalLink } from '../utils/comms';
 import { NotificationRow } from './NotificationRow';
 
 interface IProps {
   hostname: string;
-  repoNotifications: Notification[];
+  repoNotifications: GitifyNotification[];
   repoName: string;
 }
 
@@ -37,7 +37,7 @@ export const RepositoryNotifications: FC<IProps> = ({
     markRepoNotificationsDone(repoSlug, hostname);
   }, [repoNotifications, hostname]);
 
-  const avatarUrl = repoNotifications[0].repository.owner.avatar_url;
+  const avatarUrl = repoNotifications[0].repository.avatar_url;
   const repoSlug = repoNotifications[0].repository.full_name;
 
   return (
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 6fd6f7089..d06fd561d 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -1,15 +1,23 @@
 import axios, { type AxiosError, type AxiosPromise } from 'axios';
 import { useCallback, useState } from 'react';
 
+import { RocketIcon } from '@primer/octicons-react';
+import { formatDistanceToNow, parseISO } from 'date-fns';
 import type {
   AccountNotifications,
   AuthState,
   GitifyError,
+  GitifyNotification,
   SettingsState,
 } from '../types';
 import type { GithubRESTError, Notification } from '../typesGithub';
 import { apiRequestAuth } from '../utils/api-requests';
 import Constants, { Errors } from '../utils/constants';
+import {
+  formatReason,
+  getNotificationTypeIcon,
+  getNotificationTypeIconColor,
+} from '../utils/github-api';
 import {
   generateGitHubAPIUrl,
   getEnterpriseAccountToken,
@@ -109,12 +117,9 @@ export const useNotifications = (): NotificationsState => {
                   hostname,
                   notifications: accountNotifications.data.map(
                     (notification: Notification) => {
-                      return {
-                        ...notification,
-                        hostname: hostname,
-                      };
+                      return mapToGitifyNotification(notification, hostname);
                     },
-                  ),
+                  ) as GitifyNotification[],
                 };
               },
             );
@@ -126,34 +131,38 @@ export const useNotifications = (): NotificationsState => {
                     hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
                     notifications: gitHubNotifications.data.map(
                       (notification: Notification) => {
-                        return {
-                          ...notification,
-                          hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-                        };
+                        return mapToGitifyNotification(
+                          notification,
+                          Constants.DEFAULT_AUTH_OPTIONS.hostname,
+                        );
                       },
-                    ),
+                    ) as GitifyNotification[],
                   },
                 ]
               : [...enterpriseNotifications];
 
             axios
               .all(
-                data.map(async (accountNotifications) => {
+                data.map(async (accountNotifications: AccountNotifications) => {
                   return {
                     hostname: accountNotifications.hostname,
                     notifications: await axios
-                      .all<Notification>(
+                      .all<GitifyNotification>(
                         accountNotifications.notifications.map(
-                          async (notification: Notification) => {
-                            if (!settings.detailedNotifications) {
-                              return notification;
-                            }
+                          async (notification: GitifyNotification) => {
+                            // if (!settings.detailedNotifications) {
+                            return notification;
+                            // }
+                            /*
 
                             const token = getTokenForHost(
                               notification.hostname,
                               accounts,
                             );
 
+                            // include this also in the same call
+                            await generateGitHubWebUrl(notification, accounts)
+
                             const additionalSubjectDetails =
                               await getGitifySubjectDetails(
                                 notification,
@@ -167,6 +176,7 @@ export const useNotifications = (): NotificationsState => {
                                 ...additionalSubjectDetails,
                               },
                             };
+                            */
                           },
                         ),
                       )
@@ -174,7 +184,7 @@ export const useNotifications = (): NotificationsState => {
                         return notifications.filter((notification) => {
                           if (
                             !settings.showBots &&
-                            notification.subject?.user?.type === 'Bot'
+                            notification?.user?.type === 'Bot'
                           ) {
                             return false;
                           }
@@ -404,6 +414,45 @@ export const useNotifications = (): NotificationsState => {
   };
 };
 
+function mapToGitifyNotification(
+  notification: Notification,
+  hostname: string,
+): GitifyNotification {
+  const formattedReason = formatReason(notification.reason);
+  // const icon = getNotificationTypeIcon(notification.subject);
+  // const color = getNotificationTypeIconColor(notification.subject);
+
+  return {
+    hostname: hostname,
+    id: notification.id,
+    title: notification.subject.title,
+    type: notification.subject.type,
+    reason: {
+      code: notification.reason,
+      type: formattedReason.type,
+      description: formattedReason.description,
+    },
+    unread: notification.unread,
+    updated_at: {
+      raw: notification.updated_at,
+      formatted: formatDistanceToNow(parseISO(notification.updated_at), {
+        addSuffix: true,
+      }),
+    },
+    url: notification.repository.html_url, // default notification url
+    repository: {
+      full_name: notification.repository.full_name,
+      html_url: notification.repository.html_url,
+      avatar_url: notification.repository.owner.avatar_url,
+    },
+    // FIXME: TEMPORARILY HARDCODED
+    icon: {
+      type: RocketIcon,
+      color: 'text-green-500',
+    },
+  };
+}
+
 function determineFailureType(err: AxiosError<GithubRESTError>): GitifyError {
   const status = err.response.status;
   const message = err.response.data.message;
diff --git a/src/types.ts b/src/types.ts
index 36bb2e01e..bbd5e18ac 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,4 +1,6 @@
-import type { Notification } from './typesGithub';
+import type { OcticonProps } from '@primer/octicons-react';
+import type { FC } from 'react';
+import type { Reason, StateType } from './typesGithub';
 
 export interface AuthState {
   token?: string;
@@ -47,7 +49,7 @@ export interface EnterpriseAccount {
 
 export interface AccountNotifications {
   hostname: string;
-  notifications: Notification[];
+  notifications: GitifyNotification[];
 }
 
 export interface AuthOptions {
@@ -70,6 +72,42 @@ export interface AuthTokenResponse {
   token: string;
 }
 
+export interface GitifyNotification {
+  id: string;
+  hostname: string;
+  updated_at: {
+    raw: string;
+    formatted: string;
+  };
+  title: string;
+  type: string;
+  url: string;
+  unread: boolean;
+  reason: {
+    code: Reason;
+    type: string;
+    description: string;
+  };
+  state?: StateType;
+  user?: GitifyNotificationUser;
+  icon: {
+    type: FC<OcticonProps>;
+    color: string;
+  };
+  repository: {
+    full_name: string;
+    avatar_url: string;
+    html_url: string;
+  };
+}
+
+export interface GitifyNotificationUser {
+  login: string;
+  html_url: string;
+  avatar_url: string;
+  type: string;
+}
+
 export interface GitifyUser {
   login: string;
   name: string;
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 0e1004dee..0138f9fef 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -1,9 +1,14 @@
 import { ipcRenderer } from 'electron';
 import { Notification } from '../typesGithub';
 import { openInBrowser } from '../utils/helpers';
-import { updateTrayIcon } from './comms';
+import { openExternalLink, updateTrayIcon } from './comms';
 
-import type { AccountNotifications, AuthState, SettingsState } from '../types';
+import type {
+  AccountNotifications,
+  AuthState,
+  GitifyNotification,
+  SettingsState,
+} from '../types';
 
 export const setTrayIconColor = (notifications: AccountNotifications[]) => {
   const allNotificationsCount = getNotificationCount(notifications);
@@ -62,7 +67,7 @@ export const triggerNativeNotifications = (
 };
 
 export const raiseNativeNotification = (
-  notifications: Notification[],
+  notifications: GitifyNotification[],
   accounts: AuthState,
 ) => {
   let title: string;
@@ -73,7 +78,7 @@ export const raiseNativeNotification = (
     title = `${process.platform !== 'win32' ? 'Gitify - ' : ''}${
       notification.repository.full_name
     }`;
-    body = notification.subject.title;
+    body = notification.title;
   } else {
     title = 'Gitify';
     body = `You have ${notifications.length} notifications.`;
@@ -87,7 +92,7 @@ export const raiseNativeNotification = (
   nativeNotification.onclick = () => {
     if (notifications.length === 1) {
       ipcRenderer.send('hide-window');
-      openInBrowser(notifications[0], accounts);
+      openExternalLink(notifications[0].url);
     } else {
       ipcRenderer.send('reopen-window');
     }

From 8634564b860260541224c51fc28a17b2ea9e29be Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 17 Apr 2024 13:40:29 -0400
Subject: [PATCH 2/7] refactor: introduce GitifyNotification type

---
 src/utils/notifications.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 0138f9fef..41301acfb 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -1,6 +1,4 @@
 import { ipcRenderer } from 'electron';
-import { Notification } from '../typesGithub';
-import { openInBrowser } from '../utils/helpers';
 import { openExternalLink, updateTrayIcon } from './comms';
 
 import type {

From 16dc71048e88c7214d7ba62083f15530ebdd0988 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 21 Apr 2024 07:45:58 -0400
Subject: [PATCH 3/7] add html to type

---
 src/typesGithub.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/typesGithub.ts b/src/typesGithub.ts
index 0a462d6af..007cc599f 100644
--- a/src/typesGithub.ts
+++ b/src/typesGithub.ts
@@ -232,6 +232,7 @@ interface GitHubSubject {
 export interface GitifySubject {
   state?: StateType;
   user?: SubjectUser;
+  html_url?: string;
 }
 
 export interface PullRequest {

From 672724c88cec861c34315869ecd18ac7080642ec Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 21 Apr 2024 07:56:33 -0400
Subject: [PATCH 4/7] wip

---
 src/hooks/useNotifications.ts | 96 ++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 0218d8844..66e7a4fa5 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -1,16 +1,20 @@
 import axios, { type AxiosError, type AxiosPromise } from 'axios';
 import { useCallback, useState } from 'react';
 
-import { RocketIcon } from '@primer/octicons-react';
 import { formatDistanceToNow, parseISO } from 'date-fns';
 import type {
+  AccountNotifications,
   AccountNotifications,
   AuthState,
   GitifyError,
   GitifyNotification,
   SettingsState,
 } from '../types';
-import type { GithubRESTError, Notification } from '../typesGithub';
+import type {
+  GithubRESTError,
+  GitifySubject,
+  Notification,
+} from '../typesGithub';
 import { apiRequestAuth } from '../utils/api-requests';
 import { determineFailureType } from '../utils/api/errors';
 import Constants from '../utils/constants';
@@ -21,10 +25,15 @@ import {
   isEnterpriseHost,
   isGitHubLoggedIn,
 } from '../utils/helpers';
+import {
+  getNotificationTypeIcon,
+  getNotificationTypeIconColor,
+} from '../utils/icons';
 import {
   setTrayIconColor,
   triggerNativeNotifications,
 } from '../utils/notifications';
+import { formatReason } from '../utils/reason';
 import { removeNotification } from '../utils/remove-notification';
 import { removeNotifications } from '../utils/remove-notifications';
 import { getGitifySubjectDetails } from '../utils/subject';
@@ -77,7 +86,7 @@ export const useNotifications = (): NotificationsState => {
 
   const fetchNotifications = useCallback(
     async (accounts: AuthState, settings: SettingsState) => {
-      function getNotifications(hostname: string, token: string): AxiosPromise {
+      function getNotifications(hostname: string, token: string): AxiosPromise<Notification[]> {
         const endpointSuffix = `notifications?participating=${settings.participating}`;
         const url = `${generateGitHubAPIUrl(hostname)}${endpointSuffix}`;
         return apiRequestAuth(url, 'GET', token);
@@ -113,9 +122,12 @@ export const useNotifications = (): NotificationsState => {
                   hostname,
                   notifications: accountNotifications.data.map(
                     (notification: Notification) => {
-                      return mapToGitifyNotification(notification, hostname);
+                       return {
+                        ...notification,
+                        hostname: hostname,
+                      };
                     },
-                  ) as GitifyNotification[],
+                  ),
                 };
               },
             );
@@ -127,52 +139,34 @@ export const useNotifications = (): NotificationsState => {
                     hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
                     notifications: gitHubNotifications.data.map(
                       (notification: Notification) => {
-                        return mapToGitifyNotification(
-                          notification,
-                          Constants.DEFAULT_AUTH_OPTIONS.hostname,
-                        );
+                        return {
+                          ...notification,
+                          hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+                        };
                       },
-                    ) as GitifyNotification[],
+                    ),
                   },
                 ]
               : [...enterpriseNotifications];
 
             axios
               .all(
-                data.map(async (accountNotifications: AccountNotifications) => {
+                data.map(async (accountNotifications) => {
                   return {
                     hostname: accountNotifications.hostname,
                     notifications: await axios
-                      .all<GitifyNotification>(
+                      .all<Notification>(
                         accountNotifications.notifications.map(
-                          async (notification: GitifyNotification) => {
-                            // if (!settings.detailedNotifications) {
-                            return notification;
-                            // }
-                            /*
-
+                          async (notification: Notification) => {
+                          
                             const token = getTokenForHost(
                               notification.hostname,
                               accounts,
                             );
 
-                            // include this also in the same call
-                            await generateGitHubWebUrl(notification, accounts)
-
-                            const additionalSubjectDetails =
-                              await getGitifySubjectDetails(
-                                notification,
-                                token,
-                              );
-
-                            return {
-                              ...notification,
-                              subject: {
-                                ...notification.subject,
-                                ...additionalSubjectDetails,
-                              },
-                            };
-                            */
+                            // const gitifyNotification = await mapToGitifyNotification(notification, token, settings);)
+                           
+                            return notification;                            
                           },
                         ),
                       )
@@ -410,22 +404,31 @@ export const useNotifications = (): NotificationsState => {
   };
 };
 
-function mapToGitifyNotification(
+async function mapToGitifyNotification(
   notification: Notification,
-  hostname: string,
-): GitifyNotification {
+  token: string,
+  settings: SettingsState,
+): Promise<GitifyNotification> {
+  let extraSubjectDetails: GitifySubject;
+
+  if (settings.detailedNotifications) {
+    extraSubjectDetails = await getGitifySubjectDetails(notification, token);
+
+    notification.subject.state = extraSubjectDetails.state;
+    notification.subject.user = extraSubjectDetails.user;
+    notification.subject.html_url = extraSubjectDetails.user.html_url;
+  }
+
   const formattedReason = formatReason(notification.reason);
-  // const icon = getNotificationTypeIcon(notification.subject);
-  // const color = getNotificationTypeIconColor(notification.subject);
 
   return {
-    hostname: hostname,
+    hostname: notification.hostname,
     id: notification.id,
     title: notification.subject.title,
     type: notification.subject.type,
     reason: {
       code: notification.reason,
-      type: formattedReason.type,
+      type: formattedReason.title,
       description: formattedReason.description,
     },
     unread: notification.unread,
@@ -435,16 +438,17 @@ function mapToGitifyNotification(
         addSuffix: true,
       }),
     },
-    url: notification.repository.html_url, // default notification url
+    url: notification.subject.html_url ?? notification.repository.html_url,
     repository: {
       full_name: notification.repository.full_name,
       html_url: notification.repository.html_url,
       avatar_url: notification.repository.owner.avatar_url,
     },
-    // FIXME: TEMPORARILY HARDCODED
+    state: notification.subject?.state,
+    user: notification.subject?.user,
     icon: {
-      type: RocketIcon,
-      color: 'text-green-500',
+      type: getNotificationTypeIcon(notification.subject),
+      color: getNotificationTypeIconColor(notification.subject),
     },
   };
 }

From 822500c42447a31bbc4b77455c17ba260196cf6a Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 1 May 2024 06:13:44 -1000
Subject: [PATCH 5/7] refactor: use gitify notification type

---
 .../{mockedData.ts => mock-github.ts}         |  91 ++------
 src/__mocks__/mock-gitify.ts                  | 200 ++++++++++++++++++
 src/__mocks__/mock-state.ts                   |   2 +-
 src/components/AccountNotifications.test.tsx  |   2 +-
 src/components/AccountNotifications.tsx       |   1 -
 src/components/NotificationRow.test.tsx       |  19 +-
 src/components/NotificationRow.tsx            |   3 +-
 src/components/Repository.test.tsx            |   2 +-
 src/components/Sidebar.test.tsx               |   2 +-
 src/hooks/useNotifications.test.ts            |   3 +-
 src/hooks/useNotifications.ts                 |  67 +++---
 src/routes/LoginEnterprise.test.tsx           |   2 +-
 src/routes/Notifications.test.tsx             |   2 +-
 src/types.ts                                  |   5 +-
 src/utils/helpers.test.ts                     |   6 +-
 src/utils/notifications.test.ts               |   4 +-
 src/utils/notifications.ts                    |   4 +-
 src/utils/remove-notification.test.ts         |   2 +-
 src/utils/remove-notifications.test.ts        |   2 +-
 19 files changed, 273 insertions(+), 146 deletions(-)
 rename src/__mocks__/{mockedData.ts => mock-github.ts} (91%)
 create mode 100644 src/__mocks__/mock-gitify.ts

diff --git a/src/__mocks__/mockedData.ts b/src/__mocks__/mock-github.ts
similarity index 91%
rename from src/__mocks__/mockedData.ts
rename to src/__mocks__/mock-github.ts
index 6af435222..7638d8b14 100644
--- a/src/__mocks__/mockedData.ts
+++ b/src/__mocks__/mock-github.ts
@@ -1,34 +1,12 @@
-import { IssueOpenedIcon } from '@primer/octicons-react';
-import {
-  type AccountNotifications,
-  type EnterpriseAccount,
-  type GitifyNotification,
-  type GitifyUser,
-  IconColor,
-} from '../types';
 import type {
   Discussion,
   DiscussionComments,
   GraphQLSearch,
   Notification,
-  Repository,
   User,
 } from '../typesGitHub';
 import Constants from '../utils/constants';
 
-export const mockedEnterpriseAccounts: EnterpriseAccount[] = [
-  {
-    hostname: 'github.gitify.io',
-    token: '1234568790',
-  },
-];
-
-export const mockedUser: GitifyUser = {
-  login: 'octocat',
-  name: 'Mona Lisa Octocat',
-  id: 123456789,
-};
-
 export const mockedNotificationUser: User = {
   login: 'octocat',
   id: 123456789,
@@ -72,40 +50,6 @@ export const mockedCommenterUser: User = {
   site_admin: false,
 };
 
-export const mockGitifyNotification: GitifyNotification = {
-  hostname: Constants.GITHUB_API_BASE_URL,
-  id: '138661096',
-  unread: true,
-  reason: {
-    type: 'subscribed',
-    code: 'subscribed',
-    description: 'You are subscribed to this thread',
-  },
-  updated_at: {
-    raw: '2017-05-20T17:51:57Z',
-    formatted: 'May 20th, 2017',
-  },
-  title: 'I am a robot and this is a test!',
-  url: 'https://api.github.com/repos/gitify-app/notifications-test/issues/1',
-  type: 'Issue',
-  state: 'open',
-  icon: {
-    type: IssueOpenedIcon,
-    color: IconColor.GREEN,
-  },
-  user: {
-    login: 'mockUser',
-    html_url: 'https://github.com/mockUser',
-    avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
-    type: 'User',
-  },
-  repository: {
-    full_name: 'gitify-app/notifications-test',
-    avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
-    html_url: 'https://github.com/gitify-app/notifications-test',
-  },
-};
-
 export const mockedSingleNotification: Notification = {
   hostname: Constants.GITHUB_API_BASE_URL,
   id: '138661096',
@@ -234,6 +178,8 @@ export const mockedSingleNotification: Notification = {
     'https://api.github.com/notifications/threads/138661096/subscription',
 };
 
+/*
+
 // 2 Notifications
 // Repository : 'manosim/notifications-tests'
 export const mockedGitHubNotifications = [
@@ -399,24 +345,25 @@ export const mockedEnterpriseNotifications = [
     hostname: Constants.GITHUB_API_BASE_URL,
   } as Notification,
 ];
+*/
 
-export const mockedAccountNotifications: AccountNotifications[] = [
-  {
-    hostname: 'github.com',
-    notifications: mockedGitHubNotifications,
-  },
-  {
-    hostname: 'github.gitify.io',
-    notifications: mockedEnterpriseNotifications,
-  },
-];
+// export const mockedAccountNotifications: AccountNotifications[] = [
+//   {
+//     hostname: 'github.com',
+//     notifications: mockedGitHubNotifications,
+//   },
+//   {
+//     hostname: 'github.gitify.io',
+//     notifications: mockedEnterpriseNotifications,
+//   },
+// ];
 
-export const mockedSingleAccountNotifications: AccountNotifications[] = [
-  {
-    hostname: 'github.com',
-    notifications: [mockGitifyNotification],
-  },
-];
+// export const mockedSingleAccountNotifications: AccountNotifications[] = [
+//   {
+//     hostname: 'github.com',
+//     notifications: [mockedSingleNotification],
+//   },
+// ];
 
 const mockDiscussionComments: DiscussionComments = {
   nodes: [
diff --git a/src/__mocks__/mock-gitify.ts b/src/__mocks__/mock-gitify.ts
new file mode 100644
index 000000000..0095990e4
--- /dev/null
+++ b/src/__mocks__/mock-gitify.ts
@@ -0,0 +1,200 @@
+import { GitMergeIcon, IssueOpenedIcon } from '@primer/octicons-react';
+import {
+  type AccountNotifications,
+  type EnterpriseAccount,
+  type GitifyNotification,
+  type GitifyUser,
+  IconColor,
+} from '../types';
+import Constants from '../utils/constants';
+
+export const mockedEnterpriseAccounts: EnterpriseAccount[] = [
+  {
+    hostname: 'github.gitify.io',
+    token: '1234568790',
+  },
+];
+
+export const mockedUser: GitifyUser = {
+  login: 'octocat',
+  name: 'Mona Lisa Octocat',
+  id: 123456789,
+};
+
+export const mockedGitHubNotifications: GitifyNotification[] = [
+  {
+    hostname: Constants.GITHUB_API_BASE_URL,
+    id: '138661096',
+    unread: true,
+    reason: {
+      type: 'subscribed',
+      code: 'subscribed',
+      description: 'You are subscribed to this thread',
+    },
+    updated_at: {
+      raw: '2017-05-20T17:51:57Z',
+      formatted: 'May 20th, 2017',
+    },
+    title: 'I am a robot and this is a test!',
+    html_url:
+      'https://api.github.com/repos/gitify-app/notifications-test/issues/1',
+    type: 'Issue',
+    state: 'open',
+    icon: {
+      type: IssueOpenedIcon,
+      color: IconColor.GREEN,
+    },
+    user: {
+      login: 'mockUser',
+      html_url: 'https://github.com/mockUser',
+      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      type: 'User',
+    },
+    repository: {
+      full_name: 'gitify-app/notifications-test',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      html_url: 'https://github.com/gitify-app/notifications-test',
+      owner: {
+        avatar_url:
+          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      },
+    },
+  },
+  {
+    hostname: Constants.GITHUB_API_BASE_URL,
+    id: '148827438',
+    unread: true,
+    reason: {
+      type: 'author',
+      code: 'author',
+      description: 'You created this thread',
+    },
+    updated_at: {
+      raw: '2017-05-20T17:06:34Z',
+      formatted: 'May 20th, 2017',
+    },
+    title: 'Improve the UI',
+    type: 'Pull Request',
+    html_url: 'https://github.com/repos/gitify-app/notifications-test/pulls/4',
+    state: 'merged',
+    icon: {
+      type: GitMergeIcon,
+      color: IconColor.PURPLE,
+    },
+    user: {
+      login: 'mockUser',
+      html_url: 'https://github.com/mockUser',
+      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      type: 'User',
+    },
+    repository: {
+      full_name: 'gitify-app/notifications-test',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      html_url: 'https://github.com/gitify-app/notifications-test',
+      owner: {
+        avatar_url:
+          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      },
+    },
+  },
+];
+
+// TODO - Update the mock data to be accurate
+export const mockedEnterpriseNotifications: GitifyNotification[] = [
+  {
+    hostname: Constants.GITHUB_API_BASE_URL,
+    id: '138661096',
+    unread: true,
+    reason: {
+      type: 'subscribed',
+      code: 'subscribed',
+      description: 'You are subscribed to this thread',
+    },
+    updated_at: {
+      raw: '2017-05-20T17:51:57Z',
+      formatted: 'May 20th, 2017',
+    },
+    title: 'I am a robot and this is a test!',
+    html_url:
+      'https://api.github.com/repos/gitify-app/notifications-test/issues/1',
+    type: 'Issue',
+    state: 'open',
+    icon: {
+      type: IssueOpenedIcon,
+      color: IconColor.GREEN,
+    },
+    user: {
+      login: 'mockUser',
+      html_url: 'https://github.com/mockUser',
+      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      type: 'User',
+    },
+    repository: {
+      full_name: 'gitify-app/notifications-test',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      html_url: 'https://github.com/gitify-app/notifications-test',
+      owner: {
+        avatar_url:
+          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      },
+    },
+  },
+  {
+    hostname: Constants.GITHUB_API_BASE_URL,
+    id: '148827438',
+    unread: true,
+    reason: {
+      type: 'author',
+      code: 'author',
+      description: 'You created this thread',
+    },
+    updated_at: {
+      raw: '2017-05-20T17:06:34Z',
+      formatted: 'May 20th, 2017',
+    },
+    title: 'Improve the UI',
+    type: 'Pull Request',
+    html_url: 'https://github.com/repos/gitify-app/notifications-test/pulls/4',
+    state: 'merged',
+    icon: {
+      type: GitMergeIcon,
+      color: IconColor.PURPLE,
+    },
+    user: {
+      login: 'mockUser',
+      html_url: 'https://github.com/mockUser',
+      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      type: 'User',
+    },
+    repository: {
+      full_name: 'gitify-app/notifications-test',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      html_url: 'https://github.com/gitify-app/notifications-test',
+      owner: {
+        avatar_url:
+          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+      },
+    },
+  },
+];
+
+export const mockedSingleNotification: GitifyNotification =
+  mockedGitHubNotifications[0];
+
+export const mockedSingleAccountNotifications: AccountNotifications[] = [
+  {
+    hostname: 'github.com',
+    notifications: [mockedSingleNotification],
+  },
+];
+
+export const mockedAccountNotifications: AccountNotifications[] = [
+  {
+    hostname: 'github.com',
+    notifications: mockedGitHubNotifications,
+  },
+  {
+    hostname: 'github.gitify.io',
+    notifications: mockedEnterpriseNotifications,
+  },
+];
diff --git a/src/__mocks__/mock-state.ts b/src/__mocks__/mock-state.ts
index 01cb113a3..ed4702a8c 100644
--- a/src/__mocks__/mock-state.ts
+++ b/src/__mocks__/mock-state.ts
@@ -1,5 +1,5 @@
 import { type AuthState, type SettingsState, Theme } from '../types';
-import { mockedEnterpriseAccounts, mockedUser } from './mockedData';
+import { mockedEnterpriseAccounts, mockedUser } from './mock-gitify';
 
 export const mockAccounts: AuthState = {
   token: 'token-123-456',
diff --git a/src/components/AccountNotifications.test.tsx b/src/components/AccountNotifications.test.tsx
index b18ffa47c..13d07f748 100644
--- a/src/components/AccountNotifications.test.tsx
+++ b/src/components/AccountNotifications.test.tsx
@@ -1,6 +1,6 @@
 import TestRenderer from 'react-test-renderer';
 
-import { mockedGitHubNotifications } from '../__mocks__/mockedData';
+import { mockedGitHubNotifications } from '../__mocks__/mock-gitify';
 import { AccountNotifications } from './AccountNotifications';
 
 jest.mock('./Repository', () => ({
diff --git a/src/components/AccountNotifications.tsx b/src/components/AccountNotifications.tsx
index e8a5f0abf..2e7d33253 100644
--- a/src/components/AccountNotifications.tsx
+++ b/src/components/AccountNotifications.tsx
@@ -1,7 +1,6 @@
 import { ChevronDownIcon, ChevronLeftIcon } from '@primer/octicons-react';
 
 import type { GitifyNotification } from '../types';
-import type { Notification } from '../typesGitHub';
 import { RepositoryNotifications } from './Repository';
 
 interface IProps {
diff --git a/src/components/NotificationRow.test.tsx b/src/components/NotificationRow.test.tsx
index 016f86fbb..819135589 100644
--- a/src/components/NotificationRow.test.tsx
+++ b/src/components/NotificationRow.test.tsx
@@ -5,8 +5,8 @@ import * as TestRenderer from 'react-test-renderer';
 import * as helpers from '../utils/helpers';
 
 import { shell } from 'electron';
+import { mockedSingleNotification } from '../__mocks__/mock-gitify';
 import { mockAccounts, mockSettings } from '../__mocks__/mock-state';
-import { mockedSingleNotification } from '../__mocks__/mockedData';
 import { AppContext } from '../context/App';
 import { NotificationRow } from './NotificationRow';
 
@@ -39,7 +39,7 @@ describe('components/NotificationRow.tsx', () => {
       .mockImplementation(() => new Date('2024').valueOf());
 
     const mockNotification = mockedSingleNotification;
-    mockNotification.subject.user = null;
+    mockNotification.user = null;
 
     const props = {
       notification: mockNotification,
@@ -171,18 +171,7 @@ describe('components/NotificationRow.tsx', () => {
 
   it('should open notification user profile', () => {
     const props = {
-      notification: {
-        ...mockedSingleNotification,
-        subject: {
-          ...mockedSingleNotification.subject,
-          user: {
-            login: 'some-user',
-            html_url: 'https://github.com/some-user',
-            avatar_url: 'https://avatars.githubusercontent.com/u/123456789?v=4',
-            type: 'User',
-          },
-        },
-      },
+      notification: mockedSingleNotification,
       hostname: 'github.com',
     };
 
@@ -200,7 +189,7 @@ describe('components/NotificationRow.tsx', () => {
     fireEvent.click(screen.getByTitle('View User Profile'));
     expect(shell.openExternal).toHaveBeenCalledTimes(1);
     expect(shell.openExternal).toHaveBeenCalledWith(
-      props.notification.subject.user.html_url,
+      props.notification.user.html_url,
     );
   });
 });
diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index b68f39845..4042ad036 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -34,7 +34,8 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   } = useContext(AppContext);
 
   const openNotification = useCallback(() => {
-    openExternalLink(notification.url);
+    // TODO - this may need extra lookup, too
+    openExternalLink(notification.html_url);
 
     if (settings.markAsDoneOnOpen) {
       markNotificationDone(notification.id, hostname);
diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
index 0a1fb20e7..8a5453c4f 100644
--- a/src/components/Repository.test.tsx
+++ b/src/components/Repository.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import TestRenderer from 'react-test-renderer';
-import { mockedGitHubNotifications } from '../__mocks__/mockedData';
+import { mockedGitHubNotifications } from '../__mocks__/mock-gitify';
 import { AppContext } from '../context/App';
 import { RepositoryNotifications } from './Repository';
 const { shell } = require('electron');
diff --git a/src/components/Sidebar.test.tsx b/src/components/Sidebar.test.tsx
index 281ea73c0..b8cff97e0 100644
--- a/src/components/Sidebar.test.tsx
+++ b/src/components/Sidebar.test.tsx
@@ -2,8 +2,8 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import * as TestRenderer from 'react-test-renderer';
 const { shell, ipcRenderer } = require('electron');
+import { mockedAccountNotifications } from '../__mocks__/mock-gitify';
 import { mockSettings } from '../__mocks__/mock-state';
-import { mockedAccountNotifications } from '../__mocks__/mockedData';
 import { AppContext } from '../context/App';
 import { Sidebar } from './Sidebar';
 
diff --git a/src/hooks/useNotifications.test.ts b/src/hooks/useNotifications.test.ts
index 0ac0ae070..4278d39fc 100644
--- a/src/hooks/useNotifications.test.ts
+++ b/src/hooks/useNotifications.test.ts
@@ -2,8 +2,9 @@ import { act, renderHook, waitFor } from '@testing-library/react';
 import axios, { AxiosError } from 'axios';
 import nock from 'nock';
 
+import { mockedNotificationUser } from '../__mocks__/mock-github';
+import { mockedUser } from '../__mocks__/mock-gitify';
 import { mockAccounts, mockSettings } from '../__mocks__/mock-state';
-import { mockedNotificationUser, mockedUser } from '../__mocks__/mockedData';
 import type { AuthState } from '../types';
 import { Errors } from '../utils/constants';
 import { useNotifications } from './useNotifications';
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 6a6ffc912..cb7fbee05 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -2,7 +2,14 @@ import type { AxiosError } from 'axios';
 import { useCallback, useState } from 'react';
 
 import { formatDistanceToNow, parseISO } from 'date-fns';
-import type { AuthState } from '../types';
+import type {
+  AccountNotifications,
+  AuthState,
+  GitifyError,
+  GitifyNotification,
+  SettingsState,
+  Status,
+} from '../types';
 import type {
   GitHubRESTError,
   GitifySubject,
@@ -106,61 +113,35 @@ export const useNotifications = (): NotificationsState => {
         ...getEnterpriseNotifications(),
       ])
         .then(([...responses]) => {
-          const accountsNotifications: AccountNotifications[] = responses
+          const rawAccountsNotifications = responses
             .filter((response) => !!response)
             .map((accountNotifications) => {
               const { hostname } = new URL(accountNotifications.config.url);
+
               return {
                 hostname,
-                notifications: accountNotifications.data.map(
-                  (notification: Notification) => ({
-                    ...notification,
-                    hostname,
-                  }),
-                ),
+                notifications: accountNotifications.data,
               };
             });
 
           Promise.all(
-            accountsNotifications.map(async (accountNotifications) => {
+            rawAccountsNotifications.map(async (accountNotifications) => {
               return {
                 hostname: accountNotifications.hostname,
-                notifications: await Promise.all<Notification>(
+                notifications: await Promise.all<GitifyNotification>(
                   accountNotifications.notifications.map(
                     async (notification: Notification) => {
-                      if (!settings.detailedNotifications) {
-                        return notification;
-                      }
-
-                      const token = getTokenForHost(
-                        notification.hostname,
-                        accounts,
+                      return mapToGitifyNotification(
+                        notification,
+                        getTokenForHost(
+                          accountNotifications.hostname,
+                          accounts,
+                        ),
+                        settings,
                       );
-
-                      const additionalSubjectDetails =
-                        await getGitifySubjectDetails(notification, token);
-
-                      return {
-                        ...notification,
-                        subject: {
-                          ...notification.subject,
-                          ...additionalSubjectDetails,
-                        },
-                      };
                     },
                   ),
-                ).then((notifications) => {
-                  return notifications.filter((notification) => {
-                    if (
-                      !settings.showBots &&
-                      notification.subject?.user?.type === 'Bot'
-                    ) {
-                      return false;
-                    }
-
-                    return true;
-                  });
-                }),
+                ),
               };
             }),
           ).then((parsedNotifications) => {
@@ -379,11 +360,15 @@ async function mapToGitifyNotification(
         addSuffix: true,
       }),
     },
-    url: notification.subject.html_url ?? notification.repository.html_url,
+    // TODO - this may need to change
+    html_url: notification.subject.html_url ?? notification.repository.html_url,
     repository: {
       full_name: notification.repository.full_name,
       html_url: notification.repository.html_url,
       avatar_url: notification.repository.owner.avatar_url,
+      owner: {
+        avatar_url: notification.repository.owner.avatar_url,
+      },
     },
     state: notification.subject?.state,
     user: notification.subject?.user,
diff --git a/src/routes/LoginEnterprise.test.tsx b/src/routes/LoginEnterprise.test.tsx
index fbacb1dda..27cc345fc 100644
--- a/src/routes/LoginEnterprise.test.tsx
+++ b/src/routes/LoginEnterprise.test.tsx
@@ -2,7 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import * as TestRenderer from 'react-test-renderer';
 const { ipcRenderer } = require('electron');
-import { mockedEnterpriseAccounts } from '../__mocks__/mockedData';
+import { mockedEnterpriseAccounts } from '../__mocks__/mock-gitify';
 import { AppContext } from '../context/App';
 import type { AuthState } from '../types';
 import { LoginEnterpriseRoute, validate } from './LoginEnterprise';
diff --git a/src/routes/Notifications.test.tsx b/src/routes/Notifications.test.tsx
index 155a274be..b65aa96e3 100644
--- a/src/routes/Notifications.test.tsx
+++ b/src/routes/Notifications.test.tsx
@@ -1,7 +1,7 @@
 import TestRenderer from 'react-test-renderer';
 
+import { mockedAccountNotifications } from '../__mocks__/mock-gitify';
 import { mockSettings } from '../__mocks__/mock-state';
-import { mockedAccountNotifications } from '../__mocks__/mockedData';
 import { AppContext } from '../context/App';
 import { Errors } from '../utils/constants';
 import { NotificationsRoute } from './Notifications';
diff --git a/src/types.ts b/src/types.ts
index 08901a389..0203fa860 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -83,7 +83,7 @@ export interface GitifyNotification {
   };
   title: string;
   type: string;
-  url: string;
+  html_url: string;
   unread: boolean;
   reason: {
     code: Reason;
@@ -100,6 +100,9 @@ export interface GitifyNotification {
     full_name: string;
     avatar_url: string;
     html_url: string;
+    owner: {
+      avatar_url: string;
+    };
   };
 }
 
diff --git a/src/utils/helpers.test.ts b/src/utils/helpers.test.ts
index 54a1909a2..dd946454b 100644
--- a/src/utils/helpers.test.ts
+++ b/src/utils/helpers.test.ts
@@ -1,10 +1,10 @@
 import type { AxiosPromise, AxiosResponse } from 'axios';
-import { mockAccounts } from '../__mocks__/mock-state';
 import {
   mockedGraphQLResponse,
   mockedSingleNotification,
-  mockedUser,
-} from '../__mocks__/mockedData';
+} from '../__mocks__/mock-github';
+import { mockedUser } from '../__mocks__/mock-gitify';
+import { mockAccounts } from '../__mocks__/mock-state';
 import type { SubjectType } from '../typesGitHub';
 import * as apiRequests from './api/request';
 import {
diff --git a/src/utils/notifications.test.ts b/src/utils/notifications.test.ts
index d6c408db6..66e962bd0 100644
--- a/src/utils/notifications.test.ts
+++ b/src/utils/notifications.test.ts
@@ -1,11 +1,11 @@
 import { ipcRenderer } from 'electron';
 
-import { mockAccounts } from '../__mocks__/mock-state';
 import {
   mockedAccountNotifications,
   mockedGitHubNotifications,
   mockedSingleAccountNotifications,
-} from '../__mocks__/mockedData';
+} from '../__mocks__/mock-gitify';
+import { mockAccounts } from '../__mocks__/mock-state';
 import { defaultSettings } from '../context/App';
 import type { SettingsState } from '../types';
 import * as helpers from './helpers';
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 41301acfb..fdc5e3567 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -90,7 +90,9 @@ export const raiseNativeNotification = (
   nativeNotification.onclick = () => {
     if (notifications.length === 1) {
       ipcRenderer.send('hide-window');
-      openExternalLink(notifications[0].url);
+      // TODO - this might need to fetch the html url, too
+
+      openExternalLink(notifications[0].html_url);
     } else {
       ipcRenderer.send('reopen-window');
     }
diff --git a/src/utils/remove-notification.test.ts b/src/utils/remove-notification.test.ts
index dfbf8a8a9..4f1ad34a9 100644
--- a/src/utils/remove-notification.test.ts
+++ b/src/utils/remove-notification.test.ts
@@ -1,7 +1,7 @@
 import {
   mockedSingleAccountNotifications,
   mockedSingleNotification,
-} from '../__mocks__/mockedData';
+} from '../__mocks__/mock-gitify';
 import { removeNotification } from './remove-notification';
 
 describe('utils/remove-notification.ts', () => {
diff --git a/src/utils/remove-notifications.test.ts b/src/utils/remove-notifications.test.ts
index 0ec62a900..94a5857d7 100644
--- a/src/utils/remove-notifications.test.ts
+++ b/src/utils/remove-notifications.test.ts
@@ -2,7 +2,7 @@ import {
   mockedAccountNotifications,
   mockedSingleAccountNotifications,
   mockedSingleNotification,
-} from '../__mocks__/mockedData';
+} from '../__mocks__/mock-gitify';
 import { removeNotifications } from './remove-notifications';
 
 describe('utils/remove-notifications.ts', () => {

From 059dafb604c4d323ef5bd096453c6c55303374fb Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 1 May 2024 06:35:57 -1000
Subject: [PATCH 6/7] refactor: update mocks

---
 src/__mocks__/mock-github.ts | 139 +++++++++++++++--------------------
 src/__mocks__/mock-gitify.ts |  90 ++++++++++++-----------
 src/utils/helpers.test.ts    |  42 +++++------
 3 files changed, 127 insertions(+), 144 deletions(-)

diff --git a/src/__mocks__/mock-github.ts b/src/__mocks__/mock-github.ts
index 7638d8b14..fc0446444 100644
--- a/src/__mocks__/mock-github.ts
+++ b/src/__mocks__/mock-github.ts
@@ -28,29 +28,7 @@ export const mockedNotificationUser: User = {
   site_admin: false,
 };
 
-export const mockedCommenterUser: User = {
-  login: 'dummyuser',
-  id: 987654321,
-  node_id: 'MDQ6VXNlcjI=',
-  avatar_url: 'https://avatars.githubusercontent.com/u/123456789?v=4',
-  gravatar_url: '',
-  url: 'https://api.github.com/users/dummyuser',
-  html_url: 'https://github.com/dummyuser',
-  followers_url: 'https://api.github.com/users/dummyuser/followers',
-  following_url:
-    'https://api.github.com/users/dummyuser/following{/other_user}',
-  gists_url: 'https://api.github.com/users/dummyuser/gists{/gist_id}',
-  starred_url: 'https://api.github.com/users/dummyuser/starred{/owner}{/repo}',
-  subscriptions_url: 'https://api.github.com/users/dummyuser/subscriptions',
-  organizations_url: 'https://api.github.com/users/dummyuser/orgs',
-  repos_url: 'https://api.github.com/users/dummyuser/repos',
-  events_url: 'https://api.github.com/users/dummyuser/events{/privacy}',
-  received_events_url: 'https://api.github.com/users/dummyuser/received_events',
-  type: 'User',
-  site_admin: false,
-};
-
-export const mockedSingleNotification: Notification = {
+export const mockedNotificationResponse: Notification = {
   hostname: Constants.GITHUB_API_BASE_URL,
   id: '138661096',
   unread: true,
@@ -59,15 +37,15 @@ export const mockedSingleNotification: Notification = {
   last_read_at: '2017-05-20T17:06:51Z',
   subject: {
     title: 'I am a robot and this is a test!',
-    url: 'https://api.github.com/repos/manosim/notifications-test/issues/1',
+    url: 'https://api.github.com/repos/gitify-app/notifications-test/issues/1',
     latest_comment_url:
-      'https://api.github.com/repos/manosim/notifications-test/issues/comments/302888448',
+      'https://api.github.com/repos/gitify-app/notifications-test/issues/comments/302888448',
     type: 'Issue',
     state: 'open',
     user: {
-      login: 'manosim',
-      html_url: 'https://github.com/manosim',
-      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      login: 'gitify-app',
+      html_url: 'https://github.com/gitify-app',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
       type: 'User',
     },
   },
@@ -75,28 +53,29 @@ export const mockedSingleNotification: Notification = {
     id: 57216596,
     node_id: 'MDEwOlJlcG9zaXRvcnkzNjAyOTcwNg==',
     name: 'notifications-test',
-    full_name: 'manosim/notifications-test',
-    url: 'https://api.github.com/manosim/notifications-test',
+    full_name: 'gitify-app/notifications-test',
+    url: 'https://api.github.com/gitify-app/notifications-test',
     owner: {
-      login: 'manosim',
+      login: 'gitify-app',
       id: 6333409,
       node_id: 'MDQ6VXNlcjYzMzM0MDk=',
-      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
       gravatar_id: '',
-      url: 'https://api.github.com/users/manosim',
-      html_url: 'https://github.com/manosim',
-      followers_url: 'https://api.github.com/users/manosim/followers',
+      url: 'https://api.github.com/users/gitify-app',
+      html_url: 'https://github.com/gitify-app',
+      followers_url: 'https://api.github.com/users/gitify-app/followers',
       following_url:
-        'https://api.github.com/users/manosim/following{/other_user}',
-      gists_url: 'https://api.github.com/users/manosim/gists{/gist_id}',
+        'https://api.github.com/users/gitify-app/following{/other_user}',
+      gists_url: 'https://api.github.com/users/gitify-app/gists{/gist_id}',
       starred_url:
-        'https://api.github.com/users/manosim/starred{/owner}{/repo}',
-      subscriptions_url: 'https://api.github.com/users/manosim/subscriptions',
-      organizations_url: 'https://api.github.com/users/manosim/orgs',
-      repos_url: 'https://api.github.com/users/manosim/repos',
-      events_url: 'https://api.github.com/users/manosim/events{/privacy}',
+        'https://api.github.com/users/gitify-app/starred{/owner}{/repo}',
+      subscriptions_url:
+        'https://api.github.com/users/gitify-app/subscriptions',
+      organizations_url: 'https://api.github.com/users/gitify-app/orgs',
+      repos_url: 'https://api.github.com/users/gitify-app/repos',
+      events_url: 'https://api.github.com/users/gitify-app/events{/privacy}',
       received_events_url:
-        'https://api.github.com/users/manosim/received_events',
+        'https://api.github.com/users/gitify-app/received_events',
       type: 'User',
       site_admin: false,
     },
@@ -104,74 +83,76 @@ export const mockedSingleNotification: Notification = {
     description: 'Test Repository',
     fork: false,
     archive_url:
-      'https://api.github.com/repos/manosim/notifications-test/{archive_format}{/ref}',
+      'https://api.github.com/repos/gitify-app/notifications-test/{archive_format}{/ref}',
     assignees_url:
-      'https://api.github.com/repos/manosim/notifications-test/assignees{/user}',
+      'https://api.github.com/repos/gitify-app/notifications-test/assignees{/user}',
     blobs_url:
-      'https://api.github.com/repos/manosim/notifications-test/git/blobs{/sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/git/blobs{/sha}',
     branches_url:
-      'https://api.github.com/repos/manosim/notifications-test/branches{/branch}',
+      'https://api.github.com/repos/gitify-app/notifications-test/branches{/branch}',
     collaborators_url:
-      'https://api.github.com/repos/manosim/notifications-test/collaborators{/collaborator}',
+      'https://api.github.com/repos/gitify-app/notifications-test/collaborators{/collaborator}',
     comments_url:
-      'https://api.github.com/repos/manosim/notifications-test/comments{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/comments{/number}',
     commits_url:
-      'https://api.github.com/repos/manosim/notifications-test/commits{/sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/commits{/sha}',
     compare_url:
-      'https://api.github.com/repos/manosim/notifications-test/compare/{base}...{head}',
+      'https://api.github.com/repos/gitify-app/notifications-test/compare/{base}...{head}',
     contents_url:
-      'https://api.github.com/repos/manosim/notifications-test/contents/{+path}',
+      'https://api.github.com/repos/gitify-app/notifications-test/contents/{+path}',
     contributors_url:
-      'https://api.github.com/repos/manosim/notifications-test/contributors',
+      'https://api.github.com/repos/gitify-app/notifications-test/contributors',
     deployments_url:
-      'https://api.github.com/repos/manosim/notifications-test/deployments',
+      'https://api.github.com/repos/gitify-app/notifications-test/deployments',
     downloads_url:
-      'https://api.github.com/repos/manosim/notifications-test/downloads',
+      'https://api.github.com/repos/gitify-app/notifications-test/downloads',
     events_url:
-      'https://api.github.com/repos/manosim/notifications-test/events',
+      'https://api.github.com/repos/gitify-app/notifications-test/events',
     forks_url: 'https://api.github.com/repos/manosim/notifications-test/forks',
     git_commits_url:
-      'https://api.github.com/repos/manosim/notifications-test/git/commits{/sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/git/commits{/sha}',
     git_refs_url:
-      'https://api.github.com/repos/manosim/notifications-test/git/refs{/sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/git/refs{/sha}',
     git_tags_url:
-      'https://api.github.com/repos/manosim/notifications-test/git/tags{/sha}',
-    hooks_url: 'https://api.github.com/repos/manosim/notifications-test/hooks',
-    html_url: 'https://github.com/manosim/notifications-test',
+      'https://api.github.com/repos/gitify-app/notifications-test/git/tags{/sha}',
+    hooks_url:
+      'https://api.github.com/repos/gitify-app/notifications-test/hooks',
+    html_url: 'https://github.com/gitify-app/notifications-test',
     issue_comment_url:
-      'https://api.github.com/repos/manosim/notifications-test/issues/comments{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/issues/comments{/number}',
     issue_events_url:
-      'https://api.github.com/repos/manosim/notifications-test/issues/events{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/issues/events{/number}',
     issues_url:
-      'https://api.github.com/repos/manosim/notifications-test/issues{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/issues{/number}',
     keys_url:
-      'https://api.github.com/repos/manosim/notifications-test/keys{/key_id}',
+      'https://api.github.com/repos/gitify-app/notifications-test/keys{/key_id}',
     labels_url:
-      'https://api.github.com/repos/manosim/notifications-test/labels{/name}',
+      'https://api.github.com/repos/gitify-app/notifications-test/labels{/name}',
     languages_url:
-      'https://api.github.com/repos/manosim/notifications-test/languages',
+      'https://api.github.com/repos/gitify-app/notifications-test/languages',
     merges_url:
-      'https://api.github.com/repos/manosim/notifications-test/merges',
+      'https://api.github.com/repos/gitify-app/notifications-test/merges',
     milestones_url:
-      'https://api.github.com/repos/manosim/notifications-test/milestones{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/milestones{/number}',
     notifications_url:
-      'https://api.github.com/repos/manosim/notifications-test/notifications{?since,all,participating}',
+      'https://api.github.com/repos/gitify-app/notifications-test/notifications{?since,all,participating}',
     pulls_url:
-      'https://api.github.com/repos/manosim/notifications-test/pulls{/number}',
+      'https://api.github.com/repos/gitify-app/notifications-test/pulls{/number}',
     releases_url:
-      'https://api.github.com/repos/manosim/notifications-test/releases{/id}',
+      'https://api.github.com/repos/gitify-app/notifications-test/releases{/id}',
     stargazers_url:
-      'https://api.github.com/repos/manosim/notifications-test/stargazers',
+      'https://api.github.com/repos/gitify-app/notifications-test/stargazers',
     statuses_url:
-      'https://api.github.com/repos/manosim/notifications-test/statuses/{sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/statuses/{sha}',
     subscribers_url:
-      'https://api.github.com/repos/manosim/notifications-test/subscribers',
+      'https://api.github.com/repos/gitify-app/notifications-test/subscribers',
     subscription_url:
-      'https://api.github.com/repos/manosim/notifications-test/subscription',
-    tags_url: 'https://api.github.com/repos/manosim/notifications-test/tags',
-    teams_url: 'https://api.github.com/repos/manosim/notifications-test/teams',
+      'https://api.github.com/repos/gitify-app/notifications-test/subscription',
+    tags_url: 'https://api.github.com/repos/gitify-app/notifications-test/tags',
+    teams_url:
+      'https://api.github.com/repos/gitify-app/notifications-test/teams',
     trees_url:
-      'https://api.github.com/repos/manosim/notifications-test/git/trees{/sha}',
+      'https://api.github.com/repos/gitify-app/notifications-test/git/trees{/sha}',
   },
   url: 'https://api.github.com/notifications/threads/138661096',
   subscription_url:
diff --git a/src/__mocks__/mock-gitify.ts b/src/__mocks__/mock-gitify.ts
index 0095990e4..c8705e606 100644
--- a/src/__mocks__/mock-gitify.ts
+++ b/src/__mocks__/mock-gitify.ts
@@ -1,4 +1,9 @@
-import { GitMergeIcon, IssueOpenedIcon } from '@primer/octicons-react';
+import {
+  GitMergeIcon,
+  GitPullRequestIcon,
+  IssueOpenedIcon,
+  TagIcon,
+} from '@primer/octicons-react';
 import {
   type AccountNotifications,
   type EnterpriseAccount,
@@ -24,7 +29,7 @@ export const mockedUser: GitifyUser = {
 export const mockedGitHubNotifications: GitifyNotification[] = [
   {
     hostname: Constants.GITHUB_API_BASE_URL,
-    id: '138661096',
+    id: '1',
     unread: true,
     reason: {
       type: 'subscribed',
@@ -32,8 +37,8 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
       description: 'You are subscribed to this thread',
     },
     updated_at: {
-      raw: '2017-05-20T17:51:57Z',
-      formatted: 'May 20th, 2017',
+      raw: '2024-05-01T10:00:00Z',
+      formatted: 'May 1st, 2024',
     },
     title: 'I am a robot and this is a test!',
     html_url:
@@ -47,7 +52,7 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
     user: {
       login: 'mockUser',
       html_url: 'https://github.com/mockUser',
-      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
       type: 'User',
     },
     repository: {
@@ -62,7 +67,7 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
   },
   {
     hostname: Constants.GITHUB_API_BASE_URL,
-    id: '148827438',
+    id: '2',
     unread: true,
     reason: {
       type: 'author',
@@ -70,12 +75,12 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
       description: 'You created this thread',
     },
     updated_at: {
-      raw: '2017-05-20T17:06:34Z',
-      formatted: 'May 20th, 2017',
+      raw: '2024-05-01T10:00:00Z',
+      formatted: 'May 1st, 2024',
     },
     title: 'Improve the UI',
     type: 'Pull Request',
-    html_url: 'https://github.com/repos/gitify-app/notifications-test/pulls/4',
+    html_url: 'https://github.com/repos/gitify-app/notifications-test/pulls/2',
     state: 'merged',
     icon: {
       type: GitMergeIcon,
@@ -84,7 +89,7 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
     user: {
       login: 'mockUser',
       html_url: 'https://github.com/mockUser',
-      avatar_url: 'https://avatars0.githubusercontent.com/u/6333409?v=3',
+      avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
       type: 'User',
     },
     repository: {
@@ -99,11 +104,10 @@ export const mockedGitHubNotifications: GitifyNotification[] = [
   },
 ];
 
-// TODO - Update the mock data to be accurate
 export const mockedEnterpriseNotifications: GitifyNotification[] = [
   {
-    hostname: Constants.GITHUB_API_BASE_URL,
-    id: '138661096',
+    hostname: 'https://github.gitify.io/api/v3',
+    id: '3',
     unread: true,
     reason: {
       type: 'subscribed',
@@ -111,17 +115,17 @@ export const mockedEnterpriseNotifications: GitifyNotification[] = [
       description: 'You are subscribed to this thread',
     },
     updated_at: {
-      raw: '2017-05-20T17:51:57Z',
-      formatted: 'May 20th, 2017',
+      raw: '2024-05-01T10:00:00Z',
+      formatted: 'May 1st, 2024',
     },
-    title: 'I am a robot and this is a test!',
+    title: 'Release 0.0.1',
     html_url:
-      'https://api.github.com/repos/gitify-app/notifications-test/issues/1',
-    type: 'Issue',
-    state: 'open',
+      'https://github.gitify.io/repos/myorg/notifications-test/releases/3',
+    type: 'Release',
+    state: null,
     icon: {
-      type: IssueOpenedIcon,
-      color: IconColor.GREEN,
+      type: TagIcon,
+      color: IconColor.GRAY,
     },
     user: {
       login: 'mockUser',
@@ -130,35 +134,34 @@ export const mockedEnterpriseNotifications: GitifyNotification[] = [
       type: 'User',
     },
     repository: {
-      full_name: 'gitify-app/notifications-test',
-      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
-      html_url: 'https://github.com/gitify-app/notifications-test',
+      full_name: 'myorg/notifications-test',
+      avatar_url: 'https://github.gitify.io/avatars/u/4?',
+      html_url: 'https://github.gitify.io/myorg/notifications-test',
       owner: {
-        avatar_url:
-          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+        avatar_url: 'https://github.gitify.io/avatars/u/4?',
       },
     },
   },
   {
-    hostname: Constants.GITHUB_API_BASE_URL,
-    id: '148827438',
+    hostname: 'https://github.gitify.io/api/v3',
+    id: '4',
     unread: true,
     reason: {
-      type: 'author',
-      code: 'author',
-      description: 'You created this thread',
+      type: 'subscribed',
+      code: 'subscribed',
+      description: 'You are subscribed to this thread',
     },
     updated_at: {
-      raw: '2017-05-20T17:06:34Z',
-      formatted: 'May 20th, 2017',
+      raw: '2024-05-01T10:00:00Z',
+      formatted: 'May 1st, 2024',
     },
-    title: 'Improve the UI',
-    type: 'Pull Request',
-    html_url: 'https://github.com/repos/gitify-app/notifications-test/pulls/4',
-    state: 'merged',
+    title: 'Bump version',
+    html_url: 'https://github.gitify.io/repos/myorg/notifications-test/pulls/4',
+    type: 'PullRequest',
+    state: 'open',
     icon: {
-      type: GitMergeIcon,
-      color: IconColor.PURPLE,
+      type: GitPullRequestIcon,
+      color: IconColor.GREEN,
     },
     user: {
       login: 'mockUser',
@@ -167,12 +170,11 @@ export const mockedEnterpriseNotifications: GitifyNotification[] = [
       type: 'User',
     },
     repository: {
-      full_name: 'gitify-app/notifications-test',
-      avatar_url: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
-      html_url: 'https://github.com/gitify-app/notifications-test',
+      full_name: 'myorg/notifications-test',
+      avatar_url: 'https://github.gitify.io/avatars/u/4?',
+      html_url: 'https://github.gitify.io/myorg/notifications-test',
       owner: {
-        avatar_url:
-          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4',
+        avatar_url: 'https://github.gitify.io/avatars/u/4?',
       },
     },
   },
diff --git a/src/utils/helpers.test.ts b/src/utils/helpers.test.ts
index dd946454b..62bd4b72a 100644
--- a/src/utils/helpers.test.ts
+++ b/src/utils/helpers.test.ts
@@ -1,7 +1,7 @@
 import type { AxiosPromise, AxiosResponse } from 'axios';
 import {
   mockedGraphQLResponse,
-  mockedSingleNotification,
+  mockedNotificationResponse,
 } from '../__mocks__/mock-github';
 import { mockedUser } from '../__mocks__/mock-gitify';
 import { mockAccounts } from '../__mocks__/mock-state';
@@ -81,7 +81,7 @@ describe('utils/helpers.ts', () => {
   describe('generateNotificationReferrerId', () => {
     it('should generate the notification_referrer_id', () => {
       const referrerId = generateNotificationReferrerId(
-        mockedSingleNotification.id,
+        mockedNotificationResponse.id,
         mockedUser.id,
       );
       expect(referrerId).toBe(
@@ -160,7 +160,7 @@ describe('utils/helpers.ts', () => {
 
       const result = await generateGitHubWebUrl(
         {
-          ...mockedSingleNotification,
+          ...mockedNotificationResponse,
           subject: subject,
         },
         mockAccounts,
@@ -195,7 +195,7 @@ describe('utils/helpers.ts', () => {
 
       const result = await generateGitHubWebUrl(
         {
-          ...mockedSingleNotification,
+          ...mockedNotificationResponse,
           subject: subject,
         },
         mockAccounts,
@@ -221,7 +221,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -243,7 +243,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -265,7 +265,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -287,7 +287,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -309,7 +309,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -331,7 +331,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -353,7 +353,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -385,7 +385,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -393,7 +393,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
         expect(result).toBe(
-          `${mockedSingleNotification.repository.html_url}/discussions?${mockedNotificationReferrer}`,
+          `${mockedNotificationResponse.repository.html_url}/discussions?${mockedNotificationReferrer}`,
         );
       });
 
@@ -413,7 +413,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -441,7 +441,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -464,7 +464,7 @@ describe('utils/helpers.ts', () => {
 
       const result = await generateGitHubWebUrl(
         {
-          ...mockedSingleNotification,
+          ...mockedNotificationResponse,
           subject: subject,
         },
         mockAccounts,
@@ -487,7 +487,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -510,7 +510,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -532,7 +532,7 @@ describe('utils/helpers.ts', () => {
 
         const result = await generateGitHubWebUrl(
           {
-            ...mockedSingleNotification,
+            ...mockedNotificationResponse,
             subject: subject,
           },
           mockAccounts,
@@ -555,7 +555,7 @@ describe('utils/helpers.ts', () => {
 
       const result = await generateGitHubWebUrl(
         {
-          ...mockedSingleNotification,
+          ...mockedNotificationResponse,
           subject: subject,
         },
         mockAccounts,
@@ -563,7 +563,7 @@ describe('utils/helpers.ts', () => {
 
       expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
       expect(result).toBe(
-        `${mockedSingleNotification.repository.html_url}?${mockedNotificationReferrer}`,
+        `${mockedNotificationResponse.repository.html_url}?${mockedNotificationReferrer}`,
       );
     });
 

From e307821e838bba6076f593cdd41f34311ae27806 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 1 May 2024 06:44:58 -1000
Subject: [PATCH 7/7] refactor: update tests

---
 src/components/Repository.test.tsx            |   6 +-
 .../NotificationRow.test.tsx.snap             |  22 +-
 .../__snapshots__/Repository.test.tsx.snap    |  34 +-
 .../__snapshots__/Notifications.test.tsx.snap | 485 +++++++-----------
 src/utils/helpers.test.ts                     |  29 +-
 5 files changed, 220 insertions(+), 356 deletions(-)

diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
index 8a5453c4f..23952b60d 100644
--- a/src/components/Repository.test.tsx
+++ b/src/components/Repository.test.tsx
@@ -45,7 +45,7 @@ describe('components/Repository.tsx', () => {
 
     expect(shell.openExternal).toHaveBeenCalledTimes(1);
     expect(shell.openExternal).toHaveBeenCalledWith(
-      'https://github.com/manosim/notifications-test',
+      'https://github.com/gitify-app/notifications-test',
     );
   });
 
@@ -59,7 +59,7 @@ describe('components/Repository.tsx', () => {
     fireEvent.click(screen.getByTitle('Mark Repository as Read'));
 
     expect(markRepoNotifications).toHaveBeenCalledWith(
-      'manosim/notifications-test',
+      'gitify-app/notifications-test',
       'github.com',
     );
   });
@@ -74,7 +74,7 @@ describe('components/Repository.tsx', () => {
     fireEvent.click(screen.getByTitle('Mark Repository as Done'));
 
     expect(markRepoNotificationsDone).toHaveBeenCalledWith(
-      'manosim/notifications-test',
+      'gitify-app/notifications-test',
       'github.com',
     );
   });
diff --git a/src/components/__snapshots__/NotificationRow.test.tsx.snap b/src/components/__snapshots__/NotificationRow.test.tsx.snap
index b27ecc8fb..8ead9a006 100644
--- a/src/components/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/components/__snapshots__/NotificationRow.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
       >
         <span
           className="flex"
-          title="manosim updated over 6 years ago"
+          title="mockUser updated May 1st, 2024"
         >
           <span
             onClick={[Function]}
@@ -62,22 +62,22 @@ exports[`components/NotificationRow.tsx should render itself & its children 1`]
             title="View User Profile"
           >
             <img
-              alt="manosim's avatar"
+              alt="mockUser's avatar"
               className="rounded-full w-4 h-4 cursor-pointer"
-              src="https://avatars0.githubusercontent.com/u/6333409?v=3"
-              title="manosim"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              title="mockUser"
             />
           </span>
           <span
             className="ml-1"
-            title="You're watching the repository."
+            title="You are subscribed to this thread"
           >
-            Updated
+            subscribed
           </span>
           <span
             className="ml-1"
           >
-            over 6 years ago
+            May 1st, 2024
           </span>
         </span>
       </span>
@@ -231,7 +231,7 @@ exports[`components/NotificationRow.tsx should render itself & its children with
       >
         <span
           className="flex"
-          title="Updated over 6 years ago"
+          title="Updated May 1st, 2024"
         >
           <span>
             <svg
@@ -258,14 +258,14 @@ exports[`components/NotificationRow.tsx should render itself & its children with
           </span>
           <span
             className="ml-1"
-            title="You're watching the repository."
+            title="You are subscribed to this thread"
           >
-            Updated
+            subscribed
           </span>
           <span
             className="ml-1"
           >
-            over 6 years ago
+            May 1st, 2024
           </span>
         </span>
       </span>
diff --git a/src/components/__snapshots__/Repository.test.tsx.snap b/src/components/__snapshots__/Repository.test.tsx.snap
index 557a6c18b..71e2a38ef 100644
--- a/src/components/__snapshots__/Repository.test.tsx.snap
+++ b/src/components/__snapshots__/Repository.test.tsx.snap
@@ -9,16 +9,16 @@ exports[`components/Repository.tsx should render itself & its children 1`] = `
       className="flex flex-1 space-x-3 items-center mt-0 text-sm font-medium overflow-hidden overflow-ellipsis whitespace-nowrap"
     >
       <img
-        alt="manosim/notifications-test's avatar"
+        alt="gitify-app/notifications-test's avatar"
         className="rounded w-5 h-5"
-        src="https://avatars0.githubusercontent.com/u/6333409?v=3"
+        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
       />
       <span
         className="cursor-pointer"
         onClick={[Function]}
         onKeyDown={[Function]}
       >
-        manosim/gitify
+        gitify-app/gitify
       </span>
     </div>
     <div
@@ -106,33 +106,17 @@ exports[`components/Repository.tsx should use default repository icon when avata
     <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}
-        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>
+      <img
+        alt="gitify-app/notifications-test's avatar"
+        className="rounded w-5 h-5"
+        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+      />
       <span
         className="cursor-pointer"
         onClick={[Function]}
         onKeyDown={[Function]}
       >
-        manosim/gitify
+        gitify-app/gitify
       </span>
     </div>
     <div
diff --git a/src/routes/__snapshots__/Notifications.test.tsx.snap b/src/routes/__snapshots__/Notifications.test.tsx.snap
index 1b3221cef..07581651d 100644
--- a/src/routes/__snapshots__/Notifications.test.tsx.snap
+++ b/src/routes/__snapshots__/Notifications.test.tsx.snap
@@ -100,137 +100,81 @@ exports[`routes/Notifications.tsx should render itself & its children (show acco
       [
         {
           "hostname": "https://api.github.com",
-          "id": "138661096",
-          "last_read_at": "2017-05-20T17:06:51Z",
-          "reason": "subscribed",
-          "repository": {
-            "archive_url": "https://api.github.com/repos/manosim/notifications-test/{archive_format}{/ref}",
-            "assignees_url": "https://api.github.com/repos/manosim/notifications-test/assignees{/user}",
-            "blobs_url": "https://api.github.com/repos/manosim/notifications-test/git/blobs{/sha}",
-            "branches_url": "https://api.github.com/repos/manosim/notifications-test/branches{/branch}",
-            "collaborators_url": "https://api.github.com/repos/manosim/notifications-test/collaborators{/collaborator}",
-            "comments_url": "https://api.github.com/repos/manosim/notifications-test/comments{/number}",
-            "commits_url": "https://api.github.com/repos/manosim/notifications-test/commits{/sha}",
-            "compare_url": "https://api.github.com/repos/manosim/notifications-test/compare/{base}...{head}",
-            "contents_url": "https://api.github.com/repos/manosim/notifications-test/contents/{+path}",
-            "contributors_url": "https://api.github.com/repos/manosim/notifications-test/contributors",
-            "deployments_url": "https://api.github.com/repos/manosim/notifications-test/deployments",
-            "description": "Test Repository",
-            "downloads_url": "https://api.github.com/repos/manosim/notifications-test/downloads",
-            "events_url": "https://api.github.com/repos/manosim/notifications-test/events",
-            "fork": false,
-            "forks_url": "https://api.github.com/repos/manosim/notifications-test/forks",
-            "full_name": "manosim/notifications-test",
-            "git_commits_url": "https://api.github.com/repos/manosim/notifications-test/git/commits{/sha}",
-            "git_refs_url": "https://api.github.com/repos/manosim/notifications-test/git/refs{/sha}",
-            "git_tags_url": "https://api.github.com/repos/manosim/notifications-test/git/tags{/sha}",
-            "hooks_url": "https://api.github.com/repos/manosim/notifications-test/hooks",
-            "html_url": "https://github.com/manosim/notifications-test",
-            "id": 57216596,
-            "issue_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments{/number}",
-            "issue_events_url": "https://api.github.com/repos/manosim/notifications-test/issues/events{/number}",
-            "issues_url": "https://api.github.com/repos/manosim/notifications-test/issues{/number}",
-            "keys_url": "https://api.github.com/repos/manosim/notifications-test/keys{/key_id}",
-            "labels_url": "https://api.github.com/repos/manosim/notifications-test/labels{/name}",
-            "languages_url": "https://api.github.com/repos/manosim/notifications-test/languages",
-            "merges_url": "https://api.github.com/repos/manosim/notifications-test/merges",
-            "milestones_url": "https://api.github.com/repos/manosim/notifications-test/milestones{/number}",
-            "name": "notifications-test",
-            "node_id": "MDEwOlJlcG9zaXRvcnkzNjAyOTcwNg==",
-            "notifications_url": "https://api.github.com/repos/manosim/notifications-test/notifications{?since,all,participating}",
-            "owner": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "events_url": "https://api.github.com/users/manosim/events{/privacy}",
-              "followers_url": "https://api.github.com/users/manosim/followers",
-              "following_url": "https://api.github.com/users/manosim/following{/other_user}",
-              "gists_url": "https://api.github.com/users/manosim/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.com/manosim",
-              "id": 6333409,
-              "login": "manosim",
-              "node_id": "MDQ6VXNlcjYzMzM0MDk=",
-              "organizations_url": "https://api.github.com/users/manosim/orgs",
-              "received_events_url": "https://api.github.com/users/manosim/received_events",
-              "repos_url": "https://api.github.com/users/manosim/repos",
-              "site_admin": false,
-              "starred_url": "https://api.github.com/users/manosim/starred{/owner}{/repo}",
-              "subscriptions_url": "https://api.github.com/users/manosim/subscriptions",
-              "type": "User",
-              "url": "https://api.github.com/users/manosim",
+          "html_url": "https://api.github.com/repos/gitify-app/notifications-test/issues/1",
+          "icon": {
+            "color": "text-green-500",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
             },
-            "private": true,
-            "pulls_url": "https://api.github.com/repos/manosim/notifications-test/pulls{/number}",
-            "releases_url": "https://api.github.com/repos/manosim/notifications-test/releases{/id}",
-            "stargazers_url": "https://api.github.com/repos/manosim/notifications-test/stargazers",
-            "statuses_url": "https://api.github.com/repos/manosim/notifications-test/statuses/{sha}",
-            "subscribers_url": "https://api.github.com/repos/manosim/notifications-test/subscribers",
-            "subscription_url": "https://api.github.com/repos/manosim/notifications-test/subscription",
-            "tags_url": "https://api.github.com/repos/manosim/notifications-test/tags",
-            "teams_url": "https://api.github.com/repos/manosim/notifications-test/teams",
-            "trees_url": "https://api.github.com/repos/manosim/notifications-test/git/trees{/sha}",
-            "url": "https://api.github.com/manosim/notifications-test",
           },
-          "subject": {
-            "latest_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments/302888448",
-            "state": "open",
-            "title": "I am a robot and this is a test!",
-            "type": "Issue",
-            "url": "https://api.github.com/repos/manosim/notifications-test/issues/1",
-            "user": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "html_url": "https://github.com/manosim",
-              "login": "manosim",
-              "type": "User",
+          "id": "1",
+          "reason": {
+            "code": "subscribed",
+            "description": "You are subscribed to this thread",
+            "type": "subscribed",
+          },
+          "repository": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
+            "full_name": "gitify-app/notifications-test",
+            "html_url": "https://github.com/gitify-app/notifications-test",
+            "owner": {
+              "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
             },
           },
-          "subscription_url": "https://api.github.com/notifications/threads/138661096/subscription",
+          "state": "open",
+          "title": "I am a robot and this is a test!",
+          "type": "Issue",
           "unread": true,
-          "updated_at": "2017-05-20T17:51:57Z",
-          "url": "https://api.github.com/notifications/threads/138661096",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/583231?v=4",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
         {
           "hostname": "https://api.github.com",
-          "id": "148827438",
-          "last_read_at": "2017-05-20T16:59:03Z",
-          "reason": "author",
+          "html_url": "https://github.com/repos/gitify-app/notifications-test/pulls/2",
+          "icon": {
+            "color": "text-purple-500",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
+            },
+          },
+          "id": "2",
+          "reason": {
+            "code": "author",
+            "description": "You created this thread",
+            "type": "author",
+          },
           "repository": {
-            "description": null,
-            "fork": false,
-            "full_name": "manosim/notifications-test",
-            "html_url": "https://github.com/manosim/notifications-test",
-            "id": 57216596,
-            "name": "notifications-test",
+            "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
+            "full_name": "gitify-app/notifications-test",
+            "html_url": "https://github.com/gitify-app/notifications-test",
             "owner": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "events_url": "https://api.github.com/users/manosim/events{/privacy}",
-              "followers_url": "https://api.github.com/users/manosim/followers",
-              "following_url": "https://api.github.com/users/manosim/following{/other_user}",
-              "gists_url": "https://api.github.com/users/manosim/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.com/manosim",
-              "id": 6333409,
-              "login": "manosim",
-              "organizations_url": "https://api.github.com/users/manosim/orgs",
-              "received_events_url": "https://api.github.com/users/manosim/received_events",
-              "repos_url": "https://api.github.com/users/manosim/repos",
-              "site_admin": false,
-              "starred_url": "https://api.github.com/users/manosim/starred{/owner}{/repo}",
-              "subscriptions_url": "https://api.github.com/users/manosim/subscriptions",
-              "type": "User",
-              "url": "https://api.github.com/users/manosim",
+              "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
             },
-            "private": true,
-          },
-          "subject": {
-            "latest_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments/302885965",
-            "title": "Improve the UI",
-            "type": "Issue",
-            "url": "https://api.github.com/repos/manosim/notifications-test/issues/4",
           },
-          "subscription_url": "https://api.github.com/notifications/threads/148827438/subscription",
+          "state": "merged",
+          "title": "Improve the UI",
+          "type": "Pull Request",
           "unread": true,
-          "updated_at": "2017-05-20T17:06:34Z",
-          "url": "https://api.github.com/notifications/threads/148827438",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/583231?v=4",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
       ]
     }
@@ -249,137 +193,81 @@ exports[`routes/Notifications.tsx should render itself & its children (with noti
       [
         {
           "hostname": "https://api.github.com",
-          "id": "138661096",
-          "last_read_at": "2017-05-20T17:06:51Z",
-          "reason": "subscribed",
-          "repository": {
-            "archive_url": "https://api.github.com/repos/manosim/notifications-test/{archive_format}{/ref}",
-            "assignees_url": "https://api.github.com/repos/manosim/notifications-test/assignees{/user}",
-            "blobs_url": "https://api.github.com/repos/manosim/notifications-test/git/blobs{/sha}",
-            "branches_url": "https://api.github.com/repos/manosim/notifications-test/branches{/branch}",
-            "collaborators_url": "https://api.github.com/repos/manosim/notifications-test/collaborators{/collaborator}",
-            "comments_url": "https://api.github.com/repos/manosim/notifications-test/comments{/number}",
-            "commits_url": "https://api.github.com/repos/manosim/notifications-test/commits{/sha}",
-            "compare_url": "https://api.github.com/repos/manosim/notifications-test/compare/{base}...{head}",
-            "contents_url": "https://api.github.com/repos/manosim/notifications-test/contents/{+path}",
-            "contributors_url": "https://api.github.com/repos/manosim/notifications-test/contributors",
-            "deployments_url": "https://api.github.com/repos/manosim/notifications-test/deployments",
-            "description": "Test Repository",
-            "downloads_url": "https://api.github.com/repos/manosim/notifications-test/downloads",
-            "events_url": "https://api.github.com/repos/manosim/notifications-test/events",
-            "fork": false,
-            "forks_url": "https://api.github.com/repos/manosim/notifications-test/forks",
-            "full_name": "manosim/notifications-test",
-            "git_commits_url": "https://api.github.com/repos/manosim/notifications-test/git/commits{/sha}",
-            "git_refs_url": "https://api.github.com/repos/manosim/notifications-test/git/refs{/sha}",
-            "git_tags_url": "https://api.github.com/repos/manosim/notifications-test/git/tags{/sha}",
-            "hooks_url": "https://api.github.com/repos/manosim/notifications-test/hooks",
-            "html_url": "https://github.com/manosim/notifications-test",
-            "id": 57216596,
-            "issue_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments{/number}",
-            "issue_events_url": "https://api.github.com/repos/manosim/notifications-test/issues/events{/number}",
-            "issues_url": "https://api.github.com/repos/manosim/notifications-test/issues{/number}",
-            "keys_url": "https://api.github.com/repos/manosim/notifications-test/keys{/key_id}",
-            "labels_url": "https://api.github.com/repos/manosim/notifications-test/labels{/name}",
-            "languages_url": "https://api.github.com/repos/manosim/notifications-test/languages",
-            "merges_url": "https://api.github.com/repos/manosim/notifications-test/merges",
-            "milestones_url": "https://api.github.com/repos/manosim/notifications-test/milestones{/number}",
-            "name": "notifications-test",
-            "node_id": "MDEwOlJlcG9zaXRvcnkzNjAyOTcwNg==",
-            "notifications_url": "https://api.github.com/repos/manosim/notifications-test/notifications{?since,all,participating}",
-            "owner": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "events_url": "https://api.github.com/users/manosim/events{/privacy}",
-              "followers_url": "https://api.github.com/users/manosim/followers",
-              "following_url": "https://api.github.com/users/manosim/following{/other_user}",
-              "gists_url": "https://api.github.com/users/manosim/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.com/manosim",
-              "id": 6333409,
-              "login": "manosim",
-              "node_id": "MDQ6VXNlcjYzMzM0MDk=",
-              "organizations_url": "https://api.github.com/users/manosim/orgs",
-              "received_events_url": "https://api.github.com/users/manosim/received_events",
-              "repos_url": "https://api.github.com/users/manosim/repos",
-              "site_admin": false,
-              "starred_url": "https://api.github.com/users/manosim/starred{/owner}{/repo}",
-              "subscriptions_url": "https://api.github.com/users/manosim/subscriptions",
-              "type": "User",
-              "url": "https://api.github.com/users/manosim",
+          "html_url": "https://api.github.com/repos/gitify-app/notifications-test/issues/1",
+          "icon": {
+            "color": "text-green-500",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
             },
-            "private": true,
-            "pulls_url": "https://api.github.com/repos/manosim/notifications-test/pulls{/number}",
-            "releases_url": "https://api.github.com/repos/manosim/notifications-test/releases{/id}",
-            "stargazers_url": "https://api.github.com/repos/manosim/notifications-test/stargazers",
-            "statuses_url": "https://api.github.com/repos/manosim/notifications-test/statuses/{sha}",
-            "subscribers_url": "https://api.github.com/repos/manosim/notifications-test/subscribers",
-            "subscription_url": "https://api.github.com/repos/manosim/notifications-test/subscription",
-            "tags_url": "https://api.github.com/repos/manosim/notifications-test/tags",
-            "teams_url": "https://api.github.com/repos/manosim/notifications-test/teams",
-            "trees_url": "https://api.github.com/repos/manosim/notifications-test/git/trees{/sha}",
-            "url": "https://api.github.com/manosim/notifications-test",
           },
-          "subject": {
-            "latest_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments/302888448",
-            "state": "open",
-            "title": "I am a robot and this is a test!",
-            "type": "Issue",
-            "url": "https://api.github.com/repos/manosim/notifications-test/issues/1",
-            "user": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "html_url": "https://github.com/manosim",
-              "login": "manosim",
-              "type": "User",
+          "id": "1",
+          "reason": {
+            "code": "subscribed",
+            "description": "You are subscribed to this thread",
+            "type": "subscribed",
+          },
+          "repository": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
+            "full_name": "gitify-app/notifications-test",
+            "html_url": "https://github.com/gitify-app/notifications-test",
+            "owner": {
+              "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
             },
           },
-          "subscription_url": "https://api.github.com/notifications/threads/138661096/subscription",
+          "state": "open",
+          "title": "I am a robot and this is a test!",
+          "type": "Issue",
           "unread": true,
-          "updated_at": "2017-05-20T17:51:57Z",
-          "url": "https://api.github.com/notifications/threads/138661096",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/583231?v=4",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
         {
           "hostname": "https://api.github.com",
-          "id": "148827438",
-          "last_read_at": "2017-05-20T16:59:03Z",
-          "reason": "author",
+          "html_url": "https://github.com/repos/gitify-app/notifications-test/pulls/2",
+          "icon": {
+            "color": "text-purple-500",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
+            },
+          },
+          "id": "2",
+          "reason": {
+            "code": "author",
+            "description": "You created this thread",
+            "type": "author",
+          },
           "repository": {
-            "description": null,
-            "fork": false,
-            "full_name": "manosim/notifications-test",
-            "html_url": "https://github.com/manosim/notifications-test",
-            "id": 57216596,
-            "name": "notifications-test",
+            "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
+            "full_name": "gitify-app/notifications-test",
+            "html_url": "https://github.com/gitify-app/notifications-test",
             "owner": {
-              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
-              "events_url": "https://api.github.com/users/manosim/events{/privacy}",
-              "followers_url": "https://api.github.com/users/manosim/followers",
-              "following_url": "https://api.github.com/users/manosim/following{/other_user}",
-              "gists_url": "https://api.github.com/users/manosim/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.com/manosim",
-              "id": 6333409,
-              "login": "manosim",
-              "organizations_url": "https://api.github.com/users/manosim/orgs",
-              "received_events_url": "https://api.github.com/users/manosim/received_events",
-              "repos_url": "https://api.github.com/users/manosim/repos",
-              "site_admin": false,
-              "starred_url": "https://api.github.com/users/manosim/starred{/owner}{/repo}",
-              "subscriptions_url": "https://api.github.com/users/manosim/subscriptions",
-              "type": "User",
-              "url": "https://api.github.com/users/manosim",
+              "avatar_url": "https://avatars.githubusercontent.com/u/133795385?s=200&v=4",
             },
-            "private": true,
-          },
-          "subject": {
-            "latest_comment_url": "https://api.github.com/repos/manosim/notifications-test/issues/comments/302885965",
-            "title": "Improve the UI",
-            "type": "Issue",
-            "url": "https://api.github.com/repos/manosim/notifications-test/issues/4",
           },
-          "subscription_url": "https://api.github.com/notifications/threads/148827438/subscription",
+          "state": "merged",
+          "title": "Improve the UI",
+          "type": "Pull Request",
           "unread": true,
-          "updated_at": "2017-05-20T17:06:34Z",
-          "url": "https://api.github.com/notifications/threads/148827438",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars.githubusercontent.com/u/583231?v=4",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
       ]
     }
@@ -390,91 +278,82 @@ exports[`routes/Notifications.tsx should render itself & its children (with noti
     notifications={
       [
         {
-          "id": "4",
-          "last_read_at": null,
-          "reason": "subscribed",
+          "hostname": "https://github.gitify.io/api/v3",
+          "html_url": "https://github.gitify.io/repos/myorg/notifications-test/releases/3",
+          "icon": {
+            "color": "text-gray-500 dark:text-gray-300",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
+            },
+          },
+          "id": "3",
+          "reason": {
+            "code": "subscribed",
+            "description": "You are subscribed to this thread",
+            "type": "subscribed",
+          },
           "repository": {
-            "description": null,
-            "fork": false,
+            "avatar_url": "https://github.gitify.io/avatars/u/4?",
             "full_name": "myorg/notifications-test",
             "html_url": "https://github.gitify.io/myorg/notifications-test",
-            "id": 1,
-            "name": "notifications-test",
             "owner": {
               "avatar_url": "https://github.gitify.io/avatars/u/4?",
-              "events_url": "https://github.gitify.io/api/v3/users/myorg/events{/privacy}",
-              "followers_url": "https://github.gitify.io/api/v3/users/myorg/followers",
-              "following_url": "https://github.gitify.io/api/v3/users/myorg/following{/other_user}",
-              "gists_url": "https://github.gitify.io/api/v3/users/myorg/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.gitify.io/myorg",
-              "id": 4,
-              "login": "myorg",
-              "organizations_url": "https://github.gitify.io/api/v3/users/myorg/orgs",
-              "received_events_url": "https://github.gitify.io/api/v3/users/myorg/received_events",
-              "repos_url": "https://github.gitify.io/api/v3/users/myorg/repos",
-              "site_admin": false,
-              "starred_url": "https://github.gitify.io/api/v3/users/myorg/starred{/owner}{/repo}",
-              "subscriptions_url": "https://github.gitify.io/api/v3/users/myorg/subscriptions",
-              "type": "Organization",
-              "url": "https://github.gitify.io/api/v3/users/myorg",
             },
-            "private": true,
           },
-          "subject": {
-            "latest_comment_url": "https://github.gitify.io/api/v3/repos/myorg/notifications-test/releases/1",
-            "title": "Release 0.0.1",
-            "type": "Release",
-            "url": "https://github.gitify.io/api/v3/repos/myorg/notifications-test/releases/1",
-          },
-          "subscription_url": "https://github.gitify.io/api/v3/notifications/threads/4/subscription",
+          "state": null,
+          "title": "Release 0.0.1",
+          "type": "Release",
           "unread": true,
-          "updated_at": "2017-05-20T13:02:48Z",
-          "url": "https://github.gitify.io/api/v3/notifications/threads/4",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
         {
-          "hostname": "https://api.github.com",
-          "id": "3",
-          "last_read_at": "2017-05-20T14:20:55Z",
-          "reason": "subscribed",
+          "hostname": "https://github.gitify.io/api/v3",
+          "html_url": "https://github.gitify.io/repos/myorg/notifications-test/pulls/4",
+          "icon": {
+            "color": "text-green-500",
+            "type": {
+              "$$typeof": Symbol(react.forward_ref),
+              "render": [Function],
+            },
+          },
+          "id": "4",
+          "reason": {
+            "code": "subscribed",
+            "description": "You are subscribed to this thread",
+            "type": "subscribed",
+          },
           "repository": {
-            "description": null,
-            "fork": false,
+            "avatar_url": "https://github.gitify.io/avatars/u/4?",
             "full_name": "myorg/notifications-test",
             "html_url": "https://github.gitify.io/myorg/notifications-test",
-            "id": 1,
-            "name": "notifications-test",
             "owner": {
               "avatar_url": "https://github.gitify.io/avatars/u/4?",
-              "events_url": "https://github.gitify.io/api/v3/users/myorg/events{/privacy}",
-              "followers_url": "https://github.gitify.io/api/v3/users/myorg/followers",
-              "following_url": "https://github.gitify.io/api/v3/users/myorg/following{/other_user}",
-              "gists_url": "https://github.gitify.io/api/v3/users/myorg/gists{/gist_id}",
-              "gravatar_id": "",
-              "html_url": "https://github.gitify.io/myorg",
-              "id": 4,
-              "login": "myorg",
-              "organizations_url": "https://github.gitify.io/api/v3/users/myorg/orgs",
-              "received_events_url": "https://github.gitify.io/api/v3/users/myorg/received_events",
-              "repos_url": "https://github.gitify.io/api/v3/users/myorg/repos",
-              "site_admin": false,
-              "starred_url": "https://github.gitify.io/api/v3/users/myorg/starred{/owner}{/repo}",
-              "subscriptions_url": "https://github.gitify.io/api/v3/users/myorg/subscriptions",
-              "type": "Organization",
-              "url": "https://github.gitify.io/api/v3/users/myorg",
             },
-            "private": true,
-          },
-          "subject": {
-            "latest_comment_url": "https://github.gitify.io/api/v3/repos/myorg/notifications-test/issues/comments/21",
-            "title": "Bump Version",
-            "type": "PullRequest",
-            "url": "https://github.gitify.io/api/v3/repos/myorg/notifications-test/pulls/3",
           },
-          "subscription_url": "https://github.gitify.io/api/v3/notifications/threads/3/subscription",
+          "state": "open",
+          "title": "Bump version",
+          "type": "PullRequest",
           "unread": true,
-          "updated_at": "2017-05-20T15:52:20Z",
-          "url": "https://github.gitify.io/api/v3/notifications/threads/3",
+          "updated_at": {
+            "formatted": "May 1st, 2024",
+            "raw": "2024-05-01T10:00:00Z",
+          },
+          "user": {
+            "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
+            "html_url": "https://github.com/mockUser",
+            "login": "mockUser",
+            "type": "User",
+          },
         },
       ]
     }
diff --git a/src/utils/helpers.test.ts b/src/utils/helpers.test.ts
index 62bd4b72a..2d2d47fc8 100644
--- a/src/utils/helpers.test.ts
+++ b/src/utils/helpers.test.ts
@@ -229,7 +229,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Asuccess+branch%3Amain&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Asuccess+branch%3Amain&${mockedNotificationReferrer}`,
         );
       });
 
@@ -251,7 +251,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockedNotificationReferrer}`,
         );
       });
 
@@ -273,7 +273,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockedNotificationReferrer}`,
         );
       });
 
@@ -295,7 +295,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Askipped+branch%3Amain&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Askipped+branch%3Amain&${mockedNotificationReferrer}`,
         );
       });
 
@@ -317,7 +317,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?${mockedNotificationReferrer}`,
         );
       });
 
@@ -339,7 +339,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=workflow%3A%22Demo%22+branch%3Amain&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+branch%3Amain&${mockedNotificationReferrer}`,
         );
       });
 
@@ -361,7 +361,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?${mockedNotificationReferrer}`,
         );
       });
     });
@@ -421,7 +421,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/discussions/612?${mockedNotificationReferrer}#discussioncomment-2300902`,
+          `https://github.com/gitify-app/notifications-test/discussions/612?${mockedNotificationReferrer}#discussioncomment-2300902`,
         );
       });
 
@@ -449,14 +449,15 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/discussions?${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/discussions?${mockedNotificationReferrer}`,
         );
       });
     });
 
     it('Repository Invitation url', async () => {
       const subject = {
-        title: 'Invitation to join manosim/notifications-test from unit-tests',
+        title:
+          'Invitation to join gitify-app/notifications-test from unit-tests',
         url: null,
         latest_comment_url: null,
         type: 'RepositoryInvitation' as SubjectType,
@@ -472,7 +473,7 @@ describe('utils/helpers.ts', () => {
 
       expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
       expect(result).toBe(
-        `https://github.com/manosim/notifications-test/invitations?${mockedNotificationReferrer}`,
+        `https://github.com/gitify-app/notifications-test/invitations?${mockedNotificationReferrer}`,
       );
     });
 
@@ -495,7 +496,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?query=is%3Awaiting&${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?query=is%3Awaiting&${mockedNotificationReferrer}`,
         );
       });
 
@@ -518,7 +519,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?${mockedNotificationReferrer}`,
         );
       });
 
@@ -540,7 +541,7 @@ describe('utils/helpers.ts', () => {
 
         expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `https://github.com/manosim/notifications-test/actions?${mockedNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/actions?${mockedNotificationReferrer}`,
         );
       });
     });