From 2e94f7f2bcd4b060005c8585c8bbf94d71c2dde9 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Tue, 26 Nov 2024 23:35:32 +0300
Subject: [PATCH] (fix) Fix more react hooks exhaustive deps warnings

I don't know why these didn't show up in #1380, but they're fixed now.
---
 .../date-and-time-of-death.component.tsx      |  2 +-
 .../field/dob/dob.component.tsx               |  2 +-
 .../field/name/name-field.component.tsx       |  4 +-
 ...coded-person-attribute-field.component.tsx |  6 +-
 .../patient-registration-hooks.ts             | 38 ++++++-------
 .../demographics-section.component.tsx        |  6 +-
 .../relationships.resource.tsx                | 56 +++++++++----------
 .../compact-patient-search.component.tsx      |  4 +-
 .../patient-search-button.component.tsx       |  8 +--
 .../patient-search.workspace.tsx              | 15 +++--
 .../src/patient-search.resource.tsx           | 13 +++--
 .../ward-patient-pending-transfer.tsx         |  8 +--
 .../src/ward-view/ward.component.tsx          | 21 +++++--
 .../admit-patient-form.workspace.tsx          | 12 ++--
 .../cancel-admission-request.workspace.tsx    | 26 +++++----
 .../patient-discharge.workspace.tsx           | 19 ++++---
 .../patient-bed-swap-form.component.tsx       | 26 +++++----
 ...atient-transfer-request-form.component.tsx | 43 +++++++-------
 .../form/notes-form.component.tsx             | 53 ++++++++++--------
 19 files changed, 193 insertions(+), 169 deletions(-)

diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
index 0a27740f4..95b04468c 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
@@ -35,7 +35,7 @@ function DeathDateField() {
         selectedDate ? dayjs(selectedDate).hour(0).minute(0).second(0).millisecond(0).toDate() : undefined,
       );
     },
-    [deathDate],
+    [setFieldValue],
   );
 
   return (
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
index 6599103ec..efbaa6b9b 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
@@ -41,7 +41,7 @@ export const DobField: React.FC = () => {
       setFieldValue('monthsEstimated', '');
       setFieldTouched('birthdateEstimated', true, false);
     },
-    [setFieldValue],
+    [setFieldTouched, setFieldValue],
   );
 
   const onDateChange = useCallback(
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
index f2b4e2147..8de9fe809 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next';
 import { ContentSwitcher, Switch } from '@carbon/react';
 import { useField } from 'formik';
 import { ExtensionSlot, useConfig } from '@openmrs/esm-framework';
+import { type RegistrationConfig } from '../../../config-schema';
 import { Input } from '../../input/basic-input/input/input.component';
 import { PatientRegistrationContext } from '../../patient-registration-context';
-import { type RegistrationConfig } from '../../../config-schema';
 import styles from '../field.scss';
 
 export const unidentifiedPatientAttributeTypeUuid = '8b56eac7-5c76-4b9c-8c6f-1deab8d3fc47';
@@ -51,7 +51,7 @@ export const NameField = () => {
         setFieldTouched('photo', true, false);
       }
     },
-    [setCapturePhotoProps],
+    [setCapturePhotoProps, setFieldTouched],
   );
 
   const toggleNameKnown = (e) => {
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
index e5b06a050..d72e935cd 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
@@ -3,10 +3,10 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Field } from 'formik';
 import { Layer, Select, SelectItem } from '@carbon/react';
+import { reportError } from '@openmrs/esm-framework';
 import { type PersonAttributeTypeResponse } from '../../patient-registration.types';
 import { useConceptAnswers } from '../field.resource';
 import styles from './../field.scss';
