fix: issues identified by sonar

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/components/avatars/AvatarWithFallback.tsx

@@ -26,6 +26,7 @@ export const AvatarWithFallback: React.FC<IAvatarWithFallback> = ({
   const [isBroken, setIsBroken] = useState(false);
 
   const isNonHuman = isNonHumanUser(userType);
+  const DefaultUserIcon = isNonHuman ? MarkGithubIcon : FeedPersonIcon;
 
   // TODO explore using AnchoredOverlay component (https://primer.style/components/anchored-overlay/react/alpha) to render Avatar Card on hover
   return (
@@ -36,11 +37,7 @@ export const AvatarWithFallback: React.FC<IAvatarWithFallback> = ({
       data-testid="avatar"
     >
       {!src || isBroken ? (
-        isNonHuman ? (
-          <MarkGithubIcon size={size} />
-        ) : (
-          <FeedPersonIcon size={size} />
-        )
+        <DefaultUserIcon size={size} />
       ) : (
         <Avatar
           src={src}

src/renderer/components/notifications/NotificationRow.tsx

@@ -85,8 +85,9 @@ export const NotificationRow: FC<INotificationRow> = ({
     ? `#${notification.subject.number}`
     : '';
 
-  const notificationTitle =
-    `${notification.subject.title} ${notificationNumber && `[${notificationNumber}]`}`.trim();
+  const notificationTitle = notificationNumber
+    ? `${notification.subject.title} [${notificationNumber}]`
+    : notification.subject.title;
 
   const groupByDate = settings.groupBy === GroupBy.DATE;
 

src/renderer/typesGitHub.ts

@@ -94,7 +94,7 @@ export type PullRequestReviewAuthorAssociation =
   | 'NONE'
   | 'OWNER';
 
-// TODO: Add explicit types for GitHub API response vs Gitify Notifications object
+// TODO: #828 Add explicit types for GitHub API response vs Gitify Notifications object
 export type Notification = GitHubNotification & GitifyNotification;
 
 export interface GitHubNotification {

src/renderer/utils/auth/utils.ts

@@ -259,9 +259,7 @@ export function getNewOAuthAppURL(hostname: Hostname): Link {
 }
 
 export function isValidHostname(hostname: Hostname) {
-  return /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$/i.test(
-    hostname,
-  );
+  return /^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}$/i.test(hostname);
 }
 
 export function isValidClientId(clientId: ClientID) {

src/renderer/utils/constants.ts

@@ -1,5 +1,4 @@
-import type { Link } from '../types';
-import type { ClientID, ClientSecret, Hostname } from '../types';
+import type { ClientID, ClientSecret, Hostname, Link } from '../types';
 
 export const Constants = {
   REPO_SLUG: 'gitify-app/gitify',