Merge branch 'develop' into 15-send-reminder-emails-from-frontend

cph-cachet · Oct 30, 2024 · 222d4db · 222d4db
2 parents 8759773 + 909d905
commit 222d4db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/pages/Deployments/ParticipantRecord/index.tsx b/src/pages/Deployments/ParticipantRecord/index.tsx
@@ -72,7 +72,7 @@ const ParticipantRecord = ({
     >
       <AccountIcon>
         <Initials variant="h4">
-          {participantData.firstName
+          {!participantData.firstName || !participantData.lastName
             ? participantRole[0]
             : `${participantData.firstName[0]}${participantData.lastName[0]}`}
         </Initials>
@@ -81,7 +81,7 @@ const ParticipantRecord = ({
         {participantData.email ?? <GeneratedAccountLabel />}
       </Typography>
       <NameContainer>
-        {participantData.firstName && (
+        {participantData.firstName && participantData.lastName && (
           <>
             <PersonIcon fontSize="small" />
             <Typography variant="h6">

diff --git a/src/pages/Participant/ParticipantDataCard/index.tsx b/src/pages/Participant/ParticipantDataCard/index.tsx
@@ -71,8 +71,8 @@ const ParticipantDataCard = () => {
   }, [participantGroupStatus]);
 
   const participantDataFromik = getParticipantDataFormik(
-    study?.protocolSnapshot.expectedParticipantData.toArray(),
-    participantData?.common.values.toArray().filter((v) => v),
+    study?.protocolSnapshot.expectedParticipantData ? study?.protocolSnapshot.expectedParticipantData.toArray() : [],
+    participantData?.common.values ? participantData?.common.values.toArray().filter((v) => v) : [],
     setParticipantData,
     participant?.role,
     setEditing,