@openmrs/esm-patient-chart-app 11.3.1-pre.9294 → 11.3.1-pre.9304

package/src/visit/visits-widget/current-visit-summary.test.tsx

@@ -1,34 +1,52 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { useVisit, getConfig } from '@openmrs/esm-framework';
-import { waitForLoadingToFinish } from 'tools';
-import CurrentVisitSummary from './current-visit-summary.component';
+import { getConfig } from '@openmrs/esm-framework';
+import { mockPatient, waitForLoadingToFinish } from 'tools';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
+import CurrentVisitSummary from './current-visit-summary.extension';
 
 const mockGetConfig = jest.mocked(getConfig);
-const mockUseVisits = jest.mocked(useVisit);
+const mockUsePatientChartStore = jest.mocked(usePatientChartStore);
+
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
+  usePatientChartStore: jest.fn(),
+}));
 
 describe('CurrentVisitSummary', () => {
   test('renders an empty state when there is no active visit', () => {
-    mockUseVisits.mockReturnValueOnce({
-      activeVisit: null,
-      currentVisit: null,
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
-      mutate: jest.fn(),
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: null,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
     });
-
-    render(<CurrentVisitSummary patientUuid="some-uuid" />);
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
     expect(screen.getByText(/current visit/i)).toBeInTheDocument();
-    expect(screen.getByText('There are no active visit to display for this patient')).toBeInTheDocument();
+    expect(screen.getByText('There are no active visits to display for this patient')).toBeInTheDocument();
+  });
+
+  test('returns null when patientUuid does not match store patientUuid', () => {
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: 'different-patient-id',
+      patient: mockPatient,
+      visitContext: null,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
+    });
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
+    expect(screen.queryByText(/current visit/i)).not.toBeInTheDocument();
   });
 
