From 983d981e49e033bc12d54bdf48b655723564bace Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Mon, 12 Aug 2024 17:02:56 +0300
Subject: [PATCH] (fix) Fixup contact attribute config key name in patient
 banner

---
 .../actions-menu/patient-banner-actions-menu.component.tsx  | 6 +++---
 .../patient-banner-contact-details.component.tsx            | 2 +-
 ...tient-banner-toggle-contact-details-button.component.tsx | 4 ++--
 .../patient-banner/contact-details/usePatientAttributes.ts  | 6 +++---
 .../framework/esm-styleguide/src/pictograms/svgs/labs.svg   | 2 +-
 packages/framework/esm-translations/src/translations.ts     | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/framework/esm-styleguide/src/patient-banner/actions-menu/patient-banner-actions-menu.component.tsx b/packages/framework/esm-styleguide/src/patient-banner/actions-menu/patient-banner-actions-menu.component.tsx
index 17de9f19d..57e1b070a 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/actions-menu/patient-banner-actions-menu.component.tsx
+++ b/packages/framework/esm-styleguide/src/patient-banner/actions-menu/patient-banner-actions-menu.component.tsx
@@ -1,10 +1,10 @@
 /** @module @category UI */
-import { ExtensionSlot, useConnectedExtensions } from '@openmrs/esm-react-utils';
 import React, { useMemo } from 'react';
 import { OverflowMenuVertical } from '@carbon/react/icons';
-import styles from './patient-banner-actions-menu.module.scss';
-import { CustomOverflowMenu } from '../../custom-overflow-menu/custom-overflow-menu.component';
+import { ExtensionSlot, useConnectedExtensions } from '@openmrs/esm-react-utils';
 import { getCoreTranslation } from '@openmrs/esm-translations';
