@kenyaemr/esm-patient-registration-app 4.3.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-registration-app",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-registration-app.js",
   "main": "src/index.ts",
@@ -12,7 +12,7 @@
     "serve": "webpack serve --mode=development",
     "debug": "npm run serve",
     "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env analyze=true",
+    "analyze": "webpack --mode=production --env.analyze=true",
     "lint": "eslint src --ext ts,tsx",
     "typescript": "tsc",
     "extract-translations": "i18next 'src/**/*.component.tsx'"

package/src/index.ts

@@ -106,24 +106,6 @@ function setupOpenMRS() {
         online: true,
         offline: true,
       },
-      {
-        id: 'empty-client-registry-modal',
-        load: getAsyncLifecycle(
-          () => import('./patient-verification/verification-modal/empty-prompt.component'),
-          options,
-        ),
-        online: true,
-        offline: true,
-      },
-      {
-        id: 'confirm-client-registry-modal',
-        load: getAsyncLifecycle(
-          () => import('./patient-verification/verification-modal/confirm-prompt.component'),
-          options,
-        ),
-        online: true,
-        offline: true,
-      },
     ],
   };
 }

package/src/offline.resources.ts

@@ -64,7 +64,14 @@ async function fetchPatientIdentifierTypes(): Promise<Array<FetchedPatientIdenti
 
     const primaryIdentifierTypeUuid = primaryIdentifierTypeResponse?.data?.results?.[0]?.metadataUuid;
 
-    let identifierTypes = [];
+    let identifierTypes = primaryIdentifierTypeResponse?.ok
+      ? [
+          mapPatientIdentifierType(
+            patientIdentifierTypes?.find((type) => type.uuid === primaryIdentifierTypeUuid),
+            true,
+          ),
+        ]
+      : [];
 
     patientIdentifierTypes.forEach((type) => {
       if (type.uuid !== primaryIdentifierTypeUuid) {

package/src/patient-registration/field/address/address-field.component.tsx

@@ -21,7 +21,6 @@ export const AddressField: React.FC<AddressFieldProps> = ({ fieldDefinition }) =
               id={fieldDefinition.id}
               labelText={t(`${fieldDefinition.label}`, `${fieldDefinition.label}`)}
               {...field}
-              required={fieldDefinition.validation.required}
             />
           );
         }}

package/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx

