From 445141998d2755f2b78771d6b9eb6c211ca61dbc Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 8 Oct 2025 08:02:29 -0700
Subject: [PATCH 1/3] fix: sonarlint issues

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/filters/TokenSearchInput.tsx     | 4 ++--
 src/renderer/components/metrics/MetricPill.tsx           | 5 +++--
 src/renderer/components/settings/AppearanceSettings.tsx  | 1 -
 src/renderer/routes/__snapshots__/Settings.test.tsx.snap | 1 -
 src/renderer/utils/helpers.ts                            | 2 +-
 src/renderer/utils/notifications/handlers/pullRequest.ts | 6 +++---
 src/renderer/utils/notifications/native.ts               | 7 ++++---
 src/renderer/utils/notifications/notifications.ts        | 2 +-
 src/renderer/utils/notifications/remove.ts               | 6 +++---
 src/renderer/utils/zoom.ts                               | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/filters/TokenSearchInput.tsx b/src/renderer/components/filters/TokenSearchInput.tsx
index 496aad5cb..b7855be83 100644
--- a/src/renderer/components/filters/TokenSearchInput.tsx
+++ b/src/renderer/components/filters/TokenSearchInput.tsx
@@ -19,7 +19,7 @@ interface TokenSearchInputProps {
   onRemove: (token: SearchToken) => void;
 }
 
