fix optional chaining

Author: reldredge71

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactHeaderSection/ContactHeaderAddressSection.tsx

@@ -32,6 +32,9 @@ export const ContactHeaderAddressSection = ({
 }: Props): ReactElement => {
   const { t } = useTranslation();
 
+  const greeting = contact?.greeting;
+  const primaryAddress = contact?.primaryAddress;
+
   if (loading) {
     return (
       <ContactHeaderSection icon={<LocationIcon />}>
@@ -40,13 +43,10 @@ export const ContactHeaderAddressSection = ({
         <TextSkeleton variant="text" />
       </ContactHeaderSection>
     );
-  } else if (contact && contact.primaryAddress) {
-    const {
-      greeting,
-      primaryAddress: { street, city, state, postalCode },
-    } = contact;
+  } else if (greeting && primaryAddress) {
+    const { street, city, state, postalCode } = primaryAddress;
 
-    if (!!greeting && !!street && !!city && !!state && !!postalCode) {
+    if (street && city && state && postalCode) {
       return (
         <ContactHeaderSection icon={<LocationIcon />}>
           <Typography variant="subtitle1">{greeting}</Typography>

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactHeaderSection/ContactHeaderEmailSection.tsx

@@ -29,30 +29,20 @@ export const ContactHeaderEmailSection = ({
   loading,
   contact,
 }: Props): ReactElement => {
+  const email = contact?.primaryPerson?.primaryEmailAddress?.email;
+
   if (loading) {
     return (
       <ContactHeaderSection icon={<EmailIcon />}>
         <TextSkeleton variant="text" />
       </ContactHeaderSection>
     );
-  } else if (
-    contact &&
-    contact.primaryPerson &&
-    contact.primaryPerson.primaryEmailAddress
-  ) {
-    const {
-      primaryPerson: {
-        primaryEmailAddress: { email },
-      },
-    } = contact;
-
-    if (!!email) {
-      return (
-        <ContactHeaderSection icon={<EmailIcon />}>
-          <Typography variant="subtitle1">{email}</Typography>
-        </ContactHeaderSection>
-      );
-    }
+  } else if (email) {
+    return (
+      <ContactHeaderSection icon={<EmailIcon />}>
+        <Typography variant="subtitle1">{email}</Typography>
+      </ContactHeaderSection>
+    );
   }
 
   return <ContactHeaderSection icon={<EmailIcon />} />;

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactHeaderSection/ContactHeaderPhoneSection.tsx

@@ -29,30 +29,20 @@ export const ContactHeaderPhoneSection = ({
   loading,
   contact,
 }: Props): ReactElement => {
+  const number = contact?.primaryPerson?.primaryPhoneNumber?.number;
+
   if (loading) {
     return (
       <ContactHeaderSection icon={<PhoneIcon />}>
         <TextSkeleton variant="text" />
       </ContactHeaderSection>
     );
-  } else if (
-    contact &&
-    contact.primaryPerson &&
-    contact.primaryPerson.primaryPhoneNumber
-  ) {
-    const {
-      primaryPerson: {
-        primaryPhoneNumber: { number },
-      },
-    } = contact;
-
-    if (!!number) {
-      return (
-        <ContactHeaderSection icon={<PhoneIcon />}>
-          <Typography variant="subtitle1">{number}</Typography>
-        </ContactHeaderSection>
-      );
-    }
+  } else if (number) {
+    return (
+      <ContactHeaderSection icon={<PhoneIcon />}>
+        <Typography variant="subtitle1">{number}</Typography>
+      </ContactHeaderSection>
+    );
   }
 
   return <ContactHeaderSection icon={<PhoneIcon />} />;

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactHeaderSection/ContactHeaderStatusSection.tsx

@@ -25,82 +25,80 @@ export const ContactHeaderStatusSection = ({
 }: Props): ReactElement => {
   const { t } = useTranslation();
 
+  const status = contact?.status;
+
   if (loading) {
     return (
       <ContactHeaderSection icon={<HandshakeIcon />}>
         <TextSkeleton variant="text" />
       </ContactHeaderSection>
     );
-  } else if (contact) {
-    const { status } = contact;
-
-    if (!!status) {
-      let statusText = '';
-
-      switch (status) {
-        case 'NEVER_CONTACTED':
-          statusText = t('Never Contacted');
-          break;
-
-        case 'ASK_IN_FUTURE':
-          statusText = t('Ask in Future');
-          break;
-
-        case 'CULTIVATE_RELATIONSHIP':
-          statusText = t('Cultivate Relationship');
-          break;
-
-        case 'CONTACT_FOR_APPOINTMENT':
-          statusText = t('Contact for Appointment');
-          break;
-
-        case 'APPOINTMENT_SCHEDULED':
-          statusText = t('Appointment Scheduled');
-          break;
-
-        case 'CALL_FOR_DECISION':
-          statusText = t('Call for Decision');
-          break;
-
-        case 'PARTNER_FINANCIAL':
-          statusText = t('Partner - Financial');
-          break;
-
-        case 'PARTNER_SPECIAL':
-          statusText = t('Partner - Special');
-          break;
-
-        case 'PARTNER_PRAY':
-          statusText = t('Partner - Prayer');
-          break;
-
-        case 'NOT_INTERESTED':
-          statusText = t('Not Interested');
-          break;
-
-        case 'UNRESPONSIVE':
-          statusText = t('Unresponsive');
-          break;
-
-        case 'NEVER_ASK':
-          statusText = t('Never Ask');
-          break;
-
-        case 'RESEARCH_ABANDONED':
-          statusText = t('Research Abandoned');
-          break;
-
-        case 'EXPIRED_REFERRAL':
-          statusText = t('Expired Referral');
-          break;
-      }
-
-      return (
-        <ContactHeaderSection icon={<HandshakeIcon />}>
-          <Typography variant="subtitle1">{statusText}</Typography>
-        </ContactHeaderSection>
-      );
+  } else if (status) {
+    let statusText = '';
+
+    switch (status) {
+      case 'NEVER_CONTACTED':
+        statusText = t('Never Contacted');
+        break;
+
+      case 'ASK_IN_FUTURE':
+        statusText = t('Ask in Future');
+        break;
+
+      case 'CULTIVATE_RELATIONSHIP':
+        statusText = t('Cultivate Relationship');
+        break;
+
+      case 'CONTACT_FOR_APPOINTMENT':
+        statusText = t('Contact for Appointment');
+        break;
+
+      case 'APPOINTMENT_SCHEDULED':
+        statusText = t('Appointment Scheduled');
+        break;
+
+      case 'CALL_FOR_DECISION':
+        statusText = t('Call for Decision');
+        break;
+
+      case 'PARTNER_FINANCIAL':
+        statusText = t('Partner - Financial');
+        break;
+
+      case 'PARTNER_SPECIAL':
+        statusText = t('Partner - Special');
+        break;
+
+      case 'PARTNER_PRAY':
+        statusText = t('Partner - Prayer');
+        break;
+
+      case 'NOT_INTERESTED':
+        statusText = t('Not Interested');
+        break;
+
+      case 'UNRESPONSIVE':
+        statusText = t('Unresponsive');
+        break;
+
+      case 'NEVER_ASK':
+        statusText = t('Never Ask');
+        break;
+
+      case 'RESEARCH_ABANDONED':
+        statusText = t('Research Abandoned');
+        break;
+
+      case 'EXPIRED_REFERRAL':
+        statusText = t('Expired Referral');
+        break;
     }
+
+    return (
+      <ContactHeaderSection icon={<HandshakeIcon />}>
+        <Typography variant="subtitle1">{statusText}</Typography>
+      </ContactHeaderSection>
+    );
   }
 
   return <ContactHeaderSection icon={<HandshakeIcon />} />;