@@ -31,17 +31,19 @@ export function CodedPersonAttributeField({
           <Field name={fieldName}>
             {({ field, form: { touched, errors }, meta }) => {
               return (
-                <Select
-                  id={id}
-                  name={`person-attribute-${personAttributeType.uuid}`}
-                  labelText={label ?? personAttributeType?.display}
-                  invalid={errors[fieldName] && touched[fieldName]}
-                  {...field}>
-                  <SelectItem value={null} text={t('selectAnOption', 'Select an option')} />
-                  {conceptAnswers.map((answer) => (
-                    <SelectItem key={answer.uuid} value={answer.uuid} text={answer.display} />
-                  ))}
-                </Select>
+                <>
+                  <Select
+                    id={id}
+                    name={`person-attribute-${personAttributeType.uuid}`}
+                    labelText={label ?? personAttributeType?.display}
+                    invalid={errors[fieldName] && touched[fieldName]}
+                    {...field}>
+                    <SelectItem value={''} text={t('selectAnOption', 'Select an option')} />
+                    {conceptAnswers.map((answer) => (
+                      <SelectItem key={answer.uuid} value={answer.uuid} text={answer.display} />
+                    ))}
+                  </Select>
+                </>
               );
             }}
           </Field>

package/src/patient-registration/form-manager.ts

@@ -1,4 +1,4 @@
-import { FetchResponse, queueSynchronizationItem, Session, toOmrsIsoString } from '@openmrs/esm-framework';
+import { FetchResponse, openmrsFetch, queueSynchronizationItem, Session } from '@openmrs/esm-framework';
 import { patientRegistration } from '../constants';
 import {
   FormValues,
@@ -24,7 +24,6 @@ import {
   updatePatientIdentifier,
   saveEncounter,
 } from './patient-registration.resource';
-import isEqual from 'lodash-es/isEqual';
 import { RegistrationConfig } from '../config-schema';
 
 export type SavePatientForm = (
@@ -54,7 +53,7 @@ export class FormManager {
   ) => {
     const syncItem: PatientRegistration = {
       fhirPatient: FormManager.mapPatientToFhirPatient(
-        FormManager.getPatientToCreate(values, patientUuidMap, initialAddressFieldValues, []),
+        FormManager.getPatientToCreate(isNewPatient, values, patientUuidMap, initialAddressFieldValues, []),
       ),
       _patientRegistrationData: {
         isNewPatient,
@@ -102,6 +101,7 @@ export class FormManager {
     );
 
     const createdPatient = FormManager.getPatientToCreate(
+      isNewPatient,
       values,
       patientUuidMap,
       initialAddressFieldValues,
@@ -180,7 +180,7 @@ export class FormManager {
         );
       } else {
         const encounterToSave: Encounter = {
-          encounterDatetime: toOmrsIsoString(new Date()),
+          encounterDatetime: new Date(),
           patient: savePatientResponse.data.uuid,
           encounterType: config.registrationObs.encounterTypeUuid,
           location: currentLocation,
@@ -282,6 +282,7 @@ export class FormManager {
   }
 
   static getPatientToCreate(
+    isNewPatient: boolean,
     values: FormValues,
     patientUuidMap: PatientUuidMapType,
     initialAddressFieldValues: Record<string, any>,
@@ -304,7 +305,7 @@ export class FormManager {
         gender: values.gender.charAt(0),
         birthdate,
         birthdateEstimated: values.birthdateEstimated,
-        attributes: FormManager.getPatientAttributes(values),
+        attributes: FormManager.getPatientAttributes(isNewPatient, values, patientUuidMap),
         addresses: [values.address],
         ...FormManager.getPatientDeathInfo(values),
       },
@@ -336,16 +337,32 @@ export class FormManager {
     return names;
   }
 
-  static getPatientAttributes(values: FormValues) {
+  static getPatientAttributes(isNewPatient: boolean, values: FormValues, patientUuidMap: PatientUuidMapType) {
     const attributes: Array<AttributeValue> = [];
     if (values.attributes) {
-      for (const [key, value] of Object.entries(values.attributes)) {
-        attributes.push({
-          attributeType: key,
-          value,
+      Object.entries(values.attributes)
+        .filter(([, value]) => !!value)
+        .forEach(([key, value]) => {
+          attributes.push({
+            attributeType: key,
+            value,
+          });
         });
+
+      if (!isNewPatient && values.patientUuid) {
+        Object.entries(values.attributes)
+          .filter(([, value]) => !value)
+          .forEach(async ([key]) => {
+            const attributeUuid = patientUuidMap[`attribute.${key}`];
+            await openmrsFetch(`/ws/rest/v1/person/${values.patientUuid}/attribute/${attributeUuid}`, {
+              method: 'DELETE',
+            }).catch((err) => {
+              console.error(err);
+            });
+          });
       }
     }
+
     if (values.unidentifiedPatient) {
       attributes.push({
         // The UUID of the 'Unknown Patient' attribute-type will always be static across all implementations of OpenMRS

package/src/patient-registration/input/basic-input/input/input.test.tsx

@@ -9,11 +9,11 @@ describe.skip('number input', () => {
     render(
       <Formik initialValues={{ number: 0 }} onSubmit={null}>
         <Form>
-          <Input id="number" labelText="Number" name="number" />
+          <Input id="number" type="number" labelText="Number" name="number" />
         </Form>
       </Formik>,
     );
-    return screen.getByLabelText('number') as HTMLInputElement;
+    return screen.getByLabelText('Number (optional)') as HTMLInputElement;
   };
 
   it('exists', async () => {
@@ -34,16 +34,27 @@ describe.skip('number input', () => {
   });
 });
 
-describe.skip('text input', () => {
+describe('text input', () => {
   const setupInput = async () => {
     render(
-      <Formik initialValues={{ text: '' }} onSubmit={null}>
+      <Formik initialValues={{ text: '' }} onSubmit={() => {}}>
         <Form>
-          <Input id="text" labelText="Text" name="text" placeholder="Enter text" />
+          <Input
+            id="text"
+            labelText="Text"
+            name="text"
+            placeholder="Enter text"
+            required
+            checkWarning={(value) => {
+              if (value.length > 5) {
+                return 'name should be of 5 char';
+              }
+            }}
+          />
         </Form>
       </Formik>,
     );
-    return screen.getByLabelText('text') as HTMLInputElement;
+    return screen.getByLabelText('Text') as HTMLInputElement;
   };
 
   it('exists', async () => {
@@ -51,16 +62,42 @@ describe.skip('text input', () => {
     expect(input.type).toEqual('text');
   });
 
-  it('can input data', async () => {
+  it('can input valid data without warning', async () => {
     const user = userEvent.setup();
 
     const input = await setupInput();
-    const expected = 'Some text';
+    const userInput = 'text';
 
-    await user.type(input, expected);
+    await user.type(input, userInput);
     await user.tab();
 
-    expect(input.value).toEqual(expected);
+    expect(input.value).toEqual(userInput);
+    expect(screen.queryByText('name should be of 5 char')).not.toBeInTheDocument();
+  });
+
+  it('should show a warning when the invalid input is entered', async () => {
+    const user = userEvent.setup();
+
+    const input = await setupInput();
+    const userInput = 'Hello World';
+
+    await userEvent.clear(input);
+
+    await user.type(input, userInput);
+    await user.tab();
+
+    expect(screen.getByText('name should be of 5 char')).toBeInTheDocument();
+  });
+
+  it('should show the correct label text if the field is not required', () => {
+    render(
+      <Formik initialValues={{ text: '' }} onSubmit={() => {}}>
+        <Form>
+          <Input id="text" labelText="Text" name="text" placeholder="Enter text" />
+        </Form>
+      </Formik>,
+    );
+    expect(screen.getByLabelText('Text (optional)')).toBeInTheDocument();
   });
 });
 

package/src/patient-registration/input/basic-input/select/select-input.test.tsx

@@ -3,16 +3,16 @@ import { render, fireEvent, waitFor, screen } from '@testing-library/react';
 import { Formik, Form } from 'formik';
 import { SelectInput } from './select-input.component';
 
-describe.skip('select input', () => {
+describe('the select input', () => {
   const setupSelect = async () => {
     render(
       <Formik initialValues={{ select: '' }} onSubmit={null}>
         <Form>
-          <SelectInput label="Select" name="select" options={['A Option', 'B Option']} />
+          <SelectInput label="Select" name="select" options={['A Option', 'B Option']} required />
         </Form>
       </Formik>,
     );
-    return screen.getByLabelText('select') as HTMLInputElement;
+    return screen.getByLabelText('Select') as HTMLInputElement;
   };
 
   it('exists', async () => {
@@ -29,4 +29,17 @@ describe.skip('select input', () => {
 
     await waitFor(() => expect(input.value).toEqual(expected));
   });
+
+  it('should show optional label if the input is not required', () => {
+    render(
+      <Formik initialValues={{ select: '' }} onSubmit={null}>
+        <Form>
+          <SelectInput label="Select" name="select" options={['A Option', 'B Option']} />
+        </Form>
+      </Formik>,
+    );
+    const selectInput = screen.getByRole('combobox', { name: 'Select (optional)' }) as HTMLSelectElement;
+    expect(selectInput.labels).toHaveLength(1);
+    expect(selectInput.labels[0]).toHaveTextContent('Select (optional)');
+  });
 });

package/src/patient-registration/input/custom-input/autosuggest/autosuggest.test.tsx

@@ -55,7 +55,7 @@ describe('autosuggest', () => {
     expect(screen.queryByRole('list')).toBeNull();
   });
 
-  it('shows search results in an ul', async () => {
+  it('should show the search results in a list', async () => {
     setup();
     const searchbox = screen.getByRole('searchbox');
     fireEvent.change(searchbox, { target: { value: 'john' } });
@@ -64,7 +64,7 @@ describe('autosuggest', () => {
     expect(list.children).toHaveLength(2);
   });
 
-  it('creates li items whose inner text is gotten through getDisplayValue', async () => {
+  it('should creates the li items whose inner text is gotten through getDisplayValue', async () => {
     setup();
     const searchbox = screen.getByRole('searchbox');
     fireEvent.change(searchbox, { target: { value: 'john' } });
@@ -73,7 +73,7 @@ describe('autosuggest', () => {
     expect(list[1].textContent).toBe('John Smith');
   });
 
-  xit('triggers onSuggestionSelected with correct values when li is clicked', async () => {
+  it('should trigger the onSuggestionSelected with correct values when li is clicked', async () => {
     setup();
     const searchbox = screen.getByRole('searchbox');
     fireEvent.change(searchbox, { target: { value: 'john' } });
@@ -82,28 +82,39 @@ describe('autosuggest', () => {
     expect(handleSuggestionSelected).toHaveBeenNthCalledWith(1, 'person', 'randomuuid1');
   });
 
-  it.skip('sets search box value to selected suggestion', async () => {
+  it('should clear the suggestions when a suggestion is selected', async () => {
     setup();
-    let searchbox = screen.getByRole('searchbox');
+    let list = screen.queryByRole('list');
+    expect(list).toBeNull();
+    const searchbox = screen.getByRole('searchbox');
     fireEvent.change(searchbox, { target: { value: 'john' } });
-    const listitems = await waitFor(() => screen.getAllByRole('listitem'));
+    list = await waitFor(() => screen.getByRole('list'));
+    expect(list).toBeInTheDocument();
+    const listitems = screen.getAllByRole('listitem');
     fireEvent.click(listitems[0]);
-    searchbox = screen.getByRole('searchbox');
-    expect(searchbox.textContent).toBe('John Doe');
+    list = screen.queryByRole('list');
+    expect(list).toBeNull();
   });
 
-  xit('clears suggestions when a suggestion is selected', async () => {
+  it('should change suggestions when a search input is changed', async () => {
     setup();
-    // screen.getByRole('x');
     let list = screen.queryByRole('list');
     expect(list).toBeNull();
     const searchbox = screen.getByRole('searchbox');
     fireEvent.change(searchbox, { target: { value: 'john' } });
-    list = await waitFor(() => screen.getByRole('list'));
-    expect(list).toBeInTheDocument();
-    const listitems = screen.getAllByRole('listitem');
-    fireEvent.click(listitems[0]);
+    const suggestion = await screen.findByText('John Doe');
+    expect(suggestion).toBeInTheDocument();
+    fireEvent.change(searchbox, { target: { value: '' } });
     list = screen.queryByRole('list');
     expect(list).toBeNull();
   });
+
+  it('should hide suggestions when clicked outside of component', async () => {
+    setup();
+    const input = screen.getByRole('searchbox');
+    fireEvent.change(input, { target: { value: 'john' } });
+    await screen.findByText('John Doe');
+    fireEvent.mouseDown(document.body);
+    expect(screen.queryByText('John Doe')).not.toBeInTheDocument();
+  });
 });

package/src/patient-registration/patient-registration-hooks.ts

@@ -1,20 +1,16 @@
 import { FetchResponse, getSynchronizationItems, openmrsFetch, useConfig, usePatient } from '@openmrs/esm-framework';
-import last from 'lodash-es/last';
 import camelCase from 'lodash-es/camelCase';
 import { Dispatch, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { RegistrationConfig } from '../config-schema';
 import { patientRegistration } from '../constants';
-import { useConceptAnswers, useGlobalProperties } from '../patient-verification/patient-verification-hook';
 import {
   FormValues,
   PatientRegistration,
   PatientUuidMapType,
   PersonAttributeResponse,
   PatientIdentifierResponse,
-  ObsResponse,
-  ConceptAnswers,
   Encounter,
 } from './patient-registration-types';
 import {
@@ -27,13 +23,12 @@ import {
 import { useInitialPatientRelationships } from './section/patient-relationships/relationships.resource';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
-  const { martialStatus, education, occupation, educationLoad, loadingStatus } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
   const { data: attributes, isLoading: isLoadingAttributes } = useInitialPersonAttributes(patientUuid);
   const { data: identifiers, isLoading: isLoadingIdentifiers } = useInitialPatientIdentifiers(patientUuid);
   const { data: relationships, isLoading: isLoadingRelationships } = useInitialPatientRelationships(patientUuid);
-  const { data: obs, isLoading: isLoadingObs, obs: observations } = usePatientObs(patientUuid);
-  const { data: token, isLoading: isLoadingToken } = useGlobalProperties();
+  const { data: encounters } = useInitialEncounters(patientUuid, patientToEdit);
+
   const [initialFormValues, setInitialFormValues] = useState<FormValues>({
     patientUuid: v4(),
     givenName: '',
@@ -82,14 +77,6 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     })();
   }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
-  // Setting authentication token
-
-  useEffect(() => {
-    if (!isLoadingToken && token) {
-      setInitialFormValues((initialFormValues) => ({ ...initialFormValues, token: String(token.access_token) }));
-    }
-  }, [isLoadingToken, token]);
-
   // Set initial patient relationships
   useEffect(() => {
     if (!isLoadingRelationships && relationships) {
@@ -127,24 +114,15 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     }
   }, [attributes, setInitialFormValues, isLoadingAttributes]);
 
-  // Set initial patient obs
-
+  // Set Initial registration encounters
   useEffect(() => {
-    if (!isLoadingObs) {
-      setInitialFormValues((initialFormValues) => ({ ...initialFormValues, obs: obs, observation: observations }));
-    }
-  }, [isLoadingObs]);
-
-  // Set Initial encounter
-
-  useEffect(() => {
-    if (!educationLoad || !loadingStatus) {
+    if (patientToEdit && encounters) {
       setInitialFormValues((initialFormValues) => ({
         ...initialFormValues,
-        concepts: [...occupation, ...martialStatus, ...education],
+        obs: encounters as Record<string, string>,
       }));
     }
-  }, [educationLoad, loadingStatus]);
+  }, [encounters, patientToEdit]);
 
   return [initialFormValues, setInitialFormValues];
 }
@@ -175,6 +153,7 @@ export function usePatientUuidMap(
   fallback: PatientUuidMapType = {},
 ): [PatientUuidMapType, Dispatch<PatientUuidMapType>] {
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
+  const { data: attributes } = useInitialPersonAttributes(patientUuid);
   const [patientUuidMap, setPatientUuidMap] = useState(fallback);
 
   useEffect(() => {
@@ -187,6 +166,15 @@ export function usePatientUuidMap(
     }
   }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
+  useEffect(() => {
+    if (attributes) {
+      setPatientUuidMap((prevPatientUuidMap) => ({
+        ...prevPatientUuidMap,
+        ...getPatientAttributeUuidMapForPatient(attributes),
+      }));
+    }
+  }, [attributes]);
+
   return [patientUuidMap, setPatientUuidMap];
 }
 
@@ -269,52 +257,10 @@ function useInitialPersonAttributes(personUuid: string) {
   return result;
 }
 
-export function usePatientObs(patientUuid: string) {
-  const {
-    registrationObs: { encounterTypeUuid },
-  } = useConfig() as RegistrationConfig;
-  const url = `/ws/rest/v1/encounter?patient=${patientUuid}&encounterType=${encounterTypeUuid}&v=custom:(obs:(uuid,display,concept:(uuid,display),value:(uuid,display)))`;
-  const { data, isLoading, error } = useSWR<{ data: ObsResponse }>(patientUuid ? url : null, openmrsFetch);
-  let obsObject = {};
-  const patientObs = last(data?.data?.results)?.obs?.forEach((ob) => {
-    Object.assign(obsObject, { [ob.concept.uuid]: ob.value.uuid });
+function getPatientAttributeUuidMapForPatient(attributes: Array<PersonAttributeResponse>) {
+  const attributeUuidMap = {};
+  attributes.forEach((attribute) => {
+    attributeUuidMap[`attribute.${attribute?.attributeType?.uuid}`] = attribute?.uuid;
   });
-  return { data: obsObject, isLoading, error, obs: data?.data };
-}
-
-function useConcepts() {
-  const { data: martialStatus, isLoading: loadingStatus } = useConceptAnswers('1054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
-  const { data: education, isLoading: educationLoad } = useConceptAnswers('1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
-  const occupation: Array<ConceptAnswers> = [
-    {
-      uuid: '1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Farmer',
-    },
-    {
-      uuid: '1540AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Employee',
-    },
-    {
-      uuid: '1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Trader',
-    },
-    {
-      uuid: '159465AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Student',
-    },
-    {
-      uuid: '159466AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Driver',
-    },
-    {
-      uuid: '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'None',
-    },
-    {
-      uuid: '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-      display: 'Other',
-    },
-  ];
-
-  return { martialStatus, education, occupation, loadingStatus, educationLoad };
+  return attributeUuidMap;
 }

package/src/patient-registration/patient-registration-types.tsx

@@ -1,4 +1,4 @@
-import { OpenmrsResource, Session } from '@openmrs/esm-framework';
+import { Session } from '@openmrs/esm-framework';
 import { RegistrationConfig } from '../config-schema';
 import { SavePatientTransactionManager } from './form-manager';
 
@@ -118,7 +118,7 @@ export type Patient = {
 };
 
 export interface Encounter {
-  encounterDatetime: Date | string;
+  encounterDatetime: Date;
   patient: string;
   encounterType: string;
   location: string;
@@ -185,9 +185,6 @@ export interface FormValues {
   address: {
     [addressField: string]: string;
   };
-  observation?: ObsResponse;
-  concepts?: Array<ConceptAnswers>;
-  token?: string;
 }
 
 export interface PatientUuidMapType {
@@ -266,6 +263,3 @@ export interface ConceptAnswers {
   display: string;
   uuid: string;
 }
-export interface ObsResponse {
-  results: Array<{ obs: Array<{ uuid: string; display: string; value: OpenmrsResource; concept: OpenmrsResource }> }>;
-}

package/src/patient-registration/patient-registration.component.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, useMemo, useRef } from 'react';
 import { Button, Link } from '@carbon/react';
-import { XAxis, ShareKnowledge } from '@carbon/react/icons';
+import { XAxis } from '@carbon/react/icons';
 import { Router, useLocation, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Formik, Form, FormikHelpers } from 'formik';
@@ -17,19 +17,12 @@ import {
   parseAddressTemplateXml,
   scrollIntoView,
 } from './patient-registration-utils';
-import {
-  useInitialAddressFieldValues,
-  useInitialFormValues,
-  usePatientObs,
-  usePatientUuidMap,
-} from './patient-registration-hooks';
+import { useInitialAddressFieldValues, useInitialFormValues, usePatientUuidMap } from './patient-registration-hooks';
 import { ResourcesContext } from '../offline.resources';
 import { builtInSections, RegistrationConfig, SectionDefinition } from '../config-schema';
 import { SectionWrapper } from './section/section-wrapper.component';
 import BeforeSavePrompt from './before-save-prompt';
 import styles from './patient-registration.scss';
-import PatientVerification from '../patient-verification/patient-verification.component';
-import { handleSavePatientToClientRegistry } from '../patient-verification/patient-verification-hook';
 
 let exportedInitialFormValuesForTesting = {} as FormValues;
 
@@ -57,9 +50,6 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
   const { data: photo } = usePatientPhoto(patientToEdit?.id);
   const savePatientTransactionManager = useRef(new SavePatientTransactionManager());
   const fieldDefinition = config?.fieldDefinitions?.filter((def) => def.type === 'address');
-  const [enableClientRegistry, setEnableClientRegistry] = useState(
-    inEditMode ? initialFormValues.identifiers['nationalUniquePatientIdentifier']?.identifierValue : false,
-  );
 
   useEffect(() => {
     exportedInitialFormValuesForTesting = initialFormValues;
@@ -185,18 +175,6 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                     </Link>
                   </div>
                 ))}
-                <Button
-                  renderIcon={ShareKnowledge}
-                  disabled={!currentSession || !identifierTypes}
-                  onClick={() => {
-                    setEnableClientRegistry(true);
-                    props.isValid
-                      ? handleSavePatientToClientRegistry(props.values, props.setValues, inEditMode)
-                      : props.validateForm().then((errors) => displayErrors(errors));
-                  }}
-                  className={styles.submitButton}>
-                  {t('postToRegistry', 'Post to registry')}
-                </Button>
                 <Button
                   className={styles.submitButton}
                   type="submit"
@@ -204,7 +182,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   // Current session and identifiers are required for patient registration.
                   // If currentSession or identifierTypes are not available, then the
                   // user should be blocked to register the patient.
-                  disabled={!enableClientRegistry}>
+                  disabled={!currentSession || !identifierTypes}>
                   {inEditMode ? t('updatePatient', 'Update Patient') : t('registerPatient', 'Register Patient')}
                 </Button>
                 <Button className={styles.cancelButton} kind="tertiary" onClick={cancelRegistration}>
@@ -226,7 +204,6 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   isOffline,
                   initialFormValues: props.initialValues,
                 }}>
-                <PatientVerification props={props} />
                 {sections.map((section, index) => (
                   <SectionWrapper
                     key={`registration-section-${section.id}`}