-import { reportError } from '@openmrs/esm-framework';
 
 export interface CodedPersonAttributeFieldProps {
   id: string;
@@ -44,7 +44,7 @@ export function CodedPersonAttributeField({
       );
       setError(true);
     }
-  }, [answerConceptSetUuid, customConceptAnswers]);
+  }, [answerConceptSetUuid, customConceptAnswers, id, t]);
 
   useEffect(() => {
     if (!isLoadingConceptAnswers && !customConceptAnswers.length) {
@@ -72,7 +72,7 @@ export function CodedPersonAttributeField({
         setError(true);
       }
     }
-  }, [isLoadingConceptAnswers, conceptAnswers, customConceptAnswers]);
+  }, [isLoadingConceptAnswers, conceptAnswers, customConceptAnswers, t, id, answerConceptSetUuid]);
 
   const answers = useMemo(() => {
     if (customConceptAnswers.length) {
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
index ff50d4b20..b89aed9c6 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
@@ -1,14 +1,15 @@
+import { type Dispatch, useEffect, useMemo, useState } from 'react';
 import {
   type FetchResponse,
+  type OpenmrsResource,
   getSynchronizationItems,
   openmrsFetch,
-  type OpenmrsResource,
   restBaseUrl,
   useConfig,
   usePatient,
 } from '@openmrs/esm-framework';
 import camelCase from 'lodash-es/camelCase';
-import { type Dispatch, useEffect, useMemo, useState } from 'react';
+import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { type RegistrationConfig } from '../config-schema';
@@ -29,7 +30,15 @@ import {
   latestFirstEncounter,
 } from './patient-registration-utils';
 import { useInitialPatientRelationships } from './section/patient-relationships/relationships.resource';
-import dayjs from 'dayjs';
+
+interface DeathInfoResults {
+  uuid: string;
+  display: string;
+  causeOfDeath: OpenmrsResource | null;
+  dead: boolean;
+  deathDate: string;
+  causeOfDeathNonCoded: string | null;
+}
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
   const { freeTextFieldConceptUuid } = useConfig<RegistrationConfig>();
@@ -99,7 +108,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         setInitialFormValues(registration._patientRegistrationData.formValues);
       }
     })();
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [initialFormValues, isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
   // Set initial patient death info
   useEffect(() => {
@@ -118,7 +127,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         nonCodedCauseOfDeath: deathInfo.causeOfDeathNonCoded,
       }));
     }
-  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues]);
+  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues, freeTextFieldConceptUuid]);
 
   // Set initial patient relationships
   useEffect(() => {
@@ -187,7 +196,7 @@ export function useInitialAddressFieldValues(patientUuid: string, fallback = {})
         setInitialAddressFieldValues(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback);
       }
     })();
-  }, [isLoading, patient, patientUuid]);
+  }, [fallback, initialAddressFieldValues, isLoading, patient, patientUuid]);
 
   return [initialAddressFieldValues, setInitialAddressFieldValues];
 }
@@ -208,7 +217,7 @@ export function usePatientUuidMap(
         setPatientUuidMap(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback),
       );
     }
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [fallback, isLoadingPatientToEdit, patientToEdit, patientUuid, patientUuidMap]);
 
   useEffect(() => {
     if (attributes) {
@@ -263,7 +272,7 @@ export function useInitialPatientIdentifiers(patientUuid: string): {
       data: identifiers,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
 
   return result;
 }
@@ -299,19 +308,10 @@ function useInitialPersonAttributes(personUuid: string) {
       data: data?.data?.results,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
   return result;
 }
 
-interface DeathInfoResults {
-  uuid: string;
-  display: string;
-  causeOfDeath: OpenmrsResource | null;
-  dead: boolean;
-  deathDate: string;
-  causeOfDeathNonCoded: string | null;
-}
-
 function useInitialPersonDeathInfo(personUuid: string) {
   const { data, error, isLoading } = useSWR<FetchResponse<DeathInfoResults>, Error>(
     !!personUuid
@@ -325,7 +325,7 @@ function useInitialPersonDeathInfo(personUuid: string) {
       data: data?.data,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data, isLoading]);
   return result;
 }
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
index 3ab1adb22..cf2e9074e 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
@@ -1,8 +1,8 @@
 import React, { useContext, useEffect } from 'react';
-import styles from './../section.scss';
 import { useField } from 'formik';
-import { PatientRegistrationContext } from '../../patient-registration-context';
 import { Field } from '../../field/field.component';
+import { PatientRegistrationContext } from '../../patient-registration-context';
+import styles from './../section.scss';
 
 export interface DemographicsSectionProps {
   fields: Array<string>;
@@ -18,7 +18,7 @@ export const DemographicsSection: React.FC<DemographicsSectionProps> = ({ fields
       setFieldValue('additionalMiddleName', '');
       setFieldValue('additionalFamilyName', '');
     }
-  }, [field.value, meta.touched]);
+  }, [field.value, meta.touched, setFieldValue]);
 
   return (
     <section className={styles.formSection} aria-label="Demographics Section">
diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
index 643639167..810f374ac 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
@@ -4,6 +4,33 @@ import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-fram
 import { type RelationshipValue } from '../../patient-registration.types';
 import { personRelationshipRepresentation } from '../../../constants';
 
+export interface Relationship {
+  display: string;
+  uuid: string;
+  personA: {
+    age: number;
+    display: string;
+    birthdate: string;
+    uuid: string;
+  };
+  personB: {
+    age: number;
+    display: string;
+    birthdate: string;
+    uuid: string;
+  };
+  relationshipType: {
+    uuid: string;
+    display: string;
+    aIsToB: string;
+    bIsToA: string;
+  };
+}
+
+interface RelationshipsResponse {
+  results: Array<Relationship>;
+}
+
 export function useInitialPatientRelationships(patientUuid: string): {
   data: Array<RelationshipValue>;
   isLoading: boolean;
@@ -45,34 +72,7 @@ export function useInitialPatientRelationships(patientUuid: string): {
       error,
       isLoading,
     };
-  }, [patientUuid, data, error]);
+  }, [data?.data?.results, error, isLoading, patientUuid]);
 
   return result;
 }
