migrate to strict

saleor · Apr 23, 2024 · 9652a06 · 9652a06
1 parent ec7c35f
commit 9652a06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/components/Timeline/TimelineNote.tsx b/src/components/Timeline/TimelineNote.tsx
@@ -1,4 +1,3 @@
-// @ts-strict-ignore
 import { GiftCardEventFragment, OrderEventFragment } from "@dashboard/graphql";
 import { getUserInitials, getUserName } from "@dashboard/misc";
 import { Card, CardContent, Typography } from "@material-ui/core";
@@ -55,12 +54,12 @@ interface TimelineNoteProps {
 }
 
 interface NoteMessageProps {
-  message: string;
+  message: string | null;
 }
 
 const NoteMessage: React.FC<NoteMessageProps> = ({ message }) => (
   <>
-    {message.split("\n").map(string => {
+    {message?.split("\n").map(string => {
       if (string === "") {
         return <br key={`break-${string}`} />;
       }
@@ -92,8 +91,8 @@ const TimelineAvatar = ({
   if (app) {
     return (
       <UserAvatar
-        initials={app.name.slice(0, 2)}
-        url={app?.brand?.logo?.default}
+        initials={app.name?.slice(0, 2)}
+        url={app.brand?.logo?.default}
         className={className}
       />
     );
@@ -111,7 +110,7 @@ export const TimelineNote: React.FC<TimelineNoteProps> = ({
 }) => {
   const classes = useStyles();
 
-  const userDisplayName = getUserName(user, true) ?? app.name;
+  const userDisplayName = getUserName(user, true) ?? app?.name;
 
   return (
     <div className={classes.root}>

diff --git a/src/misc.ts b/src/misc.ts
@@ -356,7 +356,10 @@ interface User {
   lastName?: string;
 }
 
-export function getUserName(user?: User, returnEmail?: boolean) {
+export function getUserName(
+  user: User | null | undefined,
+  returnEmail?: boolean,
+) {
   return user && (user.email || (user.firstName && user.lastName))
     ? user.firstName && user.lastName
       ? [user.firstName, user.lastName].join(" ")