Add nullsafe check to the beneficiary.person (#1181)

podkrepi-bg · Nov 24, 2022 · f2268d7 · f2268d7
1 parent 7faec83
commit f2268d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/components/campaigns/CampaignDetails.tsx b/src/components/campaigns/CampaignDetails.tsx
@@ -140,7 +140,7 @@ export default function CampaignDetails({ campaign }: Props) {
         />
         <Typography variant="subtitle2" component="p" className={classes.beneficiaryName}>
           {campaign.beneficiary.type === BeneficiaryType.individual
-            ? campaign.beneficiary.person.firstName + ' ' + campaign.beneficiary.person?.lastName
+            ? campaign.beneficiary.person?.firstName + ' ' + campaign.beneficiary.person?.lastName
             : campaign.beneficiary.company.companyName}
         </Typography>
       </Grid>

diff --git a/src/components/campaigns/grid/CampaignGrid.tsx b/src/components/campaigns/grid/CampaignGrid.tsx
@@ -40,8 +40,8 @@ export const DisplayBeneficiary = ({ params }: CampaignCellProps) => {
   return (
     <>
       {params.row.beneficiary.type === BeneficiaryType.individual
-        ? params.row.beneficiary.person.firstName + ' ' + params.row.beneficiary.person?.lastName
-        : params.row.beneficiary.company.companyName}
+        ? params.row.beneficiary.person?.firstName + ' ' + params.row.beneficiary?.person?.lastName
+        : params.row.beneficiary.company?.companyName}
     </>
   )
 }

diff --git a/src/components/campaigns/grid/modals/DetailsModal.tsx b/src/components/campaigns/grid/modals/DetailsModal.tsx
@@ -43,8 +43,8 @@ export default function DetailsModal({ campaign, onClose }: Props) {
           <Typography variant="body1">Същество: {campaign.essence}</Typography>
           <Typography variant="body1">Тип на кампанията: {campaign.campaignType.name}</Typography>
           <Typography variant="body1">
-            Бенефициент: {campaign.beneficiary.person.firstName}{' '}
-            {campaign.beneficiary.person.lastName}
+            Бенефициент: {campaign.beneficiary.person?.firstName}{' '}
+            {campaign.beneficiary.person?.lastName}
           </Typography>
           <Typography variant="body1">
             Координатор: {campaign.coordinator.person.firstName}{' '}

diff --git a/src/components/one-time-donation/OneTimeDonationPage.tsx b/src/components/one-time-donation/OneTimeDonationPage.tsx
@@ -108,7 +108,7 @@ export default function OneTimeDonation({ slug }: { slug: string }) {
           <Image
             src={beneficiaryAvatarSource}
             // A11Y TODO: Translate alt text
-            alt={`Image of ${campaign.beneficiary.person.firstName} ${campaign.beneficiary.person.lastName}`}
+            alt={`Image of ${campaign.beneficiary.person?.firstName} ${campaign.beneficiary.person?.lastName}`}
             width={250}
             height={250}
             className={classes.beneficiaryAvatar}