-
-export interface Relationship {
-  display: string;
-  uuid: string;
-  personA: {
-    age: number;
-    display: string;
-    birthdate: string;
-    uuid: string;
-  };
-  personB: {
-    age: number;
-    display: string;
-    birthdate: string;
-    uuid: string;
-  };
-  relationshipType: {
-    uuid: string;
-    display: string;
-    aIsToB: string;
-    bIsToA: string;
-  };
-}
-
-interface RelationshipsResponse {
-  results: Array<Relationship>;
-}
diff --git a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
index 7973a5bc9..8e74237d2 100644
--- a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
+++ b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
@@ -96,7 +96,7 @@ const CompactPatientSearchComponent: React.FC<CompactPatientSearchProps> = ({
         });
       }
     },
-    [config.search.patientChartUrl, user, currentLocation],
+    [addViewedPatientAndCloseSearchResults, config.search.patientChartUrl],
   );
   const focusedResult = useArrowNavigation(
     !recentPatients ? searchedPatients?.length ?? 0 : recentPatients?.length ?? 0,
@@ -134,7 +134,7 @@ const CompactPatientSearchComponent: React.FC<CompactPatientSearchProps> = ({
         subtitle: errorFetchingUserProperties?.message,
       });
     }
-  }, [fetchError, errorFetchingUserProperties]);
+  }, [fetchError, errorFetchingUserProperties, t]);
 
   const handleSubmit = useCallback(
     (debouncedSearchTerm) => {
diff --git a/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx b/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
index 5382abad5..23f63176a 100644
--- a/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
@@ -1,7 +1,7 @@
+import React, { useCallback, useEffect } from 'react';
 import { Button } from '@carbon/react';
 import { Search } from '@carbon/react/icons';
 import { launchWorkspace } from '@openmrs/esm-framework';
-import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type PatientSearchWorkspaceProps } from '../patient-search-workspace/patient-search.workspace';
 
@@ -37,7 +37,7 @@ const PatientSearchButton: React.FC<PatientSearchButtonProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  const launchPatientSearchWorkspace = () => {
+  const launchPatientSearchWorkspace = useCallback(() => {
     const workspaceProps: PatientSearchWorkspaceProps = {
       handleSearchTermUpdated: searchQueryUpdatedAction,
       initialQuery: searchQuery,
@@ -47,13 +47,13 @@ const PatientSearchButton: React.FC<PatientSearchButtonProps> = ({
       ...workspaceProps,
       workspaceTitle: overlayHeader,
     });
-  };
+  }, [overlayHeader, searchQuery, searchQueryUpdatedAction, selectPatientAction]);
 
   useEffect(() => {
     if (isOpen) {
       launchPatientSearchWorkspace();
     }
-  }, [isOpen]);
+  }, [isOpen, launchPatientSearchWorkspace]);
 
   return (
     <Button
diff --git a/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx b/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
index c8419cfa2..4ec629ede 100644
--- a/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
@@ -1,8 +1,8 @@
-import { useConfig, useDebounce } from '@openmrs/esm-framework';
 import React, { useCallback, useState } from 'react';
+import { useConfig, useDebounce } from '@openmrs/esm-framework';
 import { type PatientSearchConfig } from '../config-schema';
-import PatientSearchBar from '../patient-search-bar/patient-search-bar.component';
 import { PatientSearchContext, type PatientSearchContextProps } from '../patient-search-context';
+import PatientSearchBar from '../patient-search-bar/patient-search-bar.component';
 import AdvancedPatientSearchComponent from '../patient-search-page/advanced-patient-search.component';
 
 export interface PatientSearchWorkspaceProps extends PatientSearchContextProps {
@@ -28,10 +28,13 @@ const PatientSearchWorkspace: React.FC<PatientSearchWorkspaceProps> = ({
 
   const handleClearSearchTerm = useCallback(() => setSearchTerm(''), [setSearchTerm]);
 
-  const onSearchTermChange = useCallback((value: string) => {
-    setSearchTerm(value);
-    handleSearchTermUpdated && handleSearchTermUpdated(value);
-  }, []);
+  const onSearchTermChange = useCallback(
+    (value: string) => {
+      setSearchTerm(value);
+      handleSearchTermUpdated && handleSearchTermUpdated(value);
+    },
+    [handleSearchTermUpdated],
+  );
 
   return (
     <PatientSearchContext.Provider value={{ nonNavigationSelectPatientAction, patientClickSideEffect }}>
diff --git a/packages/esm-patient-search-app/src/patient-search.resource.tsx b/packages/esm-patient-search-app/src/patient-search.resource.tsx
index bda4ccc82..e7ceb67bd 100644
--- a/packages/esm-patient-search-app/src/patient-search.resource.tsx
+++ b/packages/esm-patient-search-app/src/patient-search.resource.tsx
@@ -92,7 +92,7 @@ export function useInfinitePatientSearch(
       currentPage: size,
       totalResults: data?.[0]?.data?.totalCount ?? 0,
     }),
-    [data, isLoading, isValidating, error, setSize, size],
+    [mappedData, isLoading, error, data, isValidating, setSize, size],
   );
 }
 
@@ -120,7 +120,10 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
   );
 
   const userProperties = data?.data?.userProperties;
-  const patientsVisited = userProperties?.patientsVisited?.split(',').filter(Boolean) ?? [];
+  const patientsVisited = useMemo(
+    () => userProperties?.patientsVisited?.split(',').filter(Boolean) ?? [],
+    [userProperties],
+  );
 
   const updateRecentlyViewedPatients = useCallback(
     (patientUuid: string) => {
@@ -138,7 +141,7 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
         },
       });
     },
