From e513b172e25f24126969564a0e7d4f421758e626 Mon Sep 17 00:00:00 2001
From: Archie Wheeler <archwheeler@gmail.com>
Date: Thu, 6 Feb 2020 20:29:19 +0000
Subject: [PATCH] fix(patients): stop "Loading..." when patient has no related
 persons

re #1789
---
 .../related-persons/RelatedPersonTab.tsx      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/patients/related-persons/RelatedPersonTab.tsx b/src/patients/related-persons/RelatedPersonTab.tsx
index 2069429d0a..481f557ad2 100644
--- a/src/patients/related-persons/RelatedPersonTab.tsx
+++ b/src/patients/related-persons/RelatedPersonTab.tsx
@@ -32,9 +32,9 @@ const RelatedPersonTab = (props: Props) => {
             fetchedRelatedPersons.push(fetchedRelatedPerson)
           }),
         )
-
-        setRelatedPersons(fetchedRelatedPersons)
       }
+
+      setRelatedPersons(fetchedRelatedPersons)
     }
 
     fetchRelatedPersons()
@@ -88,14 +88,17 @@ const RelatedPersonTab = (props: Props) => {
         <div className="col-md-12">
           <Panel title={t('patient.relatedPersons.label')} color="primary" collapsible>
             {relatedPersons ? (
-              <List>
-                {relatedPersons.map((r) => (
-                  <ListItem key={r.id}>{r.fullName}</ListItem>
-                ))}
-              </List>
-            ) : (
-              <h1>Loading...</h1>
-            )}
+              (relatedPersons.length > 0) ? (
+                <List>
+                  {relatedPersons.map((r) => (
+                    <ListItem key={r.id}>{r.fullName}</ListItem>
+                  ))}
+                </List>
+                ) : (
+                  <h2>No related persons have been added yet.</h2>
+              )) : (
+                <h1>Loading...</h1>
+              )}
           </Panel>
         </div>
       </div>