Merge branch 'develop' into WEB-3352-tide-nav-bugs

app/components/navpatientheader/index.js

@@ -31,7 +31,8 @@ const HeaderContainer = ({ children }) => (
 
 const NavPatientHeader = ({ 
   patient,
-  user,
+  clinicPatient,
+  user, 
   permsOfLoggedInUser,
   trackMetric,
   clinicFlowActive,

app/components/navpatientheader/navPatientHeaderHelpers.js

@@ -22,4 +22,14 @@ export const getPatientListLink = (clinicFlowActive, selectedClinicId, initialSe
   }
 
   return '/patients';
-};
+};
+
+export const getDemographicInfo = (patient, clinicPatient) => {
+  const combinedPatient = personUtils.combinedAccountAndClinicPatient(patient, clinicPatient);
+
+  const name = personUtils.patientFullName(combinedPatient);
+  const birthday = combinedPatient?.profile?.patient?.birthday;
+  const mrn = clinicPatient?.mrn;
+
+  return { name, birthday, mrn };
+};

test/unit/components/navpatientheader/index.test.js

@@ -125,8 +125,9 @@ describe('NavPatientHeader', () => {
       const props = {
         user: { roles: ['clinician'] },
         trackMetric: mockTrackMetric,
-        patient: { ...defaultPatientProps, permissions: { } },
-        permsOfLoggedInUser: {},
+        patient: { ...patientProps, permissions: { } },
+        clinicPatient: { ...clinicPatientProps },
+        permsOfLoggedInUser: {}
       };
 
       const wrapper = mount(
@@ -158,7 +159,8 @@ describe('NavPatientHeader', () => {
       const props = {
         user: { roles: ['clinician'] },
         trackMetric: mockTrackMetric,
-        patient: { ...defaultPatientProps, permissions: { root: {} } },
+        patient: { ...patientProps, permissions: { root: {} } },
+        clinicPatient: { ...clinicPatientProps },
         permsOfLoggedInUser: { upload: {} },
       };
 
@@ -335,7 +337,7 @@ describe('NavPatientHeader', () => {
     describe('viewing patient or profile views and user originates from TIDE Dashboard', () => {
       const clinicClinicianProps = {
         trackMetric: mockTrackMetric,
-        patient: { ...defaultPatientProps, permissions: { } },
+        patient: { ...patientProps, permissions: { } },
         clinicFlowActive: true,
         user: { isClinicMember: true },
         selectedClinicId: 'clinic123',