fix: improve type safety and null checks

island-is · Oct 15, 2024 · 7f9d311 · 7f9d311
1 parent 341f888
commit 7f9d311
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/apps/native/app/src/screens/health/health-overview.tsx b/apps/native/app/src/screens/health/health-overview.tsx
@@ -124,17 +124,19 @@ export const HealthOverviewScreen: NavigationFunctionComponent = ({
   })
 
   const isOrganDonor =
-    organDonationRes.data?.healthDirectorateOrganDonation.donor?.isDonor
+    organDonationRes.data?.healthDirectorateOrganDonation.donor?.isDonor ??
+    false
 
   const isOrganDonorWithLimitations =
     isOrganDonor &&
-    organDonationRes.data?.healthDirectorateOrganDonation.donor?.limitations
-      ?.hasLimitations
+    (organDonationRes.data?.healthDirectorateOrganDonation.donor?.limitations
+      ?.hasLimitations ??
+      false)
 
   const organLimitations = isOrganDonorWithLimitations
     ? organDonationRes.data?.healthDirectorateOrganDonation.donor?.limitations?.limitedOrgansList?.map(
         (organ) => organ.name,
-      )
+      ) ?? []
     : []
 
   useConnectivityIndicator({