+import { CustomOverflowMenu } from '../../custom-overflow-menu/custom-overflow-menu.component';
+import styles from './patient-banner-actions-menu.module.scss';
 
 export interface PatientBannerActionsMenuProps {
   patientUuid: string;
diff --git a/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-contact-details.component.tsx b/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-contact-details.component.tsx
index 378eccd73..149ac21ec 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-contact-details.component.tsx
+++ b/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-contact-details.component.tsx
@@ -1,5 +1,6 @@
 /** @module @category UI */
 import React, { useMemo } from 'react';
+import classNames from 'classnames';
 import { InlineLoading } from '@carbon/react';
 import { type CoreTranslationKey, getCoreTranslation } from '@openmrs/esm-translations';
 import { ConfigurableLink, usePatient } from '@openmrs/esm-react-utils';
@@ -8,7 +9,6 @@ import { useRelationships } from './useRelationships';
 import { usePatientContactAttributes } from './usePatientAttributes';
 import { usePatientListsForPatient } from './usePatientListsForPatient';
 import styles from './patient-banner-contact-details.module.scss';
-import classNames from 'classnames';
 
 interface ContactDetailsProps {
   patientId: string;
diff --git a/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-toggle-contact-details-button.component.tsx b/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-toggle-contact-details-button.component.tsx
index 721ccf0b8..855296c89 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-toggle-contact-details-button.component.tsx
+++ b/packages/framework/esm-styleguide/src/patient-banner/contact-details/patient-banner-toggle-contact-details-button.component.tsx
@@ -21,10 +21,10 @@ export function PatientBannerToggleContactDetailsButton({
   return (
     <Button
       className={className}
-      kind="ghost"
-      renderIcon={showContactDetails ? ChevronUpIcon : ChevronDownIcon}
       iconDescription="Toggle contact details"
+      kind="ghost"
       onClick={toggleContactDetails}
+      renderIcon={showContactDetails ? ChevronUpIcon : ChevronDownIcon}
     >
       {showContactDetails
         ? getCoreTranslation('hideDetails', 'Hide details')
diff --git a/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientAttributes.ts b/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientAttributes.ts
index 0160252d1..73c361f05 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientAttributes.ts
+++ b/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientAttributes.ts
@@ -1,6 +1,6 @@
+import useSWRImmutable from 'swr/immutable';
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-api';
 import { useConfig } from '@openmrs/esm-react-utils';
-import useSWRImmutable from 'swr/immutable';
 import { type Patient } from './types';
 
 const customRepresentation =
@@ -31,10 +31,10 @@ export const usePatientAttributes = (patientUuid: string) => {
  * @returns Object containing `contactAttribute` {@link Attribute} loading status
  */
 export const usePatientContactAttributes = (patientUuid: string) => {
-  const { contactAttributeType } = useConfig();
+  const { contactAttributeTypes } = useConfig();
   const { attributes, isLoading } = usePatientAttributes(patientUuid);
   const contactAttributes = attributes.filter(
-    ({ attributeType }) => contactAttributeType?.some((uuid) => attributeType.uuid === uuid),
+    ({ attributeType }) => contactAttributeTypes?.some((uuid) => attributeType.uuid === uuid),
   );
   return {
     contactAttributes: contactAttributes ?? [],
diff --git a/packages/framework/esm-styleguide/src/pictograms/svgs/labs.svg b/packages/framework/esm-styleguide/src/pictograms/svgs/labs.svg
index 2a50b55bd..9786485ac 100644
--- a/packages/framework/esm-styleguide/src/pictograms/svgs/labs.svg
+++ b/packages/framework/esm-styleguide/src/pictograms/svgs/labs.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M49.5785 55.1964H53.2385C54.3885 53.0864 54.9985 50.6964 54.9985 48.2664C54.9985 43.1564 52.3085 38.4564 47.9385 35.8464C47.0485 37.3364 45.4185 38.3264 43.5585 38.3264C42.6985 38.3264 41.8885 38.1164 41.1685 37.7364L36.1485 46.4364C35.9885 46.7264 35.6285 46.8164 35.3385 46.6564L33.2485 45.4464L32.3385 47.0264L34.4285 48.2364C34.5685 48.3164 34.6585 48.4464 34.6985 48.5964C34.7385 48.7464 34.7185 48.9064 34.6385 49.0464L33.1385 51.6464C32.9785 51.9264 32.6185 52.0264 32.3285 51.8664L24.5185 47.3564C24.2385 47.1964 24.1385 46.8364 24.2985 46.5464L25.7985 43.9464C25.8785 43.8064 26.0085 43.7064 26.1585 43.6664C26.3085 43.6264 26.4685 43.6464 26.6085 43.7264L28.6985 44.9364L29.6085 43.3564L27.5185 42.1464C27.3785 42.0664 27.2885 41.9364 27.2485 41.7864C27.2085 41.6364 27.2285 41.4764 27.3085 41.3364L42.3585 15.2964C42.5185 15.0164 42.8885 14.9164 43.1685 15.0764L50.9785 19.5864C51.1185 19.6664 51.2185 19.7964 51.2585 19.9464C51.2985 20.0964 51.2785 20.2564 51.1985 20.3964L46.2785 28.9064C47.7185 29.8064 48.6685 31.4064 48.6685 33.2264C48.6685 33.7564 48.5885 34.2764 48.4285 34.7664C53.2185 37.5664 56.1785 42.6964 56.1785 48.2664C56.1785 50.6764 55.6185 53.0464 54.5685 55.1964H58.5985" fill="#CEE6E5"/>
 <path d="M25.6285 46.6264L32.4185 50.5464L33.3285 48.9664L28.6285 46.2564C28.6285 46.2564 28.6085 46.2564 28.6085 46.2464L26.5385 45.0464L25.6285 46.6264Z" fill="#7BBCB9"/>
 <path d="M30.5385 45.9864L31.3185 46.4364L32.2385 44.8564L30.6585 43.9364L29.7385 45.5264L30.5385 45.9864Z" fill="#CEE6E5"/>
diff --git a/packages/framework/esm-translations/src/translations.ts b/packages/framework/esm-translations/src/translations.ts
index 643ffe049..12aef9f56 100644
--- a/packages/framework/esm-translations/src/translations.ts
+++ b/packages/framework/esm-translations/src/translations.ts
@@ -52,7 +52,8 @@ export const coreTranslations = {
   hideDetails: 'Hide details',
   loading: 'Loading',
   male: 'Male',
-  other: 'Other',  patientIdentifierSticker: 'Patient identifier sticker',
+  other: 'Other',
+  patientIdentifierSticker: 'Patient identifier sticker',
   patientLists: 'Patient lists',
   print: 'Print',
   printError: 'Print error',