-    [patientsVisited, userProperties],
+    [patientsVisited, url, userProperties],
   );
 
   return useMemo(
@@ -149,7 +152,7 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
       updateRecentlyViewedPatients,
       mutateUserProperties: mutate,
     }),
-    [data, error, mutate],
+    [error, isLoading, mutate, patientsVisited, updateRecentlyViewedPatients],
   );
 }
 
@@ -213,6 +216,6 @@ export function useRestPatients(
       currentPage: size,
       totalResults: patientUuids?.length ?? 0,
     }),
-    [data, isLoading, isValidating, error, setSize, size, patientUuids],
+    [mappedData, isLoading, error, patientUuids, size, isValidating, setSize],
   );
 }
diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
index 23a4f0d5c..08537f076 100644
--- a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
@@ -1,10 +1,10 @@
 import React, { useMemo } from 'react';
+import { IconButton } from '@carbon/react';
 import { Movement } from '@carbon/react/icons';
-import styles from '../ward-patient-card.scss';
 import { useTranslation } from 'react-i18next';
-import { type WardPatientWorkspaceProps, type WardViewContext, type WardPatient } from '../../types';
 import { CloseOutlineIcon, launchWorkspace, useAppContext } from '@openmrs/esm-framework';
-import { IconButton } from '@carbon/react';
+import { type WardPatientWorkspaceProps, type WardViewContext, type WardPatient } from '../../types';
+import styles from '../ward-patient-card.scss';
 
 export interface WardPatientTransferProps {
   wardPatient: WardPatient;
@@ -26,7 +26,7 @@ const WardPatientPendingTransfer: React.FC<WardPatientTransferProps> = ({ wardPa
       return t('pendingDischarge', 'Pending Discharge');
     }
     return '';
-  }, [dispositionType, dispositionLocation]);
+  }, [dispositionType, dispositionLocation, t]);
 
   const launchCancelAdmissionForm = () => {
     launchWorkspace<WardPatientWorkspaceProps>('cancel-admission-request-workspace', {
diff --git a/packages/esm-ward-app/src/ward-view/ward.component.tsx b/packages/esm-ward-app/src/ward-view/ward.component.tsx
index 4c8b4fda6..6257ce2f1 100644
--- a/packages/esm-ward-app/src/ward-view/ward.component.tsx
+++ b/packages/esm-ward-app/src/ward-view/ward.component.tsx
@@ -1,11 +1,11 @@
-import { InlineNotification } from '@carbon/react';
-import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React, { useEffect, useRef, type ReactNode } from 'react';
+import classNames from 'classnames';
+import { InlineNotification } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
-import useWardLocation from '../hooks/useWardLocation';
+import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
 import { type WardViewContext } from '../types';
+import useWardLocation from '../hooks/useWardLocation';
+import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
 import styles from './ward-view.scss';
 
 const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardUnassignedPatients: ReactNode }) => {
@@ -43,13 +43,22 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
       if (scrollToLoadMoreTrigger.current) {
         observer.observe(scrollToLoadMoreTrigger.current);
       }
+
       return () => {
         if (scrollToLoadMoreTrigger.current) {
+          // TODO: Fix this more meaningfully
+          // eslint-disable-next-line react-hooks/exhaustive-deps
           observer.unobserve(scrollToLoadMoreTrigger.current);
         }
       };
     },
-    [scrollToLoadMoreTrigger, hasMoreInpatientAdmissions, errorLoadingInpatientAdmissions, loadMoreInpatientAdmissions],
+    [
+      errorLoadingInpatientAdmissions,
+      hasMoreInpatientAdmissions,
+      isLoadingInpatientAdmissions,
+      loadMoreInpatientAdmissions,
+      scrollToLoadMoreTrigger,
+    ],
   );
 
   if (!wardPatientGroupDetails) return <></>;