-  test('renders a visit summary when for the active visit', async () => {
+  test('renders a visit summary when visit context exists', async () => {
     mockGetConfig.mockResolvedValue({ htmlFormEntryForms: [] });
-    mockUseVisits.mockReturnValueOnce({
-      activeVisit: null,
-      currentVisit: {
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: {
         uuid: 'some-uuid',
         display: 'Visit 1',
         startDatetime: '2021-03-23T10:00:00.000+0300',
@@ -42,15 +60,17 @@ describe('CurrentVisitSummary', () => {
           display: 'Visit Type 1',
         },
         encounters: [],
+        patient: {
+          uuid: mockPatient.id,
+          display: 'Test Patient',
+        },
       },
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
-      mutate: jest.fn(),
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
     });
 
-    render(<CurrentVisitSummary patientUuid="some-uuid" />);
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 

package/src/visit/visits-widget/past-visits-components/encounters-table/encounters-table.component.tsx

@@ -44,6 +44,7 @@ import {
   type HtmlFormEntryForm,
   launchFormEntryOrHtmlForms,
   invalidateVisitAndEncounterData,
+  usePatientChartStore,
 } from '@openmrs/esm-patient-common-lib';
 import { jsonSchemaResourceName } from '../../../../constants';
 import {
@@ -80,7 +81,7 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
   const pageSizes = [10, 20, 30, 40, 50];
   const desktopLayout = isDesktop(useLayoutType());
   const session = useSession();
-  const { mutate: mutateCurrentVisit } = useVisit(patientUuid);
+  const { mutateVisitContext } = usePatientChartStore(patientUuid);
   const { mutate } = useSWRConfig();
   const responsiveSize = desktopLayout ? 'sm' : 'lg';
   const { data: encounterTypes, isLoading: isLoadingEncounterTypes } = useEncounterTypes();
@@ -133,7 +134,7 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
           deleteEncounter(encounterUuid, abortController)
             .then(() => {
               // Update current visit data for critical components
-              mutateCurrentVisit();
+              mutateVisitContext?.();
 
               // Also invalidate visit history and encounter tables since the encounter was deleted
               invalidateVisitAndEncounterData(mutate, patientUuid);
@@ -160,7 +161,7 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
         },
       });
     },
-    [mutate, mutateCurrentVisit, patientUuid, t],
+    [mutate, mutateVisitContext, patientUuid, t],
   );
 
   if (isLoadingEncounterTypes || isLoading) {

package/src/visit/visits-widget/past-visits-components/encounters-table/encounters-table.resource.ts

@@ -8,7 +8,6 @@ import {
   type Encounter,
   type EncounterType,
   type Obs,
-  type OpenmrsResource,
   useOpenmrsFetchAll,
   useOpenmrsPagination,
 } from '@openmrs/esm-framework';

package/src/visit/visits-widget/visit-context/retrospective-data-date-time-picker/retrospective-date-time-picker.component.tsx

@@ -1,10 +1,9 @@
 import { SelectItem, TimePickerSelect, TimePicker, Checkbox } from '@carbon/react';
-import { OpenmrsDatePicker, ResponsiveWrapper, useFeatureFlag, useVisit } from '@openmrs/esm-framework';
+import { OpenmrsDatePicker, ResponsiveWrapper, useFeatureFlag, type Visit } from '@openmrs/esm-framework';
 import React, { useEffect, useState } from 'react';
 import { type Control, Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import styles from './restrospective-date-time-picker.scss';
-import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 
 type FormValues = {
   retrospectiveDate: Date;
@@ -13,23 +12,22 @@ type FormValues = {
 };
 
 type RetrospectiveDateTimePickerProps = {
-  patientUuid: string;
+  visitContext: Visit;
   control?: Control<FormValues>;
   onChange?: (data: FormValues) => void;
 };
 
 const RetrospectiveDateTimePicker = ({
-  patientUuid,
+  visitContext,
   control: propControl,
   onChange,
 }: RetrospectiveDateTimePickerProps) => {
   const { t } = useTranslation();
   const isRdeEnabled = useFeatureFlag('rde');
 
-  const { currentVisit } = useVisit(patientUuid);
-  const isActiveVisit = !Boolean(currentVisit && currentVisit.stopDatetime);
-  const maxDate = currentVisit?.stopDatetime;
-  const minDate = currentVisit?.startDatetime;
+  const isActiveVisit = !Boolean(visitContext && visitContext.stopDatetime);
+  const maxDate = visitContext?.stopDatetime;
+  const minDate = visitContext?.startDatetime;
 
   const [manuallyEnableDateTimePicker, setManuallyEnableDateTimePicker] = useState<boolean>(false);
 

package/src/visit/visits-widget/visit-context/{visit-context-header.component.tsx → visit-context-header.extension.tsx}

@@ -1,24 +1,33 @@
-import { Button, Loading } from '@carbon/react';
-import { showModal, useFeatureFlag, useVisit } from '@openmrs/esm-framework';
+import { Button } from '@carbon/react';
+import { showModal, useFeatureFlag } from '@openmrs/esm-framework';
 import classNames from 'classnames';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from './visit-context-header.scss';
 import VisitContextInfo from './visit-context-info.component';
-import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
+import { usePatientChartStore, useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 
 interface VisitContextHeaderProps {
   patientUuid: string;
 }
 
+/**
+ * The visit context header displays the currently select visit context in the patient chart store.
+ * When creating encounters (ex: visit notes, order entry, vitals), they are associated
+ * with the visit in context.
+ *
+ * This extension uses the patient chart store and should only be shown within the patient chart.
+ * It does not render when mounted outside the patient chart.
+ */
 const VisitContextHeader: React.FC<VisitContextHeaderProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const { systemVisitEnabled } = useSystemVisitSetting();
   const isRdeEnabled = useFeatureFlag('rde');
-  const showVisitContextHeader = systemVisitEnabled && isRdeEnabled;
 
-  const { currentVisit, isLoading } = useVisit(showVisitContextHeader ? patientUuid : null);
-  const isActiveVisit = !Boolean(currentVisit && currentVisit.stopDatetime);
+  const { visitContext } = usePatientChartStore(patientUuid);
+  const isActiveVisit = Boolean(visitContext && !visitContext.stopDatetime);
+
+  const showVisitContextHeader = systemVisitEnabled && isRdeEnabled && visitContext;
 
   const openVisitSwitcherModal = () => {
     const dispose = showModal('visit-context-switcher', {
@@ -31,26 +40,19 @@ const VisitContextHeader: React.FC<VisitContextHeaderProps> = ({ patientUuid })
   if (!showVisitContextHeader) {
     return null;
   }
-  if (isLoading) {
-    return (
-      <div className={styles.visitContextHeader}>
-        <Loading small />
-      </div>
-    );
-  }
   return (
     <div
       className={classNames(styles.visitContextHeader, isActiveVisit ? styles.activeVisit : styles.retroactiveVisit)}
     >
       <div className={styles.addingTo}>{t('addingToVisit', 'Adding to:')}</div>
-      <div className={styles.visitType}>{currentVisit.visitType.display}</div>
+      <div className={styles.visitType}>{visitContext.visitType?.display}</div>
       <div className={styles.changeVisitButton}>
         <Button kind="ghost" size="sm" onClick={openVisitSwitcherModal}>
           {t('change', 'Change')}
         </Button>
       </div>
       <div className={styles.visitInfo}>
-        <VisitContextInfo visit={currentVisit} />
+        <VisitContextInfo visit={visitContext} />
       </div>
     </div>
   );

package/src/visit/visits-widget/visit-context/visit-context-header.test.tsx

@@ -1,51 +1,57 @@
-import { useVisit, useVisitContextStore } from '@openmrs/esm-framework';
-import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
+import { usePatientChartStore, useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 import { render, screen } from '@testing-library/react';
 import { mockCurrentVisit } from '__mocks__';
 import React from 'react';
-import VisitContextHeader from './visit-context-header.component';
+import VisitContextHeader from './visit-context-header.extension';
+import { mockPatient } from 'tools';
 
-const mockUseSystemVisitSetting = jest.fn(useSystemVisitSetting).mockReturnValue({
-  systemVisitEnabled: true,
-  errorFetchingSystemVisitSetting: null,
-  isLoadingSystemVisitSetting: false,
-});
-
-jest.mocked(useVisitContextStore).mockReturnValue({
-  manuallySetVisitUuid: null,
-  mutateVisitCallbacks: {},
-  patientUuid: null,
-  setVisitContext: jest.fn(),
-  mutateVisit: jest.fn(),
-});
-
-jest.mocked(useVisit).mockReturnValue({
-  currentVisit: mockCurrentVisit,
-  error: null,
-  mutate: jest.fn(),
-  isValidating: false,
-  activeVisit: null,
-  currentVisitIsRetrospective: false,
-  isLoading: false,
-});
+const mockUsePatientChartStore = jest.mocked(usePatientChartStore);
+const mockUseSystemVisitSetting = jest.mocked(useSystemVisitSetting);
 
-jest.mock('@openmrs/esm-patient-common-lib/src/useSystemVisitSetting', () => ({
-  useSystemVisitSetting: () => mockUseSystemVisitSetting(),
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  usePatientChartStore: jest.fn(),
+  useSystemVisitSetting: jest.fn(),
 }));
 
 describe('VisitContextHeader', () => {
+  beforeEach(() => {
+    mockUseSystemVisitSetting.mockReturnValue({
+      systemVisitEnabled: true,
+      errorFetchingSystemVisitSetting: null,
+      isLoadingSystemVisitSetting: false,
+    });
+  });
+
   it('should not show header if system does not support visits', () => {
     mockUseSystemVisitSetting.mockReturnValueOnce({
       systemVisitEnabled: false,
       errorFetchingSystemVisitSetting: null,
       isLoadingSystemVisitSetting: false,
     });
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: null,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
+    });
+
     render(<VisitContextHeader patientUuid="some-uuid" />);
     expect(screen.queryByText('Adding to')).not.toBeInTheDocument();
   });
 
   it('should show the current visit', () => {
-    render(<VisitContextHeader patientUuid="some-uuid" />);
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: mockCurrentVisit,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
+    });
+
+    render(<VisitContextHeader patientUuid={mockPatient.id} />);
     expect(screen.getByText(/Adding to/i)).toBeInTheDocument();
     expect(screen.getByText(mockCurrentVisit.visitType.display)).toBeInTheDocument();
   });

package/src/visit/visits-widget/visit-context/visit-context-switcher.modal.tsx

@@ -9,12 +9,13 @@ import {
   OpenmrsDatePicker,
   useDebounce,
   useOnVisible,
-  useVisitContextStore,
   type Visit,
 } from '@openmrs/esm-framework';
+import { invalidateVisitByUuid, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { useInfiniteVisits } from '../visit.resource';
 import VisitContextInfo from './visit-context-info.component';
 import styles from './visit-context-switcher.scss';
+import { useSWRConfig } from 'swr';
 
 interface VisitContextSwitcherProps {
   patientUuid: string;
@@ -37,10 +38,9 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
     { toStartDate: dayjs(maxStartDateDebounced).endOf('day').toISOString() },
     rep,
   );
-  const { patientUuid: selectedVisitPatientUuid, manuallySetVisitUuid, setVisitContext } = useVisitContextStore();
-  const [selectedVisit, setSelectedVisit] = useState<string>(
-    selectedVisitPatientUuid === patientUuid ? manuallySetVisitUuid : null,
-  );
+  const { visitContext, setVisitContext } = usePatientChartStore(patientUuid);
+  const [selectedVisitUuid, setSelectedVisitUuid] = useState<string>(visitContext?.uuid ?? null);
+  const { mutate: globalMutate } = useSWRConfig();
 
   const onScrollToEnd = useCallback(() => {
     if (hasMore) {
@@ -71,7 +71,7 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
       <ModalBody>
         {error ? (
           <ErrorState headerTitle={t('visits', 'visits')} error={error} />
-        ) : visits?.length == 0 ? (
+        ) : visits?.length === 0 ? (
           <Tile className={styles.tile}>
             <div className={styles.tileContent}>
               <p className={styles.content}>{t('noVisitsToDisplay', 'No visits to display')}</p>
@@ -85,8 +85,8 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
                 <VisitCardRow
                   key={visit.uuid}
                   visit={visit}
-                  setSelectedVisit={setSelectedVisit}
-                  isSelected={selectedVisit === visit.uuid}
+                  setSelectedVisit={setSelectedVisitUuid}
+                  isSelected={selectedVisitUuid === visit.uuid}
                 />
               );
             })}
@@ -104,9 +104,11 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
           {t('cancel', 'Cancel')}
         </Button>
         <Button
-          disabled={selectedVisit === null || isLoading}
+          disabled={selectedVisitUuid === null || isLoading}
           onClick={() => {
-            setVisitContext(visits.find((v) => v.uuid === selectedVisit));
+            const selectedVisit = visits.find((v) => v.uuid === selectedVisitUuid);
+            const mutateVisitContext = () => invalidateVisitByUuid(globalMutate, selectedVisit.uuid);
+            setVisitContext(selectedVisit, mutateVisitContext);
             onAfterVisitSelected?.();
             closeModal();
           }}
@@ -125,7 +127,7 @@ interface VisitCardRowProps {
 }
 
 /**
- * A clickable row within the the visit context switcher to select a visit. This
+ * A clickable row within the visit context switcher to select a visit. This
  * has slightly different UX than a regular radio button, as the entire card
  * (not just the radio button and the label) is clickable
  */

package/src/visit/visits-widget/visit-context/visit-context-switcher.test.tsx

@@ -1,46 +1,49 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { useVisitContextStore } from '@openmrs/esm-framework';
+import userEvent from '@testing-library/user-event';
 import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 import { mockCurrentVisit, mockVisit2, mockVisit3 } from '__mocks__';
 import { useInfiniteVisits } from '../visit.resource';
 import VisitContextSwitcherModal from './visit-context-switcher.modal';
 
-const mockUseSystemVisitSetting = jest.fn(useSystemVisitSetting).mockReturnValue({
-  errorFetchingSystemVisitSetting: null,
-  isLoadingSystemVisitSetting: false,
-  systemVisitEnabled: true,
-});
-
-jest.mocked(useVisitContextStore).mockReturnValue({
-  manuallySetVisitUuid: null,
-  mutateVisitCallbacks: {},
-  patientUuid: null,
-  setVisitContext: jest.fn(),
-  mutateVisit: jest.fn(),
-});
-
-const mockUseInfiniteVisits = jest.fn(useInfiniteVisits).mockReturnValue({
-  visits: [mockCurrentVisit, mockVisit2, mockVisit3],
-  error: null,
-  mutate: jest.fn(),
-  isValidating: false,
-  isLoading: false,
-  totalCount: 3,
-  hasMore: false,
-  loadMore: jest.fn(),
-  nextUri: '',
-});
-
-jest.mock('@openmrs/esm-patient-common-lib/src/useSystemVisitSetting', () => ({
-  useSystemVisitSetting: () => mockUseSystemVisitSetting(),
-}));
+const mockUseInfiniteVisits = jest.fn(useInfiniteVisits);
 
 jest.mock('../visit.resource', () => ({
   useInfiniteVisits: () => mockUseInfiniteVisits('some-uuid'),
 }));
 
+const mockSetVisitContext = jest.fn();
+const mockUseSystemVisitSetting = jest.fn(useSystemVisitSetting);
+
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
+  useSystemVisitSetting: jest.fn(),
+  usePatientChartStore: jest.fn(() => ({
+    visitContext: null,
+    setVisitContext: mockSetVisitContext,
+  })),
+}));
+
 describe('VisitContextSwitcherModal', () => {
+  beforeEach(() => {
+    mockUseInfiniteVisits.mockReturnValue({
+      visits: [mockCurrentVisit, mockVisit2, mockVisit3],
+      error: null,
+      mutate: jest.fn(),
+      isValidating: false,
+      isLoading: false,
+      totalCount: 3,
+      hasMore: false,
+      loadMore: jest.fn(),
+      nextUri: '',
+    });
+    mockUseSystemVisitSetting.mockReturnValue({
+      errorFetchingSystemVisitSetting: null,
+      isLoadingSystemVisitSetting: false,
+      systemVisitEnabled: true,
+    });
+  });
+
   it('should display a list of past visits', () => {
     mockUseSystemVisitSetting.mockReturnValueOnce({
       systemVisitEnabled: false,
@@ -53,6 +56,23 @@ describe('VisitContextSwitcherModal', () => {
     // visit type - only check the visitType div elements
     expect(screen.getAllByText('Facility Visit', { selector: '.visitType' })).toHaveLength(3);
   });
+
+  it('should call setVisitContext when continue button is clicked with selected visit', async () => {
+    const user = userEvent.setup();
+
+    renderVisitContextSwitcherModal();
+
+    // Select a visit by clicking on the first visit card
+    const firstVisitRadio = screen.getAllByRole('radio', { name: /Facility Visit/ })[0];
+    await user.click(firstVisitRadio);
+
+    // Click the continue button
+    const continueButton = screen.getByRole('button', { name: /continue/i });
+    await user.click(continueButton);
+
+    // Verify setVisitContext was called with the selected visit
+    expect(mockSetVisitContext).toHaveBeenCalledWith(mockCurrentVisit, expect.any(Function));
+  });
 });
 
 function renderVisitContextSwitcherModal() {

package/src/visit/visits-widget/visit.resource.tsx

@@ -53,7 +53,7 @@ export function deleteVisit(visitUuid: string) {
 }
 
 export function restoreVisit(visitUuid: string) {
-  return openmrsFetch(`${restBaseUrl}/visit/${visitUuid}`, {
+  return openmrsFetch<Visit>(`${restBaseUrl}/visit/${visitUuid}`, {
     headers: {
       'content-type': 'application/json',
     },

package/translations/am.json

@@ -1,5 +1,6 @@
 {
   "actions": "Actions",
+  "activeVisits__lower": "active visits",
   "addingToVisit": "Adding to:",
   "additionalVisitInformationUpdatedSuccessfully": "Additional visit information updated successfully",
   "addVisit": "Add visit",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "Failed loading current visit",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "Filter by encounter type",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "Indication",
   "inThePast": "In the past",
   "loading": "Loading",
-  "loadingVisit": "Loading current visit...",
   "markAliveSuccessfully": "Patient marked alive successfully",
   "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
   "markPatientAlive": "Mark patient alive",
@@ -99,7 +98,6 @@
   "nextPage": "Next page",
   "no": "No",
   "noActiveVisit": "No active visit",
-  "noActiveVisitMessage": "active visit",
   "noActiveVisitNoRDEText": "You can't add data to the patient chart without an active visit. Would you like to start a new visit?",
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersToDisplay": "No encounters to display",

package/translations/ar.json

@@ -1,5 +1,6 @@
 {
   "actions": "Actions",
+  "activeVisits__lower": "active visits",
   "addingToVisit": "Adding to:",
   "additionalVisitInformationUpdatedSuccessfully": "Additional visit information updated successfully",
   "addVisit": "Add visit",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "فشل في تحميل الزيارة الحالية",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "تصفية حسب نوع اللقاء",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "دلالة",
   "inThePast": "In the past",
   "loading": "جار التحميل",
-  "loadingVisit": "جار تحميل الزيارة الحالية...",
   "markAliveSuccessfully": "Patient marked alive successfully",
   "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
   "markPatientAlive": "Mark patient alive",
@@ -99,7 +98,6 @@
   "nextPage": "Next page",
   "no": "لا",
   "noActiveVisit": "لا يوجد زيارة نشطة",
-  "noActiveVisitMessage": "زيارة نشطة",
   "noActiveVisitNoRDEText": "لا يمكنك إضافة بيانات إلى السجل الطبي للمريض بدون زيارة نشطة. هل ترغب في بدء زيارة جديدة؟",
   "noDiagnosesFound": "لم يتم العثور على تشخيصات",
   "noEncountersToDisplay": "لا يوجد لقاءات لعرضها",

package/translations/ar_SY.json

@@ -1,5 +1,6 @@
 {
   "actions": "Actions",
+  "activeVisits__lower": "active visits",
   "addingToVisit": "Adding to:",
   "additionalVisitInformationUpdatedSuccessfully": "Additional visit information updated successfully",
   "addVisit": "Add visit",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "Failed loading current visit",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "Filter by encounter type",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "Indication",
   "inThePast": "In the past",
   "loading": "Loading",
-  "loadingVisit": "Loading current visit...",
   "markAliveSuccessfully": "Patient marked alive successfully",
   "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
   "markPatientAlive": "Mark patient alive",
@@ -99,7 +98,6 @@
   "nextPage": "Next page",
   "no": "No",
   "noActiveVisit": "No Active Visit",
-  "noActiveVisitMessage": "active visit",
   "noActiveVisitNoRDEText": "You can't add data to the patient chart without an active visit. Would you like to start a new visit?",
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersToDisplay": "No encounters to display",

package/translations/bn.json

@@ -1,5 +1,6 @@
 {
   "actions": "Actions",
+  "activeVisits__lower": "active visits",
   "addingToVisit": "Adding to:",
   "additionalVisitInformationUpdatedSuccessfully": "Additional visit information updated successfully",
   "addVisit": "Add visit",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "Failed loading current visit",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "Filter by encounter type",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "Indication",
   "inThePast": "In the past",
   "loading": "Loading",
-  "loadingVisit": "Loading current visit...",
   "markAliveSuccessfully": "Patient marked alive successfully",
   "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
   "markPatientAlive": "Mark patient alive",
@@ -99,7 +98,6 @@
   "nextPage": "Next page",
   "no": "No",
   "noActiveVisit": "No Active Visit",
-  "noActiveVisitMessage": "active visit",
   "noActiveVisitNoRDEText": "You can't add data to the patient chart without an active visit. Would you like to start a new visit?",
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersToDisplay": "No encounters to display",