-const INPUT_KEY_EVENTS = ['Enter', 'Tab', ' ', ','];
+const INPUT_KEY_EVENTS: Set<string> = new Set(['Enter', 'Tab', ' ', ',']);
 
 export const TokenSearchInput: FC<TokenSearchInputProps> = ({
   label,
@@ -51,7 +51,7 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
   }
 
   function onKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
-    if (INPUT_KEY_EVENTS.includes(e.key)) {
+    if (INPUT_KEY_EVENTS.has(e.key)) {
       tryAddToken(e);
       setShowSuggestions(false);
     } else if (e.key === 'ArrowDown') {
diff --git a/src/renderer/components/metrics/MetricPill.tsx b/src/renderer/components/metrics/MetricPill.tsx
index 990f226f6..6c86be7c2 100644
--- a/src/renderer/components/metrics/MetricPill.tsx
+++ b/src/renderer/components/metrics/MetricPill.tsx
@@ -6,7 +6,6 @@ import { Label, Stack, Text } from '@primer/react';
 import { type IconColor, Size } from '../../types';
 
 export interface IMetricPill {
-  key?: string;
   title: string;
   metric?: number;
   icon: Icon;
@@ -14,6 +13,8 @@ export interface IMetricPill {
 }
 
 export const MetricPill: FC<IMetricPill> = (props: IMetricPill) => {
+  const Icon = props.icon;
+
   return (
     <Label
       className="hover:bg-gitify-notification-pill-hover"
@@ -22,7 +23,7 @@ export const MetricPill: FC<IMetricPill> = (props: IMetricPill) => {
       variant="secondary"
     >
       <Stack align="center" direction="horizontal" gap="none">
-        <props.icon className={props.color} size={Size.XSMALL} />
+        <Icon className={props.color} size={Size.XSMALL} />
         {props.metric ? (
           <Text className="text-xxs px-1">{props.metric}</Text>
         ) : null}
diff --git a/src/renderer/components/settings/AppearanceSettings.tsx b/src/renderer/components/settings/AppearanceSettings.tsx
index f6b7363ba..031494952 100644
--- a/src/renderer/components/settings/AppearanceSettings.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.tsx
@@ -59,7 +59,6 @@ export const AppearanceSettings: FC = () => {
           <FieldLabel label="Theme:" name="theme" />
           <Select
             data-testid="settings-theme"
-            id="theme"
             onChange={(evt) =>
               updateSetting('theme', evt.target.value as Theme)
             }
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index a628e1cd1..7df4cda34 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -170,7 +170,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                 class="prc-Select-Select-F7Flx"
                 data-hasplaceholder="false"
                 data-testid="settings-theme"
-                id="theme"
               >
                 <optgroup
                   label="System"
diff --git a/src/renderer/utils/helpers.ts b/src/renderer/utils/helpers.ts
index 33a82207c..b00facda3 100644
--- a/src/renderer/utils/helpers.ts
+++ b/src/renderer/utils/helpers.ts
@@ -77,7 +77,7 @@ export function actionsURL(repositoryURL: string, filters: string[]): Link {
   }
 
   // Note: the GitHub Actions UI cannot handle encoded '+' characters.
-  return url.toString().replace(/%2B/g, '+') as Link;
+  return url.toString().replaceAll('%2B', '+') as Link;
 }
 
 async function getDiscussionUrl(notification: Notification): Promise<Link> {
diff --git a/src/renderer/utils/notifications/handlers/pullRequest.ts b/src/renderer/utils/notifications/handlers/pullRequest.ts
index 2d0617c5c..f58eccd98 100644
--- a/src/renderer/utils/notifications/handlers/pullRequest.ts
+++ b/src/renderer/utils/notifications/handlers/pullRequest.ts
@@ -139,13 +139,13 @@ export async function getLatestReviewForReviewers(
       (review) => review.state === prReview.state,
     );
 
-    if (!reviewerFound) {
+    if (reviewerFound) {
+      reviewerFound.users.push(prReview.user.login);
+    } else {
       reviewers.push({
         state: prReview.state,
         users: [prReview.user.login],
       });
-    } else {
-      reviewerFound.users.push(prReview.user.login);
     }
   }
 
diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts
index cee3e8638..86d14c3dd 100644
--- a/src/renderer/utils/notifications/native.ts
+++ b/src/renderer/utils/notifications/native.ts
@@ -22,12 +22,13 @@ export const triggerNativeNotifications = (
         return accountNotifications.notifications;
       }
 
-      const accountPreviousNotificationsIds =
-        accountPreviousNotifications.notifications.map((item) => item.id);
+      const accountPreviousNotificationsIds = new Set<string>(
+        accountPreviousNotifications.notifications.map((item) => item.id),
+      );
 
       const accountNewNotifications = accountNotifications.notifications.filter(
         (item) => {
-          return !accountPreviousNotificationsIds.includes(`${item.id}`);
+          return !accountPreviousNotificationsIds.has(`${item.id}`);
         },
       );
 
diff --git a/src/renderer/utils/notifications/notifications.ts b/src/renderer/utils/notifications/notifications.ts
index 67a0ad7d2..3ed5b0c31 100644
--- a/src/renderer/utils/notifications/notifications.ts
+++ b/src/renderer/utils/notifications/notifications.ts
@@ -42,7 +42,7 @@ function getNotifications(state: GitifyState) {
 export async function getAllNotifications(
   state: GitifyState,
 ): Promise<AccountNotifications[]> {
-  const responses = await Promise.all([...getNotifications(state)]);
+  const responses = await Promise.all(getNotifications(state));
 
   const notifications: AccountNotifications[] = await Promise.all(
     responses
diff --git a/src/renderer/utils/notifications/remove.ts b/src/renderer/utils/notifications/remove.ts
index 6b1d0cbd3..8b596bc16 100644
--- a/src/renderer/utils/notifications/remove.ts
+++ b/src/renderer/utils/notifications/remove.ts
@@ -16,8 +16,8 @@ export function removeNotifications(
   }
 
   const removeNotificationAccount = notificationsToRemove[0].account;
-  const removeNotificationIDs = notificationsToRemove.map(
-    (notification) => notification.id,
+  const removeNotificationIDs = new Set<string>(
+    notificationsToRemove.map((notification) => notification.id),
   );
 
   const accountIndex = allNotifications.findIndex(
@@ -31,7 +31,7 @@ export function removeNotifications(
     updatedNotifications[accountIndex] = {
       ...updatedNotifications[accountIndex],
       notifications: updatedNotifications[accountIndex].notifications.filter(
-        (notification) => !removeNotificationIDs.includes(notification.id),
+        (notification) => !removeNotificationIDs.has(notification.id),
       ),
     };
     return updatedNotifications;
diff --git a/src/renderer/utils/zoom.ts b/src/renderer/utils/zoom.ts
index 290e9edb8..e7a02f701 100644
--- a/src/renderer/utils/zoom.ts
+++ b/src/renderer/utils/zoom.ts
@@ -7,7 +7,7 @@ const MULTIPLIER = 2;
  * @returns zoomLevel -2 to 0.5
  */
 export const zoomPercentageToLevel = (percentage: number): number => {
-  if (typeof percentage === 'undefined') {
+  if (percentage === undefined) {
     return 0;
   }
 
@@ -20,7 +20,7 @@ export const zoomPercentageToLevel = (percentage: number): number => {
  * @returns percentage 0-150
  */
 export const zoomLevelToPercentage = (zoom: number): number => {
-  if (typeof zoom === 'undefined') {
+  if (zoom === undefined) {
     return 100;
   }
 

From 5748c41204957c43be48f2f1b4c0c228cac5663f Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 8 Oct 2025 08:33:30 -0700
Subject: [PATCH 2/3] fix: sonarlint issues

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/main/utils.ts                                  | 2 +-
 src/renderer/components/primitives/Title.tsx       | 2 +-
 src/renderer/utils/notifications/handlers/utils.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/utils.ts b/src/main/utils.ts
index 10754bfc1..907d89fff 100644
--- a/src/main/utils.ts
+++ b/src/main/utils.ts
@@ -14,7 +14,7 @@ import { sendRendererEvent } from './events';
 
 export function takeScreenshot(mb: Menubar) {
   const date = new Date();
-  const dateStr = date.toISOString().replace(/:/g, '-');
+  const dateStr = date.toISOString().replaceAll(':', '-');
 
   const capturedPicFilePath = path.join(
     os.homedir(),
diff --git a/src/renderer/components/primitives/Title.tsx b/src/renderer/components/primitives/Title.tsx
index e56a3e0e2..113e982e9 100644
--- a/src/renderer/components/primitives/Title.tsx
+++ b/src/renderer/components/primitives/Title.tsx
@@ -13,7 +13,7 @@ interface ITitle {
 }
 
 export const Title: FC<ITitle> = ({ size = 2, ...props }) => {
-  const name = props.children.toLowerCase().replace(' ', '-');
+  const name = props.children.toLowerCase().replaceAll(' ', '-');
 
   return (
     <legend>
diff --git a/src/renderer/utils/notifications/handlers/utils.ts b/src/renderer/utils/notifications/handlers/utils.ts
index cb27e3b77..e8dc1b13b 100644
--- a/src/renderer/utils/notifications/handlers/utils.ts
+++ b/src/renderer/utils/notifications/handlers/utils.ts
@@ -32,7 +32,7 @@ export function formatForDisplay(text: string[]): string {
   return text
     .join(' ')
     .replace(/([a-z])([A-Z])/g, '$1 $2') // Add space between lowercase character followed by an uppercase character
-    .replace(/_/g, ' ') // Replace underscores with spaces
+    .replaceAll('_', ' ') // Replace underscores with spaces
     .replace(/\w+/g, (word) => {
       // Convert to proper case (capitalize first letter of each word)
       return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();

From 4c15d2265d971a4cd196dc9d4ce7d0d049050d74 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 8 Oct 2025 08:34:44 -0700
Subject: [PATCH 3/3] fix: sonarlint issues

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap      | 4 ++--
 .../__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 3dc7dbe8d..dd65ba042 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="title-login-with oauth app"
+                  id="title-login-with-oauth-app"
                 >
                   <svg
                     aria-hidden="true"
@@ -513,7 +513,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="title-login-with oauth app"
+                id="title-login-with-oauth-app"
               >
                 <svg
                   aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 2fb342871..37c974364 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="title-login-with personal access token"
+                  id="title-login-with-personal-access-token"
                 >
                   <svg
                     aria-hidden="true"
@@ -506,7 +506,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="title-login-with personal access token"
+                id="title-login-with-personal-access-token"
               >
                 <svg
                   aria-hidden="true"