diff --git a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
index 40034bc5f..8166c6e97 100644
--- a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
@@ -1,14 +1,14 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Column, Form, InlineNotification, Row } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
-import useWardLocation from '../../hooks/useWardLocation';
+import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
 import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
+import useWardLocation from '../../hooks/useWardLocation';
 import BedSelector from '../bed-selector.component';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './admit-patient-form.scss';
@@ -46,7 +46,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
       z.object({
         bedId: z.number().optional(),
       }),
-    [beds],
+    [],
   );
 
   type FormValues = z.infer<typeof zodSchema>;
@@ -61,7 +61,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = (values: FormValues) => {
     setShowErrorNotifications(false);
diff --git a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
index 19665b031..81ddc7962 100644
--- a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
@@ -1,16 +1,16 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Form, InlineNotification, TextArea } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import useWardLocation from '../../hooks/useWardLocation';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { useCreateEncounter } from '../../ward.resource';
-import styles from './cancel-admission-request.scss';
+import useWardLocation from '../../hooks/useWardLocation';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
+import styles from './cancel-admission-request.scss';
 
 export default function CancelAdmissionRequestWorkspace({
   closeWorkspaceWithSavedChanges,
@@ -58,7 +58,7 @@ export default function CancelAdmissionRequestWorkspace({
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -98,13 +98,15 @@ export default function CancelAdmissionRequestWorkspace({
         });
     },
     [
-      setShowErrorNotifications,
-      currentProvider,
-      location,
-      emrConfiguration,
-      patient?.uuid,
-      wardPatientGroupDetails,
+      emrConfiguration?.consultFreeTextCommentsConcept?.uuid,
+      emrConfiguration?.admissionDecisionConcept?.uuid,
+      emrConfiguration?.denyAdmissionConcept?.uuid,
+      emrConfiguration?.cancelADTRequestEncounterType,
       createEncounter,
+      patient,
+      t,
+      closeWorkspaceWithSavedChanges,
+      wardPatientGroupDetails,
     ],
   );
 
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
index 9eb308396..44fbcf0dc 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
@@ -1,18 +1,18 @@
+import React, { useCallback, useState } from 'react';
 import { Button, ButtonSet, InlineNotification } from '@carbon/react';
 import { Exit } from '@carbon/react/icons';
-import { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
-import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import useWardLocation from '../../hooks/useWardLocation';
+import { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import { type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
 import { removePatientFromBed, useCreateEncounter } from '../../ward.resource';
+import useWardLocation from '../../hooks/useWardLocation';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './patient-discharge.scss';
 
 export default function PatientDischargeWorkspace(props: WardPatientWorkspaceProps) {
   const { wardPatient, closeWorkspaceWithSavedChanges } = props;
   const { t } = useTranslation();
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
@@ -52,11 +52,12 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
         wardPatientGroupDetails.mutate();
       });
   }, [
-    currentProvider,
-    location,
-    emrConfiguration,
-    wardPatient?.patient?.uuid,
-    wardPatient?.bed?.uuid,
+    createEncounter,
+    wardPatient?.patient,
+    wardPatient.bed.id,
+    emrConfiguration.exitFromInpatientEncounterType,
+    t,
+    closeWorkspaceWithSavedChanges,
     wardPatientGroupDetails,
   ]);
 
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
index 28dc967e2..75fbc87a4 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
@@ -1,14 +1,12 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Form, InlineNotification } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
+import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { assignPatientToBed, useCreateEncounter, removePatientFromBed } from '../../ward.resource';
 import BedSelector from '../bed-selector.component';
 import styles from './patient-transfer-swap.scss';
@@ -24,8 +22,6 @@ export default function PatientBedSwapForm({
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
     useCreateEncounter();
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const { currentProvider } = useSession();
-  const { location } = useWardLocation();
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
@@ -51,9 +47,9 @@ export default function PatientBedSwapForm({
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
-  const beds = wardPatientGroupDetails?.bedLayouts ?? [];
+  const beds = useMemo(() => wardPatientGroupDetails?.bedLayouts ?? [], [wardPatientGroupDetails]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -113,7 +109,15 @@ export default function PatientBedSwapForm({
           closeWorkspaceWithSavedChanges();
         });
     },
-    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds, wardPatientGroupDetails],
+    [
+      beds,
+      createEncounter,
+      patient,
+      emrConfiguration.bedAssignmentEncounterType,
+      t,
+      wardPatientGroupDetails,
+      closeWorkspaceWithSavedChanges,
+    ],
   );
 
   const onError = useCallback(() => {
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
index 40cb6eded..35c71a489 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
@@ -1,32 +1,25 @@
-import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import {
-  ArrowRightIcon,
-  ResponsiveWrapper,
-  showSnackbar,
-  useAppContext,
-  useLayoutType,
-  useSession,
-} from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import classNames from 'classnames';
+import { z } from 'zod';
+import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useLayoutType, useSession } from '@openmrs/esm-framework';
+import { useCreateEncounter } from '../../ward.resource';
+import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import useWardLocation from '../../hooks/useWardLocation';
+import AdmissionPatientButton from '../admit-patient-button.component';
 import LocationSelector from '../../location-selector/location-selector.component';
-import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { useCreateEncounter } from '../../ward.resource';
 import styles from './patient-transfer-swap.scss';
-import AdmissionPatientButton from '../admit-patient-button.component';
 
 export default function PatientTransferForm({
   closeWorkspaceWithSavedChanges,
   wardPatient,
   promptBeforeClosing,
 }: WardPatientWorkspaceProps) {
-  const { patient, inpatientAdmission } = wardPatient ?? {};
   const { t } = useTranslation();
+  const { patient, inpatientAdmission } = wardPatient ?? {};
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
@@ -79,12 +72,12 @@ export default function PatientTransferForm({
     if (dispositionsWithTypeTransfer?.length === 1) {
       setValue('transferType', dispositionsWithTypeTransfer[0].uuid);
     }
-  }, [dispositionsWithTypeTransfer]);
+  }, [dispositionsWithTypeTransfer, setValue]);
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -134,12 +127,16 @@ export default function PatientTransferForm({
         });
     },
     [
-      setShowErrorNotifications,
-      currentProvider,
-      location,
-      emrConfiguration,
-      patient?.uuid,
+      closeWorkspaceWithSavedChanges,
+      createEncounter,
       dispositionsWithTypeTransfer,
+      emrConfiguration.consultFreeTextCommentsConcept.uuid,
+      emrConfiguration.dispositionDescriptor.dispositionConcept.uuid,
+      emrConfiguration.dispositionDescriptor.dispositionSetConcept.uuid,
+      emrConfiguration.dispositionDescriptor.internalTransferLocationConcept.uuid,
+      emrConfiguration.transferRequestEncounterType,
+      patient,
+      t,
       wardPatientGroupDetails,
     ],
   );
diff --git a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
index ede900b9e..e917ec85e 100644
--- a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
@@ -5,7 +5,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { Button, Column, Form, InlineLoading, InlineNotification, Row, Stack, TextArea } from '@carbon/react';
 import {
-  createErrorHandler,
   type DefaultWorkspaceProps,
   type PatientUuid,
   ResponsiveWrapper,
@@ -13,13 +12,17 @@ import {
   translateFrom,
   useSession,
 } from '@openmrs/esm-framework';
-import { savePatientNote } from '../notes.resource';
-import styles from './notes-form.scss';
 import { moduleName } from '../../../constant';
+import { savePatientNote } from '../notes.resource';
 import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
+import styles from './notes-form.scss';
 
 type NotesFormData = z.infer<typeof noteFormSchema>;
 
+interface PatientNotesFormProps extends DefaultWorkspaceProps {
+  patientUuid: PatientUuid;
+}
+
 const noteFormSchema = z.object({
   wardClinicalNote: z.string().refine((val) => val.trim().length > 0, {
     //t('clinicalNoteErrorMessage','Clinical note is required')
@@ -27,10 +30,6 @@ const noteFormSchema = z.object({
   }),
 });
 
-interface PatientNotesFormProps extends DefaultWorkspaceProps {
-  patientUuid: PatientUuid;
-}
-
 const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   closeWorkspaceWithSavedChanges,
   patientUuid,
@@ -39,6 +38,7 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const { t } = useTranslation();
   const session = useSession();
+
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [rows, setRows] = useState<number>();
 
@@ -93,26 +93,31 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
           closeWorkspaceWithSavedChanges();
           showSnackbar({
             isLowContrast: true,
-            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             kind: 'success',
+            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             title: t('visitNoteSaved', 'Patient note saved'),
           });
         })
         .catch((err) => {
-          createErrorHandler();
-
           showSnackbar({
-            title: t('patientNoteSaveError', 'Error saving patient note'),
-            kind: 'error',
             isLowContrast: false,
+            kind: 'error',
             subtitle: err?.message,
+            title: t('patientNoteSaveError', 'Error saving patient note'),
           });
         })
-        .finally(() => {
-          setIsSubmitting(false);
-        });
+        .finally(() => setIsSubmitting(false));
     },
-    [emrConfiguration, patientUuid, locationUuid, providerUuid],
+    [
+      closeWorkspaceWithSavedChanges,
+      emrConfiguration?.clinicianEncounterRole.uuid,
+      emrConfiguration?.consultFreeTextCommentsConcept.uuid,
+      emrConfiguration?.inpatientNoteEncounterType.uuid,
+      locationUuid,
+      patientUuid,
+      providerUuid,
+      t,
+    ],
   );
 
   const onError = (errors) => console.error(errors);
@@ -146,19 +151,19 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
                 <ResponsiveWrapper>
                   <TextArea
                     id="additionalNote"
-                    rows={rows}
-                    labelText={t('clinicalNoteLabel', 'Write your notes')}
-                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
-                    value={value}
-                    onBlur={onBlur}
                     invalid={!!errors.wardClinicalNote}
                     invalidText={errors.wardClinicalNote?.message}
+                    labelText={t('clinicalNoteLabel', 'Write your notes')}
+                    onBlur={onBlur}
                     onChange={(event) => {
                       onChange(event);
-                      const textareaLineHeight = 24; // This is the default line height for Carbon's TextArea component
-                      const newRows = Math.ceil(event.target.scrollHeight / textareaLineHeight);
+                      const textAreaLineHeight = 24; // This is the default line height for Carbon's TextArea component
+                      const newRows = Math.ceil(event.target.scrollHeight / textAreaLineHeight);
                       setRows(newRows);
                     }}
+                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
+                    rows={rows}
+                    value={value}
                   />
                 </ResponsiveWrapper>
               )}
@@ -167,9 +172,9 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
         </Row>
       </Stack>
       <Button
-        kind="primary"
         className={styles.saveButton}
         disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+        kind="primary"
         type="submit">
         {isSubmitting ? <InlineLoading description={t('saving', 'Saving...')} /> : <span>{t('save', 'Save')}</span>}
       </Button>