diff --git a/__mocks__/react-i18next.js b/__mocks__/react-i18next.js
index 389f6c9f91..6eca421d92 100644
--- a/__mocks__/react-i18next.js
+++ b/__mocks__/react-i18next.js
@@ -43,10 +43,9 @@ useMock.i18n = { language: 'en_US' };
 
 module.exports = {
   // this mock makes sure any components using the translate HoC receive the t function as a prop
-  Trans: ({ children }) => renderNodes(children),
+  Trans: ({ children }) => (Array.isArray(children) ? renderNodes(children) : renderNodes([children])),
   Translation: ({ children }) => children((k) => k, { i18n: {} }),
   useTranslation: () => useMock,
-
   // mock if needed
   I18nextProvider: reactI18next.I18nextProvider,
   initReactI18next: reactI18next.initReactI18next,
diff --git a/e2e/specs/attachments.spec.ts b/e2e/specs/attachments.spec.ts
index bbe5c2f945..0188721aef 100644
--- a/e2e/specs/attachments.spec.ts
+++ b/e2e/specs/attachments.spec.ts
@@ -57,7 +57,7 @@ test('Add and remove an attachment', async ({ page }) => {
   });
 
   await test.step('Then I should see the file I uploaded displayed in the attachments table', async () => {
-    await expect(page.getByRole('button', { name: /brainScan.jpeg/i })).toBeVisible();
+    await expect(page.getByRole('button', { name: /brainScan/i })).toBeVisible();
   });
 
   await test.step('When I click on the `Table view` tab', async () => {
@@ -78,7 +78,7 @@ test('Add and remove an attachment', async ({ page }) => {
   });
 
   await test.step('And I should not see the deleted attachment in the list', async () => {
-    await expect(page.getByRole('button', { name: /brainScan.jpeg/i })).not.toBeVisible();
+    await expect(page.getByRole('button', { name: /brainScan/i })).not.toBeVisible();
   });
 
   await test.step('And the attachments table should be empty', async () => {
diff --git a/e2e/specs/edit-existing-visit.spec.ts b/e2e/specs/edit-existing-visit.spec.ts
index 382e90ae94..637c509fbf 100644
--- a/e2e/specs/edit-existing-visit.spec.ts
+++ b/e2e/specs/edit-existing-visit.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test';
 import { type Visit } from '@openmrs/esm-framework';
-import { type Patient, generateRandomPatient, deletePatient, startVisit } from '../commands';
+import { deletePatient, generateRandomPatient, type Patient, startVisit } from '../commands';
 import { test } from '../core';
 import { ChartPage, VisitsPage } from '../pages';
 
@@ -27,18 +27,24 @@ test('Edit an existing visit', async ({ page }) => {
 
   await test.step('Then I should see the `Edit Visit` form launch in the workspace', async () => {
     await expect(chartPage.page.getByText(/visit start date and time/i)).toBeVisible();
-    const datePickerInput = chartPage.page.getByPlaceholder(/dd\/mm\/yyyy/i);
-    await expect(datePickerInput).toBeVisible();
-    const dateValue = await datePickerInput.inputValue();
+
+    const startDateInput = chartPage.page.locator('input#visitStartDateInput');
+    const startTimeInput = chartPage.page.locator('input#visitStartTime');
+
+    await expect(startDateInput).toBeVisible();
+    const dateValue = await startDateInput.inputValue();
     expect(dateValue).not.toBe('');
     expect(dateValue).toMatch(/^\d{2}\/\d{2}\/\d{4}$/);
 
-    await expect(chartPage.page.getByPlaceholder(/hh\:mm/i)).toBeVisible();
+    await expect(startTimeInput).toBeVisible();
+    const timeValue = await startTimeInput.inputValue();
+    expect(timeValue).toMatch(/^(1[0-2]|0?[1-9]):([0-5][0-9])$/);
+
     await expect(chartPage.page.getByRole('combobox', { name: /select a location/i })).toBeVisible();
     await expect(chartPage.page.getByRole('combobox', { name: /select a location/i })).toHaveValue('Outpatient Clinic');
     await expect(chartPage.page.getByText(/visit type/i)).toBeVisible();
     await expect(chartPage.page.getByLabel(/facility visit/i)).toBeChecked();
-    await expect(chartPage.page.getByRole('search', { name: /search for a visit type/i })).toBeVisible();
+    await expect(chartPage.page.getByRole('search', { name: /visit type/i })).toBeVisible();
     await expect(chartPage.page.getByLabel(/facility visit/i)).toBeVisible();
     await expect(chartPage.page.getByLabel(/home visit/i)).toBeVisible();
     await expect(chartPage.page.getByLabel(/opd visit/i)).toBeVisible();
diff --git a/e2e/support/bamboo/playwright.Dockerfile b/e2e/support/bamboo/playwright.Dockerfile
index ba4a7e8cb7..761967921a 100644
--- a/e2e/support/bamboo/playwright.Dockerfile
+++ b/e2e/support/bamboo/playwright.Dockerfile
@@ -1,5 +1,5 @@
 # The image version should match the Playwright version specified in the package.json file
-FROM mcr.microsoft.com/playwright:v1.45.3-jammy
+FROM mcr.microsoft.com/playwright:v1.48.2-jammy
 
 ARG USER_ID
 ARG GROUP_ID
diff --git a/package.json b/package.json
index 08d8fc7c15..74702d4f37 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@openmrs/esm-framework": "next",
-    "@playwright/test": "1.45.3",
+    "@playwright/test": "1.48.2",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.89",
     "@swc/jest": "^0.2.29",
@@ -71,7 +71,7 @@
     "sass": "^1.54.3",
     "swc-loader": "^0.2.3",
     "swr": "^2.2.4",
-    "turbo": "^2.0.12",
+    "turbo": "^2.2.3",
     "typescript": "^4.0.3",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.15.1"
diff --git a/packages/esm-form-engine-app/translations/de.json b/packages/esm-form-engine-app/translations/de.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/de.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/hi.json b/packages/esm-form-engine-app/translations/hi.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/hi.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/id.json b/packages/esm-form-engine-app/translations/id.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/id.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/it.json b/packages/esm-form-engine-app/translations/it.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/it.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/pt.json b/packages/esm-form-engine-app/translations/pt.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/pt.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/si.json b/packages/esm-form-engine-app/translations/si.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/si.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/sw.json b/packages/esm-form-engine-app/translations/sw.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/sw.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/sw_KE.json b/packages/esm-form-engine-app/translations/sw_KE.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/sw_KE.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/tr.json b/packages/esm-form-engine-app/translations/tr.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/tr.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/tr_TR.json b/packages/esm-form-engine-app/translations/tr_TR.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/tr_TR.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/uk.json b/packages/esm-form-engine-app/translations/uk.json
new file mode 100644
index 0000000000..15c56f807a
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/uk.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Cancel",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Loading",
+  "or": "or",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-engine-app/translations/vi.json b/packages/esm-form-engine-app/translations/vi.json
new file mode 100644
index 0000000000..e9478712f4
--- /dev/null
+++ b/packages/esm-form-engine-app/translations/vi.json
@@ -0,0 +1,15 @@
+{
+  "cancel": "Hủy",
+  "closeThisPanel": "Close this panel",
+  "collapseAll": "Collapse all",
+  "deleteQuestion": "Delete question",
+  "deleteQuestionConfirmation": "Are you sure you want to delete this question?",
+  "deleteQuestionExplainerText": "This action cannot be undone.",
+  "errorTitle": "There was an error with this form",
+  "expandAll": "Expand all",
+  "loading": "Đang tải",
+  "or": "hoặc",
+  "thisList": "this list",
+  "toggleCollapseOrExpand": "Toggle collapse or expand",
+  "tryAgainMessage": "Try opening another form from"
+}
diff --git a/packages/esm-form-entry-app/translations/ar.json b/packages/esm-form-entry-app/translations/ar.json
index c182547d13..6cbc9a1931 100644
--- a/packages/esm-form-entry-app/translations/ar.json
+++ b/packages/esm-form-entry-app/translations/ar.json
@@ -18,13 +18,13 @@
   "daysAgo": " أيام مضت",
   "deleteEntry": "هل أنت متأكد أنك تريد حذف هذا العنصر؟",
   "discardButton": "تجاهل",
-  "disallowDecimals": "Decimals are not allowed",
+  "disallowDecimals": "غير مسموح بالأرقام العشرية",
   "enterMoreCharacters": "الرجاء إدخال 2 أحرف أو أكثر",
   "errorFetchingFormData": "حدث خطأ أثناء جلب بيانات النموذج. التفاصيل: {detail}",
   "errorLoadingForm": "خطأ في تحميل النموذج",
   "errorWithForm": "هناك خطأ في هذا النموذج",
   "fix": "إصلاح",
-  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmissionFailed": "حدث خطأ عند معالجة النموذج. الرجاء اعلام مدير النظام بالخطأ التالي : {error}",
   "formSubmittedSuccessfully": "تم إرسال النموذج بنجاح.",
   "from": "من",
   "futureDateRestriction": "لا يُسمح بتاريخ في المستقبل!",
@@ -44,14 +44,14 @@
   "minusSecond": "اطرح ثانية",
   "minutesAgo": " دقائق مضت",
   "monthsAgo": " أشهر مضت",
-  "next": "Next",
+  "next": "التالي",
   "next21Years": "الـ 21 سنة القادمة",
   "nextMonth": "الشهر القادم",
   "nextYear": "السنة القادمة",
   "patientIdentifierDuplication": "تكرار معرف المريض",
   "patientIdentifierDuplicationDescription": "المعرف المقدم مرتبط بالفعل بمريض موجود. يرجى التحقق من المعرف والمحاولة مرة أخرى.",
-  "orderNumber": "Order number",
-  "previous": "Previous",
+  "orderNumber": "رقم الأمر",
+  "previous": "السابق",
   "previous21Years": "الـ 21 سنة السابقة",
   "previousMonth": "الشهر السابق",
   "previousValue": "القيمة السابقة",
diff --git a/packages/esm-form-entry-app/translations/de.json b/packages/esm-form-entry-app/translations/de.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/de.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/hi.json b/packages/esm-form-entry-app/translations/hi.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/hi.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/id.json b/packages/esm-form-entry-app/translations/id.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/id.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/it.json b/packages/esm-form-entry-app/translations/it.json
index f5f59a4f6b..3cbf17e0bb 100644
--- a/packages/esm-form-entry-app/translations/it.json
+++ b/packages/esm-form-entry-app/translations/it.json
@@ -18,6 +18,7 @@
   "daysAgo": " giorni fa",
   "deleteEntry": "Sei sicuro di voler eliminare questo elemento?",
   "discardButton": "Annulla",
+  "disallowDecimals": "Decimals are not allowed",
   "enterMoreCharacters": "Inserisci almeno 2 caratteri",
   "errorFetchingFormData": "Si è verificato un errore nel recupero dei dati del modulo. Dettagli: {detail}",
   "errorLoadingForm": "Errore nel caricamento del modulo",
@@ -43,11 +44,14 @@
   "minusSecond": "Sottrai un secondo",
   "minutesAgo": " minuti fa",
   "monthsAgo": " mesi fa",
+  "next": "Next",
   "next21Years": "Prossimi 21 anni",
   "nextMonth": "Mese successivo",
   "nextYear": "Anno successivo",
   "patientIdentifierDuplication": "Duplicazione identificatore del paziente",
   "patientIdentifierDuplicationDescription": "L'identificatore fornito è già associato a un paziente esistente. Controlla l'identificatore e riprova.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
   "previous21Years": "Anni precedenti 21",
   "previousMonth": "Mese precedente",
   "previousValue": "Valore precedente",
diff --git a/packages/esm-form-entry-app/translations/pt.json b/packages/esm-form-entry-app/translations/pt.json
index ead6b78a3f..02185918ba 100644
--- a/packages/esm-form-entry-app/translations/pt.json
+++ b/packages/esm-form-entry-app/translations/pt.json
@@ -18,6 +18,7 @@
   "daysAgo": " dias atrás",
   "deleteEntry": "Tem certeza de que deseja excluir este item?",
   "discardButton": "Descartar",
+  "disallowDecimals": "Decimais não são permitidos",
   "enterMoreCharacters": "Por favor, insira 2 ou mais caracteres",
   "errorFetchingFormData": "Ocorreu um erro ao buscar os dados do formulário. Detalhes: {detail}",
   "errorLoadingForm": "Erro ao carregar o formulário",
@@ -43,11 +44,14 @@
   "minusSecond": "Subtrair um segundo",
   "minutesAgo": " minutos atrás",
   "monthsAgo": " meses atrás",
+  "next": "Próximo",
   "next21Years": "Próximos 21 anos",
   "nextMonth": "Próximo mês",
   "nextYear": "Próximo ano",
   "patientIdentifierDuplication": "Duplicação de identificação do paciente",
   "patientIdentifierDuplicationDescription": "A identificação fornecida já está associada a um paciente existente. Por favor, verifique a identificação e tente novamente.",
+  "orderNumber": "Número do pedido",
+  "previous": "Anterior",
   "previous21Years": "Anos anteriores 21",
   "previousMonth": "Mês anterior",
   "previousValue": "Valor anterior",
diff --git a/packages/esm-form-entry-app/translations/si.json b/packages/esm-form-entry-app/translations/si.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/si.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/sw.json b/packages/esm-form-entry-app/translations/sw.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/sw.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/sw_KE.json b/packages/esm-form-entry-app/translations/sw_KE.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/sw_KE.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/tr.json b/packages/esm-form-entry-app/translations/tr.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/tr.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/tr_TR.json b/packages/esm-form-entry-app/translations/tr_TR.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/tr_TR.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/uk.json b/packages/esm-form-entry-app/translations/uk.json
new file mode 100644
index 0000000000..5960bc32d1
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/uk.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "a day ago",
+  "aFewSecondsAgo": "a few seconds ago",
+  "aMinuteAgo": "a minute ago",
+  "aMonthAgo": "a month ago",
+  "aYearAgo": "a year ago",
+  "add": "Add",
+  "addHour": "Add a hour",
+  "addMinute": "Add a minute",
+  "addSecond": "Add a second",
+  "anHourAgo": "an hour ago",
+  "cancel": "Cancel",
+  "changeToMonthView": "Change to month view",
+  "chooseMonthAndYear": "Choose month and year",
+  "clearEntry": "Are you sure you want to clear this entry?",
+  "closeThisPanel": "Close this panel",
+  "componentLoadingFailed": "Component Loading failed...",
+  "daysAgo": " days ago",
+  "deleteEntry": "Are you sure you want to delete this item?",
+  "discardButton": "Discard",
+  "disallowDecimals": "Decimals are not allowed",
+  "enterMoreCharacters": "Please enter 2 or more characters",
+  "errorFetchingFormData": "There was an error fetching form data. Details: {detail}",
+  "errorLoadingForm": "Error loading form",
+  "errorWithForm": "There was an error with this form",
+  "fix": "Fix",
+  "formSubmissionFailed": "An error occurred while processing your form submission. Kindly notify the system administrator and reference the following error : {error}",
+  "formSubmittedSuccessfully": "The form has been submitted successfully.",
+  "from": "From",
+  "futureDateRestriction": "Future date is not allowed!",
+  "hoursAgo": " hours ago",
+  "invalidDate": "Provided date is invalid!",
+  "loading": "Loading...",
+  "loadingComponent": "Loading Component...",
+  "max": "Max value should be {max}",
+  "maxDate": "Max Date should be {maxDate}",
+  "maxEntries": "Cannot have more than {max} entries",
+  "maxLength": "Max Length should be {maxLength}",
+  "min": "Min value should be {min}",
+  "minDate": "Min Date should be {minDate}",
+  "minLength": "Min Length should be {minLength}",
+  "minusHour": "Minus a hour",
+  "minusMinute": "Minus a minute",
+  "minusSecond": "Minus a second",
+  "minutesAgo": " minutes ago",
+  "monthsAgo": " months ago",
+  "next": "Next",
+  "next21Years": "Next 21 years",
+  "nextMonth": "Next month",
+  "nextYear": "Next year",
+  "patientIdentifierDuplication": "Patient identifier duplication",
+  "patientIdentifierDuplicationDescription": "The identifier provided is already associated with an existing patient. Please check the identifier and try again.",
+  "orderNumber": "Order number",
+  "previous": "Previous",
+  "previous21Years": "Previous 21 years",
+  "previousMonth": "Previous month",
+  "previousValue": "Previous Value",
+  "previousYear": "Previous year",
+  "remove": "Remove",
+  "requiredField": "This field is required!",
+  "saveAndCloseButton": "Save and close",
+  "selectWeeks": "Select Weeks",
+  "set": "Set",
+  "submitting": "Submitting",
+  "to": "To",
+  "tryOpeningAnotherForm": "Try opening another form",
+  "useValue": "Use Value",
+  "weeks": "Weeks",
+  "yearsAgo": " years ago"
+}
diff --git a/packages/esm-form-entry-app/translations/vi.json b/packages/esm-form-entry-app/translations/vi.json
new file mode 100644
index 0000000000..280f5f4899
--- /dev/null
+++ b/packages/esm-form-entry-app/translations/vi.json
@@ -0,0 +1,70 @@
+{
+  "aDayAgo": "một ngày trước",
+  "aFewSecondsAgo": "một vài giây trước",
+  "aMinuteAgo": "một phút trước",
+  "aMonthAgo": "một tháng trước",
+  "aYearAgo": "một năm trước",
+  "add": "Thêm",
+  "addHour": "Thêm một giờ",
+  "addMinute": "Thêm một phút",
+  "addSecond": "Thêm một giây",
+  "anHourAgo": "một giờ trước",
+  "cancel": "Hủy",
+  "changeToMonthView": "Thay đổi thành chế độ xem tháng",
+  "chooseMonthAndYear": "Chọn tháng và năm",
+  "clearEntry": "Bạn có chắc chắn muốn xóa mục này không?",
+  "closeThisPanel": "Đóng bảng điều khiển này",
+  "componentLoadingFailed": "Không tải được thành phần...",
+  "daysAgo": "vài ngày trước",
+  "deleteEntry": "Bạn có muốn xóa mục này không?",
+  "discardButton": "Loại bỏ",
+  "disallowDecimals": "Không được phép sử dụng số thập phân",
+  "enterMoreCharacters": "Vui lòng nhập 2 hoặc nhiều ký tự",
+  "errorFetchingFormData": "Đã xảy ra lỗi khi lấy dữ liệu biểu mẫu. Chi tiết: {detail}",
+  "errorLoadingForm": "Lỗi tải biểu mẫu",
+  "errorWithForm": "Có lỗi với mẫu này",
+  "fix": "Sửa chữa",
+  "formSubmissionFailed": "Đã xảy ra lỗi khi xử lý biểu mẫu của bạn. Vui lòng thông báo cho quản trị viên hệ thống và tham chiếu lỗi sau: {error}",
+  "formSubmittedSuccessfully": "Biểu mẫu đã được gửi thành công.",
+  "from": "Từ",
+  "futureDateRestriction": "Ngày tương lai không được phép sử dụng",
+  "hoursAgo": "giờ trước",
+  "invalidDate": "Ngày cung cấp không hợp lệ!",
+  "loading": "Đang tải...",
+  "loadingComponent": "Đang tải thành phần...",
+  "max": "Giá trị tối đa nên là {max}",
+  "maxDate": "Ngày tối đa nên là {maxDate}",
+  "maxEntries": "Không thể có nhiều hơn {max} mục nhập",
+  "maxLength": "Chiều dài tối đa nên là {maxLength}",
+  "min": "Giá trị tối thiểu nên là {min}",
+  "minDate": "Ngày tối thiểu nên là {minDate}",
+  "minLength": "Chiều dài tối thiểu nên là {minLength}",
+  "minusHour": "Trừ một giờ",
+  "minusMinute": "Trừ một phút",
+  "minusSecond": "Trừ một giây",
+  "minutesAgo": "phút trước",
+  "monthsAgo": "tháng trước",
+  "next": "Tiếp theo",
+  "next21Years": "21 năm tới",
+  "nextMonth": "Tháng tới",
+  "nextYear": "Năm tới",
+  "patientIdentifierDuplication": "Sao chép mã định danh bệnh nhân",
+  "patientIdentifierDuplicationDescription": "Mã định danh được cung cấp đã được liên kết với một bệnh nhân hiện có. Vui lòng kiểm tra mã định danh và thử lại.",
+  "orderNumber": "Số đơn đặt",
+  "previous": "Trước",
+  "previous21Years": "21 năm trước",
+  "previousMonth": "Tháng trước",
+  "previousValue": "Giá trị trước",
+  "previousYear": "Năm trước",
+  "remove": "Xóa",
+  "requiredField": "Trường này là bắt buộc!",
+  "saveAndCloseButton": "Lưu và đóng",
+  "selectWeeks": "Chọn tuần",
+  "set": "Thiệt lập",
+  "submitting": "Đang gửi",
+  "to": "Tới",
+  "tryOpeningAnotherForm": "Hãy thử mở một biểu mẫu khác",
+  "useValue": "Sử dụng giá trị",
+  "weeks": "Tuần",
+  "yearsAgo": "vài năm trước"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/de.json b/packages/esm-generic-patient-widgets-app/translations/de.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/de.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/hi.json b/packages/esm-generic-patient-widgets-app/translations/hi.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/hi.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/id.json b/packages/esm-generic-patient-widgets-app/translations/id.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/id.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/it.json b/packages/esm-generic-patient-widgets-app/translations/it.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/it.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/pt.json b/packages/esm-generic-patient-widgets-app/translations/pt.json
new file mode 100644
index 0000000000..3149b67d05
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/pt.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Visualização de Gráfico",
+  "dateAndTime": "Data e hora",
+  "displaying": "Visualizando",
+  "encounterType": "Tipo de consulta",
+  "tableView": "Visualização em Tabela"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/si.json b/packages/esm-generic-patient-widgets-app/translations/si.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/si.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/sw.json b/packages/esm-generic-patient-widgets-app/translations/sw.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/sw.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/sw_KE.json b/packages/esm-generic-patient-widgets-app/translations/sw_KE.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/sw_KE.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/tr.json b/packages/esm-generic-patient-widgets-app/translations/tr.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/tr.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/tr_TR.json b/packages/esm-generic-patient-widgets-app/translations/tr_TR.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/tr_TR.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/uk.json b/packages/esm-generic-patient-widgets-app/translations/uk.json
new file mode 100644
index 0000000000..7b2512d798
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/uk.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Chart View",
+  "dateAndTime": "Date and time",
+  "displaying": "Displaying",
+  "encounterType": "Encounter type",
+  "tableView": "Table View"
+}
diff --git a/packages/esm-generic-patient-widgets-app/translations/vi.json b/packages/esm-generic-patient-widgets-app/translations/vi.json
new file mode 100644
index 0000000000..54e08b3404
--- /dev/null
+++ b/packages/esm-generic-patient-widgets-app/translations/vi.json
@@ -0,0 +1,7 @@
+{
+  "chartView": "Xem biểu đồ",
+  "dateAndTime": "Ngày và giờ",
+  "displaying": "Đang hiển thị",
+  "encounterType": "Loại gặp gỡ",
+  "tableView": "Xem bảng"
+}
diff --git a/packages/esm-patient-allergies-app/translations/de.json b/packages/esm-patient-allergies-app/translations/de.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/de.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/hi.json b/packages/esm-patient-allergies-app/translations/hi.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/hi.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/id.json b/packages/esm-patient-allergies-app/translations/id.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/id.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/it.json b/packages/esm-patient-allergies-app/translations/it.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/it.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/pt.json b/packages/esm-patient-allergies-app/translations/pt.json
new file mode 100644
index 0000000000..8f2f588b04
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/pt.json
@@ -0,0 +1,47 @@
+{
+  "add": "Adicionar",
+  "allergen": "Alérgeno",
+  "allergies": "Alergias",
+  "Allergies": "Alergias",
+  "allergyDeleted": "Alergia excluída",
+  "allergyIntolerances": "intolerâncias alérgicas",
+  "allergyNowVisible": "Está agora visível na página de Alergias",
+  "allergySaved": "Alergia gravada",
+  "allergySaveError": "Erro ao gravar alergia",
+  "allergyUpdated": "Alergia atualizada",
+  "cancel": "Cancelar",
+  "dateOfOnsetAndComments": "Data de início e comentários",
+  "delete": "Apagar",
+  "deleteModalConfirmationText": "Tem certeza de que deseja remover esta alergia?",
+  "deletePatientAllergy": "Apagar alergia",
+  "deleting": "Removendo",
+  "discard": "Descartar",
+  "edit": "Editar",
+  "editAllergy": "Editar uma Alergia",
+  "editOrDeleteAllergy": "Editar ou apagar alergia",
+  "errorDeletingAllergy": "Erro ao apagar alergia",
+  "invalidComment": "Comentário inválido, tente novamente",
+  "loading": "Carregando",
+  "mild": "Leve",
+  "moderate": "Moderado",
+  "name": "Nome",
+  "nonCodedAllergenWarningDescription": "Adicionar um alérgeno personalizado pode afetar as notificações de alergia em todo o sistema. É recomendado escolher na lista correta fornecida para alertas. As entradas personalizadas podem não acionar notificações em todos os contextos relevantes.",
+  "nonCodedAllergenWarningTitle": "Aviso: Entrada personalizada de alérgenos",
+  "onsetDateAndComments": "Data de início e comentários",
+  "other": "Outro",
+  "otherNonCodedAllergen": "Outro alergeno não codificado",
+  "otherNonCodedAllergicReaction": "Outra reação alergica não codificada",
+  "reaction": "Reação",
+  "reactions": "Reações",
+  "recordNewAllergy": "Registar nova alergia",
+  "saveAndClose": "Salvar e fechar",
+  "seeAll": "Visualizar tudo",
+  "selectAllergen": "Selecione o alérgeno",
+  "selectReactions": "Selecione as reações",
+  "severe": "Severa",
+  "severityandReaction": "Gravidade",
+  "severityOfWorstReaction": "Gravidade da pior reação",
+  "typeAdditionalComments": "Providencie aqui comentarios adicionais",
+  "typeAllergenName": "Por favor digite o nome do alérgeno",
+  "typeAllergicReactionName": "Por favor digite o nome da reação alérgica"
+}
diff --git a/packages/esm-patient-allergies-app/translations/si.json b/packages/esm-patient-allergies-app/translations/si.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/si.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/sw.json b/packages/esm-patient-allergies-app/translations/sw.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/sw.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/sw_KE.json b/packages/esm-patient-allergies-app/translations/sw_KE.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/sw_KE.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/tr.json b/packages/esm-patient-allergies-app/translations/tr.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/tr.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/tr_TR.json b/packages/esm-patient-allergies-app/translations/tr_TR.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/tr_TR.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/uk.json b/packages/esm-patient-allergies-app/translations/uk.json
new file mode 100644
index 0000000000..92d41f0b49
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/uk.json
@@ -0,0 +1,47 @@
+{
+  "add": "Add",
+  "allergen": "Allergen",
+  "allergies": "Allergies",
+  "Allergies": "Allergies",
+  "allergyDeleted": "Allergy deleted",
+  "allergyIntolerances": "allergy intolerances",
+  "allergyNowVisible": "It is now visible on the Allergies page",
+  "allergySaved": "Allergy saved",
+  "allergySaveError": "Error saving allergy",
+  "allergyUpdated": "Allergy updated",
+  "cancel": "Cancel",
+  "dateOfOnsetAndComments": "Date of onset and comments",
+  "delete": "Delete",
+  "deleteModalConfirmationText": "Are you sure you want to delete this allergy?",
+  "deletePatientAllergy": "Delete allergy",
+  "deleting": "Deleting",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editAllergy": "Edit an Allergy",
+  "editOrDeleteAllergy": "Edit or delete allergy",
+  "errorDeletingAllergy": "Error deleting allergy",
+  "invalidComment": "Invalid comment, try again",
+  "loading": "Loading",
+  "mild": "Mild",
+  "moderate": "Moderate",
+  "name": "Name",
+  "nonCodedAllergenWarningDescription": "Adding a custom allergen may impact system-wide allergy notifications. It's recommended to choose from the provided list for accurate alerts. Custom entries may not trigger notifications in all relevant contexts.",
+  "nonCodedAllergenWarningTitle": "Warning: Custom Allergen Entry",
+  "onsetDateAndComments": "Onset date and comments",
+  "other": "Other",
+  "otherNonCodedAllergen": "Other non-coded allergen",
+  "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
+  "reaction": "Reaction",
+  "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "selectAllergen": "Select the allergen",
+  "selectReactions": "Select the reactions",
+  "severe": "Severe",
+  "severityandReaction": "Severity",
+  "severityOfWorstReaction": "Severity of worst reaction",
+  "typeAdditionalComments": "Type any additional comments here",
+  "typeAllergenName": "Please type in the name of the allergen",
+  "typeAllergicReactionName": "Please type in the name of the allergic reaction"
+}
diff --git a/packages/esm-patient-allergies-app/translations/vi.json b/packages/esm-patient-allergies-app/translations/vi.json
new file mode 100644
index 0000000000..1dd0551fe5
--- /dev/null
+++ b/packages/esm-patient-allergies-app/translations/vi.json
@@ -0,0 +1,47 @@
+{
+  "add": "Thêm",
+  "allergen": "Chất gây dị ứng",
+  "allergies": "Dị ứng",
+  "Allergies": "Dị ứng",
+  "allergyDeleted": "Đã xóa dị ứng",
+  "allergyIntolerances": "không dung nạp dị ứng",
+  "allergyNowVisible": "Bây giờ nó có thể nhìn thấy trên trang Dị ứng",
+  "allergySaved": "Đã lưu dị ứng",
+  "allergySaveError": "Lỗi khi lưu dị ứng",
+  "allergyUpdated": "Đã cập nhật dị ứng",
+  "cancel": "Hủy",
+  "dateOfOnsetAndComments": "Ngày bắt đầu và bình luận",
+  "delete": "Xóa",
+  "deleteModalConfirmationText": "Bạn có chắc chắn muốn xóa dị ứng này không?",
+  "deletePatientAllergy": "Xóa dị ứng",
+  "deleting": "Đang xóa",
+  "discard": "Hủy bỏ",
+  "edit": "Chỉnh sửa",
+  "editAllergy": "Sủa dị ứng",
+  "editOrDeleteAllergy": "Sửa hoặc xóa dự ứng",
+  "errorDeletingAllergy": "Lỗi xóa dị ứng",
+  "invalidComment": "Bình luận không hợp lệ, hãy thử lại",
+  "loading": "Đang tải",
+  "mild": "Nhẹ",
+  "moderate": "Vừa phải",
+  "name": "Tên",
+  "nonCodedAllergenWarningDescription": "Việc thêm chất gây dị ứng tùy chỉnh có thể ảnh hưởng đến thông báo dị ứng trên toàn hệ thống. Bạn nên chọn từ danh sách được cung cấp để có cảnh báo chính xác. Các mục tùy chỉnh có thể không kích hoạt thông báo trong mọi bối cảnh có liên quan.",
+  "nonCodedAllergenWarningTitle": "Cảnh báo: Mục nhập chất gây dị ứng tùy chỉnh",
+  "onsetDateAndComments": "Ngày bắt đầu và bình luận",
+  "other": "Khác",
+  "otherNonCodedAllergen": "Chất gây dị ứng khác không được mã hóa",
+  "otherNonCodedAllergicReaction": "Phản ứng dị ứng khác không được mã hóa",
+  "reaction": "Phản ứng",
+  "reactions": "Phản ứng",
+  "recordNewAllergy": "Ghi lại một dị ứng mới",
+  "saveAndClose": "Lưu và đóng",
+  "seeAll": "Xem tất cả",
+  "selectAllergen": "Chọn chất gây dị ứng",
+  "selectReactions": "Chọn các phản ứng",
+  "severe": "Nghiêm trọng",
+  "severityandReaction": "Mức độ nghiêm trọng",
+  "severityOfWorstReaction": "Mức độ nghiêm trọng của phản ứng tồi tệ nhất",
+  "typeAdditionalComments": "Nhập bất kỳ bình luận bổ sung nào ở đây",
+  "typeAllergenName": "Vui lòng nhập tên chất gây dị ứng",
+  "typeAllergicReactionName": "Vui lòng nhập tên phản ứng dị ứng"
+}
diff --git a/packages/esm-patient-attachments-app/src/camera-media-uploader/camera-media-uploader.component.tsx b/packages/esm-patient-attachments-app/src/camera-media-uploader/camera-media-uploader.component.tsx
index 6cd1eab718..d0efbd41a7 100644
--- a/packages/esm-patient-attachments-app/src/camera-media-uploader/camera-media-uploader.component.tsx
+++ b/packages/esm-patient-attachments-app/src/camera-media-uploader/camera-media-uploader.component.tsx
@@ -2,16 +2,15 @@ import React, { useState, useCallback, useMemo, useEffect, useRef, useContext }
 import { useTranslation } from 'react-i18next';
 import { Tabs, Tab, TabList, TabPanels, TabPanel, ModalHeader, ModalBody, InlineNotification } from '@carbon/react';
 import { type FetchResponse, type UploadedFile } from '@openmrs/esm-framework';
+import { useAllowedFileExtensions } from '@openmrs/esm-patient-common-lib';
 import CameraComponent from './camera.component';
 import CameraMediaUploaderContext from './camera-media-uploader-context.resources';
 import FileReviewContainer from './file-review.component';
 import MediaUploaderComponent from './media-uploader.component';
 import UploadStatusComponent from './upload-status.component';
 import styles from './camera-media-uploader.scss';
-import { useAllowedFileExtensions } from '@openmrs/esm-patient-common-lib';
 
 interface CameraMediaUploaderModalProps {
-  allowedExtensions: Array<string> | null;
   cameraOnly?: boolean;
   closeModal: () => void;
   collectDescription?: boolean;
@@ -26,7 +25,6 @@ interface CameraMediaUploadTabsProps {
 }
 
 const CameraMediaUploaderModal: React.FC<CameraMediaUploaderModalProps> = ({
-  allowedExtensions,
   cameraOnly,
   closeModal,
   collectDescription,
diff --git a/packages/esm-patient-attachments-app/src/camera-media-uploader/file-review.component.tsx b/packages/esm-patient-attachments-app/src/camera-media-uploader/file-review.component.tsx
index ffe302b60d..dadedf183b 100644
--- a/packages/esm-patient-attachments-app/src/camera-media-uploader/file-review.component.tsx
+++ b/packages/esm-patient-attachments-app/src/camera-media-uploader/file-review.component.tsx
@@ -1,5 +1,8 @@
 import React, { type SyntheticEvent, useCallback, useState, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
+import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Controller, useForm, type SubmitHandler } from 'react-hook-form';
 import { Button, Form, ModalBody, ModalFooter, ModalHeader, Stack, TextArea, TextInput } from '@carbon/react';
 import { DocumentPdf, DocumentUnknown } from '@carbon/react/icons';
 import { type UploadedFile, UserHasAccess } from '@openmrs/esm-framework';
@@ -17,6 +20,7 @@ interface FilePreviewProps {
   moveToNextFile: () => void;
   onSaveFile: (dataUri: UploadedFile) => void;
   title?: string;
+  // TODO: Constrain the file type to a more specific type that only allows image and pdf
   uploadedFile: UploadedFile;
 }
 
@@ -70,58 +74,63 @@ const FilePreview: React.FC<FilePreviewProps> = ({
   clearData,
 }) => {
   const { t } = useTranslation();
-  const [fileName, setFileName] = useState(uploadedFile.fileName);
-  const [fileDescription, setFileDescription] = useState(uploadedFile.fileDescription);
-  const [emptyName, setEmptyName] = useState(false);
-
-  const saveImageOrPdf = useCallback(
-    (event: SyntheticEvent) => {
-      event.preventDefault();
-      onSaveFile?.({
-        ...uploadedFile,
-        fileName,
-        fileDescription,
-      });
+  const { allowedExtensions } = useContext(CameraMediaUploaderContext);
+  const fileNameWithoutExtension = uploadedFile.fileName.trim().replace(/\.[^\\/.]+$/, '');
+
+  const schema = z.object({
+    fileName: z.string({
+      required_error: t('nameIsRequired', 'Name is required'),
+    }),
+    fileDescription: z.string().optional(),
+  });
+
+  const {
+    control,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<z.infer<typeof schema>>({
+    resolver: zodResolver(schema),
+    defaultValues: {
+      fileName: fileNameWithoutExtension,
     },
-    [onSaveFile, fileName, fileDescription, uploadedFile],
-  );
+  });
 
-  const cancelCapture = useCallback(
-    (event: SyntheticEvent) => {
-      event.preventDefault();
-      clearData?.();
-    },
-    [clearData],
-  );
+  const onSubmit: SubmitHandler<z.infer<typeof schema>> = (data) => {
+    const { fileName, fileDescription } = data;
 
-  const updateFileName = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      event.preventDefault();
+    const sanitizedFileName =
+      allowedExtensions?.reduce((name, extension) => {
+        const regex = new RegExp(`\\.(${extension})+$`, 'i');
+        return name.replace(regex, '');
+      }, fileName) || fileName;
 
-      if (event.target.value === '') {
-        setEmptyName(true);
-      } else if (emptyName) {
-        setEmptyName(false);
-      }
+    onSaveFile?.({
+      ...uploadedFile,
+      fileName: `${sanitizedFileName}${fileExtension}`,
+      fileDescription,
+    });
+  };
 
-      setFileName(event.target.value);
-    },
-    [setEmptyName, setFileName, emptyName],
-  );
+  const getFileExtension = useCallback((filename: string): string => {
+    const validExtension = filename.match(/\.[0-9a-z]+$/i);
+    return validExtension ? validExtension[0].toLowerCase() : '';
+  }, []);
 
-  const updateDescription = useCallback(
-    (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+  const fileExtension = getFileExtension(uploadedFile.fileName);
+
+  const handleCancelUpload = useCallback(
+    (event: SyntheticEvent) => {
       event.preventDefault();
-      setFileDescription(event.target.value);
+      clearData?.();
     },
-    [setFileDescription],
+    [clearData],
   );
 
   return (
-    <Form onSubmit={saveImageOrPdf}>
+    <Form onSubmit={handleSubmit(onSubmit)}>
       <ModalBody className={styles.overview}>
         {uploadedFile.fileType === 'image' ? (
-          <img src={uploadedFile.base64Content} alt="placeholder" />
+          <img src={uploadedFile.base64Content} alt={t('imagePlaceholder', 'Image placeholder')} />
         ) : uploadedFile.fileType === 'pdf' ? (
           <div className={styles.filePlaceholder}>
             <DocumentPdf size={16} />
@@ -134,30 +143,39 @@ const FilePreview: React.FC<FilePreviewProps> = ({
         <div className={styles.imageDetails}>
           <Stack gap={5}>
             <div className={styles.captionFrame}>
-              <TextInput
-                autoComplete="off"
-                autoFocus
-                id="caption"
-                invalid={emptyName}
-                invalidText={emptyName && t('fieldRequired', 'This field is required')}
-                labelText={`${uploadedFile.fileType === 'image' ? t('image', 'Image') : t('file', 'File')} ${t(
-                  'name',
-                  'name',
-                )}`}
-                onChange={updateFileName}
-                placeholder={t('attachmentCaptionInstruction', 'Enter caption')}
-                required
-                value={fileName}
+              <Controller
+                control={control}
+                name="fileName"
+                render={({ field: { onChange, value } }) => (
+                  <TextInput
+                    autoFocus
+                    id="caption"
+                    invalid={!!errors.fileName}
+                    invalidText={errors.fileName?.message}
+                    labelText={`${uploadedFile.fileType === 'image' ? t('image', 'Image') : t('file', 'File')} ${t(
+                      'name',
+                      'name',
+                    )}`}
+                    onChange={onChange}
+                    placeholder={t('enterAttachmentName', 'Enter attachment name')}
+                    value={value}
+                  />
+                )}
               />
             </div>
             {collectDescription && (
-              <TextArea
-                autoComplete="off"
-                id="description"
-                labelText={t('imageDescription', 'Image description')}
-                onChange={updateDescription}
-                placeholder={t('attachmentCaptionInstruction', 'Enter caption')}
-                value={fileDescription}
+              <Controller
+                control={control}
+                name="fileDescription"
+                render={({ field: { onChange, value } }) => (
+                  <TextArea
+                    id="description"
+                    labelText={t('imageDescription', 'Image description')}
+                    onChange={onChange}
+                    placeholder={t('enterAttachmentDescription', 'Enter attachment description')}
+                    value={value}
+                  />
+                )}
               />
             )}
           </Stack>
@@ -165,10 +183,10 @@ const FilePreview: React.FC<FilePreviewProps> = ({
       </ModalBody>
       <ModalFooter>
         <UserHasAccess privilege="Create Attachment">
-          <Button kind="secondary" size="lg" onClick={cancelCapture}>
+          <Button kind="secondary" onClick={handleCancelUpload} size="lg">
             {t('cancel', 'Cancel')}
           </Button>
-          <Button type="submit" size="lg" onClick={saveImageOrPdf} disabled={emptyName}>
+          <Button type="submit" size="lg">
             {title || t('addAttachment', 'Add attachment')}
           </Button>
         </UserHasAccess>
diff --git a/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx b/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
index 4634de945c..f996a72bca 100644
--- a/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
+++ b/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
@@ -91,6 +91,10 @@ const MediaUploaderComponent = () => {
         {t('fileUploadSizeConstraints', 'Size limit is {{fileSize}}MB', {
           fileSize: maxFileSize,
         })}
+        .{' '}
+        {t('supportedFiletypes', 'Supported files are {{supportedFiles}}', {
+          supportedFiles: allowedExtensions?.join(', '),
+        })}
         .
       </p>
       <div className={styles.uploadFile}>
diff --git a/packages/esm-patient-attachments-app/src/camera-media-uploader/upload-status.component.tsx b/packages/esm-patient-attachments-app/src/camera-media-uploader/upload-status.component.tsx
index bd0ede228d..b5503c14da 100644
--- a/packages/esm-patient-attachments-app/src/camera-media-uploader/upload-status.component.tsx
+++ b/packages/esm-patient-attachments-app/src/camera-media-uploader/upload-status.component.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonSet, FileUploaderItem, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { showSnackbar } from '@openmrs/esm-framework';
@@ -27,7 +27,7 @@ const UploadStatusComponent: React.FC<UploadStatusComponentProps> = ({ title })
 
   useEffect(() => {
     Promise.all(
-      filesToUpload.map((file, indx) =>
+      filesToUpload.map((file, index) =>
         saveFile(file)
           .then(() => {
             showSnackbar({
@@ -37,8 +37,8 @@ const UploadStatusComponent: React.FC<UploadStatusComponentProps> = ({ title })
               isLowContrast: true,
             });
             setFilesUploading((prevfilesToUpload) =>
-              prevfilesToUpload.map((file, ind) =>
-                ind === indx
+              prevfilesToUpload.map((file, prevFileIndex) =>
+                prevFileIndex === index
                   ? {
                       ...file,
                       status: 'complete',
@@ -47,16 +47,15 @@ const UploadStatusComponent: React.FC<UploadStatusComponentProps> = ({ title })
               ),
             );
           })
-          .catch((err) => {
+          .catch((error) => {
             showSnackbar({
               kind: 'error',
-              subtitle: err,
+              subtitle: error?.message,
               title: `${t('uploading', 'Uploading')} ${file.fileName} ${t('failed', 'failed')}`,
             });
           }),
       ),
     ).then(() => {
-      true;
       onCompletion?.();
     });
   }, [onCompletion, saveFile, filesToUpload, t, setFilesUploading]);
diff --git a/packages/esm-patient-attachments-app/src/routes.json b/packages/esm-patient-attachments-app/src/routes.json
index 1de27d117a..2f4a0d99df 100644
--- a/packages/esm-patient-attachments-app/src/routes.json
+++ b/packages/esm-patient-attachments-app/src/routes.json
@@ -23,7 +23,9 @@
       "name": "capture-photo-widget",
       "component": "capturePhotoWidget",
       "slot": "capture-patient-photo-slot"
-    },
+    }
+  ],
+  "modals": [
     {
       "name": "capture-photo-modal",
       "component": "capturePhotoModal"
diff --git a/packages/esm-patient-attachments-app/src/utils.ts b/packages/esm-patient-attachments-app/src/utils.ts
index 9352ea3e0e..5fd6c1e7fa 100644
--- a/packages/esm-patient-attachments-app/src/utils.ts
+++ b/packages/esm-patient-attachments-app/src/utils.ts
@@ -28,7 +28,7 @@ export function createGalleryEntry(data: AttachmentResponse): Attachment {
   return {
     id: data.uuid,
     src: `${window.openmrsBase}${attachmentUrl}/${data.uuid}/bytes`,
-    filename: data.filename,
+    filename: data.filename.replace(/\.[^\\/.]+$/, ''),
     description: data.comment,
     dateTime: formatDate(new Date(data.dateTime), {
       mode: 'wide',
diff --git a/packages/esm-patient-attachments-app/translations/am.json b/packages/esm-patient-attachments-app/translations/am.json
index a4868502db..b6819fce2b 100644
--- a/packages/esm-patient-attachments-app/translations/am.json
+++ b/packages/esm-patient-attachments-app/translations/am.json
@@ -4,7 +4,6 @@
   "addAttachment": "Add attachment",
   "addAttachment_title": "Add Attachment",
   "addMoreAttachments": "Add more attachments",
-  "attachmentCaptionInstruction": "Enter caption",
   "attachments": "Attachments",
   "Attachments": "Attachments",
   "attachmentsInLowerCase": "attachments",
@@ -21,10 +20,11 @@
   "deleteImage": "Delete image",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Error",
   "failed": "failed",
   "failedDeleting": "couldn't be deleted",
-  "fieldRequired": "This field is required",
   "file": "File",
   "fileDeleted": "File deleted",
   "fileName": "File name",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "Image",
   "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "name",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "Type",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/ar.json b/packages/esm-patient-attachments-app/translations/ar.json
index fb36acad81..2335df282a 100644
--- a/packages/esm-patient-attachments-app/translations/ar.json
+++ b/packages/esm-patient-attachments-app/translations/ar.json
@@ -4,7 +4,6 @@
   "addAttachment": "أضف مرفق",
   "addAttachment_title": "أضف مرفق",
   "addMoreAttachments": "أضف المزيد من المرفقات",
-  "attachmentCaptionInstruction": "أدخل الوصف",
   "attachments": "المرفقات",
   "Attachments": "المرفقات",
   "attachmentsInLowerCase": "attachments",
@@ -21,10 +20,11 @@
   "deleteImage": "حذف الصورة",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "خطأ",
   "failed": "فشل",
   "failedDeleting": "تعذر الحذف",
-  "fieldRequired": "هذا الحقل مطلوب",
   "file": "ملف",
   "fileDeleted": "تم حذف الملف",
   "fileName": "اسم الملف",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "صورة",
   "imageDescription": "وصف الصورة",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "الاسم",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "تم الحذف بنجاح",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "النوع",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/de.json b/packages/esm-patient-attachments-app/translations/de.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/de.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/en.json b/packages/esm-patient-attachments-app/translations/en.json
index 29333098e8..867ad03668 100644
--- a/packages/esm-patient-attachments-app/translations/en.json
+++ b/packages/esm-patient-attachments-app/translations/en.json
@@ -4,7 +4,6 @@
   "addAttachment": "Add Attachment",
   "addAttachment_title": "Add Attachment",
   "addMoreAttachments": "Add more attachments",
-  "attachmentCaptionInstruction": "Enter caption",
   "attachments": "Attachments",
   "Attachments": "Attachments",
   "attachmentsInLowerCase": "attachments",
@@ -21,10 +20,11 @@
   "deleteImage": "Delete image",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Error",
   "failed": "failed",
   "failedDeleting": "couldn't be deleted",
-  "fieldRequired": "This field is required",
   "file": "File",
   "fileDeleted": "File deleted",
   "fileName": "File name",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "Image",
   "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "name",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "Type",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/es.json b/packages/esm-patient-attachments-app/translations/es.json
index ab3e630efc..1b77594187 100644
--- a/packages/esm-patient-attachments-app/translations/es.json
+++ b/packages/esm-patient-attachments-app/translations/es.json
@@ -4,7 +4,6 @@
   "addAttachment": "Añadir archivo adjunto",
   "addAttachment_title": "Añadir archivo adjunto",
   "addMoreAttachments": "Añadir más archivos adjuntos",
-  "attachmentCaptionInstruction": "Introduzca título",
   "attachments": "Archivos adjuntos",
   "Attachments": "Archivos adjuntos",
   "attachmentsInLowerCase": "archivos adjuntos",
@@ -21,10 +20,11 @@
   "deleteImage": "Borrar imagen",
   "deletePdf": "Eliminar PDF",
   "edit": "Editar",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Error",
   "failed": "fallido",
   "failedDeleting": "no se pudo borrar",
-  "fieldRequired": "Este campo es obligatorio",
   "file": "Archivo",
   "fileDeleted": "Archivo eliminado",
   "fileName": "Nombre de archivo",
@@ -35,11 +35,14 @@
   "gridView": "Vista de cuadrícula",
   "image": "Imagen",
   "imageDescription": "Descripción de la imagen",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Vista previa de la imagen",
   "name": "nombre",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No hay imagen para mostrar",
   "options": "Opciones",
   "successfullyDeleted": "eliminado exitosamente",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Vista de tabla",
   "type": "Tipo",
   "unsupportedFileType": "Tipo de archivo no compatible",
diff --git a/packages/esm-patient-attachments-app/translations/fr.json b/packages/esm-patient-attachments-app/translations/fr.json
index 383daca3aa..882496d363 100644
--- a/packages/esm-patient-attachments-app/translations/fr.json
+++ b/packages/esm-patient-attachments-app/translations/fr.json
@@ -4,7 +4,6 @@
   "addAttachment": "Ajouter une Pièce Jointe",
   "addAttachment_title": "Ajouter une Pièce Jointe",
   "addMoreAttachments": "Ajouter plus de pièces jointes",
-  "attachmentCaptionInstruction": "Ajouter une légende pour l'image",
   "attachments": "Pièces Jointes",
   "Attachments": "Pièces Jointes",
   "attachmentsInLowerCase": "pièces jointes",
@@ -21,10 +20,11 @@
   "deleteImage": "Effacer l'image",
   "deletePdf": "Supprimer PDF",
   "edit": "Afficher",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Erreur",
   "failed": "échec",
   "failedDeleting": "n'a pu être supprimé",
-  "fieldRequired": "Ce champs est requis",
   "file": "Fichier",
   "fileDeleted": "Fichier supprimé",
   "fileName": "Nom du fichier",
@@ -35,11 +35,14 @@
   "gridView": "Vue en grille",
   "image": "Image",
   "imageDescription": "Description de l'image",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Aperçu de l'image",
   "name": "Nom",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "Aucune image à afficher",
   "options": "Options",
   "successfullyDeleted": "Supprimé avec succès",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Vue tabulaire",
   "type": "Type",
   "unsupportedFileType": "Type de fichier non pris en charge",
diff --git a/packages/esm-patient-attachments-app/translations/he.json b/packages/esm-patient-attachments-app/translations/he.json
index e2dd025bbd..5725c64664 100644
--- a/packages/esm-patient-attachments-app/translations/he.json
+++ b/packages/esm-patient-attachments-app/translations/he.json
@@ -4,7 +4,6 @@
   "addAttachment": "הוסף קובץ מצורף",
   "addAttachment_title": "הוסף קובץ מצורף",
   "addMoreAttachments": "הוסף קבצים מצורפים נוספים",
-  "attachmentCaptionInstruction": "הכנס תיאור לתמונה",
   "attachments": "קבצים מצורפים",
   "Attachments": "קבצים מצורפים",
   "attachmentsInLowerCase": "קבצים מצורפים",
@@ -21,10 +20,11 @@
   "deleteImage": "מחק תמונה",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "שגיאה",
   "failed": "נכשל",
   "failedDeleting": "לא ניתן למחוק",
-  "fieldRequired": "שדה זה נדרש",
   "file": "קובץ",
   "fileDeleted": "קובץ נמחק",
   "fileName": "שם הקובץ",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "תמונה",
   "imageDescription": "תיאור התמונה",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "שם",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "נמחק בהצלחה",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "סוג",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/hi.json b/packages/esm-patient-attachments-app/translations/hi.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/hi.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/hi_IN.json b/packages/esm-patient-attachments-app/translations/hi_IN.json
index 29333098e8..867ad03668 100644
--- a/packages/esm-patient-attachments-app/translations/hi_IN.json
+++ b/packages/esm-patient-attachments-app/translations/hi_IN.json
@@ -4,7 +4,6 @@
   "addAttachment": "Add Attachment",
   "addAttachment_title": "Add Attachment",
   "addMoreAttachments": "Add more attachments",
-  "attachmentCaptionInstruction": "Enter caption",
   "attachments": "Attachments",
   "Attachments": "Attachments",
   "attachmentsInLowerCase": "attachments",
@@ -21,10 +20,11 @@
   "deleteImage": "Delete image",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Error",
   "failed": "failed",
   "failedDeleting": "couldn't be deleted",
-  "fieldRequired": "This field is required",
   "file": "File",
   "fileDeleted": "File deleted",
   "fileName": "File name",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "Image",
   "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "name",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "Type",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/id.json b/packages/esm-patient-attachments-app/translations/id.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/id.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/it.json b/packages/esm-patient-attachments-app/translations/it.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/it.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/km.json b/packages/esm-patient-attachments-app/translations/km.json
index 708ec7c49a..dcec68589c 100644
--- a/packages/esm-patient-attachments-app/translations/km.json
+++ b/packages/esm-patient-attachments-app/translations/km.json
@@ -4,7 +4,6 @@
   "addAttachment": "បន្ថែមឯកសារភ្ជាប់",
   "addAttachment_title": "បន្ថែមឯកសារភ្ជាប់",
   "addMoreAttachments": "បន្ថែមឯកសារភ្ជាប់បន្ថែម",
-  "attachmentCaptionInstruction": "បញ្ចូលចំណងជើងសម្រាប់រូបភាព",
   "attachments": "ឯកសារភ្ជាប់",
   "Attachments": "ឯកសារភ្ជាប់",
   "attachmentsInLowerCase": "ឯកសារភ្ជាប់",
@@ -21,10 +20,11 @@
   "deleteImage": "លុបរូបភាពចោល",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "កំហុស",
   "failed": "បរាជ័យ",
   "failedDeleting": "មិនអាចលុបចោលបានទេ",
-  "fieldRequired": "ចន្លោះនេះត្រូវតែបំពេញ",
   "file": "ឯកសារ",
   "fileDeleted": "បានលុបឯកសារចោល",
   "fileName": "ឈ្មោះឯកសារ",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "រូបភាព",
   "imageDescription": "ការពិពណ៌នារូបភាព",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "ឈ្មោះ",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "បានលុបចោលដោយជោគជ័យ",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "ប្រភេទ",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/pt.json b/packages/esm-patient-attachments-app/translations/pt.json
new file mode 100644
index 0000000000..125e7e4ca7
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/pt.json
@@ -0,0 +1,56 @@
+{
+  "add": "Adicionar",
+  "addAnImage": "Adicionar imagem",
+  "addAttachment": "Adicionar anexo",
+  "addAttachment_title": "Adicionar anexo",
+  "addMoreAttachments": "Adicionar mais anexos",
+  "attachments": "Anexos",
+  "Attachments": "Anexos",
+  "attachmentsInLowerCase": "anexos",
+  "attachmentsInProperFormat": "Anexos",
+  "cameraAccessErrorMessage": "Favor de ativa o acesso à câmera nas configurações do seu navegador e tente novamente.",
+  "cameraError": "Erro de câmera",
+  "cancel": "Cancelar",
+  "chooseAnAllowedFileType": " O arquivo \"{{fileName}}\" não pode ser carregado. Faça o carregamento de um arquivo com uma das seguintes extensões: {{supportedExtensions}} ou {{ lastExtension }}.",
+  "closeModal": "Fechar",
+  "closePreview": "Fechar visualização",
+  "dateUploaded": "Data de carregamento",
+  "delete": "Apagar",
+  "deleteAttachmentConfirmationText": "Tem certeza de que deseja apagar este {{attachmentType}}? Esta ação não pode ser desfeita.",
+  "deleteImage": "Apagar imagem",
+  "deletePdf": "Apagar PDF",
+  "edit": "Editar",
+  "enterAttachmentDescription": "Insira a descrição do anexo",
+  "enterAttachmentName": "Insira o nome do anexo",
+  "error": "Erro",
+  "failed": "Falhou",
+  "failedDeleting": "Não pode ser apagado",
+  "file": "Ficheiro",
+  "fileDeleted": "Ficheiro excluído",
+  "fileName": "Nome do ficheiro",
+  "fileSizeInstructions": "Arraste e solte os arquivos aqui ou clique para carregar",
+  "fileSizeLimitExceeded": "excede o tamanho limite de",
+  "fileSizeLimitExceededText": "Limite de tamanho de arquivo excedido",
+  "fileUploadSizeConstraints": "O tamanho limite de arquivos é {{fileSize}} MB",
+  "gridView": "Visualização em grade",
+  "image": "Imagem",
+  "imageDescription": "Descrição da imagem",
+  "imagePlaceholder": "Espaço reservado para imagem",
+  "imagePreview": "Visualizar imagem",
+  "name": "nome",
+  "nameIsRequired": "Nome é obrigatório",
+  "noImageToDisplay": "Nemhuma imagem para mostrar",
+  "options": "Opções",
+  "successfullyDeleted": "apagado com sucesso",
+  "supportedFiletypes": "Arquivos suportados são {{supportedFiles}}",
+  "tableView": "Visualização em Tabela",
+  "type": "Tipo",
+  "unsupportedFileType": "Tipo de arquivo não suportado",
+  "uploadComplete": "Carregamento terminado",
+  "uploadedSuccessfully": "carregado com sucesso",
+  "uploadError": "Erro ao carregar arquivo",
+  "uploadFiles": "Arquivos carregados",
+  "uploading": "Carregando",
+  "uploadWillContinueInTheBackground": "Os arquivos serão carregados em segundo plano. Você pode fechar este modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/qu.json b/packages/esm-patient-attachments-app/translations/qu.json
index 29333098e8..867ad03668 100644
--- a/packages/esm-patient-attachments-app/translations/qu.json
+++ b/packages/esm-patient-attachments-app/translations/qu.json
@@ -4,7 +4,6 @@
   "addAttachment": "Add Attachment",
   "addAttachment_title": "Add Attachment",
   "addMoreAttachments": "Add more attachments",
-  "attachmentCaptionInstruction": "Enter caption",
   "attachments": "Attachments",
   "Attachments": "Attachments",
   "attachmentsInLowerCase": "attachments",
@@ -21,10 +20,11 @@
   "deleteImage": "Delete image",
   "deletePdf": "Delete PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "Error",
   "failed": "failed",
   "failedDeleting": "couldn't be deleted",
-  "fieldRequired": "This field is required",
   "file": "File",
   "fileDeleted": "File deleted",
   "fileName": "File name",
@@ -35,11 +35,14 @@
   "gridView": "Grid view",
   "image": "Image",
   "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "name",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "Options",
   "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "Table view",
   "type": "Type",
   "unsupportedFileType": "Unsupported file type",
diff --git a/packages/esm-patient-attachments-app/translations/si.json b/packages/esm-patient-attachments-app/translations/si.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/si.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/sw.json b/packages/esm-patient-attachments-app/translations/sw.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/sw.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/sw_KE.json b/packages/esm-patient-attachments-app/translations/sw_KE.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/sw_KE.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/tr.json b/packages/esm-patient-attachments-app/translations/tr.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/tr.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/tr_TR.json b/packages/esm-patient-attachments-app/translations/tr_TR.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/tr_TR.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/uk.json b/packages/esm-patient-attachments-app/translations/uk.json
new file mode 100644
index 0000000000..867ad03668
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/uk.json
@@ -0,0 +1,56 @@
+{
+  "add": "Add",
+  "addAnImage": "Add image",
+  "addAttachment": "Add Attachment",
+  "addAttachment_title": "Add Attachment",
+  "addMoreAttachments": "Add more attachments",
+  "attachments": "Attachments",
+  "Attachments": "Attachments",
+  "attachmentsInLowerCase": "attachments",
+  "attachmentsInProperFormat": "Attachments",
+  "cameraAccessErrorMessage": "Please enable camera access in your browser settings and try again.",
+  "cameraError": "Camera Error",
+  "cancel": "Cancel",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
+  "closeModal": "Close",
+  "closePreview": "Close preview",
+  "dateUploaded": "Date uploaded",
+  "delete": "Delete",
+  "deleteAttachmentConfirmationText": "Are you sure you want to delete this {{attachmentType}}? This action can't be undone.",
+  "deleteImage": "Delete image",
+  "deletePdf": "Delete PDF",
+  "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
+  "error": "Error",
+  "failed": "failed",
+  "failedDeleting": "couldn't be deleted",
+  "file": "File",
+  "fileDeleted": "File deleted",
+  "fileName": "File name",
+  "fileSizeInstructions": "Drag and drop files here or click to upload",
+  "fileSizeLimitExceeded": "exceeds the size limit of",
+  "fileSizeLimitExceededText": "File size limit exceeded",
+  "fileUploadSizeConstraints": "File limit is {{fileSize}}MB",
+  "gridView": "Grid view",
+  "image": "Image",
+  "imageDescription": "Image description",
+  "imagePlaceholder": "Image placeholder",
+  "imagePreview": "Image preview",
+  "name": "name",
+  "nameIsRequired": "Name is required",
+  "noImageToDisplay": "No image to display",
+  "options": "Options",
+  "successfullyDeleted": "successfully deleted",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
+  "tableView": "Table view",
+  "type": "Type",
+  "unsupportedFileType": "Unsupported file type",
+  "uploadComplete": "Upload complete",
+  "uploadedSuccessfully": "uploaded successfully",
+  "uploadError": "Error uploading file",
+  "uploadFiles": "Upload files",
+  "uploading": "Uploading",
+  "uploadWillContinueInTheBackground": "Files will be uploaded in the background. You can close this modal.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/vi.json b/packages/esm-patient-attachments-app/translations/vi.json
new file mode 100644
index 0000000000..e355b91251
--- /dev/null
+++ b/packages/esm-patient-attachments-app/translations/vi.json
@@ -0,0 +1,56 @@
+{
+  "add": "Thêm",
+  "addAnImage": "Thêm hình ảnh",
+  "addAttachment": "Thêm tệp đính kèm",
+  "addAttachment_title": "Thêm tệp đính kèm",
+  "addMoreAttachments": "Thêm nhiều tệp đính kèm hơn",
+  "attachments": "Đính kèm",
+  "Attachments": "Đính kèm",
+  "attachmentsInLowerCase": "đính kèm",
+  "attachmentsInProperFormat": "Đính kèm",
+  "cameraAccessErrorMessage": "Vui lòng bật quyền truy cập camera trong cài đặt trình duyệt của bạn và thử lại.",
+  "cameraError": "Lỗi máy ảnh",
+  "cancel": "Hủy",
+  "chooseAnAllowedFileType": "Không thể tải lên tệp \"{{fileName}}\". Vui lòng tải lên tệp có một trong các phần mở rộng sau: {{supportedExtensions}} hoặc {{lastExtension }}.",
+  "closeModal": "Đóng",
+  "closePreview": "Đóng bản xem trước",
+  "dateUploaded": "Ngày tải lên",
+  "delete": "Xóa",
+  "deleteAttachmentConfirmationText": "Bạn có chắc chắn muốn xóa {{attachmentType}} này không? Không thể hoàn tác hành động này.",
+  "deleteImage": "Xóa hình ảnh",
+  "deletePdf": "Xóa PDF",
+  "edit": "Chỉnh sửa",
+  "enterAttachmentDescription": "Nhập mô tả tệp đính kèm",
+  "enterAttachmentName": "Nhập tên tệp đính kèm",
+  "error": "Lỗi",
+  "failed": "thất bại",
+  "failedDeleting": "không thể xóa được",
+  "file": "Tệp",
+  "fileDeleted": "Tập tin đã xóa",
+  "fileName": "Tên tệp",
+  "fileSizeInstructions": "Kéo và thả tập tin vào đây hoặc nhấp để tải lên",
+  "fileSizeLimitExceeded": "vượt quá giới hạn kích thước của",
+  "fileSizeLimitExceededText": "Đã vượt quá giới hạn kích thước tệp",
+  "fileUploadSizeConstraints": "Giới hạn tệp là {{fileSize}}MB",
+  "gridView": "Chế độ xem lưới",
+  "image": "Hình ảnh",
+  "imageDescription": "Mô tả hình ảnh",
+  "imagePlaceholder": "Giữ chỗ hình ảnh",
+  "imagePreview": "Xem trước hình ảnh",
+  "name": "tên",
+  "nameIsRequired": "Tên là bắt buộc",
+  "noImageToDisplay": "Không có hình ảnh để hiển thị",
+  "options": "Tùy chọn",
+  "successfullyDeleted": "đã xóa thành công",
+  "supportedFiletypes": "Các tập tin được hỗ trợ là {{supportedFiles}}",
+  "tableView": "Xem bảng",
+  "type": "Loại",
+  "unsupportedFileType": "Loại tệp không được hỗ trợ",
+  "uploadComplete": "Tải lên hoàn tất",
+  "uploadedSuccessfully": "đã tải lên thành công",
+  "uploadError": "Lỗi tải tập tin lên",
+  "uploadFiles": "Tải lên các tập tin",
+  "uploading": "Đang tải lên",
+  "uploadWillContinueInTheBackground": "Các tập tin sẽ được tải lên ở chế độ nền. Bạn có thể đóng hộp thoại này.",
+  "webcam": "Webcam"
+}
diff --git a/packages/esm-patient-attachments-app/translations/zh.json b/packages/esm-patient-attachments-app/translations/zh.json
index 3a90c4501d..0adab77551 100644
--- a/packages/esm-patient-attachments-app/translations/zh.json
+++ b/packages/esm-patient-attachments-app/translations/zh.json
@@ -4,7 +4,6 @@
   "addAttachment": "添加附件",
   "addAttachment_title": "添加附件",
   "addMoreAttachments": "增加更多附件",
-  "attachmentCaptionInstruction": "输入标题",
   "attachments": "附件",
   "Attachments": "附件",
   "attachmentsInLowerCase": "附件",
@@ -21,10 +20,11 @@
   "deleteImage": "删除图像",
   "deletePdf": "删除PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "错误",
   "failed": "失败",
   "failedDeleting": "无法删除",
-  "fieldRequired": "此字段为必填项",
   "file": "文件",
   "fileDeleted": "文件已删除",
   "fileName": "文件名",
@@ -35,11 +35,14 @@
   "gridView": "网格视图",
   "image": "图像",
   "imageDescription": "图像描述",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "名称",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "选项",
   "successfullyDeleted": "删除成功",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "表格视图",
   "type": "类型",
   "unsupportedFileType": "不支持的文件类型",
diff --git a/packages/esm-patient-attachments-app/translations/zh_CN.json b/packages/esm-patient-attachments-app/translations/zh_CN.json
index 3a90c4501d..0adab77551 100644
--- a/packages/esm-patient-attachments-app/translations/zh_CN.json
+++ b/packages/esm-patient-attachments-app/translations/zh_CN.json
@@ -4,7 +4,6 @@
   "addAttachment": "添加附件",
   "addAttachment_title": "添加附件",
   "addMoreAttachments": "增加更多附件",
-  "attachmentCaptionInstruction": "输入标题",
   "attachments": "附件",
   "Attachments": "附件",
   "attachmentsInLowerCase": "附件",
@@ -21,10 +20,11 @@
   "deleteImage": "删除图像",
   "deletePdf": "删除PDF",
   "edit": "Edit",
+  "enterAttachmentDescription": "Enter attachment description",
+  "enterAttachmentName": "Enter attachment name",
   "error": "错误",
   "failed": "失败",
   "failedDeleting": "无法删除",
-  "fieldRequired": "此字段为必填项",
   "file": "文件",
   "fileDeleted": "文件已删除",
   "fileName": "文件名",
@@ -35,11 +35,14 @@
   "gridView": "网格视图",
   "image": "图像",
   "imageDescription": "图像描述",
+  "imagePlaceholder": "Image placeholder",
   "imagePreview": "Image preview",
   "name": "名称",
+  "nameIsRequired": "Name is required",
   "noImageToDisplay": "No image to display",
   "options": "选项",
   "successfullyDeleted": "删除成功",
+  "supportedFiletypes": "Supported files are {{supportedFiles}}",
   "tableView": "表格视图",
   "type": "类型",
   "unsupportedFileType": "不支持的文件类型",
diff --git a/packages/esm-patient-banner-app/src/hooks/useCauseOfDeath.ts b/packages/esm-patient-banner-app/src/hooks/useCauseOfDeath.ts
index 94089f3307..4750fabb99 100644
--- a/packages/esm-patient-banner-app/src/hooks/useCauseOfDeath.ts
+++ b/packages/esm-patient-banner-app/src/hooks/useCauseOfDeath.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import useSWR from 'swr';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 
 interface CauseOfDeathResponse {
   data: {
@@ -13,7 +13,7 @@ interface CauseOfDeathResponse {
 
 export function useCauseOfDeath(patientUuid: string) {
   const customRepresentation = 'custom:(causeOfDeath:(display),causeOfDeathNonCoded)';
-  const url = `/ws/rest/v1/person/${patientUuid}?v=${customRepresentation}`;
+  const url = `${restBaseUrl}/person/${patientUuid}?v=${customRepresentation}`;
 
   const { data, error } = useSWR<CauseOfDeathResponse, Error>(patientUuid ? url : null, openmrsFetch);
 
diff --git a/packages/esm-patient-banner-app/translations/am.json b/packages/esm-patient-banner-app/translations/am.json
index c96dacfc21..61c50e2670 100644
--- a/packages/esm-patient-banner-app/translations/am.json
+++ b/packages/esm-patient-banner-app/translations/am.json
@@ -6,9 +6,15 @@
   "country": "Country",
   "countyDistrict": "District",
   "district": "District",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "State",
-  "stateProvince": "State"
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/ar.json b/packages/esm-patient-banner-app/translations/ar.json
index 6a75959da9..c13a2fdf11 100644
--- a/packages/esm-patient-banner-app/translations/ar.json
+++ b/packages/esm-patient-banner-app/translations/ar.json
@@ -6,9 +6,15 @@
   "country": "الدولة",
   "countyDistrict": "المنطقة",
   "district": "المنطقة",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "الرمز البريدي",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "الولاية",
-  "stateProvince": "الولاية"
+  "stateProvince": "الولاية",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/de.json b/packages/esm-patient-banner-app/translations/de.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/de.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/es.json b/packages/esm-patient-banner-app/translations/es.json
index 7872be89bf..9ff6b9e998 100644
--- a/packages/esm-patient-banner-app/translations/es.json
+++ b/packages/esm-patient-banner-app/translations/es.json
@@ -6,9 +6,15 @@
   "country": "País",
   "countyDistrict": "Distrito",
   "district": "Distrito",
-  "dob": "Fecha de Nacimiento",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Etiqueta de identificación del paciente",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "Código Postal",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "Estado",
-  "stateProvince": "Estado"
+  "stateProvince": "Estado",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/fr.json b/packages/esm-patient-banner-app/translations/fr.json
index 40f4c5bfee..5f367042a5 100644
--- a/packages/esm-patient-banner-app/translations/fr.json
+++ b/packages/esm-patient-banner-app/translations/fr.json
@@ -6,9 +6,15 @@
   "country": "Pays",
   "countyDistrict": "District",
   "district": "District",
-  "dob": "Date de naissance",
+  "implementationLogo": "Logo de mise en œuvre",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date de Naissance:",
+  "patientGenderWithSeparator": "Genre:",
   "patientIdentifierSticker": "Autocollant d'identification du patient",
+  "patientNameWithSeparator": "Nom du Patient:",
   "postalCode": "Code postal",
+  "printIdentifierSticker": "Imprimer l'autocollant d'identification",
   "state": "État",
-  "stateProvince": "État"
+  "stateProvince": "État",
+  "telephoneNumberWithSeparator": "Numéro de téléphone:"
 }
diff --git a/packages/esm-patient-banner-app/translations/he.json b/packages/esm-patient-banner-app/translations/he.json
index d26af5031b..b444cfdd74 100644
--- a/packages/esm-patient-banner-app/translations/he.json
+++ b/packages/esm-patient-banner-app/translations/he.json
@@ -6,9 +6,15 @@
   "country": "מדינה",
   "countyDistrict": "מחוז",
   "district": "מחוז",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "מיקוד",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "מדינה",
-  "stateProvince": "מדינה"
+  "stateProvince": "מדינה",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/hi.json b/packages/esm-patient-banner-app/translations/hi.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/hi.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/hi_IN.json b/packages/esm-patient-banner-app/translations/hi_IN.json
index c96dacfc21..61c50e2670 100644
--- a/packages/esm-patient-banner-app/translations/hi_IN.json
+++ b/packages/esm-patient-banner-app/translations/hi_IN.json
@@ -6,9 +6,15 @@
   "country": "Country",
   "countyDistrict": "District",
   "district": "District",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "State",
-  "stateProvince": "State"
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/id.json b/packages/esm-patient-banner-app/translations/id.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/id.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/it.json b/packages/esm-patient-banner-app/translations/it.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/it.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/km.json b/packages/esm-patient-banner-app/translations/km.json
index 5adc5acdf5..233d56abb5 100644
--- a/packages/esm-patient-banner-app/translations/km.json
+++ b/packages/esm-patient-banner-app/translations/km.json
@@ -6,9 +6,15 @@
   "country": "ប្រទេស",
   "countyDistrict": "ស្រុក/ខ័ណ្ឌ",
   "district": "ស្រុក/ខ័ណ្ឌ",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "លេខកូដតំបន់",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "រដ្ឋ",
-  "stateProvince": "រដ្ឋ"
+  "stateProvince": "រដ្ឋ",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/pt.json b/packages/esm-patient-banner-app/translations/pt.json
new file mode 100644
index 0000000000..47d6730993
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/pt.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Endereço linha 1",
+  "address2": "Endereço linha 2",
+  "city": "Cidade",
+  "cityVillage": "cidade",
+  "country": "País",
+  "countyDistrict": "Distrito",
+  "district": "Distrito",
+  "implementationLogo": "Logotipo de implementação",
+  "patientAge": "Idade:",
+  "patientDateOfBirthWithSeparator": "Data de nascimento:",
+  "patientGenderWithSeparator": "Sexo:",
+  "patientIdentifierSticker": "Etiqueta de Identificador do Utente",
+  "patientNameWithSeparator": "Nome do utente:",
+  "postalCode": "Caixa postal",
+  "printIdentifierSticker": "Imprimir etiqueta do identificador",
+  "state": "Estado",
+  "stateProvince": "Estado",
+  "telephoneNumberWithSeparator": "Número de Telefone:"
+}
diff --git a/packages/esm-patient-banner-app/translations/qu.json b/packages/esm-patient-banner-app/translations/qu.json
index c96dacfc21..61c50e2670 100644
--- a/packages/esm-patient-banner-app/translations/qu.json
+++ b/packages/esm-patient-banner-app/translations/qu.json
@@ -6,9 +6,15 @@
   "country": "Country",
   "countyDistrict": "District",
   "district": "District",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "State",
-  "stateProvince": "State"
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/si.json b/packages/esm-patient-banner-app/translations/si.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/si.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/sw.json b/packages/esm-patient-banner-app/translations/sw.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/sw.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/sw_KE.json b/packages/esm-patient-banner-app/translations/sw_KE.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/sw_KE.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/tr.json b/packages/esm-patient-banner-app/translations/tr.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/tr.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/tr_TR.json b/packages/esm-patient-banner-app/translations/tr_TR.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/tr_TR.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/uk.json b/packages/esm-patient-banner-app/translations/uk.json
new file mode 100644
index 0000000000..61c50e2670
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/uk.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Address line 1",
+  "address2": "Address line 2",
+  "city": "City",
+  "cityVillage": "city",
+  "country": "Country",
+  "countyDistrict": "District",
+  "district": "District",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
+  "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
+  "postalCode": "Postal code",
+  "printIdentifierSticker": "Print identifier sticker",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Telephone number:"
+}
diff --git a/packages/esm-patient-banner-app/translations/vi.json b/packages/esm-patient-banner-app/translations/vi.json
new file mode 100644
index 0000000000..c1abe8095a
--- /dev/null
+++ b/packages/esm-patient-banner-app/translations/vi.json
@@ -0,0 +1,20 @@
+{
+  "address1": "Địa chỉ 1",
+  "address2": "Địa chỉ 2",
+  "city": "Thành phố",
+  "cityVillage": "thành phố",
+  "country": "Đất nước",
+  "countyDistrict": "Huyện",
+  "district": "Huyện",
+  "implementationLogo": "Logo triển khai",
+  "patientAge": "Tuổi\"",
+  "patientDateOfBirthWithSeparator": "Ngày sinh:",
+  "patientGenderWithSeparator": "Giới tính:",
+  "patientIdentifierSticker": "Nhãn dán nhận dạng bệnh nhân",
+  "patientNameWithSeparator": "Tên bệnh nhân:",
+  "postalCode": "Mã bưu chính",
+  "printIdentifierSticker": "In nhãn dán nhận dạng",
+  "state": "State",
+  "stateProvince": "State",
+  "telephoneNumberWithSeparator": "Số điện thoại:"
+}
diff --git a/packages/esm-patient-banner-app/translations/zh.json b/packages/esm-patient-banner-app/translations/zh.json
index 5cf26417e3..2a7db4c417 100644
--- a/packages/esm-patient-banner-app/translations/zh.json
+++ b/packages/esm-patient-banner-app/translations/zh.json
@@ -6,9 +6,15 @@
   "country": "国家",
   "countyDistrict": "区县",
   "district": "区县",
-  "dob": "出生日期",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "患者标识符贴纸",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "邮政编码",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "省份",
-  "stateProvince": "省份"
+  "stateProvince": "省份",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-banner-app/translations/zh_CN.json b/packages/esm-patient-banner-app/translations/zh_CN.json
index 0ed0585479..bd02eec04c 100644
--- a/packages/esm-patient-banner-app/translations/zh_CN.json
+++ b/packages/esm-patient-banner-app/translations/zh_CN.json
@@ -6,9 +6,15 @@
   "country": "国家",
   "countyDistrict": "区县",
   "district": "区县",
-  "dob": "DOB",
+  "implementationLogo": "Implementation logo",
+  "patientAge": "Age:",
+  "patientDateOfBirthWithSeparator": "Date of birth:",
+  "patientGenderWithSeparator": "Gender:",
   "patientIdentifierSticker": "Patient identifier sticker",
+  "patientNameWithSeparator": "Patient name:",
   "postalCode": "邮政编码",
+  "printIdentifierSticker": "Print identifier sticker",
   "state": "省份",
-  "stateProvince": "省份"
+  "stateProvince": "省份",
+  "telephoneNumberWithSeparator": "Telephone number:"
 }
diff --git a/packages/esm-patient-chart-app/src/offline.ts b/packages/esm-patient-chart-app/src/offline.ts
index 255f6d850c..87792b472d 100644
--- a/packages/esm-patient-chart-app/src/offline.ts
+++ b/packages/esm-patient-chart-app/src/offline.ts
@@ -29,7 +29,7 @@ export function setupOfflineVisitsSync() {
       stopDatetime: new Date(),
     };
 
-    const res = await saveVisit(visitPayload, options.abort).toPromise();
+    const res = await saveVisit(visitPayload, options.abort);
     if (!res.ok) {
       throw new Error(
         `Failed to synchronize offline visit with the UUID: ${visit.uuid}. Error: ${JSON.stringify(res.data)}`,
diff --git a/packages/esm-patient-chart-app/src/patient-chart/patient-chart.component.tsx b/packages/esm-patient-chart-app/src/patient-chart/patient-chart.component.tsx
index 63bba2e81e..4443bc0d73 100644
--- a/packages/esm-patient-chart-app/src/patient-chart/patient-chart.component.tsx
+++ b/packages/esm-patient-chart-app/src/patient-chart/patient-chart.component.tsx
@@ -17,6 +17,7 @@ import Loader from '../loader/loader.component';
 import styles from './patient-chart.scss';
 import VisitHeader from '../visit-header/visit-header.component';
 import SideMenuPanel from '../side-nav/side-menu.component';
+import { getPatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 const PatientChart: React.FC = () => {
   const { patientUuid, view: encodedView } = useParams();
@@ -41,6 +42,17 @@ const PatientChart: React.FC = () => {
     };
   }, [patientUuid]);
 
+  useEffect(() => {
+    getPatientChartStore().setState({
+      patientUuid,
+    });
+    return () => {
+      getPatientChartStore().setState({
+        patientUuid: null,
+      });
+    };
+  }, [patientUuid]);
+
   const leftNavBasePath = useMemo(() => spaBasePath.replace(':patientUuid', patientUuid), [patientUuid]);
   useEffect(() => {
     setLeftNav({ name: 'patient-chart-dashboard-slot', basePath: leftNavBasePath });
diff --git a/packages/esm-patient-chart-app/src/visit/hooks/useVisitAttributeType.tsx b/packages/esm-patient-chart-app/src/visit/hooks/useVisitAttributeType.tsx
index 46ed1516a7..363f5d9482 100644
--- a/packages/esm-patient-chart-app/src/visit/hooks/useVisitAttributeType.tsx
+++ b/packages/esm-patient-chart-app/src/visit/hooks/useVisitAttributeType.tsx
@@ -36,7 +36,7 @@ const visitAttributeTypeCustomRepresentation =
 
 export function useVisitAttributeTypes() {
   const { data, error, isLoading } = useSWRImmutable<FetchResponse<{ results: VisitAttributeType[] }>, Error>(
-    `/ws/rest/v1/visitattributetype?v=${visitAttributeTypeCustomRepresentation}`,
+    `${restBaseUrl}/visitattributetype?v=${visitAttributeTypeCustomRepresentation}`,
     openmrsFetch,
   );
 
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index 51cfac5ab2..e29ab38bd0 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -25,6 +25,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import {
   ExtensionSlot,
   formatDatetime,
+  type NewVisitPayload,
   openmrsFetch,
   restBaseUrl,
   saveVisit,
@@ -39,15 +40,14 @@ import {
   useSession,
   useVisit,
   useVisitTypes,
-  type NewVisitPayload,
   type Visit,
 } from '@openmrs/esm-framework';
 import {
   convertTime12to24,
   createOfflineVisitForPatient,
+  type DefaultPatientWorkspaceProps,
   time12HourFormatRegex,
   useActivePatientEnrollment,
-  type DefaultPatientWorkspaceProps,
 } from '@openmrs/esm-patient-common-lib';
 import { type ChartConfig } from '../../config-schema';
 import { type VisitFormData } from './visit-form.resource';
@@ -121,8 +121,8 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
   });
 
   const displayVisitStopDateTimeFields = useMemo(
-    () => Boolean(visitToEdit?.stopDatetime || showVisitEndDateTimeFields),
-    [visitToEdit?.stopDatetime, showVisitEndDateTimeFields],
+    () => Boolean(visitToEdit?.uuid || showVisitEndDateTimeFields),
+    [visitToEdit?.uuid, showVisitEndDateTimeFields],
   );
 
   const visitFormSchema = useMemo(() => {
@@ -148,6 +148,8 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
       return new Date(visitStartDatetime) <= new Date();
     };
 
+    const hadPreviousStopDateTime = Boolean(visitToEdit?.stopDatetime);
+
     return z
       .object({
         visitStartDate: z.date().refine(
@@ -167,13 +169,18 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           .string()
           .refine((value) => value.match(time12HourFormatRegex), t('invalidTimeFormat', 'Invalid time format')),
         visitStartTimeFormat: z.enum(['PM', 'AM']),
-        visitStopDate: displayVisitStopDateTimeFields ? z.date() : z.date().optional(),
-        visitStopTime: displayVisitStopDateTimeFields
-          ? z
-              .string()
-              .refine((value) => value.match(time12HourFormatRegex), t('invalidTimeFormat', 'Invalid time format'))
-          : z.string().optional(),
-        visitStopTimeFormat: displayVisitStopDateTimeFields ? z.enum(['PM', 'AM']) : z.enum(['PM', 'AM']).optional(),
+        visitStopDate: displayVisitStopDateTimeFields && hadPreviousStopDateTime ? z.date() : z.date().optional(),
+        visitStopTime:
+          displayVisitStopDateTimeFields && hadPreviousStopDateTime
+            ? z.string().refine((value) => value.match(time12HourFormatRegex), t('invalidTimeFormat'))
+            : z
+                .string()
+                .refine((value) => !value || value.match(time12HourFormatRegex), t('invalidTimeFormat'))
+                .optional(),
+        visitStopTimeFormat:
+          displayVisitStopDateTimeFields && hadPreviousStopDateTime
+            ? z.enum(['PM', 'AM'])
+            : z.enum(['PM', 'AM']).optional(),
         programType: z.string().optional(),
         visitType: z.string().refine((value) => !!value, t('visitTypeRequired', 'Visit type is required')),
         visitLocation: z.object({
@@ -186,7 +193,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
         message: t('futureStartTime', 'Visit start time cannot be in the future'),
         path: ['visitStartTime'],
       });
-  }, [t, config, displayVisitStopDateTimeFields]);
+  }, [config.visitAttributeTypes, visitToEdit?.stopDatetime, t, displayVisitStopDateTimeFields]);
 
   const defaultValues = useMemo(() => {
     const visitStartDate = visitToEdit?.startDatetime ? new Date(visitToEdit?.startDatetime) : new Date();
@@ -283,31 +290,33 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
     const visitStopTime = getValues('visitStopTime');
     const visitStopTimeFormat = getValues('visitStopTimeFormat');
 
-    const [visitStopHours, visitStopMinutes] = convertTime12to24(visitStopTime, visitStopTimeFormat);
-
-    const visitStopDatetime = visitStopDate.setHours(visitStopHours, visitStopMinutes);
-
-    if (minVisitStopDatetime && visitStopDatetime <= minVisitStopDatetime) {
-      validSubmission = false;
-      setError('visitStopDate', {
-        message: t(
-          'visitStopDateMustBeAfterMostRecentEncounter',
-          'Stop date needs to be on or after {{lastEncounterDatetime}}',
-          {
-            lastEncounterDatetime: new Date(minVisitStopDatetime).toLocaleString(),
-            interpolation: {
-              escapeValue: false,
+    if (visitStopDate && visitStopTime && visitStopTimeFormat) {
+      const [visitStopHours, visitStopMinutes] = convertTime12to24(visitStopTime, visitStopTimeFormat);
+
+      const visitStopDatetime = visitStopDate.setHours(visitStopHours, visitStopMinutes);
+
+      if (minVisitStopDatetime && visitStopDatetime <= minVisitStopDatetime) {
+        validSubmission = false;
+        setError('visitStopDate', {
+          message: t(
+            'visitStopDateMustBeAfterMostRecentEncounter',
+            'Stop date needs to be on or after {{lastEncounterDatetime}}',
+            {
+              lastEncounterDatetime: new Date(minVisitStopDatetime).toLocaleString(),
+              interpolation: {
+                escapeValue: false,
+              },
             },
-          },
-        ),
-      });
-    }
+          ),
+        });
+      }
 
-    if (visitStartDatetime >= visitStopDatetime) {
-      validSubmission = false;
-      setError('visitStopDate', {
-        message: t('invalidVisitStopDate', 'Visit stop date time cannot be on or before visit start date time'),
-      });
+      if (visitStartDatetime >= visitStopDatetime) {
+        validSubmission = false;
+        setError('visitStopDate', {
+          message: t('invalidVisitStopDate', 'Visit stop date time cannot be on or before visit start date time'),
+        });
+      }
     }
 
     return validSubmission;
@@ -442,7 +451,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
         delete payload.patient;
       }
 
-      if (displayVisitStopDateTimeFields) {
+      if (displayVisitStopDateTimeFields && visitStopDate && visitStopTime && visitStopTimeFormat) {
         const [visitStopHours, visitStopMinutes] = convertTime12to24(visitStopTime, visitStopTimeFormat);
 
         payload.stopDatetime = toDateObjectStrict(
@@ -474,122 +483,120 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           ? updateVisit(visitToEdit?.uuid, payload, abortController)
           : saveVisit(payload, abortController)
         )
-          .pipe(first())
-          .subscribe({
-            next: (response) => {
-              if (config.showServiceQueueFields && queueLocation && service && priority) {
-                // retrieve values from the queue extension
-                setVisitUuid(response.data.uuid);
-
-                saveQueueEntry(
-                  response.data.uuid,
-                  service,
-                  patientUuid,
-                  priority,
-                  status,
-                  sortWeight,
-                  queueLocation,
-                  visitQueueNumberAttributeUuid,
-                  abortController,
-                ).then(
-                  ({ status }) => {
+          .then((response) => {
+            if (config.showServiceQueueFields && queueLocation && service && priority) {
+              // retrieve values from the queue extension
+              setVisitUuid(response.data.uuid);
+
+              saveQueueEntry(
+                response.data.uuid,
+                service,
+                patientUuid,
+                priority,
+                status,
+                sortWeight,
+                queueLocation,
+                visitQueueNumberAttributeUuid,
+                abortController,
+              ).then(
+                () => {
+                  mutateCurrentVisit();
+                  mutateVisits();
+                  mutateInfiniteVisits();
+                  mutateQueueEntry();
+                  showSnackbar({
+                    kind: 'success',
+                    title: t('visitStarted', 'Visit started'),
+                    subtitle: t('queueAddedSuccessfully', `Patient added to the queue successfully.`),
+                  });
+                },
+                (error) => {
+                  showSnackbar({
+                    title: t('queueEntryError', 'Error adding patient to the queue'),
+                    kind: 'error',
+                    isLowContrast: false,
+                    subtitle: error?.message,
+                  });
+                },
+              );
+
+              if (config.showUpcomingAppointments && upcomingAppointment) {
+                updateAppointmentStatus('CheckedIn', upcomingAppointment.uuid, abortController).then(
+                  () => {
                     mutateCurrentVisit();
                     mutateVisits();
                     mutateInfiniteVisits();
-                    mutateQueueEntry();
+                    mutateAppointments();
                     showSnackbar({
+                      isLowContrast: true,
                       kind: 'success',
-                      title: t('visitStarted', 'Visit started'),
-                      subtitle: t('queueAddedSuccessfully', `Patient added to the queue successfully.`),
+                      subtitle: t('appointmentMarkedChecked', 'Appointment marked as Checked In'),
+                      title: t('appointmentCheckedIn', 'Appointment Checked In'),
                     });
                   },
                   (error) => {
                     showSnackbar({
-                      title: t('queueEntryError', 'Error adding patient to the queue'),
+                      title: t('updateError', 'Error updating upcoming appointment'),
                       kind: 'error',
                       isLowContrast: false,
                       subtitle: error?.message,
                     });
                   },
                 );
-
-                if (config.showUpcomingAppointments && upcomingAppointment) {
-                  updateAppointmentStatus('CheckedIn', upcomingAppointment.uuid, abortController).then(
-                    () => {
-                      mutateCurrentVisit();
-                      mutateVisits();
-                      mutateInfiniteVisits();
-                      mutateAppointments();
-                      showSnackbar({
-                        isLowContrast: true,
-                        kind: 'success',
-                        subtitle: t('appointmentMarkedChecked', 'Appointment marked as Checked In'),
-                        title: t('appointmentCheckedIn', 'Appointment Checked In'),
-                      });
-                    },
-                    (error) => {
-                      showSnackbar({
-                        title: t('updateError', 'Error updating upcoming appointment'),
-                        kind: 'error',
-                        isLowContrast: false,
-                        subtitle: error?.message,
-                      });
-                    },
-                  );
-                }
               }
+            }
 
-              from(handleVisitAttributes(visitAttributes, response.data.uuid))
-                .pipe(first())
-                .subscribe({
-                  next: (attributesResponses) => {
-                    setIsSubmitting(false);
-                    // Check for no undefined,
-                    // that if there was no failed requests on either creating, updating or deleting an attribute
-                    // then continue and close workspace
-                    if (!attributesResponses.includes(undefined)) {
-                      mutateCurrentVisit();
-                      mutateVisits();
-                      mutateInfiniteVisits();
-                      closeWorkspace({ ignoreChanges: true });
-                      showSnackbar({
-                        isLowContrast: true,
-                        kind: 'success',
-                        subtitle: !visitToEdit
-                          ? t('visitStartedSuccessfully', '{{visit}} started successfully', {
-                              visit: response?.data?.visitType?.display ?? t('visit', 'Visit'),
-                            })
-                          : t('visitDetailsUpdatedSuccessfully', '{{visit}} updated successfully', {
-                              visit: response?.data?.visitType?.display ?? t('pastVisit', 'Past visit'),
-                            }),
-                        title: !visitToEdit
-                          ? t('visitStarted', 'Visit started')
-                          : t('visitDetailsUpdated', 'Visit details updated'),
-                      });
-                    }
-                  },
-                  error: (error) => {
+            // TODO: Refactor this to use Promises
+            from(handleVisitAttributes(visitAttributes, response.data.uuid))
+              .pipe(first())
+              .subscribe({
+                next: (attributesResponses) => {
+                  setIsSubmitting(false);
+                  // Check for no undefined,
+                  // that if there was no failed requests on either creating, updating or deleting an attribute
+                  // then continue and close workspace
+                  if (!attributesResponses.includes(undefined)) {
+                    mutateCurrentVisit();
+                    mutateVisits();
+                    mutateInfiniteVisits();
+                    closeWorkspace({ ignoreChanges: true });
                     showSnackbar({
+                      isLowContrast: true,
+                      kind: 'success',
+                      subtitle: !visitToEdit
+                        ? t('visitStartedSuccessfully', '{{visit}} started successfully', {
+                            visit: response?.data?.visitType?.display ?? t('visit', 'Visit'),
+                          })
+                        : t('visitDetailsUpdatedSuccessfully', '{{visit}} updated successfully', {
+                            visit: response?.data?.visitType?.display ?? t('pastVisit', 'Past visit'),
+                          }),
                       title: !visitToEdit
-                        ? t('startVisitError', 'Error starting visit')
-                        : t('errorUpdatingVisitDetails', 'Error updating visit details'),
-                      kind: 'error',
-                      isLowContrast: false,
-                      subtitle: error?.message,
+                        ? t('visitStarted', 'Visit started')
+                        : t('visitDetailsUpdated', 'Visit details updated'),
                     });
-                  },
-                });
-            },
-            error: (error) => {
-              showSnackbar({
-                title: !visitToEdit
-                  ? t('startVisitError', 'Error starting visit')
-                  : t('errorUpdatingVisitDetails', 'Error updating visit details'),
-                kind: 'error',
-                isLowContrast: false,
-                subtitle: error?.message,
+                  }
+                },
+                error: (error) => {
+                  showSnackbar({
+                    title: !visitToEdit
+                      ? t('startVisitError', 'Error starting visit')
+                      : t('errorUpdatingVisitDetails', 'Error updating visit details'),
+                    kind: 'error',
+                    isLowContrast: false,
+                    subtitle: error?.message,
+                  });
+                },
               });
-            },
+          })
+          .catch((error) => {
+            showSnackbar({
+              title: !visitToEdit
+                ? t('startVisitError', 'Error starting visit')
+                : t('errorUpdatingVisitDetails', 'Error updating visit details'),
+              kind: 'error',
+              isLowContrast: false,
+              subtitle: error?.message,
+            });
           });
       } else {
         createOfflineVisitForPatient(
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
index c76723ef7e..86bb0b482b 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import dayjs from 'dayjs';
-import { of, throwError } from 'rxjs';
 import { render, screen } from '@testing-library/react';
 import { esmPatientChartSchema, type ChartConfig } from '../../config-schema';
 import userEvent from '@testing-library/user-event';
 import {
   getDefaultsFromConfigSchema,
   openmrsFetch,
+  restBaseUrl,
   saveVisit,
   showSnackbar,
   updateVisit,
@@ -255,16 +255,14 @@ describe('Visit form', () => {
   it('starts a new visit upon successful submission of the form', async () => {
     const user = userEvent.setup();
 
-    mockSaveVisit.mockReturnValue(
-      of({
-        status: 201,
-        data: {
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockSaveVisit.mockResolvedValue({
+      status: 201,
+      data: {
+        visitType: {
+          display: 'Facility Visit',
         },
-      } as FetchResponse<{ visitType: { display: string } }>),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     renderVisitForm();
 
@@ -323,17 +321,15 @@ describe('Visit form', () => {
     await user.clear(insuranceNumberInput);
     await user.type(insuranceNumberInput, '183299');
 
-    mockSaveVisit.mockReturnValue(
-      of({
-        status: 201,
-        data: {
-          uuid: visitUuid,
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockSaveVisit.mockResolvedValue({
+      status: 201,
+      data: {
+        uuid: visitUuid,
+        visitType: {
+          display: 'Facility Visit',
         },
-      } as FetchResponse<{ uuid: string; visitType: { display: string } }>),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     await user.click(saveButton);
 
@@ -347,13 +343,13 @@ describe('Visit form', () => {
       expect.any(Object),
     );
 
-    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`/ws/rest/v1/visit/${visitUuid}/attribute`, {
+    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`${restBaseUrl}/visit/${visitUuid}/attribute`, {
       method: 'POST',
       headers: { 'Content-type': 'application/json' },
       body: { attributeType: visitAttributes.punctuality.uuid, value: '66cdc0a1-aa19-4676-af51-80f66d78d9eb' },
     });
 
-    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`/ws/rest/v1/visit/${visitUuid}/attribute`, {
+    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`${restBaseUrl}/visit/${visitUuid}/attribute`, {
       method: 'POST',
       headers: { 'Content-type': 'application/json' },
       body: { attributeType: visitAttributes.insurancePolicyNumber.uuid, value: '183299' },
@@ -393,17 +389,15 @@ describe('Visit form', () => {
     await user.clear(insuranceNumberInput);
     await user.type(insuranceNumberInput, '1873290');
 
-    mockUpdateVisit.mockReturnValue(
-      of({
-        status: 201,
-        data: {
-          uuid: visitUuid,
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockUpdateVisit.mockResolvedValue({
+      status: 201,
+      data: {
+        uuid: visitUuid,
+        visitType: {
+          display: 'Facility Visit',
         },
-      }),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     await user.click(saveButton);
 
@@ -417,7 +411,7 @@ describe('Visit form', () => {
     );
 
     expect(mockOpenmrsFetch).toHaveBeenCalledWith(
-      `/ws/rest/v1/visit/${visitUuid}/attribute/c98e66d7-7db5-47ae-b46f-91a0f3b6dda1`,
+      `${restBaseUrl}/visit/${visitUuid}/attribute/c98e66d7-7db5-47ae-b46f-91a0f3b6dda1`,
       {
         method: 'POST',
         headers: { 'Content-type': 'application/json' },
@@ -426,7 +420,7 @@ describe('Visit form', () => {
     );
 
     expect(mockOpenmrsFetch).toHaveBeenCalledWith(
-      `/ws/rest/v1/visit/${visitUuid}/attribute/d6d7d26a-5975-4f03-8abb-db073c948897`,
+      `${restBaseUrl}/visit/${visitUuid}/attribute/d6d7d26a-5975-4f03-8abb-db073c948897`,
       {
         method: 'POST',
         headers: { 'Content-type': 'application/json' },
@@ -466,17 +460,15 @@ describe('Visit form', () => {
     const insuranceNumberInput = screen.getByRole('textbox', { name: 'Insurance Policy Number (optional)' });
     await user.clear(insuranceNumberInput);
 
-    mockUpdateVisit.mockReturnValue(
-      of({
-        status: 201,
-        data: {
-          uuid: visitUuid,
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockUpdateVisit.mockResolvedValue({
+      status: 201,
+      data: {
+        uuid: visitUuid,
+        visitType: {
+          display: 'Facility Visit',
         },
-      }),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     await user.click(saveButton);
 
@@ -490,12 +482,12 @@ describe('Visit form', () => {
     );
 
     expect(mockOpenmrsFetch).toHaveBeenCalledWith(
-      `/ws/rest/v1/visit/${visitUuid}/attribute/c98e66d7-7db5-47ae-b46f-91a0f3b6dda1`,
+      `${restBaseUrl}/visit/${visitUuid}/attribute/c98e66d7-7db5-47ae-b46f-91a0f3b6dda1`,
       { method: 'DELETE' },
     );
 
     expect(mockOpenmrsFetch).toHaveBeenCalledWith(
-      `/ws/rest/v1/visit/${visitUuid}/attribute/d6d7d26a-5975-4f03-8abb-db073c948897`,
+      `${restBaseUrl}/visit/${visitUuid}/attribute/d6d7d26a-5975-4f03-8abb-db073c948897`,
       { method: 'DELETE' },
     );
 
@@ -511,7 +503,8 @@ describe('Visit form', () => {
 
   it('renders an error message if there was a problem starting a new visit', async () => {
     const user = userEvent.setup();
-    mockSaveVisit.mockReturnValue(throwError(() => ({ status: 500, statusText: 'Internal server error' })));
+
+    mockSaveVisit.mockRejectedValue({ status: 500, statusText: 'Internal server error' });
 
     renderVisitForm();
 
@@ -575,16 +568,14 @@ describe('Visit form', () => {
       ],
     });
 
-    mockSaveVisit.mockReturnValue(
-      of({
-        status: 201,
-        data: {
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockSaveVisit.mockResolvedValue({
+      status: 201,
+      data: {
+        visitType: {
+          display: 'Facility Visit',
         },
-      } as FetchResponse<{ visitType: { display: string } }>),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     renderVisitForm();
 
diff --git a/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.component.tsx
index 7e0453782f..6f2290b05c 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.component.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { first } from 'rxjs/operators';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
-import { parseDate, setCurrentVisit, showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
+import { setCurrentVisit, showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
 import { useVisitQueueEntry } from '../queue-entry/queue.resource';
 import { removeQueuedPatient } from '../hooks/useServiceQueue';
 import styles from './end-visit-dialog.scss';
@@ -17,52 +16,45 @@ const EndVisitDialog: React.FC<EndVisitDialogProps> = ({ patientUuid, closeModal
   const { currentVisit, currentVisitIsRetrospective, mutate } = useVisit(patientUuid);
   const { queueEntry } = useVisitQueueEntry(patientUuid, currentVisit?.uuid);
 
-  const endCurrentVisit = () => {
+  const handleEndVisit = () => {
     if (currentVisitIsRetrospective) {
       setCurrentVisit(null, null);
       closeModal();
     } else {
       const endVisitPayload = {
-        location: currentVisit.location.uuid,
-        startDatetime: parseDate(currentVisit.startDatetime),
-        visitType: currentVisit.visitType.uuid,
         stopDatetime: new Date(),
       };
 
       const abortController = new AbortController();
+
       updateVisit(currentVisit.uuid, endVisitPayload, abortController)
-        .pipe(first())
-        .subscribe(
-          (response) => {
-            if (response.status === 200) {
-              if (queueEntry) {
-                removeQueuedPatient(
-                  queueEntry.queue.uuid,
-                  queueEntry.queueEntryUuid,
-                  abortController,
-                  response?.data.stopDatetime,
-                );
-              }
-              mutate();
-              closeModal();
+        .then((response) => {
+          if (queueEntry) {
+            removeQueuedPatient(
+              queueEntry.queue.uuid,
+              queueEntry.queueEntryUuid,
+              abortController,
+              response?.data.stopDatetime,
+            );
+          }
+          mutate();
+          closeModal();
 
-              showSnackbar({
-                isLowContrast: true,
-                kind: 'success',
-                subtitle: t('visitEndSuccessfully', `${response?.data?.visitType?.display} ended successfully`),
-                title: t('visitEnded', 'Visit ended'),
-              });
-            }
-          },
-          (error) => {
-            showSnackbar({
-              title: t('errorEndingVisit', 'Error ending visit'),
-              kind: 'error',
-              isLowContrast: false,
-              subtitle: error?.message,
-            });
-          },
-        );
+          showSnackbar({
+            isLowContrast: true,
+            kind: 'success',
+            subtitle: t('visitEndSuccessfully', `${response?.data?.visitType?.display} ended successfully`),
+            title: t('visitEnded', 'Visit ended'),
+          });
+        })
+        .catch((error) => {
+          showSnackbar({
+            title: t('errorEndingVisit', 'Error ending visit'),
+            kind: 'error',
+            isLowContrast: false,
+            subtitle: error?.message,
+          });
+        });
     }
   };
 
@@ -84,7 +76,7 @@ const EndVisitDialog: React.FC<EndVisitDialogProps> = ({ patientUuid, closeModal
         <Button kind="secondary" onClick={closeModal}>
           {t('cancel', 'Cancel')}
         </Button>
-        <Button kind="danger" onClick={endCurrentVisit}>
+        <Button kind="danger" onClick={handleEndVisit}>
           {t('endVisit_title', 'End Visit')}
         </Button>
       </ModalFooter>
diff --git a/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.test.tsx
index 2027529bca..af3049c330 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-prompt/end-visit-dialog.test.tsx
@@ -1,16 +1,12 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
-import { of, throwError } from 'rxjs';
-import { showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
+import { showSnackbar, updateVisit, useVisit, type Visit, type FetchResponse } from '@openmrs/esm-framework';
 import { mockCurrentVisit } from '__mocks__';
 import EndVisitDialog from './end-visit-dialog.component';
 
 const endVisitPayload = {
-  location: '6351fcf4-e311-4a19-90f9-35667d99a8af',
-  startDatetime: new Date('2021-03-16T08:16:00.000Z'),
-  stopDatetime: expect.anything(),
-  visitType: '7b0f5697-27e3-40c4-8bae-f4049abfb4ed',
+  stopDatetime: expect.any(Date),
 };
 
 const mockCloseModal = jest.fn();
@@ -35,16 +31,14 @@ describe('End visit dialog', () => {
   test('displays a success snackbar when the visit is ended successfully', async () => {
     const user = userEvent.setup();
 
-    mockUpdateVisit.mockReturnValueOnce(
-      of({
-        status: 200,
-        data: {
-          visitType: {
-            display: 'Facility Visit',
-          },
+    mockUpdateVisit.mockResolvedValue({
+      status: 200,
+      data: {
+        visitType: {
+          display: 'Facility Visit',
         },
-      }),
-    );
+      },
+    } as unknown as FetchResponse<Visit>);
 
     render(<EndVisitDialog patientUuid="some-patient-uuid" closeModal={mockCloseModal} />);
 
@@ -78,7 +72,16 @@ describe('End visit dialog', () => {
 
   test('displays an error snackbar if there was a problem ending a visit', async () => {
     const user = userEvent.setup();
-    mockUpdateVisit.mockReturnValue(throwError(() => new Error('Internal error message')));
+
+    const error = {
+      message: 'Internal error message',
+      response: {
+        status: 500,
+        statusText: 'Internal server error',
+      },
+    };
+
+    mockUpdateVisit.mockRejectedValue(error);
 
     render(<EndVisitDialog patientUuid="some-patient-uuid" closeModal={mockCloseModal} />);
 
@@ -93,7 +96,7 @@ describe('End visit dialog', () => {
 
     await user.click(endVisitButton);
 
-    expect(updateVisit).toHaveBeenCalledWith(mockCurrentVisit.uuid, endVisitPayload, expect.anything());
+    expect(updateVisit).toHaveBeenCalledWith(mockCurrentVisit.uuid, endVisitPayload, new AbortController());
     expect(mockShowSnackbar).toHaveBeenCalledWith({
       subtitle: 'Internal error message',
       kind: 'error',
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/tests-summary.component.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/tests-summary.component.tsx
index eebd5c7f2c..57b0326eea 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/tests-summary.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/tests-summary.component.tsx
@@ -11,12 +11,7 @@ const TestsSummary = ({ patientUuid, encounters }: { patientUuid: string; encoun
     };
   }, [encounters]);
 
-  return (
-    <ExtensionSlot
-      name="test-results-filtered-overview-slot"
-      state={{ filter, patientUuid } as ExternalOverviewProps}
-    />
-  );
+  return <ExtensionSlot name="test-results-filtered-overview-slot" state={{ filter, patientUuid }} />;
 };
 
 export default TestsSummary;
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.component.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.component.tsx
index 44f116ec99..191b442e9f 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.component.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { Tab, Tabs, TabList, TabPanel, TabPanels, Tag } from '@carbon/react';
+import { Tab, TabList, TabPanel, TabPanels, Tabs, Tag } from '@carbon/react';
 import {
   type AssignedExtension,
   Extension,
@@ -14,13 +14,13 @@ import {
   type Visit,
 } from '@openmrs/esm-framework';
 import {
-  type Order,
+  type Diagnosis,
   type Encounter,
+  mapEncounters,
   type Note,
   type Observation,
+  type Order,
   type OrderItem,
-  type Diagnosis,
-  mapEncounters,
 } from '../visit.resource';
 import VisitsTable from './visits-table/visits-table.component';
 import MedicationSummary from './medications-summary.component';
@@ -31,7 +31,8 @@ import styles from './visit-summary.scss';
 
 interface DiagnosisItem {
   diagnosis: string;
-  order: string;
+  rank: number;
+  type: string;
 }
 
 interface VisitSummaryProps {
@@ -70,14 +71,15 @@ const VisitSummary: React.FC<VisitSummaryProps> = ({ visit, patientUuid }) => {
         );
       }
 
-      //Check if there is a diagnosis associated with this encounter
+      // Check if there is a diagnosis associated with this encounter
       if (enc.hasOwnProperty('diagnoses')) {
         if (enc.diagnoses.length > 0) {
           enc.diagnoses.forEach((diagnosis: Diagnosis) => {
             // Putting all the diagnoses in a single array.
             diagnoses.push({
               diagnosis: diagnosis.display,
-              order: diagnosis.rank === 1 ? 'Primary' : 'Secondary',
+              type: diagnosis.rank === 1 ? 'red' : 'blue',
+              rank: diagnosis.rank,
             });
           });
         }
@@ -102,6 +104,9 @@ const VisitSummary: React.FC<VisitSummaryProps> = ({ visit, patientUuid }) => {
       }
     });
 
+    // Sort the diagnoses by rank, so that primary diagnoses come first
+    diagnoses.sort((a, b) => a.rank - b.rank);
+
     return [diagnoses, notes, medications];
   }, [config.notesConceptUuids, visit?.encounters]);
 
@@ -118,7 +123,7 @@ const VisitSummary: React.FC<VisitSummaryProps> = ({ visit, patientUuid }) => {
       <div className={styles.diagnosesList}>
         {diagnoses.length > 0 ? (
           diagnoses.map((diagnosis, i) => (
-            <Tag key={i} type={diagnosis.order === 'Primary' ? 'red' : 'blue'}>
+            <Tag key={`${diagnosis.diagnosis}-${i}`} type={diagnosis.type}>
               {diagnosis.diagnosis}
             </Tag>
           ))
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.test.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.test.tsx
index 26eb51f9f8..dd3a2cccfa 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visit-summary.test.tsx
@@ -56,6 +56,24 @@ describe('VisitSummary', () => {
     expect(screen.getByText(/test-results-filtered-overview/)).toBeInTheDocument();
   });
 
+   it('renders diagnoses tags when there are diagnoses', () => {
+    const mockVisit = visitOverviewDetailMockDataNotEmpty.data.results[0];
+
+    render(<VisitSummary patientUuid={mockPatient.id} visit={mockVisit} />);
+
+    const malariaTag = screen.getByText(/^malaria, confirmed$/i);
+    const hivTag = screen.getByText(/human immunodeficiency virus \(hiv\)/i);
+
+    expect(screen.getByText(/^diagnoses$/i)).toBeInTheDocument();
+    expect(malariaTag).toBeInTheDocument();
+    expect(hivTag).toBeInTheDocument();
+
+    // eslint-disable-next-line testing-library/no-node-access
+    expect(malariaTag.closest('div')).toHaveClass('cds--tag--red');
+    // eslint-disable-next-line testing-library/no-node-access
+    expect(hivTag.closest('div')).toHaveClass('cds--tag--blue');
+  });
+
   it('should display notes, tests and medication summary', async () => {
     const user = userEvent.setup();
 
diff --git a/packages/esm-patient-chart-app/translations/am.json b/packages/esm-patient-chart-app/translations/am.json
index 72d9aad523..1b270e6a4e 100644
--- a/packages/esm-patient-chart-app/translations/am.json
+++ b/packages/esm-patient-chart-app/translations/am.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
diff --git a/packages/esm-patient-chart-app/translations/ar.json b/packages/esm-patient-chart-app/translations/ar.json
index 4883058327..d70d41bf5a 100644
--- a/packages/esm-patient-chart-app/translations/ar.json
+++ b/packages/esm-patient-chart-app/translations/ar.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "البرنامج",
   "provider": "مقدم الخدمة",
   "quantity": "الكمية",
diff --git a/packages/esm-patient-chart-app/translations/de.json b/packages/esm-patient-chart-app/translations/de.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/de.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/es.json b/packages/esm-patient-chart-app/translations/es.json
index b0ea1bc7be..29ad4486d1 100644
--- a/packages/esm-patient-chart-app/translations/es.json
+++ b/packages/esm-patient-chart-app/translations/es.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Error de visita pasada",
   "pastVisits": "Visita pasada",
   "Patient Summary": "Resumen del paciente ",
-  "printIdentifierSticker": "Imprimir etiqueta de identificación",
   "program": "Programa",
   "provider": "Proveedor",
   "quantity": "Cantidad",
diff --git a/packages/esm-patient-chart-app/translations/fr.json b/packages/esm-patient-chart-app/translations/fr.json
index e5b7ce8eb2..1e1a1a64fc 100644
--- a/packages/esm-patient-chart-app/translations/fr.json
+++ b/packages/esm-patient-chart-app/translations/fr.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Erreur de visite antérieure",
   "pastVisits": "Visites précédentes",
   "Patient Summary": "Résumé du patient",
-  "printIdentifierSticker": "Imprimer l'autocollant d'identification",
   "program": "Programme",
   "provider": "Prestataire",
   "quantity": "Quantité",
diff --git a/packages/esm-patient-chart-app/translations/he.json b/packages/esm-patient-chart-app/translations/he.json
index 44aae13ea7..2bb3e2d593 100644
--- a/packages/esm-patient-chart-app/translations/he.json
+++ b/packages/esm-patient-chart-app/translations/he.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "תוכנית",
   "provider": "ספק",
   "quantity": "כמות",
diff --git a/packages/esm-patient-chart-app/translations/hi.json b/packages/esm-patient-chart-app/translations/hi.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/hi.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/hi_IN.json b/packages/esm-patient-chart-app/translations/hi_IN.json
index ff5752f32a..bef2c0bf30 100644
--- a/packages/esm-patient-chart-app/translations/hi_IN.json
+++ b/packages/esm-patient-chart-app/translations/hi_IN.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
diff --git a/packages/esm-patient-chart-app/translations/id.json b/packages/esm-patient-chart-app/translations/id.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/id.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/it.json b/packages/esm-patient-chart-app/translations/it.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/it.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/km.json b/packages/esm-patient-chart-app/translations/km.json
index d7e597fa21..e633ce190c 100644
--- a/packages/esm-patient-chart-app/translations/km.json
+++ b/packages/esm-patient-chart-app/translations/km.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "កម្មវិធី",
   "provider": "អ្នកផ្តល់សេវា",
   "quantity": "បរិមាណ",
diff --git a/packages/esm-patient-chart-app/translations/pt.json b/packages/esm-patient-chart-app/translations/pt.json
new file mode 100644
index 0000000000..52ddbddcbb
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/pt.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Adicionar uma visita anterior",
+  "addPastVisit": "Adicionar visita anterior",
+  "addPastVisitText": "Você pode adicionar uma nova visita anterior ou actualizar uma antiga. Escolha uma das opções abaixo para continuar.",
+  "all": "Todos",
+  "allEncounters": "Todas consultas",
+  "appointmentCheckedIn": "Consulta marcada Check-in",
+  "appointmentMarkedChecked": "Consulta marcada como Check-in",
+  "cancel": "Cancelar",
+  "cancelActiveVisitConfirmation": "Tem certeza de que deseja cancelar esta visita activa?",
+  "cancellingVisit": "Cancelando visita",
+  "cancelVisit": "Cancelar visita",
+  "cancelVisitExplainerMessage": "Ao cancelar esta visita irá apagar as suas consultas associadas.",
+  "causeOfDeath": "Causa de óbito",
+  "causeOfDeath_lower": "conceitos de causa de óbito configurados no sistema",
+  "causeOfDeathIsRequired": "Por favor selecione a causa de óbito",
+  "checkFilters": "Verifique os filtros acima",
+  "close": "Fechar",
+  "confirm": "Confirmar",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Tem certeza de que deseja excluir {{visit}} que iniciou em {{visitStartDate}} e terminou em {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "A data de consulta está fora do intervalo de datas associada a visita. Gostaria de modificar a data da visita para acomodar a nova data da consulta?",
+  "currentVisit": "Visita actual",
+  "date": "Data",
+  "dateAndTime": "Data e hora",
+  "dateOfDeath": "Data de óbito",
+  "deathDateRequired": "Por favor selecione a data de óbito",
+  "delete": "Apagar",
+  "deleteEncounter": "Apagar consulta",
+  "deleteEncounterConfirmationText": "Tem certeza de que deseja apagar esta consulta? Esta ação não pode ser desfeita.",
+  "deleteThisEncounter": "Apagar esta consulta",
+  "deleteVisit": "Apagar visita",
+  "deleteVisitDialogHeader": "Tem certeza de que deseja apagar esta visita?",
+  "deletingVisit": "Apagando visita",
+  "deletingVisitWillDeleteEncounters": "Apagando esta visita irá apagar todas as consultas associadas.",
+  "diagnoses": "Diagnósticos",
+  "discard": "Descartar",
+  "dose": "Dose",
+  "editPastVisit": "Editar visita anterior",
+  "editThisEncounter": "Editar esta consulta",
+  "editThisVisit": "Editar esta visita",
+  "editVisitDetails": "Editar detalhes da visita",
+  "emptyStateText": "Não há {{displayText}} para mostrar para este utente",
+  "encounterDeleted": "Consulta eliminada",
+  "encounters": "Consultas",
+  "encounters__lower": "consultas",
+  "encounters_title": "Consultas",
+  "encounterType": "Tipo de consulta",
+  "end": "E",
+  "endActiveVisitConfirmation": "Tem certeza de que deseja terminar esta visita activa?",
+  "endDate": "Data de fim",
+  "endDate_title": "Data de fim",
+  "endVisit": "Terminar visita",
+  "endVisit_title": "Terminar Visita",
+  "endVisitExplainerMessage": "Ao terminar esta visita significa que você não poderá mais adicionar consultas a ela. Se precisar adicionar uma consulta, você pode criar uma nova visita para este utente ou editar uma visita anterior.",
+  "enterNonCodedCauseOfDeath": "Insira a causa de óbito não codificada",
+  "error": "Erro",
+  "errorCancellingVisit": "Erro ao cancelar visita activa",
+  "errorCopy": "Desculpe, ocorreu um problema ao visualizar essas informações. Você pode tentar recarregar esta página ou entrar em contato com o administrador do sistema providenciando o código de erro acima.",
+  "errorCreatingVisitAttribute": "Não foi possível apagar o atributo  {{attributeName}}",
+  "errorDeletingVisit": "Erro ao apagar visita",
+  "errorDeletingVisitAttribute": "Não foi possível apagar o atributo  {{attributeName}}",
+  "errorEndingVisit": "Erro ao terminar visita",
+  "errorMarkingPatientAlive": "Erro ao marcar utente como vivo",
+  "errorMarkingPatientDeceased": "Erro ao marcar utente como óbito",
+  "errorOccuredDeletingVisit": "Ocorreu um erro ao apagar a visita",
+  "errorUpdatingVisitAttribute": "Não foi possível actualizar o atributo  {{attributeName}}",
+  "errorUpdatingVisitDetails": "Erro ao actualizar detalhes da visita",
+  "errorWhenRestoringVisit": "Ocorreu um erro ao restaurar {{visit}}",
+  "failedDeleting": "Não pode ser apagado",
+  "failedToLoadCurrentVisit": "Falha ao carregar a visita actual",
+  "fieldRequired": "Este campo é obrigatório",
+  "filterByEncounterType": "Filtrar por tipo de consulta",
+  "form": "Nome do formulário",
+  "futureStartTime": "Data de início da visita não pode ser no futuro ",
+  "goToThisEncounter": "Ir para esta consulta",
+  "indication": "Indicação",
+  "invalidTimeFormat": "Formato de hora inválido",
+  "invalidVisitStartDate": "Data de inicio deve ser igual ou antes de {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "A data de fim da visita não pode ser igual ou anterior à data de início da visita",
+  "loading": "Carregando",
+  "loadingVisit": "Carregando visita actual...",
+  "loadMore": "Carregar mais",
+  "location": "Local",
+  "markAliveSuccessfully": "Utente marcado vivo com sucesso",
+  "markDeceasedWarning": "Marcar o utente como óbito encerrará todas as visitas activas",
+  "markPatientAlive": "Marcar utente vivo",
+  "markPatientAliveConfirmation": "Tem certeza de que deseja marcar este utente como vivo?",
+  "markPatientDeceased": "Marcar paciente como obitou",
+  "medications": "Medicamentos",
+  "medications__lower": "medicamentos",
+  "missingVisitType": "Falta o tipo de visita",
+  "modifyVisitDate": "Modifcar data de visita",
+  "movePatient": "Mover utente",
+  "movePatientToNextService": "Mover o utente para próximo serviço?",
+  "name": "Nome",
+  "no": "Não",
+  "noActiveVisit": "Sem Visita Ativa",
+  "noActiveVisitMessage": "visita activa",
+  "noActiveVisitNoRDEText": "Você não pode adicionar dados ao prontuário do utente sem uma visita activa. Gostaria de iniciar uma nova visita?",
+  "noActiveVisitText": "Você não pode adicionar dados ao prontuário do utente sem uma visita activa. Escolha uma das opções abaixo para continuar.",
+  "noDiagnosesFound": "Nenhum diagnóstico encontrado",
+  "noEncountersFound": "Nenhuma consulta encontrada",
+  "noEncountersToDisplay": "Nenhuma consulta para mostrar",
+  "noMatchingCodedCausesOfDeath": "Nenhuma causa de óbito codificada encontrada",
+  "nonCodedCauseOfDeath": "Causa de óbito não codificada",
+  "nonCodedCauseOfDeathRequired": "Por favor, insira a causa de óbito não codificada",
+  "noObservationsFound": "Nenhuma observação encontrada",
+  "notes": "Notas",
+  "notes__lower": "notas",
+  "noVisitTypesToDisplay": "Nenhum tipo de visita para mostrar",
+  "optional": "opcional",
+  "orderDurationAndUnit": "para {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Duração indefinida",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} itens",
+  "paginationPageText_one": "de {{count}} página",
+  "paginationPageText_other": "de {{count}} páginas",
+  "partOfFormDidntLoad": "Parte do formulário não foi carregado",
+  "pastVisitErrorText": "Erro de visita anterior",
+  "pastVisits": "Visitas anteriores",
+  "Patient Summary": "Sumário do utente",
+  "program": "Programa",
+  "provider": "Provedor",
+  "quantity": "Quantidade",
+  "queueAddedSuccessfully": "O paciente foi adicionado à fila com sucesso.",
+  "queueEntryError": "Erro ao adicionar o utente na fila",
+  "recommended": "Recomendado",
+  "record": "Registo",
+  "refills": "Repor",
+  "refreshToTryAgain": "Por favor, actualize para tentar novamente",
+  "required": "Obrigatório",
+  "retrospectiveEntry": "Digitação retroespectiva",
+  "saveAndClose": "Salvar e fechar",
+  "saving": "Gravando",
+  "searchForAVisitType": "Pesquise um tipo de visita",
+  "searchForCauseOfDeath": "Pesquise a causa de óbito",
+  "searchThisList": "Pesquisar esta lista",
+  "seeAll": "Ver tudo",
+  "selectAnOption": "Selecione uma opção",
+  "selectLocation": "Selecione um local",
+  "selectProgramType": "Selecione tipo de programa",
+  "selectVisitType": "Favor, selecionar o tipo de visita",
+  "start": "Iniciar",
+  "startAVisit": "Iniciar uma visita",
+  "startDate": "Data inicial",
+  "startingVisit": "Iniciando visita",
+  "startNewVisit": "Iniciar nova visita",
+  "startVisit": "Iniciar visita",
+  "startVisitError": "Erro ao iniciar visita",
+  "successfullyDeleted": "apagado com sucesso",
+  "tests": "Testes",
+  "time": "Tempo",
+  "timeFormat ": "Formato de hora",
+  "type": "Tipo",
+  "undo": "Desfazer",
+  "updateError": "Erro ao actualizar a próxima consulta marcada",
+  "updateVisit": "Actualizar visita",
+  "updatingVisit": "Actualizando visita",
+  "visit": "Visita",
+  "visitAttributes": "Atributos da visita",
+  "visitCancelled": "Visita cancelada",
+  "visitCancelSuccessMessage": " {{visit}} activa cancelada com sucesso",
+  "visitDeleted": "{{visit}} apagada",
+  "visitDeletedSuccessfully": "{{visit}} apagada com sucesso",
+  "visitDetailsUpdated": "Detalhes da visita actualizados",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} actualizado com sucesso",
+  "visitEnded": "Visita terminada",
+  "visitEndSuccessfully": "Visita actual terminada com sucesso",
+  "visitLocation": "Local da Visita",
+  "visitNotRestored": "Visita não pode ser restaurada",
+  "visitRestored": "Visita restaurada",
+  "visitRestoredSuccessfully": "{{visit}} restaurada com sucesso",
+  "visits": "visitas",
+  "Visits": "Visitas",
+  "visitStartDatetime": "Data e hora de início da visita",
+  "visitStarted": "Visita iniciada",
+  "visitStartedSuccessfully": "{{visit}} iniciada com sucesso",
+  "visitStopDateMustBeAfterMostRecentEncounter": "A data de fim precisa ser igual ou posterior a {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Data e hora de fim da visita",
+  "visitSummaries": "Resumos de visitas",
+  "visitType": "Tipo de visita",
+  "visitType_title": "Tipo de Visita",
+  "visitTypeRequired": "Tipo de visita é obrigatório",
+  "warning": "Aviso",
+  "yes": "Sim"
+}
diff --git a/packages/esm-patient-chart-app/translations/qu.json b/packages/esm-patient-chart-app/translations/qu.json
index ff5752f32a..bef2c0bf30 100644
--- a/packages/esm-patient-chart-app/translations/qu.json
+++ b/packages/esm-patient-chart-app/translations/qu.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "Patient summary",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
diff --git a/packages/esm-patient-chart-app/translations/si.json b/packages/esm-patient-chart-app/translations/si.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/si.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/sw.json b/packages/esm-patient-chart-app/translations/sw.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/sw.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/sw_KE.json b/packages/esm-patient-chart-app/translations/sw_KE.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/sw_KE.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/tr.json b/packages/esm-patient-chart-app/translations/tr.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/tr.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/tr_TR.json b/packages/esm-patient-chart-app/translations/tr_TR.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/tr_TR.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/uk.json b/packages/esm-patient-chart-app/translations/uk.json
new file mode 100644
index 0000000000..bef2c0bf30
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/uk.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Add a past visit",
+  "addPastVisit": "Add past visit",
+  "addPastVisitText": "You can add a new past visit or update an old one. Choose from one of the options below to continue.",
+  "all": "All",
+  "allEncounters": "All encounters",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "cancel": "Cancel",
+  "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
+  "cancellingVisit": "Cancelling visit",
+  "cancelVisit": "Cancel visit",
+  "cancelVisitExplainerMessage": "Cancelling this visit will delete its associated encounters",
+  "causeOfDeath": "Cause of death",
+  "causeOfDeath_lower": "cause of death concepts configured in the system",
+  "causeOfDeathIsRequired": "Please select the cause of death",
+  "checkFilters": "Check the filters above",
+  "close": "Close",
+  "confirm": "Confirm",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Are you sure you want to delete {{visit}} which started {{visitStartDate}} and ended {{visitEndDate}}?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "The encounter date falls outside the designated visit date range. Would you like to modify the visit date to accommodate the new encounter date?",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "dateAndTime": "Date & time",
+  "dateOfDeath": "Date of death",
+  "deathDateRequired": "Please select the date of death",
+  "delete": "Delete",
+  "deleteEncounter": "Delete encounter",
+  "deleteEncounterConfirmationText": "Are you sure you want to delete this encounter? This action can't be undone.",
+  "deleteThisEncounter": "Delete this encounter",
+  "deleteVisit": "Delete visit",
+  "deleteVisitDialogHeader": "Are you sure you want to delete visit?",
+  "deletingVisit": "Deleting visit",
+  "deletingVisitWillDeleteEncounters": "Deleting this visit will delete all associated encounters.",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "dose": "Dose",
+  "editPastVisit": "Edit past visit",
+  "editThisEncounter": "Edit this encounter",
+  "editThisVisit": "Edit this visit",
+  "editVisitDetails": "Edit visit details",
+  "emptyStateText": "There are no {{displayText}} to display for this patient",
+  "encounterDeleted": "Encounter deleted",
+  "encounters": "Encounters",
+  "encounters__lower": "encounters",
+  "encounters_title": "Encounters",
+  "encounterType": "Encounter type",
+  "end": "End",
+  "endActiveVisitConfirmation": "Are you sure you want to end this active visit?",
+  "endDate": "End date",
+  "endDate_title": "End date",
+  "endVisit": "End visit",
+  "endVisit_title": "End Visit",
+  "endVisitExplainerMessage": "Ending this visit means that you will no longer be able to add encounters to it. If you need to add an encounter, you can create a new visit for this patient or edit a past one.",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorCancellingVisit": "Error cancelling active visit",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorDeletingVisit": "Error deleting visit",
+  "errorDeletingVisitAttribute": "Could not delete {{attributeName}} attribute",
+  "errorEndingVisit": "Error ending visit",
+  "errorMarkingPatientAlive": "Error marking patient alive",
+  "errorMarkingPatientDeceased": "Error marking patient deceased",
+  "errorOccuredDeletingVisit": "An error occured when deleting visit",
+  "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
+  "errorUpdatingVisitDetails": "Error updating visit details",
+  "errorWhenRestoringVisit": "Error occured when restoring {{visit}}",
+  "failedDeleting": "couldn't be deleted",
+  "failedToLoadCurrentVisit": "Failed loading current visit",
+  "fieldRequired": "This field is required",
+  "filterByEncounterType": "Filter by encounter type",
+  "form": "Form name",
+  "futureStartTime": "Visit start time cannot be in the future",
+  "goToThisEncounter": "Go to this encounter",
+  "indication": "Indication",
+  "invalidTimeFormat": "Invalid time format",
+  "invalidVisitStartDate": "Start date needs to be on or before {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Visit stop date time cannot be on or before visit start date time",
+  "loading": "Loading",
+  "loadingVisit": "Loading current visit...",
+  "loadMore": "Load more",
+  "location": "Location",
+  "markAliveSuccessfully": "Patient marked alive succesfully",
+  "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
+  "markPatientAlive": "Mark patient alive",
+  "markPatientAliveConfirmation": "Are you sure you want to mark this patient alive?",
+  "markPatientDeceased": "Mark patient deceased",
+  "medications": "Medications",
+  "medications__lower": "medications",
+  "missingVisitType": "Missing visit type",
+  "modifyVisitDate": "Modify visit date",
+  "movePatient": "Move patient",
+  "movePatientToNextService": "Move patient to next service",
+  "name": "Name",
+  "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?",
+  "noActiveVisitText": "You can't add data to the patient chart without an active visit. Choose from one of the options below to continue.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noEncountersToDisplay": "No encounters to display",
+  "noMatchingCodedCausesOfDeath": "No matching coded causes of death",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Please enter the non-coded cause of death",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "notes__lower": "notes",
+  "noVisitTypesToDisplay": "No visit types to display",
+  "optional": "optional",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} item",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} items",
+  "paginationPageText_one": "of {{count}} page",
+  "paginationPageText_other": "of {{count}} pages",
+  "partOfFormDidntLoad": "Part of the form did not load",
+  "pastVisitErrorText": "Past visit error",
+  "pastVisits": "Past visits",
+  "Patient Summary": "Patient summary",
+  "program": "Program",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Patient has been added to the queue successfully.",
+  "queueEntryError": "Error adding patient to the queue",
+  "recommended": "Recommended",
+  "record": "Record",
+  "refills": "Refills",
+  "refreshToTryAgain": "Please refresh to try again",
+  "required": "Required",
+  "retrospectiveEntry": "Retrospective entry",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForAVisitType": "Search for a visit type",
+  "searchForCauseOfDeath": "Search for a cause of death",
+  "searchThisList": "Search this list",
+  "seeAll": "See all",
+  "selectAnOption": "Select an option",
+  "selectLocation": "Select a location",
+  "selectProgramType": "Select program type",
+  "selectVisitType": "Please select a visit type",
+  "start": "Start",
+  "startAVisit": "Start a visit",
+  "startDate": "Start date",
+  "startingVisit": "Starting visit",
+  "startNewVisit": "Start new visit",
+  "startVisit": "Start visit",
+  "startVisitError": "Error starting visit",
+  "successfullyDeleted": "successfully deleted",
+  "tests": "Tests",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "type": "Type",
+  "undo": "Undo",
+  "updateError": "Error updating upcoming appointment",
+  "updateVisit": "Update visit",
+  "updatingVisit": "Updating visit",
+  "visit": "Visit",
+  "visitAttributes": "Visit attributes",
+  "visitCancelled": "Visit cancelled",
+  "visitCancelSuccessMessage": "Active {{visit}} cancelled successfully",
+  "visitDeleted": "{{visit}} deleted",
+  "visitDeletedSuccessfully": "{{visit}} deleted successfully",
+  "visitDetailsUpdated": "Visit details updated",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} updated successfully",
+  "visitEnded": "Visit ended",
+  "visitEndSuccessfully": "Ended current visit successfully",
+  "visitLocation": "Visit location",
+  "visitNotRestored": "Visit couldn't be restored",
+  "visitRestored": "Visit restored",
+  "visitRestoredSuccessfully": "{{visit}} restored successfully",
+  "visits": "visits",
+  "Visits": "Visits",
+  "visitStartDatetime": "Visit start date and time",
+  "visitStarted": "Visit started",
+  "visitStartedSuccessfully": "{{visit}} started successfully",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Stop date needs to be on or after {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Visit stop date and time",
+  "visitSummaries": "Visit summaries",
+  "visitType": "Visit type",
+  "visitType_title": "Visit Type",
+  "visitTypeRequired": "Visit type is required",
+  "warning": "Warning",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-chart-app/translations/vi.json b/packages/esm-patient-chart-app/translations/vi.json
new file mode 100644
index 0000000000..98cb016488
--- /dev/null
+++ b/packages/esm-patient-chart-app/translations/vi.json
@@ -0,0 +1,186 @@
+{
+  "addAPastVisit": "Thêm một lượt khám trước đó",
+  "addPastVisit": "Thêm một lượt khám sau đó",
+  "addPastVisitText": "Bạn có thể thêm một lượt khám mới hoặc cập nhật một lượt khám cũ. Chọn một trong các tùy chọn bên dưới để tiếp tục.",
+  "all": "Tất cả",
+  "allEncounters": "Tất cả cuộc gặp",
+  "appointmentCheckedIn": "Cuộc hẹn đã đăng ký",
+  "appointmentMarkedChecked": "Cuộc hẹn được đánh dấu là Đã tham gia",
+  "cancel": "Hủy",
+  "cancelActiveVisitConfirmation": "Bạn có chắc chắn muốn hủy lượt khám đang hoạt động này không?",
+  "cancellingVisit": "Đang hủy lượt khám",
+  "cancelVisit": "Hủy lượt khám",
+  "cancelVisitExplainerMessage": "Hủy lượt khám này sẽ xóa các cuộc gặp gỡ liên quan",
+  "causeOfDeath": "Nguyên nhân tử vong",
+  "causeOfDeath_lower": "nguyên nhân của các khái niệm tử vong được cấu hình trong hệ thống",
+  "causeOfDeathIsRequired": "Vui lòng chọn nguyên nhân tử vong",
+  "checkFilters": "Kiểm tra các bộ lọc ở trên",
+  "close": "Đóng",
+  "confirm": "Xác nhận",
+  "confirmDeletingVisitTextWithStartAndEndDate": "Bạn có chắc chắn muốn xóa {{visit}} bắt đầu vào {{visitStartDate}} và kết thúc vào {{visitEndDate}} không?",
+  "confirmModifyingVisitDateToAccomodateEncounter": "Ngày gặp mặt nằm ngoài phạm vi ngày thăm khám được chỉ định. Bạn có muốn thay đổi ngày thăm khám để phù hợp với ngày gặp mặt mới không?",
+  "currentVisit": "Lượt khám hiện tại",
+  "date": "Ngày",
+  "dateAndTime": "Ngày & giờ",
+  "dateOfDeath": "Ngày tử vong",
+  "deathDateRequired": "Vui lòng chọn ngày mất",
+  "delete": "Xóa",
+  "deleteEncounter": "Xóa cuộc gặp",
+  "deleteEncounterConfirmationText": "Bạn có chắc chắn muốn xóa cuộc gặp gỡ này không? Không thể hoàn tác hành động này.",
+  "deleteThisEncounter": "Xóa cuộc gặp gỡ này",
+  "deleteVisit": "Xóa lượt khám",
+  "deleteVisitDialogHeader": "Bạn có chắc chắn muốn xóa lượt khám không?",
+  "deletingVisit": "Đang xóa lượt khám",
+  "deletingVisitWillDeleteEncounters": "Xóa chuyến thăm này sẽ xóa tất cả các cuộc gặp gỡ có liên quan.",
+  "diagnoses": "Chẩn đoán",
+  "discard": "Hủy bỏ",
+  "dose": "Liều lượng",
+  "editPastVisit": "Chỉnh sửa lượt khám trước đó",
+  "editThisEncounter": "Chỉnh sửa cuộc gặp gỡ này",
+  "editThisVisit": "Chỉnh sửa lượt khám này",
+  "editVisitDetails": "Chỉnh sửa chi tiết lượt khám",
+  "emptyStateText": "Không có {{displayText}} để hiển thị cho bệnh nhân này",
+  "encounterDeleted": "Cuộc gặp gỡ đã xóa",
+  "encounters": "Cuộc gặp",
+  "encounters__lower": "cuộc gặp",
+  "encounters_title": "Cuộc gặp",
+  "encounterType": "Loại gặp gỡ",
+  "end": "Kết thúc",
+  "endActiveVisitConfirmation": "Bạn có chắc chắn muốn kết thúc lượt khám hiện tại này không?",
+  "endDate": "Ngày kết thúc",
+  "endDate_title": "Ngày kết thúc",
+  "endVisit": "Kết thúc lượt khám",
+  "endVisit_title": "Kết thúc lượt khám",
+  "endVisitExplainerMessage": "Kết thúc lượt khám này có nghĩa là bạn sẽ không thể thêm cuộc gặp gỡ vào đó nữa. Nếu bạn cần thêm một cuộc gặp gỡ, bạn có thể tạo một lượt thăm khám mới cho bệnh nhân này hoặc chỉnh sửa một lượt thăm khám trước đó.",
+  "enterNonCodedCauseOfDeath": "Nhập nguyên nhân tử vong không được mã hóa",
+  "error": "Lỗi",
+  "errorCancellingVisit": "Lỗi khi hủy chuyến thăm đang hoạt động",
+  "errorCopy": "Xin lỗi, đã xảy ra sự cố khi hiển thị thông tin này. Bạn có thể thử tải lại trang này hoặc liên hệ với quản trị viên trang web và trích dẫn mã lỗi ở trên.",
+  "errorCreatingVisitAttribute": "Không thể xóa thuộc tính {{attributeName}}",
+  "errorDeletingVisit": "Lỗi xóa lượt khám",
+  "errorDeletingVisitAttribute": "Không thể xóa thuộc tính {{attributeName}}",
+  "errorEndingVisit": "Lỗi kết thúc lượt truy cập",
+  "errorMarkingPatientAlive": "Lỗi đánh dấu bệnh nhân còn sống",
+  "errorMarkingPatientDeceased": "Lỗi đánh dấu bệnh nhân đã chết",
+  "errorOccuredDeletingVisit": "Đã xảy ra lỗi khi xóa lượt khám",
+  "errorUpdatingVisitAttribute": "Không thể cập nhật thuộc tính {{attributeName}}",
+  "errorUpdatingVisitDetails": "Lỗi cập nhật chi tiết lượt khám",
+  "errorWhenRestoringVisit": "Đã xảy ra lỗi khi khôi phục {{visit}}",
+  "failedDeleting": "không thể xóa được",
+  "failedToLoadCurrentVisit": "Không tải được lượt khám hiện tại",
+  "fieldRequired": "Trường này là bắt buộc",
+  "filterByEncounterType": "Lọc theo loại cuộc gặp gỡ",
+  "form": "Tên biểu mẫu",
+  "futureStartTime": "Thời gian bắt đầu khám không thể ở trong tương lai",
+  "goToThisEncounter": "Đi đến cuộc gặp gỡ này",
+  "indication": "Chỉ định",
+  "invalidTimeFormat": "Định dạng thời gian không hợp lệ",
+  "invalidVisitStartDate": "Ngày bắt đầu phải vào hoặc trước {{firstEncounterDatetime}}",
+  "invalidVisitStopDate": "Ngày giờ kết thúc chuyến thăm khám không được trùng hoặc trước ngày giờ bắt đầu chuyến thăm khám",
+  "loading": "Đang tải",
+  "loadingVisit": "Đang tải lượt truy cập hiện tại...",
+  "loadMore": "Tải thêm",
+  "location": "Vị trí",
+  "markAliveSuccessfully": "Bệnh nhân được đánh dấu là còn sống thành công",
+  "markDeceasedWarning": "Đánh dấu bệnh nhân là đã chết sẽ kết thúc mọi cuộc thăm khám đang hoạt động của bệnh nhân này",
+  "markPatientAlive": "Đánh dấu bệnh nhân còn sống",
+  "markPatientAliveConfirmation": "Bạn có chắc chắn muốn đánh dấu bệnh nhân này còn sống không?",
+  "markPatientDeceased": "Đánh dấu bệnh nhân đã chết",
+  "medications": "Thuốc",
+  "medications__lower": "thuốc",
+  "missingVisitType": "Loại chuyến thăm khám bị thiếu",
+  "modifyVisitDate": "Sửa đổi ngày thăm khám",
+  "movePatient": "Di chuyển bệnh nhân",
+  "movePatientToNextService": "Chuyển bệnh nhân đến dịch vụ tiếp theo",
+  "name": "Tên",
+  "no": "Không",
+  "noActiveVisit": "Không có chuyến thăm khám nào hoạt động",
+  "noActiveVisitMessage": "lượt khám hoạt động",
+  "noActiveVisitNoRDEText": "Bạn không thể thêm dữ liệu vào biểu đồ bệnh nhân nếu không có chuyến thăm khám đang hoạt động. Bạn có muốn bắt đầu một chuyến thăm khám mới không?",
+  "noActiveVisitText": "Bạn không thể thêm dữ liệu vào biểu đồ bệnh nhân nếu không có chuyến thăm khám đang hoạt động. Chọn một trong các tùy chọn bên dưới để tiếp tục.",
+  "noDiagnosesFound": "Không tìm thấy chẩn đoán",
+  "noEncountersFound": "Không tìm thấy cuộc gặp gỡ nào",
+  "noEncountersToDisplay": "Không có cuộc gặp gỡ nào để hiển thị",
+  "noMatchingCodedCausesOfDeath": "Không có nguyên nhân tử vong được mã hóa phù hợp",
+  "nonCodedCauseOfDeath": "Nguyên nhân tử vong không được mã hóa",
+  "nonCodedCauseOfDeathRequired": "Vui lòng nhập nguyên nhân tử vong không được mã hóa",
+  "noObservationsFound": "Không tìm thấy quan sát nào",
+  "notes": "Ghi chú",
+  "notes__lower": "ghi chú",
+  "noVisitTypesToDisplay": "Không có loại thăm khám nào để hiển thị",
+  "optional": "tùy chọn",
+  "orderDurationAndUnit": "cho {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Thời hạn không xác định",
+  "paginationItemsCount_one": "{{pageItemsCount}} / {{count}} mục",
+  "paginationItemsCount_other": "{{pageItemsCount}} / {{count}} mục",
+  "paginationPageText_one": "của {{count}} trang",
+  "paginationPageText_other": "của {{count}} trang",
+  "partOfFormDidntLoad": "Một phần của biểu mẫu không tải được",
+  "pastVisitErrorText": "Lỗi lượt khám trước đây",
+  "pastVisits": "Các chuyến thăm khám trước đây",
+  "Patient Summary": "Tóm tắt bệnh nhân",
+  "program": "Chương trình",
+  "provider": "Nhà cung cấp",
+  "quantity": "Số lượng",
+  "queueAddedSuccessfully": "Bệnh nhân đã được thêm vào hàng đợi thành công.",
+  "queueEntryError": "Lỗi khi thêm bệnh nhân vào hàng đợi",
+  "recommended": "Gợi ý",
+  "record": "Ghi",
+  "refills": "Nạp lại",
+  "refreshToTryAgain": "Vui lòng làm mới để thử lại",
+  "required": "Yêu cầu",
+  "retrospectiveEntry": "Mục nhập hồi tưởng",
+  "saveAndClose": "Lưu và đóng",
+  "saving": "Đang lưu",
+  "searchForAVisitType": "Tìm kiếm loại chuyến thăm khám",
+  "searchForCauseOfDeath": "Tìm kiếm nguyên nhân tử vong",
+  "searchThisList": "Tìm kiếm danh sách này",
+  "seeAll": "Xem tất cả",
+  "selectAnOption": "Chọn một tùy chọn",
+  "selectLocation": "Chọn một vị trí",
+  "selectProgramType": "Chọn loại chương trình",
+  "selectVisitType": "Vui lòng chọn loại thăm khám",
+  "start": "Bắt đầu",
+  "startAVisit": "Bắt đầu một lượt thăm khám",
+  "startDate": "Ngày bắt đầu",
+  "startingVisit": "Bắt đầu khám",
+  "startNewVisit": "Bắt đầu lượt khám mới",
+  "startVisit": "Bắt đầu lượt khám",
+  "startVisitError": "Lỗi khi bắt đầu lượt khám",
+  "successfullyDeleted": "đã xóa thành công",
+  "tests": "Kiểm tra",
+  "time": "Thời gian",
+  "timeFormat ": "Định dạng thời gian",
+  "type": "Kiểu",
+  "undo": "Hoàn tác",
+  "updateError": "Lỗi khi cập nhật cuộc hẹn sắp tới",
+  "updateVisit": "Cập nhật lượt thăm khám",
+  "updatingVisit": "Đang cập nhật lượt thăm khám",
+  "visit": "Lượt khám",
+  "visitAttributes": "Thuộc tính thăm khám",
+  "visitCancelled": "Hủy lượt khám",
+  "visitCancelSuccessMessage": "{{visit}} đang hoạt động đã bị hủy thành công",
+  "visitDeleted": "{{ghé thăm}} đã bị xóa",
+  "visitDeletedSuccessfully": "{{visit}} đã xóa thành công",
+  "visitDetailsUpdated": "Đã cập nhật chi tiết chuyến thăm khám",
+  "visitDetailsUpdatedSuccessfully": "{{visit}} đã cập nhật thành công",
+  "visitEnded": "Chuyến thăm khám đã kết thúc",
+  "visitEndSuccessfully": "Đã kết thúc chuyến thăm khám hiện tại thành công",
+  "visitLocation": "Địa điểm khám",
+  "visitNotRestored": "Không thể khôi phục lại chuyến thăm khám",
+  "visitRestored": "Đã khôi phục lượt khám",
+  "visitRestoredSuccessfully": "{{visit}} đã được khôi phục thành công",
+  "visits": "lượt khám",
+  "Visits": "Lượt khám",
+  "visitStartDatetime": "Ngày và giờ bắt đầu thăm khám",
+  "visitStarted": "Đã bắt đầu chuyến thăm khám",
+  "visitStartedSuccessfully": "{{visit}} đã bắt đầu thành công",
+  "visitStopDateMustBeAfterMostRecentEncounter": "Ngày dừng phải vào hoặc sau {{lastEncounterDatetime}}",
+  "visitStopDatetime": "Ngày và giờ dừng thăm khám",
+  "visitSummaries": "Tóm tắt lượt thăm khám",
+  "visitType": "Loại thăm khám",
+  "visitType_title": "Loại thăm khám",
+  "visitTypeRequired": "Loại thăm khám là bắt buộc",
+  "warning": "Cảnh báo",
+  "yes": "Có"
+}
diff --git a/packages/esm-patient-chart-app/translations/zh.json b/packages/esm-patient-chart-app/translations/zh.json
index 3e0bff6bd8..7616dd615c 100644
--- a/packages/esm-patient-chart-app/translations/zh.json
+++ b/packages/esm-patient-chart-app/translations/zh.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "患者摘要",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "项目",
   "provider": "提供者",
   "quantity": "数量",
diff --git a/packages/esm-patient-chart-app/translations/zh_CN.json b/packages/esm-patient-chart-app/translations/zh_CN.json
index 3e0bff6bd8..7616dd615c 100644
--- a/packages/esm-patient-chart-app/translations/zh_CN.json
+++ b/packages/esm-patient-chart-app/translations/zh_CN.json
@@ -119,7 +119,6 @@
   "pastVisitErrorText": "Past visit error",
   "pastVisits": "Past visits",
   "Patient Summary": "患者摘要",
-  "printIdentifierSticker": "Print identifier sticker",
   "program": "项目",
   "provider": "提供者",
   "quantity": "数量",
diff --git a/packages/esm-patient-common-lib/src/get-patient-uuid-from-url.ts b/packages/esm-patient-common-lib/src/get-patient-uuid-from-url.ts
index 12c1357f86..be4c1399b0 100644
--- a/packages/esm-patient-common-lib/src/get-patient-uuid-from-url.ts
+++ b/packages/esm-patient-common-lib/src/get-patient-uuid-from-url.ts
@@ -1,4 +1,11 @@
+import { getPatientUuidFromStore } from './store/patient-chart-store';
+
+/**
+ * @deprecated This function is now replaced with `getPatientUuidFromStore`. This function will be removed in upcoming releases.
+ * @returns {string} patientUuid
+ */
 export function getPatientUuidFromUrl(): string {
   const match = /\/patient\/([a-zA-Z0-9\-]+)\/?/.exec(location.pathname);
-  return match && match[1];
+  const patientUuidFromUrl = match && match[1];
+  return patientUuidFromUrl || getPatientUuidFromStore();
 }
diff --git a/packages/esm-patient-common-lib/src/index.ts b/packages/esm-patient-common-lib/src/index.ts
index 76537159b7..e35a3031c7 100644
--- a/packages/esm-patient-common-lib/src/index.ts
+++ b/packages/esm-patient-common-lib/src/index.ts
@@ -20,3 +20,4 @@ export * from './types';
 export * from './useAllowedFileExtensions';
 export * from './useSystemVisitSetting';
 export * from './workspaces';
+export * from './store/patient-chart-store';
diff --git a/packages/esm-patient-common-lib/src/orders/postOrders.ts b/packages/esm-patient-common-lib/src/orders/postOrders.ts
index 2bbe929442..9928861769 100644
--- a/packages/esm-patient-common-lib/src/orders/postOrders.ts
+++ b/packages/esm-patient-common-lib/src/orders/postOrders.ts
@@ -1,5 +1,5 @@
 import { openmrsFetch, type OpenmrsResource, parseDate, restBaseUrl, type Visit } from '@openmrs/esm-framework';
-import { getPatientUuidFromUrl } from '../get-patient-uuid-from-url';
+import { getPatientUuidFromStore } from '../store/patient-chart-store';
 import { type OrderBasketStore, orderBasketStore } from './store';
 import { type ExtractedOrderErrorObject, type OrderBasketItem, type OrderErrorObject, type OrderPost } from './types';
 
@@ -55,7 +55,7 @@ export async function postOrdersOnNewEncounter(
 }
 
 export async function postOrders(encounterUuid: string, abortController: AbortController) {
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
   const { items, postDataPrepFunctions }: OrderBasketStore = orderBasketStore.getState();
   const patientItems = items[patientUuid];
 
diff --git a/packages/esm-patient-common-lib/src/orders/useOrderBasket.ts b/packages/esm-patient-common-lib/src/orders/useOrderBasket.ts
index 625afb2c70..843035e98f 100644
--- a/packages/esm-patient-common-lib/src/orders/useOrderBasket.ts
+++ b/packages/esm-patient-common-lib/src/orders/useOrderBasket.ts
@@ -1,6 +1,6 @@
 import { useStoreWithActions } from '@openmrs/esm-framework';
 import type { OrderBasketItem, PostDataPrepFunction } from './types';
-import { getPatientUuidFromUrl } from '../get-patient-uuid-from-url';
+import { getPatientUuidFromStore } from '../store/patient-chart-store';
 import { useEffect } from 'react';
 import { type OrderBasketStore, orderBasketStore } from './store';
 
@@ -10,7 +10,7 @@ const orderBasketStoreActions = {
     grouping: string,
     value: Array<OrderBasketItem> | (() => Array<OrderBasketItem>),
   ) {
-    const patientUuid = getPatientUuidFromUrl();
+    const patientUuid = getPatientUuidFromStore();
     if (!Object.keys(state.postDataPrepFunctions).includes(grouping)) {
       console.warn(`Programming error: You must register a postDataPrepFunction for grouping ${grouping} `);
     }
@@ -35,7 +35,7 @@ const orderBasketStoreActions = {
 };
 
 function getOrderItems(items: OrderBasketStore['items'], grouping?: string | null): Array<OrderBasketItem> {
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
   const patientItems = items?.[patientUuid] ?? {};
   return grouping ? patientItems[grouping] ?? [] : Object.values(patientItems).flat();
 }
@@ -46,7 +46,7 @@ export interface ClearOrdersOptions {
 
 function clearOrders(options?: ClearOrdersOptions) {
   const exceptThoseMatchingFcn = options?.exceptThoseMatching ?? (() => false);
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
   const items = orderBasketStore.getState().items;
   const patientItems = items[patientUuid] ?? {};
   const newPatientItems = Object.fromEntries(
diff --git a/packages/esm-patient-common-lib/src/orders/useOrders.ts b/packages/esm-patient-common-lib/src/orders/useOrders.ts
index 7afb8611a9..87de8cf147 100644
--- a/packages/esm-patient-common-lib/src/orders/useOrders.ts
+++ b/packages/esm-patient-common-lib/src/orders/useOrders.ts
@@ -1,8 +1,9 @@
+import { useCallback, useMemo } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
 import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { useCallback, useMemo } from 'react';
 import { type OrderTypeFetchResponse, type PatientOrderFetchResponse } from '@openmrs/esm-patient-common-lib';
 
+export type Status = 'ACTIVE' | 'any';
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
 export const drugCustomRepresentation =
@@ -13,7 +14,7 @@ export const drugCustomRepresentation =
   'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
   'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';
 
-export function usePatientOrders(patientUuid: string, status?: 'ACTIVE' | 'any', orderType?: string) {
+export function usePatientOrders(patientUuid: string, status?: Status, orderType?: string) {
   const { mutate } = useSWRConfig();
   const baseOrdersUrl = `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&v=full&status=${status}`;
   const ordersUrl = orderType ? `${baseOrdersUrl}&orderType=${orderType}` : baseOrdersUrl;
@@ -26,7 +27,7 @@ export function usePatientOrders(patientUuid: string, status?: 'ACTIVE' | 'any',
   const mutateOrders = useCallback(
     () =>
       mutate((key) => typeof key === 'string' && key.startsWith(`${restBaseUrl}/order?patient=${patientUuid}`), data),
-    [patientUuid, data, mutate],
+    [data, mutate, patientUuid],
   );
 
   const orders = useMemo(
@@ -54,7 +55,7 @@ export function useOrderTypes() {
   );
 
   return {
-    data: data?.data?.results,
+    data: data?.data?.results ?? null,
     error,
     isLoading,
     isValidating,
diff --git a/packages/esm-patient-common-lib/src/store/patient-chart-store.ts b/packages/esm-patient-common-lib/src/store/patient-chart-store.ts
new file mode 100644
index 0000000000..1b9f401e1b
--- /dev/null
+++ b/packages/esm-patient-common-lib/src/store/patient-chart-store.ts
@@ -0,0 +1,33 @@
+import { createGlobalStore, useStore } from '@openmrs/esm-framework';
+
+export interface PatientChartStore {
+  patientUuid: string;
+}
+
+const patientChartStoreName = 'patient-chart-global-store';
+
+const patientChartStore = createGlobalStore<PatientChartStore>(patientChartStoreName, {
+  patientUuid: '',
+});
+
+/**
+ * This function returns the patient chart store.
+ *
+ * The patient chart store is used to store all global variables used in the patient chart.
+ * In the recent requirements, patient chart is now not only bound with `/patient/{patientUuid}/` path.
+ */
+export function getPatientChartStore() {
+  return patientChartStore;
+}
+
+export function usePatientChartStore() {
+  return useStore(patientChartStore);
+}
+
+/**
+ * This function will get the patient UUID from either URL, or will look into the patient chart store.
+ * @returns {string} patientUuid
+ */
+export function getPatientUuidFromStore(): string {
+  return patientChartStore.getState()?.patientUuid;
+}
diff --git a/packages/esm-patient-common-lib/src/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces.ts
index c202a6363d..50ffb1dfd2 100644
--- a/packages/esm-patient-common-lib/src/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces.ts
@@ -4,18 +4,19 @@ import {
   navigateAndLaunchWorkspace,
   usePatient,
 } from '@openmrs/esm-framework';
-import { getPatientUuidFromUrl } from './get-patient-uuid-from-url';
+import { getPatientUuidFromStore } from './store/patient-chart-store';
 import { useSystemVisitSetting } from './useSystemVisitSetting';
 import { useVisitOrOfflineVisit } from './offline/visit';
 import { useCallback } from 'react';
 import { launchStartVisitPrompt } from './launchStartVisitPrompt';
+import { usePatientChartStore } from './store/patient-chart-store';
 
 export interface DefaultPatientWorkspaceProps extends DefaultWorkspaceProps {
   patientUuid: string;
 }
 
 export function launchPatientWorkspace(workspaceName: string, additionalProps?: object) {
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
   launchWorkspace(workspaceName, {
     patientUuid: patientUuid,
     ...additionalProps,
@@ -42,7 +43,7 @@ export function launchPatientChartWithWorkspaceOpen({
 }
 
 export function useLaunchWorkspaceRequiringVisit<T extends object>(workspaceName: string) {
-  const { patientUuid } = usePatient();
+  const { patientUuid } = usePatientChartStore();
   const { systemVisitEnabled } = useSystemVisitSetting();
   const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
 
diff --git a/packages/esm-patient-conditions-app/translations/de.json b/packages/esm-patient-conditions-app/translations/de.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/de.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/hi.json b/packages/esm-patient-conditions-app/translations/hi.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/hi.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/id.json b/packages/esm-patient-conditions-app/translations/id.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/id.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/it.json b/packages/esm-patient-conditions-app/translations/it.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/it.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/pt.json b/packages/esm-patient-conditions-app/translations/pt.json
new file mode 100644
index 0000000000..d21a84655c
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/pt.json
@@ -0,0 +1,41 @@
+{
+  "active": "Ativo",
+  "add": "Adicionar",
+  "cancel": "Cancelar",
+  "checkFilters": "Verifique os filtros acima",
+  "clinicalStatus": "Estado clínico",
+  "clinicalStatusRequired": "É necessário um estado clínico",
+  "condition": "Condição",
+  "conditionDeleted": "Condição excluída",
+  "conditionNowVisible": "Está agora visível na página de Condições",
+  "conditionRequired": "Uma condição é necessária",
+  "conditions": "Condições",
+  "Conditions": "Condições",
+  "conditionSaved": "Condição gravada com sucesso",
+  "conditionUpdated": "Condição actualizada",
+  "dateOfOnset": "Data de início",
+  "delete": "Apagar",
+  "deleteCondition": "Apagar a condição",
+  "deleteModalConfirmationText": "Tem certeza de que deseja excluir esta condição?",
+  "deleting": "Removendo",
+  "edit": "Editar",
+  "editCondition": "Editar uma condição",
+  "endDate": "Data de fim",
+  "enterCondition": "Insira a condição",
+  "errorCreatingCondition": "Erro ao criar condição",
+  "errorDeletingCondition": "Erro ao apagar condição",
+  "errorUpdatingCondition": "Erro ao atualizar a condição",
+  "inactive": "Inactivo",
+  "noConditionsToDisplay": "Nenhuma condição para mostrar",
+  "noResultsFor": "Nenhum resultado para",
+  "onsetDate": "Data de início",
+  "recordCondition": "Registe uma condição",
+  "required": "Obrigatório",
+  "saveAndClose": "Salvar e fechar",
+  "saving": "Gravando",
+  "searchConditions": "Pesquisar condições",
+  "searching": "Pesquisando",
+  "seeAll": "Ver tudo",
+  "show": "Mostrar",
+  "status": "Estado"
+}
diff --git a/packages/esm-patient-conditions-app/translations/si.json b/packages/esm-patient-conditions-app/translations/si.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/si.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/sw.json b/packages/esm-patient-conditions-app/translations/sw.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/sw.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/sw_KE.json b/packages/esm-patient-conditions-app/translations/sw_KE.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/sw_KE.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/tr.json b/packages/esm-patient-conditions-app/translations/tr.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/tr.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/tr_TR.json b/packages/esm-patient-conditions-app/translations/tr_TR.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/tr_TR.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/uk.json b/packages/esm-patient-conditions-app/translations/uk.json
new file mode 100644
index 0000000000..1f6dbeb2cd
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/uk.json
@@ -0,0 +1,41 @@
+{
+  "active": "Active",
+  "add": "Add",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Condition",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Conditions",
+  "Conditions": "Conditions",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Delete",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Deleting",
+  "edit": "Edit",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Required",
+  "saveAndClose": "Save & close",
+  "saving": "Saving",
+  "searchConditions": "Search conditions",
+  "searching": "Searching",
+  "seeAll": "See all",
+  "show": "Show",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-conditions-app/translations/vi.json b/packages/esm-patient-conditions-app/translations/vi.json
new file mode 100644
index 0000000000..ecd8c9febc
--- /dev/null
+++ b/packages/esm-patient-conditions-app/translations/vi.json
@@ -0,0 +1,41 @@
+{
+  "active": "Kích hoạt",
+  "add": "Thêm",
+  "cancel": "Hủy",
+  "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
+  "condition": "Tình trạng",
+  "conditionDeleted": "Condition deleted",
+  "conditionNowVisible": "It is now visible on the Conditions page",
+  "conditionRequired": "A condition is required",
+  "conditions": "Điều kiện",
+  "Conditions": "Điều kiện",
+  "conditionSaved": "Condition saved successfully",
+  "conditionUpdated": "Condition updated",
+  "dateOfOnset": "Date of onset",
+  "delete": "Xóa",
+  "deleteCondition": "Delete condition",
+  "deleteModalConfirmationText": "Are you sure you want to delete this condition?",
+  "deleting": "Đang xóa",
+  "edit": "Chỉnh sửa",
+  "editCondition": "Edit a Condition",
+  "endDate": "End date",
+  "enterCondition": "Enter condition",
+  "errorCreatingCondition": "Error creating condition",
+  "errorDeletingCondition": "Error deleting condition",
+  "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Không hoạt động",
+  "noConditionsToDisplay": "No conditions to display",
+  "noResultsFor": "No results for",
+  "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
+  "required": "Yêu cầu",
+  "saveAndClose": "Save & close",
+  "saving": "Đang lưu",
+  "searchConditions": "Search conditions",
+  "searching": "Đang tìm kiếm",
+  "seeAll": "See all",
+  "show": "Trình diễn",
+  "status": "Trạng thái"
+}
diff --git a/packages/esm-patient-flags-app/translations/de.json b/packages/esm-patient-flags-app/translations/de.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/de.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/hi.json b/packages/esm-patient-flags-app/translations/hi.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/hi.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/id.json b/packages/esm-patient-flags-app/translations/id.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/id.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/it.json b/packages/esm-patient-flags-app/translations/it.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/it.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/pt.json b/packages/esm-patient-flags-app/translations/pt.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/pt.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/si.json b/packages/esm-patient-flags-app/translations/si.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/si.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/sw.json b/packages/esm-patient-flags-app/translations/sw.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/sw.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/sw_KE.json b/packages/esm-patient-flags-app/translations/sw_KE.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/sw_KE.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/tr.json b/packages/esm-patient-flags-app/translations/tr.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/tr.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/tr_TR.json b/packages/esm-patient-flags-app/translations/tr_TR.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/tr_TR.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/uk.json b/packages/esm-patient-flags-app/translations/uk.json
new file mode 100644
index 0000000000..69c9683858
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/uk.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Discard",
+  "edit": "Edit",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Loading",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-flags-app/translations/vi.json b/packages/esm-patient-flags-app/translations/vi.json
new file mode 100644
index 0000000000..88edbe44e7
--- /dev/null
+++ b/packages/esm-patient-flags-app/translations/vi.json
@@ -0,0 +1,29 @@
+{
+  "activeFirst": "Active first",
+  "alphabetically": "A - Z",
+  "clearSearch": "Clear search",
+  "closeFlagsBar": "Close flags bar",
+  "disableFlagError": "Disable flag error",
+  "disablingFlag": "Disabling flag...",
+  "discard": "Hủy bỏ",
+  "edit": "Chỉnh sửa",
+  "editFlags": "Edit flags",
+  "editPatientFlags": "Edit patient flags",
+  "enabledFlag": "Enabled flag",
+  "enablingFlag": "Enabling flag...",
+  "flagCount_one": "{{count}} risk flag",
+  "flagCount_other": "{{count}} risk flags",
+  "flagDisabled": "Flag disabled",
+  "flagDisabledSuccessfully": "Flag successfully disabled",
+  "flagDisableError": "Error disabling the flag",
+  "flagEnabled": "flag enabled",
+  "flagEnabledSuccessfully": "Flag successfully enabled",
+  "flagEnableError": "Error enabling flag",
+  "loading": "Đang tải",
+  "matchesForSearchTerm_one": "{{count}} flag",
+  "matchesForSearchTerm_other": "{{count}} flags",
+  "noFlagsFound": "Sorry, no flags found matching your search",
+  "retiredFirst": "Retired first",
+  "saveAndClose": "Save & close",
+  "searchForAFlag": "Search for a flag"
+}
diff --git a/packages/esm-patient-forms-app/translations/de.json b/packages/esm-patient-forms-app/translations/de.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/de.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/hi.json b/packages/esm-patient-forms-app/translations/hi.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/hi.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/id.json b/packages/esm-patient-forms-app/translations/id.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/id.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/it.json b/packages/esm-patient-forms-app/translations/it.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/it.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/pt.json b/packages/esm-patient-forms-app/translations/pt.json
new file mode 100644
index 0000000000..1db680dbad
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/pt.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Formulário Clínico",
+  "clinicalForms": "Formulários clínicos",
+  "editForm": "Editar formulário",
+  "formName": "Nome do Formulário (A-Z)",
+  "forms": "Formulários",
+  "formSearchHint": "Tente pesquisar o formulário usando um nome ou palavra-chave alternativa",
+  "homeOverviewCardView": "Visualizar",
+  "lastCompleted": "Último preenchido",
+  "never": "Nunca",
+  "noFormsToDisplay": "Não há formulários para visualizar.",
+  "noMatchingFormsAvailable": "Não há formulários {{formCategory}} para visualizar",
+  "noMatchingFormsToDisplay": "Não há formulários correspondentes para visualizar",
+  "offlineForms": "Formulários off-line",
+  "offlineForms__lower": "Formulários on-line",
+  "offlineFormsOverviewCardAvailableOffline": "Disponível off-line",
+  "offlineFormsTableFormAvailableOffline": "Off-line",
+  "offlineFormsTableFormNameHeader": "Nome do formulário",
+  "offlineFormsTitle": "Formulários off-line",
+  "offlinePatientsTableSearchLabel": "Pesquisar esta lista",
+  "offlinePatientsTableSearchPlaceholder": "Pesquisar esta lista",
+  "offlineToggle": "Alternar off-line",
+  "searchForAForm": "Pesquise um formulário",
+  "searchThisList": "Pesquisar esta lista"
+}
diff --git a/packages/esm-patient-forms-app/translations/si.json b/packages/esm-patient-forms-app/translations/si.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/si.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/sw.json b/packages/esm-patient-forms-app/translations/sw.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/sw.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/sw_KE.json b/packages/esm-patient-forms-app/translations/sw_KE.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/sw_KE.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/tr.json b/packages/esm-patient-forms-app/translations/tr.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/tr.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/tr_TR.json b/packages/esm-patient-forms-app/translations/tr_TR.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/tr_TR.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/uk.json b/packages/esm-patient-forms-app/translations/uk.json
new file mode 100644
index 0000000000..7cf1901ce6
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/uk.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Forms",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "View",
+  "lastCompleted": "Last completed",
+  "never": "Never",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Offline",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-forms-app/translations/vi.json b/packages/esm-patient-forms-app/translations/vi.json
new file mode 100644
index 0000000000..645c88fc0e
--- /dev/null
+++ b/packages/esm-patient-forms-app/translations/vi.json
@@ -0,0 +1,25 @@
+{
+  "clinicalForm": "Clinical Form",
+  "clinicalForms": "Clinical forms",
+  "editForm": "Edit form",
+  "formName": "Form Name (A-Z)",
+  "forms": "Biểu mẫu",
+  "formSearchHint": "Try searching for the form using an alternative name or keyword",
+  "homeOverviewCardView": "Xem",
+  "lastCompleted": "Last completed",
+  "never": "Không bao giờ",
+  "noFormsToDisplay": "There are no forms to display.",
+  "noMatchingFormsAvailable": "There are no {{formCategory}} forms to display",
+  "noMatchingFormsToDisplay": "No matching forms to display",
+  "offlineForms": "Offline forms",
+  "offlineForms__lower": "offline forms",
+  "offlineFormsOverviewCardAvailableOffline": "Available offline",
+  "offlineFormsTableFormAvailableOffline": "Ngoại tuyến",
+  "offlineFormsTableFormNameHeader": "Form name",
+  "offlineFormsTitle": "Offline forms",
+  "offlinePatientsTableSearchLabel": "Search this list",
+  "offlinePatientsTableSearchPlaceholder": "Search this list",
+  "offlineToggle": "Offline toggle",
+  "searchForAForm": "Search for a form",
+  "searchThisList": "Search this list"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/de.json b/packages/esm-patient-immunizations-app/translations/de.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/de.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/hi.json b/packages/esm-patient-immunizations-app/translations/hi.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/hi.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/id.json b/packages/esm-patient-immunizations-app/translations/id.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/id.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/it.json b/packages/esm-patient-immunizations-app/translations/it.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/it.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/pt.json b/packages/esm-patient-immunizations-app/translations/pt.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/pt.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/si.json b/packages/esm-patient-immunizations-app/translations/si.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/si.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/sw.json b/packages/esm-patient-immunizations-app/translations/sw.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/sw.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/sw_KE.json b/packages/esm-patient-immunizations-app/translations/sw_KE.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/sw_KE.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/tr.json b/packages/esm-patient-immunizations-app/translations/tr.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/tr.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/tr_TR.json b/packages/esm-patient-immunizations-app/translations/tr_TR.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/tr_TR.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/uk.json b/packages/esm-patient-immunizations-app/translations/uk.json
new file mode 100644
index 0000000000..510dd0e3b5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/uk.json
@@ -0,0 +1,31 @@
+{
+  "add": "Add",
+  "cancel": "Cancel",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Edit",
+  "error": "Error",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Immunization",
+  "immunizations": "Immunizations",
+  "Immunizations": "Immunizations",
+  "immunizations__lower": "immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Manufacturer",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Save",
+  "seeAll": "See all",
+  "sequence": "Sequence",
+  "singleDoseOn": "Single Dose on",
+  "time": "Time",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-immunizations-app/translations/vi.json b/packages/esm-patient-immunizations-app/translations/vi.json
new file mode 100644
index 0000000000..dc30534ee5
--- /dev/null
+++ b/packages/esm-patient-immunizations-app/translations/vi.json
@@ -0,0 +1,31 @@
+{
+  "add": "Thêm",
+  "cancel": "Hủy",
+  "doseNumber": "Dose number within series",
+  "doseNumberWithinSeries": "Dose number within series",
+  "edit": "Chỉnh sửa",
+  "error": "Lỗi",
+  "errorSaving": "Error saving vaccination",
+  "expirationDate": "Expiration Date",
+  "goToSummary": "Go to Summary",
+  "immunization": "Tiêm chủng",
+  "immunizations": "Tiêm chủng",
+  "Immunizations": "Tiêm chủng",
+  "immunizations__lower": "Tiêm chủng",
+  "immunizationWorkspaceTitle": "Immunization Form",
+  "lotNumber": "Lot Number",
+  "manufacturer": "Nhà sản xuất",
+  "pleaseSelect": "Please select",
+  "recentVaccination": "Recent vaccination",
+  "save": "Lưu",
+  "seeAll": "See all",
+  "sequence": "Liên tục",
+  "singleDoseOn": "Single Dose on",
+  "time": "Thời gian",
+  "timeFormat ": "Time Format",
+  "vaccinationDate": "Vaccination date",
+  "vaccinationDateRequired": "Vaccination date required",
+  "vaccinationSaved": "Vaccination saved successfully",
+  "vaccine": "Vaccine",
+  "vaccineRequired": "Vaccine required"
+}
diff --git a/packages/esm-patient-lists-app/translations/de.json b/packages/esm-patient-lists-app/translations/de.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/de.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/hi.json b/packages/esm-patient-lists-app/translations/hi.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/hi.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/id.json b/packages/esm-patient-lists-app/translations/id.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/id.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/it.json b/packages/esm-patient-lists-app/translations/it.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/it.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/pt.json b/packages/esm-patient-lists-app/translations/pt.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/pt.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/si.json b/packages/esm-patient-lists-app/translations/si.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/si.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/sw.json b/packages/esm-patient-lists-app/translations/sw.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/sw.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/sw_KE.json b/packages/esm-patient-lists-app/translations/sw_KE.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/sw_KE.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/tr.json b/packages/esm-patient-lists-app/translations/tr.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/tr.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/tr_TR.json b/packages/esm-patient-lists-app/translations/tr_TR.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/tr_TR.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/uk.json b/packages/esm-patient-lists-app/translations/uk.json
new file mode 100644
index 0000000000..90c336895d
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/uk.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Identifier",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Name",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "patients",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-lists-app/translations/vi.json b/packages/esm-patient-lists-app/translations/vi.json
new file mode 100644
index 0000000000..58701db2df
--- /dev/null
+++ b/packages/esm-patient-lists-app/translations/vi.json
@@ -0,0 +1,21 @@
+{
+  "backToPatientLists": "Back to patient lists",
+  "checkFilters": "Check the filters above",
+  "createdOn": "Created on",
+  "identifier": "Mã định danh",
+  "listName": "List name",
+  "listType": "List type",
+  "name": "Tên",
+  "noMatchingListsFound": "No matching lists to display",
+  "noMatchingPatients": "No matching patients to display",
+  "noPatientListsToDisplay": "No patient lists to display",
+  "noPatientsInList": "There are no patients in this list",
+  "numberOfPatients": "No. of patients",
+  "patientListDetailWorkspaceTitle": "Patient List Details",
+  "patientLists": "Patient lists",
+  "patientListsWorkspaceTitle": "Patient Lists",
+  "patients": "bệnh nhân",
+  "searchThisList": "Search this list",
+  "sex": "Giới tính",
+  "startDate": "Start Date"
+}
diff --git a/packages/esm-patient-medications-app/src/active-medications/active-medications.component.tsx b/packages/esm-patient-medications-app/src/active-medications/active-medications.component.tsx
index 13dce82f68..dcfa0a82e0 100644
--- a/packages/esm-patient-medications-app/src/active-medications/active-medications.component.tsx
+++ b/packages/esm-patient-medications-app/src/active-medications/active-medications.component.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { DataTableSkeleton } from '@carbon/react';
 import { EmptyState, ErrorState, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
 import MedicationsDetailsTable from '../components/medications-details-table.component';
-import { usePatientOrders } from '../api/api';
+import { useActivePatientOrders } from '../api/api';
 
 interface ActiveMedicationsProps {
   patient: fhir.Patient;
@@ -14,7 +14,7 @@ const ActiveMedications: React.FC<ActiveMedicationsProps> = ({ patient }) => {
   const displayText = t('activeMedicationsDisplayText', 'Active medications');
   const headerTitle = t('activeMedicationsHeaderTitle', 'active medications');
 
-  const { data: activePatientOrders, error, isLoading, isValidating } = usePatientOrders(patient?.id, 'ACTIVE');
+  const { data: activePatientOrders, error, isLoading, isValidating } = useActivePatientOrders(patient?.id);
 
   const launchAddDrugWorkspace = useLaunchWorkspaceRequiringVisit('add-drug-order');
 
@@ -35,6 +35,7 @@ const ActiveMedications: React.FC<ActiveMedicationsProps> = ({ patient }) => {
       />
     );
   }
+
   return <EmptyState displayText={displayText} headerTitle={headerTitle} launchForm={() => launchAddDrugWorkspace()} />;
 };
 
diff --git a/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx b/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx
index dba13504db..b211732560 100644
--- a/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx
+++ b/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx
@@ -90,12 +90,12 @@ describe('ActiveMedications', () => {
 
     const expectedTableRows = [
       /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration — take it sometimes INDICATION Bad boo-boo/,
-      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration INDICATION No good — DISCONTINUED DATE 14-Aug-2023/,
+      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet 14-Aug-2023 DOSE 2 tablet — oral — twice daily — indefinite duration INDICATION No good 0/,
       /14-Aug-2023 Admin User Sulfacetamide 0.1 — 10% DOSE 1 application — for {{duration}} weeks — REFILLS 1 — apply it INDICATION Pain — QUANTITY 8 Application/,
       /14-Aug-2023 Admin User Aspirin 162.5mg — 162.5mg — tablet DOSE 1 tablet — oral — once daily — for {{duration}} days INDICATION Heart — QUANTITY 30 Tablet/,
     ];
 
-    expectedTableRows.map((row) =>
+    expectedTableRows.forEach((row) =>
       expect(within(table).getByRole('row', { name: new RegExp(row, 'i') })).toBeInTheDocument(),
     );
   });
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
index 3480dc3d40..3226682fb6 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
@@ -51,6 +51,7 @@ import type {
 } from '../types';
 import { useRequireOutpatientQuantity } from '../api';
 import styles from './drug-order-form.scss';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 export interface DrugOrderFormProps {
   initialOrderBasketItem: DrugOrderBasketItem;
@@ -354,7 +355,8 @@ export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel, prompt
   }, []);
 
   const [showStickyMedicationHeader, setShowMedicationHeader] = useState(false);
-  const { patient, isLoading: isLoadingPatientDetails } = usePatient();
+  const { patientUuid } = usePatientChartStore();
+  const { patient, isLoading: isLoadingPatientDetails } = usePatient(patientUuid);
   const patientName = patient ? getPatientName(patient) : '';
   const { maxDispenseDurationInDays } = useConfig<ConfigObject>();
 
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
index 6f566a79c0..7264d85b4b 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
@@ -24,6 +24,7 @@ import {
 } from './drug-search.resource';
 import type { DrugOrderBasketItem } from '../../types';
 import styles from './order-basket-search-results.scss';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 export interface OrderBasketSearchResultsProps {
   searchTerm: string;
@@ -114,8 +115,8 @@ export default function OrderBasketSearchResults({
 const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ drug, openOrderForm }) => {
   const isTablet = useLayoutType() === 'tablet';
   const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications', prepMedicationOrderPostData);
-  const patient = usePatient();
-  const { data: activeOrders, isLoading: isLoadingActiveOrders } = usePatientOrders(patient.patientUuid, 'ACTIVE');
+  const { patientUuid } = usePatientChartStore();
+  const { data: activeOrders, isLoading: isLoadingActiveOrders } = usePatientOrders(patientUuid);
   const drugAlreadyInBasket = useMemo(
     () => orders?.some((order) => ordersEqual(order, getTemplateOrderBasketItem(drug))),
     [orders, drug],
diff --git a/packages/esm-patient-medications-app/src/api/api.ts b/packages/esm-patient-medications-app/src/api/api.ts
index 158afd7e09..adae25c28a 100644
--- a/packages/esm-patient-medications-app/src/api/api.ts
+++ b/packages/esm-patient-medications-app/src/api/api.ts
@@ -1,29 +1,42 @@
 import { useCallback, useMemo } from 'react';
 import useSWR, { mutate } from 'swr';
-import { type ConfigObject } from '../config-schema';
-import { type FetchResponse, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
+import useSWRImmutable from 'swr/immutable';
+import { openmrsFetch, restBaseUrl, useConfig, type FetchResponse } from '@openmrs/esm-framework';
 import { type OrderPost, type PatientOrderFetchResponse } from '@openmrs/esm-patient-common-lib';
+import { type ConfigObject } from '../config-schema';
 import { type DrugOrderBasketItem } from '../types';
-import useSWRImmutable from 'swr/immutable';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
+const customRepresentation =
+  'custom:(uuid,dosingType,orderNumber,accessionNumber,' +
+  'patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,' +
+  'orderType:ref,encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,' +
+  'commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),dose,doseUnits:ref,' +
+  'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
+  'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';
+
+/**
+ * Sorts orders by date activated in descending order.
+ *
+ * @param orders The orders to sort.
+ * @returns The sorted orders.
+ */
+function sortOrdersByDateActivated(orders: any[]) {
+  return orders?.sort(
+    (order1, order2) => new Date(order2.dateActivated).getTime() - new Date(order1.dateActivated).getTime(),
+  );
+}
+
 /**
  * SWR-based data fetcher for patient orders.
  *
  * @param patientUuid The UUID of the patient whose orders should be fetched.
- * @param status Allows fetching either all orders or only active orders.
  */
-export function usePatientOrders(patientUuid: string, status: 'ACTIVE' | 'any') {
-  const { drugOrderTypeUUID } = useConfig() as ConfigObject;
-  const customRepresentation =
-    'custom:(uuid,dosingType,orderNumber,accessionNumber,' +
-    'patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,' +
-    'orderType:ref,encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,' +
-    'commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),dose,doseUnits:ref,' +
-    'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
-    'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';
-  const ordersUrl = `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&status=${status}&orderType=${drugOrderTypeUUID}&v=${customRepresentation}`;
+export function usePatientOrders(patientUuid: string) {
+  const { drugOrderTypeUUID } = useConfig<ConfigObject>();
+
+  const ordersUrl = `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&orderTypes=${drugOrderTypeUUID}&v=${customRepresentation}&excludeDiscontinueOrders=true`;
 
   const { data, error, isLoading, isValidating } = useSWR<FetchResponse<PatientOrderFetchResponse>, Error>(
     patientUuid ? ordersUrl : null,
@@ -35,22 +48,73 @@ export function usePatientOrders(patientUuid: string, status: 'ACTIVE' | 'any')
     [patientUuid],
   );
 
-  const drugOrders = useMemo(
+  const drugOrders = useMemo(() => sortOrdersByDateActivated(data?.data?.results) ?? null, [data]);
+
+  return {
+    data: data ? drugOrders : null,
+    error,
+    isLoading,
+    isValidating,
+    mutate: mutateOrders,
+  };
+}
+
+/**
+ * Hook to get active patient orders.
+ *
+ * @param patientUuid The UUID of the patient whose active orders should be fetched.
+ */
+export function useActivePatientOrders(patientUuid: string) {
+  const { drugOrderTypeUUID } = useConfig<ConfigObject>();
+  const ordersUrl = useMemo(
     () =>
-      data?.data?.results
-        ? data.data.results
-            .filter((order) => order.orderType.display === 'Drug Order')
-            ?.sort((order1, order2) => (order2.dateActivated > order1.dateActivated ? 1 : -1))
+      patientUuid
+        ? `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&orderTypes=${drugOrderTypeUUID}&excludeCanceledAndExpired=true&v=${customRepresentation}`
         : null,
-    [data],
+    [patientUuid, drugOrderTypeUUID],
+  );
+  const { data, error, isLoading, isValidating } = useSWR<FetchResponse<PatientOrderFetchResponse>, Error>(
+    ordersUrl,
+    openmrsFetch,
   );
 
+  const activeOrders = useMemo(() => sortOrdersByDateActivated(data?.data?.results) ?? null, [data]);
+
   return {
-    data: data ? drugOrders : null,
+    data: activeOrders,
     error,
     isLoading,
     isValidating,
-    mutate: mutateOrders,
+    mutate,
+  };
+}
+
+/**
+ * Hook to get past patient orders.
+ *
+ * @param patientUuid The UUID of the patient whose past orders should be fetched.
+ */
+export function usePastPatientOrders(patientUuid: string) {
+  const { data: allOrders, error, isLoading, isValidating, mutate } = usePatientOrders(patientUuid);
+  const { data: activeOrders } = useActivePatientOrders(patientUuid);
+
+  const pastOrders = useMemo(() => {
+    if (!allOrders || !activeOrders) {
+      return [];
+    }
+
+    const filteredDrugOrders = allOrders.filter(
+      (order) => !activeOrders.some((activeOrder) => activeOrder.uuid === order.uuid),
+    );
+    return sortOrdersByDateActivated(filteredDrugOrders);
+  }, [allOrders, activeOrders]);
+
+  return {
+    data: pastOrders,
+    error,
+    isLoading,
+    isValidating,
+    mutate,
   };
 }
 
diff --git a/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx b/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
index 1d67284c0d..813239cb20 100644
--- a/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
+++ b/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
@@ -15,6 +15,8 @@ import {
   TableHead,
   TableHeader,
   TableRow,
+  Tag,
+  Tooltip,
 } from '@carbon/react';
 import {
   CardHeader,
@@ -102,6 +104,13 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
               <strong>{capitalize(medication.drug?.display)}</strong>{' '}
               {medication.drug?.strength && <>&mdash; {medication.drug?.strength.toLowerCase()}</>}{' '}
               {medication.drug?.dosageForm?.display && <>&mdash; {medication.drug.dosageForm.display.toLowerCase()}</>}
+              {medication.dateStopped && (
+                <Tooltip align="right" label={<>{formatDate(new Date(medication.dateStopped))}</>}>
+                  <Tag type="gray" className={styles.tag}>
+                    {t('discontinued', 'Discontinued')}
+                  </Tag>
+                </Tooltip>
+              )}
             </p>
             <p className={styles.bodyLong01}>
               <span className={styles.label01}>{t('dose', 'Dose').toUpperCase()}</span>{' '}
@@ -128,26 +137,18 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
             </p>
           </div>
           <p className={styles.bodyLong01}>
-            {medication.orderReasonNonCoded ? (
+            {medication.orderReasonNonCoded && (
               <span>
                 <span className={styles.label01}>{t('indication', 'Indication').toUpperCase()}</span>{' '}
                 {medication.orderReasonNonCoded}
               </span>
-            ) : null}
-            {medication.quantity ? (
+            )}
+            {medication.quantity && (
               <span>
                 <span className={styles.label01}> &mdash; {t('quantity', 'Quantity').toUpperCase()}</span>{' '}
                 {medication.quantity} {medication?.quantityUnits?.display}
               </span>
-            ) : null}
-            {medication.dateStopped ? (
-              <span>
-                <span className={styles.label01}>
-                  &mdash; {t('discontinuedDate', 'Discontinued date').toUpperCase()}
-                </span>
-                {formatDate(new Date(medication.dateStopped))}
-              </span>
-            ) : null}
+            )}
           </p>
         </div>
       ),
diff --git a/packages/esm-patient-medications-app/src/components/medications-details-table.scss b/packages/esm-patient-medications-app/src/components/medications-details-table.scss
index 079cbbb2e3..0f24186054 100644
--- a/packages/esm-patient-medications-app/src/components/medications-details-table.scss
+++ b/packages/esm-patient-medications-app/src/components/medications-details-table.scss
@@ -66,3 +66,10 @@
     border-bottom: none !important;
   }
 }
+
+.tag {
+  margin: 0 !important;
+  margin-left: layout.$spacing-03 !important;
+  border: none;
+  text-transform: uppercase;
+}
diff --git a/packages/esm-patient-medications-app/src/medications-summary/medications-summary.component.tsx b/packages/esm-patient-medications-app/src/medications-summary/medications-summary.component.tsx
index 7596191882..9875c4c779 100644
--- a/packages/esm-patient-medications-app/src/medications-summary/medications-summary.component.tsx
+++ b/packages/esm-patient-medications-app/src/medications-summary/medications-summary.component.tsx
@@ -1,11 +1,10 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { DataTableSkeleton } from '@carbon/react';
-import { parseDate } from '@openmrs/esm-framework';
-import { EmptyState, ErrorState, useLaunchWorkspaceRequiringVisit, type Order } from '@openmrs/esm-patient-common-lib';
-import { usePatientOrders } from '../api';
-import MedicationsDetailsTable from '../components/medications-details-table.component';
+import { EmptyState, ErrorState, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
+import { useActivePatientOrders, usePastPatientOrders } from '../api';
 import { type AddDrugOrderWorkspaceAdditionalProps } from '../add-drug-order/add-drug-order.workspace';
+import MedicationsDetailsTable from '../components/medications-details-table.component';
 
 export interface MedicationsSummaryProps {
   patient: fhir.Patient;
@@ -17,32 +16,18 @@ export default function MedicationsSummary({ patient }: MedicationsSummaryProps)
     useLaunchWorkspaceRequiringVisit<AddDrugOrderWorkspaceAdditionalProps>('add-drug-order');
 
   const {
-    data: allOrders,
-    error: error,
-    isLoading: isLoading,
-    isValidating: isValidating,
-  } = usePatientOrders(patient?.id, 'any');
-
-  const [pastOrders, activeOrders] = useMemo(() => {
-    const currentDate = new Date();
-    const pastOrders: Array<Order> = [];
-    const activeOrders: Array<Order> = [];
+    data: activeOrders,
+    error: activeOrdersError,
+    isLoading: isLoadingActiveOrders,
+    isValidating: isValidatingActiveOrders,
+  } = useActivePatientOrders(patient?.id);
 
-    if (allOrders) {
-      for (let i = 0; i < allOrders.length; i++) {
-        const order = allOrders[i];
-        if (order.autoExpireDate && parseDate(order.autoExpireDate) < currentDate) {
-          pastOrders.push(order);
-        } else if (order.dateStopped && parseDate(order.dateStopped) < currentDate) {
-          pastOrders.push(order);
-        } else {
-          activeOrders.push(order);
-        }
-      }
-    }
-
-    return [pastOrders, activeOrders];
-  }, [allOrders]);
+  const {
+    data: pastOrders,
+    error: pastOrdersError,
+    isLoading: isLoadingPastOrders,
+    isValidating: isValidatingPastOrders,
+  } = usePastPatientOrders(patient?.id);
 
   return (
     <div>
@@ -51,14 +36,14 @@ export default function MedicationsSummary({ patient }: MedicationsSummaryProps)
           const displayText = t('activeMedicationsDisplayText', 'Active medications');
           const headerTitle = t('activeMedicationsHeaderTitle', 'active medications');
 
-          if (isLoading) return <DataTableSkeleton role="progressbar" />;
+          if (isLoadingActiveOrders) return <DataTableSkeleton role="progressbar" />;
 
-          if (error) return <ErrorState error={error} headerTitle={headerTitle} />;
+          if (activeOrdersError) return <ErrorState error={activeOrdersError} headerTitle={headerTitle} />;
 
           if (activeOrders?.length) {
             return (
               <MedicationsDetailsTable
-                isValidating={isValidating}
+                isValidating={isValidatingActiveOrders}
                 title={t('activeMedicationsTableTitle', 'Active Medications')}
                 medications={activeOrders}
                 showDiscontinueButton={true}
@@ -77,14 +62,14 @@ export default function MedicationsSummary({ patient }: MedicationsSummaryProps)
           const displayText = t('pastMedicationsDisplayText', 'Past medications');
           const headerTitle = t('pastMedicationsHeaderTitle', 'past medications');
 
-          if (isLoading) return <DataTableSkeleton role="progressbar" />;
+          if (isValidatingPastOrders) return <DataTableSkeleton role="progressbar" />;
 
-          if (error) return <ErrorState error={error} headerTitle={headerTitle} />;
+          if (pastOrdersError) return <ErrorState error={pastOrdersError} headerTitle={headerTitle} />;
 
           if (pastOrders?.length) {
             return (
               <MedicationsDetailsTable
-                isValidating={isValidating}
+                isValidating={isValidatingPastOrders}
                 title={t('pastMedicationsTableTitle', 'Past Medications')}
                 medications={pastOrders}
                 showDiscontinueButton={false}
diff --git a/packages/esm-patient-medications-app/translations/am.json b/packages/esm-patient-medications-app/translations/am.json
index a389715c8e..2a200aea4d 100644
--- a/packages/esm-patient-medications-app/translations/am.json
+++ b/packages/esm-patient-medications-app/translations/am.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
   "discontinue": "Discontinue",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Dispensing instructions",
   "dosageInstructions": "1. Dosage instructions",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -74,6 +75,7 @@
   "refills": "Refills",
   "removeFromBasket": "Remove from basket",
   "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "Save order",
   "searchAgain": "search again",
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
diff --git a/packages/esm-patient-medications-app/translations/ar.json b/packages/esm-patient-medications-app/translations/ar.json
index 3b10071103..673b2cc0ec 100644
--- a/packages/esm-patient-medications-app/translations/ar.json
+++ b/packages/esm-patient-medications-app/translations/ar.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "أضف إلى السلة",
   "discard": "تجاهل",
   "discontinue": "إيقاف",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. تعليمات الصرف",
   "dosageInstructions": "1. تعليمات الجرعة",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "لا توجد نتائج لـ \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "في",
+  "or": "or",
   "orderActionDiscontinue": "إيقاف",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "جديد",
@@ -74,6 +75,7 @@
   "refills": "إعادة ملء",
   "removeFromBasket": "إزالة من السلة",
   "reorder": "إعادة ترتيب",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "حفظ الطلب",
   "searchAgain": "ابحث مرة أخرى",
   "searchFieldPlaceholder": "ابحث عن دواء أو مجموعة طلبات (مثل \"أسبرين\")",
diff --git a/packages/esm-patient-medications-app/translations/de.json b/packages/esm-patient-medications-app/translations/de.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/de.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/en.json b/packages/esm-patient-medications-app/translations/en.json
index 3e0e07ff75..2a200aea4d 100644
--- a/packages/esm-patient-medications-app/translations/en.json
+++ b/packages/esm-patient-medications-app/translations/en.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
   "discontinue": "Discontinue",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Dispensing instructions",
   "dosageInstructions": "1. Dosage instructions",
   "dosageRequiredErrorMessage": "Dosage is required",
diff --git a/packages/esm-patient-medications-app/translations/es.json b/packages/esm-patient-medications-app/translations/es.json
index 963b9259d5..088ef1fbfb 100644
--- a/packages/esm-patient-medications-app/translations/es.json
+++ b/packages/esm-patient-medications-app/translations/es.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Añadir a la cesta",
   "discard": "Descartar",
   "discontinue": "Descontinuar",
-  "discontinuedDate": "Fecha de descontinuación",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Instrucciones de suministro",
   "dosageInstructions": "1. Instrucciones de dosificación",
   "dosageRequiredErrorMessage": "La dosificación es obligatoria",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "No hay resultados para \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "El número de reposiciones es obligatorio",
   "onDate": "en",
+  "or": "o",
   "orderActionDiscontinue": "Descontinuar",
   "orderActionIncomplete": "Incompleto",
   "orderActionNew": "Nuevo",
@@ -74,6 +75,7 @@
   "refills": "Reposición",
   "removeFromBasket": "Retirar de la cesta",
   "reorder": "Volver a ordenar",
+  "returnToOrderBasket": "Volver a la cesta de órdenes",
   "saveOrder": "Guardar orden",
   "searchAgain": "buscar de nuevo",
   "searchFieldPlaceholder": "Buscar un medicamento o un conjunto de órdenes (por ejemplo, \"Aspirina\")",
diff --git a/packages/esm-patient-medications-app/translations/fr.json b/packages/esm-patient-medications-app/translations/fr.json
index caffb2abef..85a6a136a0 100644
--- a/packages/esm-patient-medications-app/translations/fr.json
+++ b/packages/esm-patient-medications-app/translations/fr.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Ajouter au panier",
   "discard": "Rejeter",
   "discontinue": "Interrompre",
-  "discontinuedDate": "Date d'arrêt",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Instructions de distribution",
   "dosageInstructions": "1. Instructions de dosage",
   "dosageRequiredErrorMessage": "Le dosage est requis",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "Aucun résultat à afficher pour « {{searchTerm}} »",
   "numRefillsErrorMessage": "Le nombre de recharges est requis",
   "onDate": "sur",
+  "or": "ou",
   "orderActionDiscontinue": "Interrompre",
   "orderActionIncomplete": "Incomplet",
   "orderActionNew": "Nouveau",
@@ -74,6 +75,7 @@
   "refills": "Renouvellements",
   "removeFromBasket": "Retirer du panier",
   "reorder": "Recommander",
+  "returnToOrderBasket": "Retour au panier de demandes",
   "saveOrder": "Enregistrer la commande",
   "searchAgain": "rechercher à nouveau",
   "searchFieldPlaceholder": "Recherche d'un médicament ou d'un ensemble de commandes (p. ex. « Aspirine »)",
diff --git a/packages/esm-patient-medications-app/translations/he.json b/packages/esm-patient-medications-app/translations/he.json
index 55d5d0b491..2f874c70c4 100644
--- a/packages/esm-patient-medications-app/translations/he.json
+++ b/packages/esm-patient-medications-app/translations/he.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "הוסף לסל מיד",
   "discard": "בטל",
   "discontinue": "הפסק",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. הוראות חליפה",
   "dosageInstructions": "1. הוראות מינון",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "אין תוצאות להצגה עבור \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "עַל",
+  "or": "or",
   "orderActionDiscontinue": "הפסק",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "חדש",
@@ -74,6 +75,7 @@
   "refills": "משיבות",
   "removeFromBasket": "הסר מהסל",
   "reorder": "הזמן מחדש",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "שמירת הזמנה",
   "searchAgain": "חיפוש מחדש",
   "searchFieldPlaceholder": "חפש תרופה או סט הזמנות (לדוגמה: \"אספירין\")",
diff --git a/packages/esm-patient-medications-app/translations/hi.json b/packages/esm-patient-medications-app/translations/hi.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/hi.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/hi_IN.json b/packages/esm-patient-medications-app/translations/hi_IN.json
index a389715c8e..2a200aea4d 100644
--- a/packages/esm-patient-medications-app/translations/hi_IN.json
+++ b/packages/esm-patient-medications-app/translations/hi_IN.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
   "discontinue": "Discontinue",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Dispensing instructions",
   "dosageInstructions": "1. Dosage instructions",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -74,6 +75,7 @@
   "refills": "Refills",
   "removeFromBasket": "Remove from basket",
   "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "Save order",
   "searchAgain": "search again",
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
diff --git a/packages/esm-patient-medications-app/translations/id.json b/packages/esm-patient-medications-app/translations/id.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/id.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/it.json b/packages/esm-patient-medications-app/translations/it.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/it.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/km.json b/packages/esm-patient-medications-app/translations/km.json
index 69daf868a5..df7446117a 100644
--- a/packages/esm-patient-medications-app/translations/km.json
+++ b/packages/esm-patient-medications-app/translations/km.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "បញ្ចូលទៅក្នុង(ប្រអប់)កញ្ចប់ភ្លាមៗ",
   "discard": "បោះបង់",
   "discontinue": "បញ្ឈប់",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. ការណែនាំអំពីការផ្តល់ឱសថ",
   "dosageInstructions": "1. ការណែនាំអំពីកំរិតប្រើប្រាស់",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "គ្មានលទ្ធផលដែលត្រូវបង្ហាញសម្រាប់ \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "នៅលើ",
+  "or": "or",
   "orderActionDiscontinue": "បញ្ឈប់",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "ថ្មី។",
@@ -74,6 +75,7 @@
   "refills": "ការបំពេញបន្ថែម",
   "removeFromBasket": "យកចេញពីប្រអប់",
   "reorder": "ចេញវេជ្ជបញ្ជាជាថ្មីឡើងវិញ",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "រក្សាទុកវេជ្ជបញ្ជា",
   "searchAgain": "ស្វែងរកម្តងទៀត",
   "searchFieldPlaceholder": "ស្វែងរកវេជ្ជបញ្ជា (ឧ. \"Aspirin\")",
diff --git a/packages/esm-patient-medications-app/translations/pt.json b/packages/esm-patient-medications-app/translations/pt.json
new file mode 100644
index 0000000000..e4d692d99b
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/pt.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Medicamentos activos",
+  "activeMedicationsHeaderTitle": "medicamentos activos",
+  "activeMedicationsTableTitle": "Medicamentos Activos",
+  "add": "Adicionar",
+  "addDrugOrderWorkspaceTitle": "Adicionar prescrição",
+  "backToOrderBasket": "Voltar ao carinho de pedidos",
+  "clearSearchResults": "Limpar Resultados",
+  "decrement": "Diminuir",
+  "details": "Detalhes",
+  "directlyAddToBasket": "Adicionar ao carrinho",
+  "discard": "Descartar",
+  "discontinue": "Discontinuar",
+  "discontinued": "Discontinuar",
+  "dispensingInformation": "3. Instruções de dispensa",
+  "dosageInstructions": "1. Instruções de dosagem",
+  "dosageRequiredErrorMessage": "Dosagem é obrigatório",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Já prescrito",
+  "drugOrders": "Prescrição de medicamentos",
+  "duration": "Duração",
+  "durationUnit": "Unidade de duração",
+  "durationUnitPlaceholder": "Unidade de Duração",
+  "editDispensingUnit": "Unidade de quantidade",
+  "editDosageUnitsPlaceholder": "Unidade",
+  "editDosageUnitsTitle": "Unidade de dosagem",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequência",
+  "editRouteComboBoxTitle": "Rota",
+  "error": "Erro",
+  "errorFetchingDrugOrderTemplates": "Erro ao buscar modelos de prescrição de medicamentos",
+  "errorFetchingDrugResults": "Erro ao buscar resultados para \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Ocorreu um erro ao buscar a configuração da prescrição",
+  "female": "Feminino",
+  "freeDosageErrorMessage": "Adicionar nota livre de dosagem",
+  "freeTextDosage": "Dosagem texto livre",
+  "goToDrugOrderForm": "Formulário de prescrição",
+  "increment": "Incremento",
+  "indication": "Indicação",
+  "indicationErrorMessage": "Indicação é obrigatório",
+  "indicationPlaceholder": "Ex: \"Hipertensão\"",
+  "male": "Masculino",
+  "medicationDurationAndUnit": "para {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Duração indefinida",
+  "medications": "Medicamentos",
+  "modify": "Modificar",
+  "none": "Nenhum",
+  "noResultsForDrugSearch": "Não há resultados a mostrar para  \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Número de reabastecimento é obrigatório",
+  "onDate": "no",
+  "or": "ou",
+  "orderActionDiscontinue": "Discontinuar",
+  "orderActionIncomplete": "Incompleto",
+  "orderActionNew": "Novo",
+  "orderActionRenew": "Renovar",
+  "orderActionRevise": "Modificar",
+  "orderForm": "Formulário de prescrição",
+  "other": "Outro",
+  "pastMedicationsDisplayText": "Medicamentos anteriores",
+  "pastMedicationsHeaderTitle": "medicamentos anteriores",
+  "pastMedicationsTableTitle": "Medicamentos Anteriores",
+  "patientInstructions": "Instruções do utente",
+  "patientInstructionsPlaceholder": "Instruções adicionais de dosagem (Ex: \"Tomar depois de comer\")",
+  "pillDispensedErrorMessage": "Quantidade para dispensar é obrigatória",
+  "prescriptionDuration": "2. Duração da prescrição",
+  "prescriptionRefills": "Repor prescrição",
+  "print": "Imprimir",
+  "printedBy": "Impresso por",
+  "prn": "P.R.N.",
+  "prnReason": "Razão P.R.N.",
+  "prnReasonPlaceholder": "Motivo para tomar remédio",
+  "quantity": "Quantidade",
+  "quantityToDispense": "Quantidade a dispensar",
+  "refills": "Repor",
+  "removeFromBasket": "Remover do carinho",
+  "reorder": "Reordenar",
+  "returnToOrderBasket": "Retornar à carinho de pedidos",
+  "saveOrder": "Gravar prescrição",
+  "searchAgain": "Pesquisar novamente",
+  "searchFieldPlaceholder": "Pesquise um medicamento ou conjunto de pedidos (Ex: \"Aspirina\")",
+  "searchResultsMatchesForTerm_one": "{{count}} resultado para \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} resultados para \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequência é obrigatória",
+  "selectQuantityUnitsErrorMessage": "A unidade da quantidade é obrigatória",
+  "selectRouteErrorMessage": "Rota é obrigatória",
+  "selectUnitErrorMessage": "Unidade da dose é obrigatória",
+  "startDate": "Data inicial",
+  "takeAsNeeded": "Tome conforme necessário",
+  "tryReopeningTheForm": "Por favor, tente iniciar o formulário novamente",
+  "trySearchingAgain": "Por favor, tente pesquisar novamente",
+  "tryTo": "Tente para",
+  "unknown": "Desconhecido",
+  "usingADifferentTerm": "usando um termo diferente"
+}
diff --git a/packages/esm-patient-medications-app/translations/qu.json b/packages/esm-patient-medications-app/translations/qu.json
index a389715c8e..2a200aea4d 100644
--- a/packages/esm-patient-medications-app/translations/qu.json
+++ b/packages/esm-patient-medications-app/translations/qu.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
   "discontinue": "Discontinue",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. Dispensing instructions",
   "dosageInstructions": "1. Dosage instructions",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -74,6 +75,7 @@
   "refills": "Refills",
   "removeFromBasket": "Remove from basket",
   "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "Save order",
   "searchAgain": "search again",
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
diff --git a/packages/esm-patient-medications-app/translations/si.json b/packages/esm-patient-medications-app/translations/si.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/si.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/sw.json b/packages/esm-patient-medications-app/translations/sw.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/sw.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/sw_KE.json b/packages/esm-patient-medications-app/translations/sw_KE.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/sw_KE.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/tr.json b/packages/esm-patient-medications-app/translations/tr.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/tr.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/tr_TR.json b/packages/esm-patient-medications-app/translations/tr_TR.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/tr_TR.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/uk.json b/packages/esm-patient-medications-app/translations/uk.json
new file mode 100644
index 0000000000..2a200aea4d
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/uk.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Decrement",
+  "details": "Details",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "discontinue": "Discontinue",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Dose",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Duration",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Unit",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Dose",
+  "editDoseComboBoxTitle": "Dose",
+  "editFrequencyComboBoxTitle": "Frequency",
+  "editRouteComboBoxTitle": "Route",
+  "error": "Error",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Female",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Increment",
+  "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Male",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modify": "Modify",
+  "none": "None",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "orderForm": "Order Form",
+  "other": "Other",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Quantity",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Refills",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Reorder",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/vi.json b/packages/esm-patient-medications-app/translations/vi.json
new file mode 100644
index 0000000000..7f30af9842
--- /dev/null
+++ b/packages/esm-patient-medications-app/translations/vi.json
@@ -0,0 +1,95 @@
+{
+  "activeMedicationsDisplayText": "Active medications",
+  "activeMedicationsHeaderTitle": "active medications",
+  "activeMedicationsTableTitle": "Active Medications",
+  "add": "Thêm",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
+  "backToOrderBasket": "Back to order basket",
+  "clearSearchResults": "Clear Results",
+  "decrement": "Giảm",
+  "details": "Chi tiết",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Hủy bỏ",
+  "discontinue": "Ngừng lại",
+  "discontinued": "Discontinued",
+  "dispensingInformation": "3. Dispensing instructions",
+  "dosageInstructions": "1. Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
+  "dose": "Liều lượng",
+  "drugAlreadyPrescribed": "Already prescribed",
+  "drugOrders": "Drug orders",
+  "duration": "Khoảng thời gian",
+  "durationUnit": "Duration unit",
+  "durationUnitPlaceholder": "Duration Unit",
+  "editDispensingUnit": "Quantity unit",
+  "editDosageUnitsPlaceholder": "Đơn vị",
+  "editDosageUnitsTitle": "Dose unit",
+  "editDoseComboBoxPlaceholder": "Liều lượng",
+  "editDoseComboBoxTitle": "Liều lượng",
+  "editFrequencyComboBoxTitle": "Tính thường xuyên",
+  "editRouteComboBoxTitle": "Tuyến đường",
+  "error": "Lỗi",
+  "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
+  "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
+  "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "female": "Nữ",
+  "freeDosageErrorMessage": "Add free dosage note",
+  "freeTextDosage": "Free text dosage",
+  "goToDrugOrderForm": "Order form",
+  "increment": "Tăng dần",
+  "indication": "Chỉ định",
+  "indicationErrorMessage": "Indication is required",
+  "indicationPlaceholder": "e.g. \"Hypertension\"",
+  "male": "Nam",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Thuốc",
+  "modify": "Chỉnh sửa",
+  "none": "Không có",
+  "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Ngừng lại",
+  "orderActionIncomplete": "Chưa hoàn thành",
+  "orderActionNew": "Mới",
+  "orderActionRenew": "Làm mới",
+  "orderActionRevise": "Chỉnh sửa",
+  "orderForm": "Order Form",
+  "other": "Khác",
+  "pastMedicationsDisplayText": "Past medications",
+  "pastMedicationsHeaderTitle": "past medications",
+  "pastMedicationsTableTitle": "Past Medications",
+  "patientInstructions": "Patient instructions",
+  "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
+  "prescriptionDuration": "2. Prescription duration",
+  "prescriptionRefills": "Prescription refills",
+  "print": "In",
+  "printedBy": "Printed by",
+  "prn": "P.R.N.",
+  "prnReason": "P.R.N. reason",
+  "prnReasonPlaceholder": "Reason to take medicine",
+  "quantity": "Số lượng",
+  "quantityToDispense": "Quantity to dispense",
+  "refills": "Nạp lại",
+  "removeFromBasket": "Remove from basket",
+  "reorder": "Sắp xếp lại",
+  "returnToOrderBasket": "Return to order basket",
+  "saveOrder": "Save order",
+  "searchAgain": "search again",
+  "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
+  "startDate": "Start date",
+  "takeAsNeeded": "Take as needed",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term"
+}
diff --git a/packages/esm-patient-medications-app/translations/zh.json b/packages/esm-patient-medications-app/translations/zh.json
index 3065d76d2b..4b689a19ed 100644
--- a/packages/esm-patient-medications-app/translations/zh.json
+++ b/packages/esm-patient-medications-app/translations/zh.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "添加到医嘱篮",
   "discard": "放弃",
   "discontinue": "停止使用",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. 配药说明",
   "dosageInstructions": "1. 用药剂量指导",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "没有与“{{searchTerm}}”有关的结果可显示",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "停止使用",
   "orderActionIncomplete": "不完整",
   "orderActionNew": "新增",
@@ -74,6 +75,7 @@
   "refills": "处方补充",
   "removeFromBasket": "从医嘱篮中移除",
   "reorder": "重新使用",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "保存医嘱",
   "searchAgain": "重新搜索",
   "searchFieldPlaceholder": "搜索药品或医嘱集（例如“Aspirin”）",
diff --git a/packages/esm-patient-medications-app/translations/zh_CN.json b/packages/esm-patient-medications-app/translations/zh_CN.json
index 3065d76d2b..4b689a19ed 100644
--- a/packages/esm-patient-medications-app/translations/zh_CN.json
+++ b/packages/esm-patient-medications-app/translations/zh_CN.json
@@ -11,7 +11,7 @@
   "directlyAddToBasket": "添加到医嘱篮",
   "discard": "放弃",
   "discontinue": "停止使用",
-  "discontinuedDate": "Discontinued date",
+  "discontinued": "Discontinued",
   "dispensingInformation": "3. 配药说明",
   "dosageInstructions": "1. 用药剂量指导",
   "dosageRequiredErrorMessage": "Dosage is required",
@@ -49,6 +49,7 @@
   "noResultsForDrugSearch": "没有与“{{searchTerm}}”有关的结果可显示",
   "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "停止使用",
   "orderActionIncomplete": "不完整",
   "orderActionNew": "新增",
@@ -74,6 +75,7 @@
   "refills": "处方补充",
   "removeFromBasket": "从医嘱篮中移除",
   "reorder": "重新使用",
+  "returnToOrderBasket": "Return to order basket",
   "saveOrder": "保存医嘱",
   "searchAgain": "重新搜索",
   "searchFieldPlaceholder": "搜索药品或医嘱集（例如“Aspirin”）",
diff --git a/packages/esm-patient-notes-app/translations/de.json b/packages/esm-patient-notes-app/translations/de.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/de.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/hi.json b/packages/esm-patient-notes-app/translations/hi.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/hi.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/id.json b/packages/esm-patient-notes-app/translations/id.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/id.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/it.json b/packages/esm-patient-notes-app/translations/it.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/it.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/pt.json b/packages/esm-patient-notes-app/translations/pt.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/pt.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/si.json b/packages/esm-patient-notes-app/translations/si.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/si.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/sw.json b/packages/esm-patient-notes-app/translations/sw.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/sw.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/sw_KE.json b/packages/esm-patient-notes-app/translations/sw_KE.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/sw_KE.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/tr.json b/packages/esm-patient-notes-app/translations/tr.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/tr.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/tr_TR.json b/packages/esm-patient-notes-app/translations/tr_TR.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/tr_TR.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/uk.json b/packages/esm-patient-notes-app/translations/uk.json
new file mode 100644
index 0000000000..51df0d8d62
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/uk.json
@@ -0,0 +1,38 @@
+{
+  "add": "Add",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Date",
+  "diagnoses": "Diagnoses",
+  "discard": "Discard",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Image",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Note",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-notes-app/translations/vi.json b/packages/esm-patient-notes-app/translations/vi.json
new file mode 100644
index 0000000000..71de5ba41f
--- /dev/null
+++ b/packages/esm-patient-notes-app/translations/vi.json
@@ -0,0 +1,38 @@
+{
+  "add": "Thêm",
+  "addImage": "Add image",
+  "addVisitNote": "Add a visit note",
+  "clinicalNoteLabel": "Write your notes",
+  "clinicalNotePlaceholder": "Write any notes here",
+  "date": "Ngày",
+  "diagnoses": "Chẩn đoán",
+  "discard": "Hủy bỏ",
+  "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
+  "enterPrimaryDiagnoses": "Enter Primary diagnoses",
+  "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Lỗi",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
+  "image": "Hình ảnh",
+  "imageRemoved": "Image removed",
+  "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
+  "noMatchingDiagnoses": "No diagnoses found matching",
+  "note": "Ghi chú",
+  "noVisitNoteToDisplay": "No visit note to display",
+  "primaryDiagnosis": "Primary diagnosis",
+  "primaryDiagnosisInputPlaceholder": "Choose a primary diagnosis",
+  "primaryDiagnosisRequired": "Choose at least one primary diagnosis",
+  "saveAndClose": "Save and close",
+  "saving": "Đang lưu",
+  "searchForPrimaryDiagnosis": "Search for a primary diagnosis",
+  "searchForSecondaryDiagnosis": "Search for a secondary diagnosis",
+  "secondaryDiagnosis": "Secondary diagnosis",
+  "secondaryDiagnosisInputPlaceholder": "Choose a secondary diagnosis",
+  "seeAll": "See all",
+  "visitDate": "Visit date",
+  "visitNote": "Visit note",
+  "visitNoteNowVisible": "It is now visible on the Encounters page",
+  "visitNotes": "Visit notes",
+  "visitNoteSaved": "Visit note saved",
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
+}
diff --git a/packages/esm-patient-orders-app/src/components/order-details-table.scss b/packages/esm-patient-orders-app/src/components/order-details-table.scss
index c081f81c53..7c4ef3007f 100644
--- a/packages/esm-patient-orders-app/src/components/order-details-table.scss
+++ b/packages/esm-patient-orders-app/src/components/order-details-table.scss
@@ -31,6 +31,10 @@
 
 .dropdownContainer {
   min-width: max-content;
+
+  :global(.cds--dropdown__wrapper--inline) {
+    grid-gap: 0 0.5rem;
+  }
 }
 
 .buttons {
@@ -157,3 +161,18 @@
 .helperText {
   @include type.type-style('helper-text-02');
 }
+
+.printButton {
+  margin-left: 1.25rem;
+}
+
+@media print {
+  html,
+  body {
+    margin: 0 !important;
+    width: fit-content;
+    padding: 0 !important;
+    overflow: hidden;
+    page-break-inside: avoid;
+  }
+}
diff --git a/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx b/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
index 3493800e92..7d19f57e06 100644
--- a/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
+++ b/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
@@ -177,43 +177,61 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
     },
   ];
 
-  const tableRows = useMemo(() => {
-    return allOrders?.map((order) => ({
-      id: order.uuid,
-      dateActivated: order.dateActivated,
-      orderNumber: order.orderNumber,
-      dateOfOrder: <div className={styles.singleLineText}>{formatDate(new Date(order.dateActivated))}</div>,
-      orderType: capitalize(order.orderType?.display ?? '--'),
-      order: order.display,
-      priority: (
-        <div className={styles.priorityPill} data-priority={lowerCase(order.urgency)}>
-          {
-            // t('ON_SCHEDULED_DATE', 'On scheduled date')
-            // t('ROUTINE', 'Routine')
-            // t('STAT', 'STAT')
-          }
-          {t(order.urgency, capitalize(order.urgency.replace('_', ' ')))}
-        </div>
-      ),
-      orderedBy: order.orderer?.display,
-      status: order.fulfillerStatus ? (
-        <div className={styles.statusPill} data-status={lowerCase(order.fulfillerStatus.replace('_', ' '))}>
-          {
-            // t('RECEIVED', 'Received')
-            // t('IN_PROGRESS', 'In progress')
-            // t('EXCEPTION', 'Exception')
-            // t('ON_HOLD', 'On hold')
-            // t('DECLINED', 'Declined')
-            // t('COMPLETED', 'Completed')
-            // t('DISCONTINUED', 'Discontinued')
-          }
-          {t(order.fulfillerStatus, capitalize(order.fulfillerStatus.replace('_', ' ')))}
-        </div>
-      ) : (
-        '--'
-      ),
-    }));
-  }, [allOrders, t]);
+  if (isPrinting) {
+    tableHeaders.push({
+      key: 'dosage',
+      header: t('dosage', 'Dosage'),
+      isSortable: true,
+    });
+  }
+
+  const tableRows = useMemo(
+    () =>
+      allOrders?.map((order) => ({
+        id: order.uuid,
+        dateActivated: order.dateActivated,
+        orderNumber: order.orderNumber,
+        dateOfOrder: <div className={styles.singleLineText}>{formatDate(new Date(order.dateActivated))}</div>,
+        orderType: capitalize(order.orderType?.display ?? '-'),
+        dosage:
+          order.type === 'drugorder' ? (
+            <div className={styles.singleLineText}>{`${t('indication', 'Indication').toUpperCase()}
+            ${order.orderReasonNonCoded} ${'-'} ${t('quantity', 'Quantity').toUpperCase()} ${order.quantity} ${order
+              ?.quantityUnits?.display} `}</div>
+          ) : (
+            '--'
+          ),
+        order: order.display,
+        priority: (
+          <div className={styles.priorityPill} data-priority={lowerCase(order.urgency)}>
+            {
+              // t('ON_SCHEDULED_DATE', 'On scheduled date')
+              // t('ROUTINE', 'Routine')
+              // t('STAT', 'STAT')
+            }
+            {t(order.urgency, capitalize(order.urgency.replace('_', ' ')))}
+          </div>
+        ),
+        orderedBy: order.orderer?.display,
+        status: order.fulfillerStatus ? (
+          <div className={styles.statusPill} data-status={lowerCase(order.fulfillerStatus.replace('_', ' '))}>
+            {
+              // t('RECEIVED', 'Received')
+              // t('IN_PROGRESS', 'In progress')
+              // t('EXCEPTION', 'Exception')
+              // t('ON_HOLD', 'On hold')
+              // t('DECLINED', 'Declined')
+              // t('COMPLETED', 'Completed')
+              // t('DISCONTINUED', 'Discontinued')
+            }
+            {t(order.fulfillerStatus, capitalize(order.fulfillerStatus.replace('_', ' ')))}
+          </div>
+        ) : (
+          '--'
+        ),
+      })) ?? [],
+    [allOrders, t],
+  );
 
   const { results: paginatedOrders, goTo, currentPage } = usePagination(tableRows, defaultPageSize);
 
@@ -253,15 +271,15 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
     if (isPrinting && onBeforeGetContentResolve.current) {
       onBeforeGetContentResolve.current();
     }
-  }, [isPrinting, onBeforeGetContentResolve]);
+  }, [isPrinting]);
 
   const handlePrint = useReactToPrint({
     content: () => contentToPrintRef.current,
     documentTitle: `OpenMRS - ${patientDetails.name} - ${title}`,
-    onBeforeGetContent: () =>
+    onBeforeGetContent: (): Promise<void> =>
       new Promise((resolve) => {
-        if (patient && patient?.patient && title) {
-          onBeforeGetContentResolve.current = resolve;
+        if (patient && title) {
+          onBeforeGetContentResolve.current = resolve();
           setIsPrinting(true);
         }
       }),
@@ -301,7 +319,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
             setSelectedOrderTypeUuid(e.selectedItem.uuid);
           }}
           selectedItem={orderTypes?.find((x) => x.uuid === selectedOrderTypeUuid)}
-          titleText={t('selectOrderType', 'Select order type')}
+          titleText={t('selectOrderType', 'Select order type') + ':'}
           type="inline"
         />
       </div>
@@ -318,8 +336,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
         if (orderTypes && orderTypes?.length > 0) {
           return (
             <>
-              {!tableRows.length ? (
-                // FIXME: The displayText translation is not working as expected
+              {!tableRows?.length ? (
                 <EmptyState
                   headerTitle={headerTitle}
                   displayText={
@@ -327,7 +344,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                       ? t('orders', 'Orders')
                       : // t('Drug Order_few', 'Drug Orders')
                         // t('Test Order_few', 'Test Orders')
-                        t(selectedOrderName, {
+                        t(selectedOrderName?.toLowerCase() ?? 'orders', {
                           count: 3,
                           default: selectedOrderName,
                         })
@@ -346,8 +363,8 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                       {showPrintButton && (
                         <Button
                           kind="ghost"
-                          renderIcon={(props) => <PrinterIcon {...props} size={16} />}
-                          iconDescription={t('print', 'Print')}
+                          renderIcon={PrinterIcon}
+                          iconDescription={t('printOrder', 'Print order')}
                           className={styles.printButton}
                           onClick={handlePrint}
                         >
@@ -357,7 +374,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                       {showAddButton && (
                         <Button
                           kind="ghost"
-                          renderIcon={(props) => <AddIcon {...props} size={16} />}
+                          renderIcon={AddIcon}
                           iconDescription={t('launchOrderBasket', 'Launch order basket')}
                           onClick={launchOrderBasket}
                         >
@@ -391,18 +408,20 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                       }) => (
                         <>
                           <TableContainer {...getTableContainerProps}>
-                            <div className={styles.toolBarContent}>
-                              <TableToolbarContent>
-                                <Layer>
-                                  <Search
-                                    expanded
-                                    onChange={onInputChange}
-                                    placeholder={t('searchTable', 'Search table')}
-                                    size="lg"
-                                  />
-                                </Layer>
-                              </TableToolbarContent>
-                            </div>
+                            {!isPrinting && (
+                              <div className={styles.toolBarContent}>
+                                <TableToolbarContent>
+                                  <Layer>
+                                    <Search
+                                      expanded
+                                      onChange={onInputChange}
+                                      placeholder={t('searchTable', 'Search table')}
+                                      size="lg"
+                                    />
+                                  </Layer>
+                                </TableToolbarContent>
+                              </div>
+                            )}
                             <Table className={styles.table} {...getTableProps()}>
                               <TableHead>
                                 <TableRow>
@@ -424,19 +443,21 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                                       <TableExpandRow className={styles.row} {...getRowProps({ row })}>
                                         {row.cells.map((cell) => (
                                           <TableCell className={styles.tableCell} key={cell.id}>
-                                            {cell.value['content'] ?? cell.value}
+                                            {cell.value?.['content'] ?? cell.value}
                                           </TableCell>
                                         ))}
-                                        <TableCell className="cds--table-column-menu">
-                                          <OrderBasketItemActions
-                                            items={orders}
-                                            openOrderBasket={launchOrderBasket}
-                                            openOrderForm={() => openOrderForm(matchingOrder)}
-                                            orderItem={matchingOrder}
-                                            setOrderItems={setOrders}
-                                            responsiveSize={responsiveSize}
-                                          />
-                                        </TableCell>
+                                        {!isPrinting && (
+                                          <TableCell className="cds--table-column-menu">
+                                            <OrderBasketItemActions
+                                              items={orders}
+                                              openOrderBasket={launchOrderBasket}
+                                              openOrderForm={() => openOrderForm(matchingOrder)}
+                                              orderItem={matchingOrder}
+                                              setOrderItems={setOrders}
+                                              responsiveSize={responsiveSize}
+                                            />
+                                          </TableCell>
+                                        )}
                                       </TableExpandRow>
                                       {row.isExpanded ? (
                                         <TableExpandedRow
diff --git a/packages/esm-patient-orders-app/src/config-schema.ts b/packages/esm-patient-orders-app/src/config-schema.ts
index 465dd07817..67dbe9d7c4 100644
--- a/packages/esm-patient-orders-app/src/config-schema.ts
+++ b/packages/esm-patient-orders-app/src/config-schema.ts
@@ -6,8 +6,15 @@ export const configSchema = {
     _description: 'The encounter type of the encounter encapsulating orders',
     _default: '39da3525-afe4-45ff-8977-c53b7b359158',
   },
+  showPrintButton: {
+    _type: Type.Boolean,
+    _default: false,
+    _description:
+      'Determines whether or not to display a Print button in the Orders details table. If set to true, a Print button gets shown in both the orders table headers. When clicked, this button enables the user to print out the contents of the table',
+  },
 };
 
 export interface ConfigObject {
   orderEncounterType: string;
+  showPrintButton: boolean;
 }
diff --git a/packages/esm-patient-orders-app/src/lab-results/lab-results-form-field.component.tsx b/packages/esm-patient-orders-app/src/lab-results/lab-results-form-field.component.tsx
index 52f6dbb0e6..1d36efe273 100644
--- a/packages/esm-patient-orders-app/src/lab-results/lab-results-form-field.component.tsx
+++ b/packages/esm-patient-orders-app/src/lab-results/lab-results-form-field.component.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { NumberInput, Select, SelectItem, TextInput } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { type Control, Controller } from 'react-hook-form';
+import { type Control, Controller, type FieldErrors } from 'react-hook-form';
 import { type LabOrderConcept } from './lab-results.resource';
 import styles from './lab-results-form.scss';
 
@@ -9,9 +9,10 @@ interface ResultFormFieldProps {
   concept: LabOrderConcept;
   control: Control<any, any>;
   defaultValue: any;
+  errors: FieldErrors;
 }
 
-const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, defaultValue }) => {
+const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, defaultValue, errors }) => {
   const { t } = useTranslation();
 
   const isCoded = (concept: LabOrderConcept) => concept.datatype?.display === 'Coded';
@@ -42,12 +43,14 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
           name={concept.uuid}
           render={({ field }) => (
             <TextInput
+              {...field}
               className={styles.textInput}
               id={concept.uuid}
               key={concept.uuid}
               labelText={concept?.display ?? ''}
               type="text"
-              {...field}
+              invalidText={errors[concept.uuid]?.message}
+              invalid={!!errors[concept.uuid]}
             />
           )}
         />
@@ -66,8 +69,10 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
               id={concept.uuid}
               key={concept.uuid}
               label={concept?.display + printValueRange(concept)}
-              onChange={(event) => field.onChange(event.target.value)}
+              onChange={(event) => field.onChange(parseFloat(event.target.value))}
               value={field.value || ''}
+              invalidText={errors[concept.uuid]?.message}
+              invalid={!!errors[concept.uuid]}
             />
           )}
         />
@@ -85,6 +90,8 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
               id={`select-${concept.uuid}`}
               key={concept.uuid}
               labelText={concept?.display}
+              invalidText={errors[concept.uuid]?.message}
+              invalid={!!errors[concept.uuid]}
             >
               <SelectItem text={t('chooseAnOption', 'Choose an option')} value="" />
               {concept?.answers?.length &&
@@ -113,6 +120,8 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
                     key={member.uuid}
                     labelText={member?.display ?? ''}
                     type="text"
+                    invalidText={errors[member.uuid]?.message}
+                    invalid={!!errors[member.uuid]}
                   />
                 )}
               />
@@ -130,8 +139,10 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
                     id={`number-${member.uuid}`}
                     key={member.uuid}
                     label={member?.display + printValueRange(member)}
-                    onChange={(event) => field.onChange(event.target.value)}
+                    onChange={(event) => field.onChange(parseFloat(event.target.value))}
                     value={field.value || ''}
+                    invalidText={errors[member.uuid]?.message}
+                    invalid={!!errors[member.uuid]}
                   />
                 )}
               />
@@ -149,6 +160,8 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
                     key={member.uuid}
                     labelText={member?.display}
                     type="text"
+                    invalidText={errors[member.uuid]?.message}
+                    invalid={!!errors[member.uuid]}
                   >
                     <SelectItem text={t('chooseAnOption', 'Choose an option')} value="" />
 
diff --git a/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx b/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx
index 4632389dd0..1745cfed17 100644
--- a/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx
+++ b/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx
@@ -1,13 +1,21 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
 import { mutate } from 'swr';
 import { Button, ButtonSet, Form, InlineLoading, InlineNotification, Stack } from '@carbon/react';
 import { type DefaultPatientWorkspaceProps, type Order } from '@openmrs/esm-patient-common-lib';
 import { restBaseUrl, showSnackbar, useAbortController, useLayoutType } from '@openmrs/esm-framework';
-import { useOrderConceptByUuid, updateOrderResult, useLabEncounter, useObservation } from './lab-results.resource';
+import {
+  useOrderConceptByUuid,
+  updateOrderResult,
+  useLabEncounter,
+  useObservation,
+  createObservationPayload,
+} from './lab-results.resource';
 import ResultFormField from './lab-results-form-field.component';
 import styles from './lab-results-form.scss';
+import { useLabResultsFormSchema } from './useLabResultsFormSchema';
+import { zodResolver } from '@hookform/resolvers/zod';
 
 export interface LabResultsFormProps extends DefaultPatientWorkspaceProps {
   order: Order;
@@ -30,19 +38,28 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
   const { encounter, isLoading: isLoadingEncounter, mutate: mutateLabOrders } = useLabEncounter(order.encounter.uuid);
   const { data, isLoading: isLoadingObs, error: isErrorObs } = useObservation(obsUuid);
   const [showEmptyFormErrorNotification, setShowEmptyFormErrorNotification] = useState(false);
+  const schema = useLabResultsFormSchema(order.concept.uuid);
 
   const {
     control,
-    register,
     formState: { errors, isDirty, isSubmitting },
-    getValues,
     handleSubmit,
-  } = useForm<{ testResult: any }>({
+  } = useForm<{ testResult: Record<string, unknown> }>({
     defaultValues: {},
+    resolver: zodResolver(schema),
+    mode: 'all',
   });
 
+  const mutateOrderData = useCallback(() => {
+    mutate(
+      (key) => typeof key === 'string' && key.startsWith(`${restBaseUrl}/order?patient=${order.patient.uuid}`),
+      undefined,
+      { revalidate: true },
+    );
+  }, [order.patient.uuid]);
+
   useEffect(() => {
-    if (!isLoadingEncounter && encounter?.obs.length > 0 && !isEditing) {
+    if (!isLoadingEncounter && encounter?.obs?.length > 0 && !isEditing) {
       const obs = encounter.obs.find((obs) => obs.concept?.uuid === order?.concept.uuid);
       if (obs) {
         setObsUuid(obs.uuid);
@@ -82,66 +99,16 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     );
   }
 
-  const saveLabResults = () => {
-    const formValues = getValues();
-
+  const saveLabResults = async (formValues: Record<string, unknown>) => {
     const isEmptyForm = Object.values(formValues).every(
       (value) => value === '' || value === null || value === undefined,
     );
-
     if (isEmptyForm) {
       setShowEmptyFormErrorNotification(true);
       return;
     }
-
-    let obsValue = [];
-
-    if (concept.set && concept.setMembers.length > 0) {
-      let groupMembers = [];
-      concept.setMembers.forEach((member) => {
-        let value;
-        if (member.datatype.display === 'Numeric' || member.datatype.display === 'Text') {
-          value = getValues()[`${member.uuid}`];
-        } else if (member.datatype.display === 'Coded') {
-          value = {
-            uuid: getValues()[`${member.uuid}`],
-          };
-        }
-        const groupMember = {
-          concept: { uuid: member.uuid },
-          value: value,
-          status: 'FINAL',
-          order: { uuid: order.uuid },
-        };
-        groupMembers.push(groupMember);
-      });
-
-      obsValue.push({
-        concept: { uuid: order.concept.uuid },
-        status: 'FINAL',
-        order: { uuid: order.uuid },
-        groupMembers: groupMembers,
-      });
-    } else if (!concept.set && concept.setMembers.length === 0) {
-      let value;
-      if (concept.datatype.display === 'Numeric' || concept.datatype.display === 'Text') {
-        value = getValues()[`${concept.uuid}`];
-      } else if (concept.datatype.display === 'Coded') {
-        value = {
-          uuid: getValues()[`${concept.uuid}`],
-        };
-      }
-
-      obsValue.push({
-        concept: { uuid: order.concept.uuid },
-        status: 'FINAL',
-        order: { uuid: order.uuid },
-        value: value,
-      });
-    }
-
-    const obsPayload = { obs: obsValue };
-
+    // Set the observation status to 'FINAL' as we're not capturing it in the form
+    const obsPayload = createObservationPayload(concept, order, formValues, 'FINAL');
     const orderDiscontinuationPayload = {
       previousOrder: order.uuid,
       type: 'testorder',
@@ -152,56 +119,49 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
       concept: order.concept.uuid,
       orderer: order.orderer,
     };
-
     const resultsStatusPayload = {
       fulfillerStatus: 'COMPLETED',
       fulfillerComment: 'Test Results Entered',
     };
 
-    updateOrderResult(
-      order.uuid,
-      order.encounter.uuid,
-      obsPayload,
-      resultsStatusPayload,
-      orderDiscontinuationPayload,
-      abortController,
-    ).then(
-      () => {
-        closeWorkspaceWithSavedChanges();
-        mutateLabOrders();
-        mutate(
-          (key) => typeof key === 'string' && key.startsWith(`${restBaseUrl}/order?patient=${order.patient.uuid}`),
-          undefined,
-          { revalidate: true },
-        );
-        showSnackbar({
-          title: t('saveLabResults', 'Save lab results'),
-          kind: 'success',
-          subtitle: t('successfullySavedLabResults', 'Lab results for {{orderNumber}} have been successfully updated', {
-            orderNumber: order?.orderNumber,
-          }),
-        });
-      },
-      (err) => {
-        showSnackbar({
-          title: t('errorSavingLabResults', 'Error saving lab results'),
-          kind: 'error',
-          subtitle: err?.message,
-        });
-      },
-    );
-
-    setShowEmptyFormErrorNotification(false);
+    try {
+      await updateOrderResult(
+        order.uuid,
+        order.encounter.uuid,
+        obsPayload,
+        resultsStatusPayload,
+        orderDiscontinuationPayload,
+        abortController,
+      );
+      closeWorkspaceWithSavedChanges();
+      mutateLabOrders();
+      mutateOrderData();
+      showSnackbar({
+        title: t('saveLabResults', 'Save lab results'),
+        kind: 'success',
+        subtitle: t('successfullySavedLabResults', 'Lab results for {{orderNumber}} have been successfully updated', {
+          orderNumber: order?.orderNumber,
+        }),
+      });
+    } catch (err) {
+      showSnackbar({
+        title: t('errorSavingLabResults', 'Error saving lab results'),
+        kind: 'error',
+        subtitle: err?.message,
+      });
+    } finally {
+      setShowEmptyFormErrorNotification(false);
+    }
   };
 
   return (
-    <Form className={styles.form}>
+    <Form className={styles.form} onSubmit={handleSubmit(saveLabResults)}>
       <div className={styles.grid}>
         {concept.setMembers.length > 0 && <p className={styles.heading}>{concept.display}</p>}
         {concept && (
           <Stack gap={5}>
             {!isLoadingInitialValues ? (
-              <ResultFormField defaultValue={initialValues} concept={concept} control={control} />
+              <ResultFormField defaultValue={initialValues} concept={concept} control={control} errors={errors} />
             ) : (
               <InlineLoading description={t('loadingInitialValues', 'Loading initial values') + '...'} />
             )}
@@ -223,8 +183,7 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
         <Button
           className={styles.button}
           kind="primary"
-          onClick={handleSubmit(saveLabResults)}
-          disabled={isSubmitting}
+          disabled={isSubmitting || Object.keys(errors).length > 0}
           type="submit"
         >
           {isSubmitting ? (
diff --git a/packages/esm-patient-orders-app/src/lab-results/lab-results-form.test.tsx b/packages/esm-patient-orders-app/src/lab-results/lab-results-form.test.tsx
new file mode 100644
index 0000000000..5f9cafbaa0
--- /dev/null
+++ b/packages/esm-patient-orders-app/src/lab-results/lab-results-form.test.tsx
@@ -0,0 +1,612 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  useOrderConceptByUuid,
+  useLabEncounter,
+  useObservation,
+  type LabOrderConcept,
+  updateOrderResult,
+  type Datatype,
+} from './lab-results.resource';
+import LabResultsForm from './lab-results-form.component';
+import { type Order } from '@openmrs/esm-patient-common-lib';
+import { type Encounter } from '../types/encounter';
+
+const mockUseOrderConceptByUuid = jest.mocked(useOrderConceptByUuid);
+const mockUseLabEncounter = jest.mocked(useLabEncounter);
+const mockUseObservation = jest.mocked(useObservation);
+
+jest.mock('./lab-results.resource', () => ({
+  ...jest.requireActual('./lab-results.resource'),
+  useOrderConceptByUuid: jest.fn(),
+  useLabEncounter: jest.fn(),
+  useObservation: jest.fn(),
+  updateOrderResult: jest.fn().mockResolvedValue({}),
+}));
+
+const mockOrder = {
+  uuid: 'order-uuid',
+  concept: { uuid: 'concept-uuid' },
+  encounter: { uuid: 'encounter-uuid' },
+  patient: { uuid: 'patient-uuid' },
+  orderNumber: 'ORD-1',
+  careSetting: { uuid: 'care-setting-uuid' },
+  orderer: { uuid: 'orderer-uuid' },
+};
+
+const testProps = {
+  closeWorkspace: jest.fn(),
+  closeWorkspaceWithSavedChanges: jest.fn(),
+  order: mockOrder as Order,
+  promptBeforeClosing: jest.fn(),
+  setTitle: jest.fn(),
+  patientUuid: 'patient-uuid',
+};
+
+describe('LabResultsForm', () => {
+  beforeEach(() => {
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        setMembers: [],
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        hiAbsolute: 100,
+        hiCritical: 80,
+        hiNormal: 70,
+        lowAbsolute: 0,
+        lowCritical: 40,
+        lowNormal: 50,
+        units: 'mg/dL',
+        allowDecimal: false,
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    mockUseLabEncounter.mockReturnValue({
+      encounter: { obs: [] } as Encounter,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    mockUseObservation.mockReturnValue({
+      data: null,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+  });
+
+  test('validates numeric input correctly', async () => {
+    const user = userEvent.setup();
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '150');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(screen.getByText('Test Concept must be between 0 and 100')).toBeInTheDocument();
+    });
+  });
+
+  test('validate when we have a concept with allowDecimal set to true', async () => {
+    const user = userEvent.setup();
+    // if allowDecimal is true, we should allow decimal values
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        setMembers: [],
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        hiAbsolute: 100,
+        lowAbsolute: null,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        units: 'mg/dL',
+        allowDecimal: true,
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '50.5');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(screen.queryByText('Test Concept must be a whole number')).not.toBeInTheDocument();
+    });
+  });
+
+  test('validate when we have a concept with allowDecimal set to null', async () => {
+    const user = userEvent.setup();
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '50.5');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    // if allowDecimal is null or false, we should not allow decimal values
+    await waitFor(() => {
+      expect(screen.getByText('Test Concept must be a whole number')).toBeInTheDocument();
+    });
+  });
+
+  test('validate numeric input with negative value', async () => {
+    const user = userEvent.setup();
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '-50');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(screen.getByText('Test Concept must be between 0 and 100')).toBeInTheDocument();
+    });
+  });
+
+  test('validate numeric input with zero value', async () => {
+    const user = userEvent.setup();
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '0');
+
+    await waitFor(() => {
+      expect(screen.queryByText('Test Concept must be between 0 and 100')).not.toBeInTheDocument();
+    });
+  });
+
+  test('validate numeric input with concept having only hiAbsolute', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        setMembers: [],
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        hiAbsolute: 100,
+        lowAbsolute: null,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        units: 'mg/dL',
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '150');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(screen.getByText('Test Concept must be less than or equal to 100')).toBeInTheDocument();
+    });
+  });
+
+  test('validate numeric input with concept having only lowAbsolute', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        setMembers: [],
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        lowAbsolute: 0,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        hiAbsolute: null,
+        units: 'mg/dL',
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    render(<LabResultsForm {...testProps} />);
+
+    const input = await screen.findByLabelText(`Test Concept (0 - -- mg/dL)`);
+    await user.type(input, '-50');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(screen.getByText('Test Concept must be greater than or equal to 0')).toBeInTheDocument();
+    });
+  });
+
+  test('submits form with valid data', async () => {
+    const user = userEvent.setup();
+    const mockCloseWorkspace = jest.fn();
+    const mockCloseWorkspaceWithSavedChanges = jest.fn();
+
+    render(
+      <LabResultsForm
+        {...testProps}
+        closeWorkspace={mockCloseWorkspace}
+        closeWorkspaceWithSavedChanges={mockCloseWorkspaceWithSavedChanges}
+      />,
+    );
+
+    const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
+    await user.type(input, '50');
+
+    const saveButton = screen.getByRole('button', { name: /Save and close/i });
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(mockCloseWorkspaceWithSavedChanges).toHaveBeenCalled();
+    });
+  });
+
+  test('validate numeric input where concept is a set', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        lowAbsolute: 0,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        hiAbsolute: null,
+        units: 'mg/dL',
+        setMembers: [
+          {
+            uuid: 'set-member-uuid',
+            display: 'Set Member',
+            setMembers: [],
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+            lowAbsolute: 50,
+            lowCritical: 70,
+            lowNormal: 80,
+            hiCritical: 140,
+            hiNormal: 120,
+            hiAbsolute: 150,
+            units: 'mg/dL',
+          },
+          {
+            uuid: 'set-member-uuid-2',
+            display: 'Set Member 2',
+            setMembers: [],
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+            lowAbsolute: 5,
+            lowCritical: 10,
+            lowNormal: 15,
+            hiCritical: 20,
+            hiNormal: 25,
+            hiAbsolute: 30,
+            units: 'mg/dL',
+          },
+        ],
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+    render(<LabResultsForm {...testProps} />);
+
+    // Normal input range
+    const setMember1Input = screen.getByLabelText('Set Member (50 - 150 mg/dL)');
+    await user.type(setMember1Input, '50');
+    expect(screen.queryByText('Set Member must be between 50 and 150')).not.toBeInTheDocument();
+
+    const setMember2Input = screen.getByLabelText('Set Member 2 (5 - 30 mg/dL)');
+    await user.type(setMember2Input, '10');
+    expect(screen.queryByText('Set Member must be between 5 and 30')).not.toBeInTheDocument();
+
+    // Out of range input, upper limit
+    await user.type(setMember1Input, '151');
+    expect(await screen.findByText('Set Member must be between 50 and 150')).toBeInTheDocument();
+
+    await user.type(setMember2Input, '31');
+    expect(await screen.findByText('Set Member 2 must be between 5 and 30')).toBeInTheDocument();
+
+    // Out of range input, lower limit
+    await user.type(setMember1Input, '49');
+    expect(await screen.findByText('Set Member must be between 50 and 150')).toBeInTheDocument();
+
+    await user.type(setMember2Input, '4');
+    expect(await screen.findByText('Set Member 2 must be between 5 and 30')).toBeInTheDocument();
+  });
+
+  test('lab results form submits the correct lab result payload when the concept is not a set', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        setMembers: [],
+        datatype: { display: 'Text', hl7Abbreviation: 'ST' } as Datatype,
+        hiAbsolute: 100,
+        lowAbsolute: 0,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        units: 'mg/dL',
+      } as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+
+    render(<LabResultsForm {...testProps} />);
+    const input = await screen.findByRole('textbox', { name: /Test Concept/i });
+    await user.type(input, '100');
+    const submitButton = screen.getByRole('button', { name: 'Save and close' });
+    await user.click(submitButton);
+
+    expect(updateOrderResult).toHaveBeenCalledWith(
+      'order-uuid',
+      'encounter-uuid',
+      { obs: [{ concept: { uuid: 'concept-uuid' }, order: { uuid: 'order-uuid' }, status: 'FINAL', value: '100' }] },
+      { fulfillerComment: 'Test Results Entered', fulfillerStatus: 'COMPLETED' },
+      {
+        action: 'DISCONTINUE',
+        careSetting: 'care-setting-uuid',
+        concept: 'concept-uuid',
+        encounter: 'encounter-uuid',
+        orderer: mockOrder.orderer,
+        patient: 'patient-uuid',
+        previousOrder: 'order-uuid',
+        type: 'testorder',
+      },
+      expect.anything(),
+    );
+  });
+
+  test('lab results forms submits correct payload when the concept is a set and one set member is keyed', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        set: true,
+        setMembers: [
+          {
+            uuid: 'set-member-uuid-1',
+            display: 'Set Member 1',
+            concept: { uuid: 'concept-uuid-1', display: 'Concept 1' },
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' } as Datatype,
+            hiAbsolute: 100,
+            lowAbsolute: 0,
+            lowCritical: null,
+            lowNormal: null,
+            hiCritical: null,
+            hiNormal: null,
+            units: 'mg/dL',
+          },
+          {
+            uuid: 'set-member-uuid-2',
+            display: 'Set Member 2',
+            concept: { uuid: 'concept-uuid-2', display: 'Concept 2' },
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' } as Datatype,
+            hiAbsolute: 80,
+            lowAbsolute: 0,
+            lowCritical: null,
+            lowNormal: null,
+            hiCritical: null,
+            hiNormal: null,
+            units: 'mmol/L',
+          },
+        ],
+        datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+        hiAbsolute: 100,
+        lowAbsolute: 0,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        units: 'mg/dL',
+      } as unknown as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+
+    render(<LabResultsForm {...testProps} />);
+    const concept1Input = await screen.findByLabelText('Set Member 1 (0 - 100 mg/dL)');
+    await user.type(concept1Input, '100');
+
+    const submitButton = screen.getByRole('button', { name: 'Save and close' });
+    await user.click(submitButton);
+
+    // Expect the observation payload to include only the set member that was keyed
+    expect(updateOrderResult).toHaveBeenCalledWith(
+      'order-uuid',
+      'encounter-uuid',
+      {
+        obs: [
+          {
+            concept: {
+              uuid: 'concept-uuid',
+            },
+            status: 'FINAL',
+            order: {
+              uuid: 'order-uuid',
+            },
+            groupMembers: [
+              {
+                concept: {
+                  uuid: 'set-member-uuid-1',
+                },
+                value: 100,
+                status: 'FINAL',
+                order: {
+                  uuid: 'order-uuid',
+                },
+              },
+            ],
+          },
+        ],
+      },
+      {
+        fulfillerStatus: 'COMPLETED',
+        fulfillerComment: 'Test Results Entered',
+      },
+      {
+        previousOrder: 'order-uuid',
+        type: 'testorder',
+        action: 'DISCONTINUE',
+        careSetting: 'care-setting-uuid',
+        encounter: 'encounter-uuid',
+        patient: 'patient-uuid',
+        concept: 'concept-uuid',
+        orderer: { uuid: 'orderer-uuid' },
+      },
+      expect.anything(),
+    );
+  });
+
+  test('lab results form submits correct payload when the concept is a set and both set members are keyed', async () => {
+    const user = userEvent.setup();
+    mockUseOrderConceptByUuid.mockReturnValue({
+      concept: {
+        uuid: 'concept-uuid',
+        display: 'Test Concept',
+        set: true,
+        setMembers: [
+          {
+            uuid: 'set-member-uuid-1',
+            display: 'Set Member 1',
+            concept: { uuid: 'concept-uuid-1', display: 'Concept 1' },
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+            hiAbsolute: 100,
+            lowAbsolute: 0,
+            lowCritical: null,
+            lowNormal: null,
+            hiCritical: null,
+            hiNormal: null,
+            units: 'mg/dL',
+          },
+          {
+            uuid: 'set-member-uuid-2',
+            display: 'Set Member 2',
+            concept: { uuid: 'concept-uuid-2', display: 'Concept 2' },
+            datatype: { display: 'Numeric', hl7Abbreviation: 'NM' },
+            hiAbsolute: 80,
+            lowAbsolute: 0,
+            lowCritical: null,
+            lowNormal: null,
+            hiCritical: null,
+            hiNormal: null,
+            units: 'mmol/L',
+          },
+        ],
+        datatype: { display: 'Numeric' },
+        hiAbsolute: 100,
+        lowAbsolute: 0,
+        lowCritical: null,
+        lowNormal: null,
+        hiCritical: null,
+        hiNormal: null,
+        units: 'mg/dL',
+      } as unknown as LabOrderConcept,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
+
+    render(<LabResultsForm {...testProps} />);
+    const concept1Input = await screen.findByLabelText('Set Member 1 (0 - 100 mg/dL)');
+    await user.type(concept1Input, '100');
+
+    const concept2Input = await screen.findByLabelText('Set Member 2 (0 - 80 mmol/L)');
+    await user.type(concept2Input, '60');
+
+    const submitButton = screen.getByRole('button', { name: 'Save and close' });
+    await user.click(submitButton);
+
+    // Expect the observation payload to include both set members with their respective values
+    expect(updateOrderResult).toHaveBeenCalledWith(
+      'order-uuid',
+      'encounter-uuid',
+      {
+        obs: [
+          {
+            concept: {
+              uuid: 'concept-uuid',
+            },
+            status: 'FINAL',
+            order: {
+              uuid: 'order-uuid',
+            },
+            groupMembers: [
+              {
+                concept: {
+                  uuid: 'set-member-uuid-1',
+                },
+                value: 100,
+                status: 'FINAL',
+                order: {
+                  uuid: 'order-uuid',
+                },
+              },
+              {
+                concept: {
+                  uuid: 'set-member-uuid-2',
+                },
+                value: 60,
+                status: 'FINAL',
+                order: {
+                  uuid: 'order-uuid',
+                },
+              },
+            ],
+          },
+        ],
+      },
+      {
+        fulfillerStatus: 'COMPLETED',
+        fulfillerComment: 'Test Results Entered',
+      },
+      {
+        previousOrder: 'order-uuid',
+        type: 'testorder',
+        action: 'DISCONTINUE',
+        careSetting: 'care-setting-uuid',
+        encounter: 'encounter-uuid',
+        patient: 'patient-uuid',
+        concept: 'concept-uuid',
+        orderer: { uuid: 'orderer-uuid' },
+      },
+      expect.anything(),
+    );
+  });
+});
diff --git a/packages/esm-patient-orders-app/src/lab-results/lab-results.resource.ts b/packages/esm-patient-orders-app/src/lab-results/lab-results.resource.ts
index 52328faac3..569dc1ae6b 100644
--- a/packages/esm-patient-orders-app/src/lab-results/lab-results.resource.ts
+++ b/packages/esm-patient-orders-app/src/lab-results/lab-results.resource.ts
@@ -2,6 +2,7 @@ import useSWR from 'swr';
 import { type OpenmrsResource, openmrsFetch, restBaseUrl, type FetchResponse } from '@openmrs/esm-framework';
 import { type Observation, type Encounter } from '../types/encounter';
 import { type OrderDiscontinuationPayload } from '../types/order';
+import { type Order } from '@openmrs/esm-patient-common-lib';
 
 const labEncounterRepresentation =
   'custom:(uuid,encounterDatetime,encounterType,location:(uuid,name),' +
@@ -9,10 +10,11 @@ const labEncounterRepresentation =
   'obs:(uuid,obsDatetime,voided,groupMembers,formFieldNamespace,formFieldPath,order:(uuid,display),concept:(uuid,name:(uuid,name)),' +
   'value:(uuid,display,name:(uuid,name),names:(uuid,conceptNameType,name))))';
 const labConceptRepresentation =
-  'custom:(uuid,display,name,datatype,set,answers,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,' +
-  'setMembers:(uuid,display,answers,datatype,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units))';
+  'custom:(uuid,display,name,datatype,set,answers,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,allowDecimal,' +
+  'setMembers:(uuid,display,answers,datatype,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,allowDecimal))';
 const conceptObsRepresentation = 'custom:(uuid,display,concept:(uuid,display),groupMembers,value)';
 
+type NullableNumber = number | null | undefined;
 export interface LabOrderConcept {
   uuid: string;
   display: string;
@@ -25,12 +27,13 @@ export interface LabOrderConcept {
   mappings?: Array<Mapping>;
   answers?: Array<OpenmrsResource>;
   setMembers?: Array<LabOrderConcept>;
-  hiNormal?: number;
-  hiAbsolute?: number;
-  hiCritical?: number;
-  lowNormal?: number;
-  lowAbsolute?: number;
-  lowCritical?: number;
+  hiNormal?: NullableNumber;
+  hiAbsolute?: NullableNumber;
+  hiCritical?: NullableNumber;
+  lowNormal?: NullableNumber;
+  lowAbsolute?: NullableNumber;
+  lowCritical?: NullableNumber;
+  allowDecimal?: boolean | null;
   units?: string;
 }
 
@@ -124,26 +127,26 @@ export async function updateOrderResult(
   orderPayload: OrderDiscontinuationPayload,
   abortController: AbortController,
 ) {
-  const updateOrderCall = await openmrsFetch(`${restBaseUrl}/order`, {
+  const saveEncounter = await openmrsFetch(`${restBaseUrl}/encounter/${encounterUuid}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
     },
     signal: abortController.signal,
-    body: orderPayload,
+    body: obsPayload,
   });
 
-  if (updateOrderCall.status === 201) {
-    const saveEncounter = await openmrsFetch(`${restBaseUrl}/encounter/${encounterUuid}`, {
+  if (saveEncounter.ok) {
+    const updateOrderCall = await openmrsFetch(`${restBaseUrl}/order`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
       signal: abortController.signal,
-      body: obsPayload,
+      body: orderPayload,
     });
 
-    if (saveEncounter.ok) {
+    if (updateOrderCall.status === 201) {
       const fulfillOrder = await openmrsFetch(`${restBaseUrl}/order/${orderUuid}/fulfillerdetails/`, {
         method: 'POST',
         headers: {
@@ -157,3 +160,71 @@ export async function updateOrderResult(
   }
   throw new Error('Failed to update order');
 }
+
+export function createObservationPayload(
+  concept: LabOrderConcept,
+  order: Order,
+  values: Record<string, unknown>,
+  status: string,
+) {
+  if (concept.set && concept.setMembers.length > 0) {
+    const groupMembers = concept.setMembers
+      .map((member) => createGroupMember(member, order, values, status))
+      .filter((member) => member !== null && member.value !== null && member.value !== undefined);
+
+    if (groupMembers.length === 0) {
+      return { obs: [] };
+    }
+
+    return { obs: [createObservation(order, groupMembers, null, status)] };
+  } else {
+    const value = getValue(concept, values);
+    if (value === null || value === undefined) {
+      return { obs: [] };
+    }
+    return { obs: [createObservation(order, null, value, status)] };
+  }
+}
+
+function createGroupMember(member: LabOrderConcept, order: Order, values: Record<string, unknown>, status: string) {
+  const value = getValue(member, values);
+  if (value === null || value === undefined) {
+    return null;
+  }
+  return {
+    concept: { uuid: member.uuid },
+    value: value,
+    status: status,
+    order: { uuid: order.uuid },
+  };
+}
+
+function createObservation(order: Order, groupMembers = null, value = null, status: string) {
+  return {
+    concept: { uuid: order.concept.uuid },
+    status: status,
+    order: { uuid: order.uuid },
+    ...(groupMembers && groupMembers.length > 0 && { groupMembers }),
+    ...(value !== null && value !== undefined && { value }),
+  };
+}
+
+function getValue(concept: LabOrderConcept, values: Record<string, unknown>) {
+  const { datatype, uuid } = concept;
+  const value = values[uuid];
+
+  if (value === null || value === undefined) {
+    return null;
+  }
+
+  // hl7Abbreviation is NM for Numeric and ST for Text
+  if (['NM', 'ST'].includes(datatype.hl7Abbreviation)) {
+    return value;
+  }
+  // hl7Abbreviation is CWE for Coded with exceptions datatype
+  if (datatype.hl7Abbreviation === 'CWE') {
+    return { uuid: value };
+  }
+
+  return null;
+}
diff --git a/packages/esm-patient-orders-app/src/lab-results/useLabResultsFormSchema.tsx b/packages/esm-patient-orders-app/src/lab-results/useLabResultsFormSchema.tsx
new file mode 100644
index 0000000000..8982e90eaf
--- /dev/null
+++ b/packages/esm-patient-orders-app/src/lab-results/useLabResultsFormSchema.tsx
@@ -0,0 +1,159 @@
+import { z } from 'zod';
+import { type LabOrderConcept, useOrderConceptByUuid } from './lab-results.resource';
+
+type SchemaRecord = Record<string, z.ZodType>;
+
+/**
+ * Custom hook to generate a Zod schema for lab results form based on a lab order concept.
+ * @param labOrderConceptUuid - The UUID of the lab order concept.
+ * @returns A Zod schema object for the lab results form.
+ */
+export const useLabResultsFormSchema = (labOrderConceptUuid: string) => {
+  const { concept, isLoading: isLoadingConcept } = useOrderConceptByUuid(labOrderConceptUuid);
+
+  if (isLoadingConcept || !concept) {
+    if (!concept) {
+      console.warn(`Couldn't load concept ${labOrderConceptUuid}`);
+    }
+    return z.object({});
+  }
+
+  const setMembers = concept?.setMembers ?? [];
+
+  if (setMembers.length > 0) {
+    return createSetMembersSchema(setMembers);
+  }
+
+  return createSingleConceptSchema(concept);
+};
+
+/**
+ * Creates a Zod schema for a single lab order concept.
+ * @param labOrderConcept - The lab order concept to create a schema for.
+ * @returns A Zod schema object for the single concept.
+ */
+const createSingleConceptSchema = (labOrderConcept: LabOrderConcept) => {
+  const {
+    hiAbsolute: upperLimit,
+    lowAbsolute: lowerLimit,
+    datatype: { hl7Abbreviation },
+  } = labOrderConcept;
+
+  let zodObject: z.ZodType;
+
+  switch (hl7Abbreviation) {
+    // hl7Abbreviation for numeric is NM
+    case 'NM':
+      zodObject = createNumericSchema(labOrderConcept, upperLimit, lowerLimit);
+      break;
+    default:
+      zodObject = z.any();
+  }
+
+  return z.object({
+    [labOrderConcept.uuid]: zodObject,
+  });
+};
+
+/**
+ * Creates a Zod schema for a set of lab order concepts.
+ * @param labOrderConcepts - An array of lab order concepts.
+ * @returns A Zod schema object for the set of concepts.
+ */
+const createSetMembersSchema = (labOrderConcepts: Array<LabOrderConcept>): z.ZodObject<SchemaRecord> => {
+  const schema = z.object(
+    labOrderConcepts.reduce<SchemaRecord>((acc, member) => {
+      acc[member.uuid] = createSchema(member);
+      return acc;
+    }, {}),
+  );
+
+  return schema;
+};
+
+/**
+ * Determines and returns the appropriate Zod schema for a given lab order concept.
+ * @param labOrderConcept - The lab order concept to create a schema for.
+ * @returns A Zod schema type based on the concept's data type.
+ */
+const createSchema = (labOrderConcept: LabOrderConcept): z.ZodType => {
+  const {
+    hiAbsolute: upperLimit,
+    lowAbsolute: lowerLimit,
+    datatype: { hl7Abbreviation },
+  } = labOrderConcept;
+
+  switch (hl7Abbreviation) {
+    case 'ST':
+      return z.string().optional();
+    case 'NM':
+      return createNumericSchema(labOrderConcept, upperLimit, lowerLimit);
+    default:
+      return z.any();
+  }
+};
+
+/**
+ * Creates a Zod schema for a numeric lab order concept, including validation for upper and lower limits.
+ * @param labOrderConcept - The lab order concept to create a schema for.
+ * @param upperLimit - The upper limit for the numeric value.
+ * @param lowerLimit - The lower limit for the numeric value.
+ * @returns A Zod schema type with appropriate numeric validations.
+ */
+const createNumericSchema = (
+  labOrderConcept: LabOrderConcept,
+  upperLimit: number | null | undefined,
+  lowerLimit: number | null | undefined,
+): z.ZodType => {
+  const { allowDecimal, display } = labOrderConcept;
+  const processNumber = (val: unknown) => {
+    if (val === '' || val === null || val === undefined) return undefined;
+    const parsed = Number(val);
+    if (isNaN(parsed)) return undefined;
+    return parsed;
+  };
+
+  let baseSchema = z
+    .preprocess(processNumber, z.number().optional())
+    .refine((val) => val === undefined || !isNaN(val), {
+      message: `${display} must be a valid number`,
+    })
+    .refine(
+      (val) => {
+        if (val === undefined) return true;
+        if (!allowDecimal) {
+          return Number.isInteger(val);
+        }
+        return true;
+      },
+      {
+        message: !allowDecimal ? `${display} must be a whole number` : `${display} must be a valid number`,
+      },
+    );
+
+  // Add range validations
+  const hasLowerLimit = lowerLimit !== null && lowerLimit !== undefined;
+  const hasUpperLimit = upperLimit !== null && upperLimit !== undefined;
+
+  if (!hasLowerLimit && !hasUpperLimit) {
+    return baseSchema;
+  }
+
+  if (hasLowerLimit && hasUpperLimit) {
+    return baseSchema.refine((val) => val === undefined || (val >= lowerLimit && val <= upperLimit), {
+      message: `${display} must be between ${lowerLimit} and ${upperLimit}`,
+    });
+  }
+
+  if (hasLowerLimit) {
+    return baseSchema.refine((val) => val === undefined || val >= lowerLimit, {
+      message: `${display} must be greater than or equal to ${lowerLimit}`,
+    });
+  }
+
+  if (hasUpperLimit) {
+    return baseSchema.refine((val) => val === undefined || val <= upperLimit, {
+      message: `${display} must be less than or equal to ${upperLimit}`,
+    });
+  }
+};
diff --git a/packages/esm-patient-orders-app/src/order-basket-action-button/order-basket-action-button.test.tsx b/packages/esm-patient-orders-app/src/order-basket-action-button/order-basket-action-button.test.tsx
index b2d061e746..43505b3572 100644
--- a/packages/esm-patient-orders-app/src/order-basket-action-button/order-basket-action-button.test.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket-action-button/order-basket-action-button.test.tsx
@@ -47,6 +47,7 @@ jest.mock('@openmrs/esm-patient-common-lib', () => {
   return {
     ...originalModule,
     getPatientUuidFromUrl: () => mockGetPatientUuidFromUrl(),
+    getPatientUuidFromStore: () => mockGetPatientUuidFromUrl(),
     launchPatientWorkspace: (arg) => mockLaunchPatientWorkspace(arg),
   };
 });
@@ -61,8 +62,11 @@ jest.mock('@openmrs/esm-patient-common-lib/src/launchStartVisitPrompt', () => {
   return { launchStartVisitPrompt: () => mockLaunchStartVisitPrompt() };
 });
 
-jest.mock('@openmrs/esm-patient-common-lib/src/get-patient-uuid-from-url', () => {
-  return { getPatientUuidFromUrl: () => mockGetPatientUuidFromUrl() };
+jest.mock('@openmrs/esm-patient-common-lib/src/store/patient-chart-store', () => {
+  return {
+    getPatientUuidFromStore: () => mockGetPatientUuidFromUrl(),
+    usePatientChartStore: () => ({ patientUuid: mockPatient.id }),
+  };
 });
 
 jest.mock('@openmrs/esm-patient-common-lib/src/offline/visit', () => {
diff --git a/packages/esm-patient-orders-app/src/orders-summary/orders-summary.component.tsx b/packages/esm-patient-orders-app/src/orders-summary/orders-summary.component.tsx
index faf9c2e381..f3182da981 100644
--- a/packages/esm-patient-orders-app/src/orders-summary/orders-summary.component.tsx
+++ b/packages/esm-patient-orders-app/src/orders-summary/orders-summary.component.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import OrderDetailsTable from '../components/orders-details-table.component';
+import { type ConfigObject, useConfig } from '@openmrs/esm-framework';
 
 export interface OrdersSummaryProps {
   patientUuid: string;
@@ -9,10 +10,16 @@ export interface OrdersSummaryProps {
 const OrdersSummary: React.FC<OrdersSummaryProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const ordersDisplayText = t('orders', 'Orders');
+  const { showPrintButton } = useConfig<ConfigObject>();
 
   return (
     <div style={{ marginBottom: '1.5rem' }}>
-      <OrderDetailsTable patientUuid={patientUuid} showAddButton showPrintButton={false} title={ordersDisplayText} />
+      <OrderDetailsTable
+        patientUuid={patientUuid}
+        showAddButton
+        showPrintButton={showPrintButton}
+        title={ordersDisplayText}
+      />
     </div>
   );
 };
diff --git a/packages/esm-patient-orders-app/translations/am.json b/packages/esm-patient-orders-app/translations/am.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/am.json
+++ b/packages/esm-patient-orders-app/translations/am.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/ar.json b/packages/esm-patient-orders-app/translations/ar.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/ar.json
+++ b/packages/esm-patient-orders-app/translations/ar.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/de.json b/packages/esm-patient-orders-app/translations/de.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/de.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/en.json b/packages/esm-patient-orders-app/translations/en.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/en.json
+++ b/packages/esm-patient-orders-app/translations/en.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/es.json b/packages/esm-patient-orders-app/translations/es.json
index c494a03ea3..61887aaa4d 100644
--- a/packages/esm-patient-orders-app/translations/es.json
+++ b/packages/esm-patient-orders-app/translations/es.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Fecha de la orden",
   "discard": "Descartar",
   "discontinued": "Descontinuado",
+  "dosage": "Dosage",
   "dose": "Dosis",
   "editResults": "Editar resultados",
   "endDate": "Fecha de finalización",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Por favor, complete todos los campos obligatorios",
   "print": "Imprimir",
   "printedBy": "Impreso por",
+  "printOrder": "Print order",
   "priority": "Prioridad",
   "quantity": "Cantidad",
   "reasonForCancellation": "Motivo de cancelación",
diff --git a/packages/esm-patient-orders-app/translations/fr.json b/packages/esm-patient-orders-app/translations/fr.json
index 34506698f0..f7373c05cb 100644
--- a/packages/esm-patient-orders-app/translations/fr.json
+++ b/packages/esm-patient-orders-app/translations/fr.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date de la commande",
   "discard": "Retiré",
   "discontinued": "Arrêté",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Afficher les résultats",
   "endDate": "Date de fin",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Veuillez remplir tous les champs obligatoires",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priorité",
   "quantity": "Quantité",
   "reasonForCancellation": "Raison de l'annulation",
diff --git a/packages/esm-patient-orders-app/translations/he.json b/packages/esm-patient-orders-app/translations/he.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/he.json
+++ b/packages/esm-patient-orders-app/translations/he.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/hi.json b/packages/esm-patient-orders-app/translations/hi.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/hi.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/hi_IN.json b/packages/esm-patient-orders-app/translations/hi_IN.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/hi_IN.json
+++ b/packages/esm-patient-orders-app/translations/hi_IN.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/id.json b/packages/esm-patient-orders-app/translations/id.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/id.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/it.json b/packages/esm-patient-orders-app/translations/it.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/it.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/km.json b/packages/esm-patient-orders-app/translations/km.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/km.json
+++ b/packages/esm-patient-orders-app/translations/km.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/pt.json b/packages/esm-patient-orders-app/translations/pt.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/pt.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/qu.json b/packages/esm-patient-orders-app/translations/qu.json
index 1ac3c77404..4e3f28edb0 100644
--- a/packages/esm-patient-orders-app/translations/qu.json
+++ b/packages/esm-patient-orders-app/translations/qu.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "Discard",
   "discontinued": "Discontinued",
+  "dosage": "Dosage",
   "dose": "Dose",
   "editResults": "Edit results",
   "endDate": "End date",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "Please fill all the required fields",
   "print": "Print",
   "printedBy": "Printed by",
+  "printOrder": "Print order",
   "priority": "Priority",
   "quantity": "Quantity",
   "reasonForCancellation": "Reason for cancellation",
diff --git a/packages/esm-patient-orders-app/translations/si.json b/packages/esm-patient-orders-app/translations/si.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/si.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/sw.json b/packages/esm-patient-orders-app/translations/sw.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/sw.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/sw_KE.json b/packages/esm-patient-orders-app/translations/sw_KE.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/sw_KE.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/tr.json b/packages/esm-patient-orders-app/translations/tr.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/tr.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/tr_TR.json b/packages/esm-patient-orders-app/translations/tr_TR.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/tr_TR.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/uk.json b/packages/esm-patient-orders-app/translations/uk.json
new file mode 100644
index 0000000000..4e3f28edb0
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/uk.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Add",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Cancel",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Discard",
+  "discontinued": "Discontinued",
+  "dosage": "Dosage",
+  "dose": "Dose",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Error",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Indication",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Loading",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Order",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Orders",
+  "Orders": "Orders",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Priority",
+  "quantity": "Quantity",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Refills",
+  "result": "Result",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Saving",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Status",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Updated"
+}
diff --git a/packages/esm-patient-orders-app/translations/vi.json b/packages/esm-patient-orders-app/translations/vi.json
new file mode 100644
index 0000000000..8f19f5fc61
--- /dev/null
+++ b/packages/esm-patient-orders-app/translations/vi.json
@@ -0,0 +1,79 @@
+{
+  "actionsMenu": "Actions menu",
+  "activeVisitRequired": "An active visit is required to make orders",
+  "add": "Thêm",
+  "addResults": "Add results",
+  "allOrders": "All orders",
+  "cancel": "Hủy",
+  "cancellationDate": "Cancellation date",
+  "cancellationDateRequired": "Cancellation date is required",
+  "cancelOrder": "Cancel order",
+  "checkFilters": "Check the filters above",
+  "chooseAnOption": "Choose an option",
+  "dateCannotBeBeforeToday": "Date cannot be before today",
+  "dateOfOrder": "Date of order",
+  "discard": "Hủy bỏ",
+  "discontinued": "Đã ngừng",
+  "dosage": "Dosage",
+  "dose": "Liều lượng",
+  "editResults": "Edit results",
+  "endDate": "End date",
+  "enterTestResults": "Enter test results",
+  "error": "Lỗi",
+  "errorCancellingOrder": "Error cancelling order",
+  "errorSavingLabResults": "Error saving lab results",
+  "indication": "Chỉ định",
+  "launchOrderBasket": "Launch order basket",
+  "loading": "Đang tải",
+  "loadingInitialValues": "Loading initial values",
+  "loadingTestDetails": "Loading test details",
+  "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Thuốc",
+  "modifyOrder": "Modify order",
+  "noMatchingOrdersToDisplay": "No matching orders to display",
+  "normalRange": "Normal range",
+  "onDate": "on",
+  "order": "Đặt hàng",
+  "orderBasket": "Order basket",
+  "orderBasketWorkspaceTitle": "Order basket",
+  "orderCancellation": "Order cancellation",
+  "orderCancelled": "Order cancelled",
+  "orderCompleted": "Placed orders",
+  "orderDetails": "Order details",
+  "ordered": "Placed order for",
+  "orderedBy": "Ordered by",
+  "ordererInformation": "Orderer information",
+  "orderNumber": "Order number",
+  "orders": "Đơn hàng",
+  "Orders": "Đơn hàng",
+  "orderType": "Order type",
+  "pleaseFillField": "Please fill at least one field",
+  "pleaseFillRequiredFields": "Please fill all the required fields",
+  "print": "In",
+  "printedBy": "Printed by",
+  "printOrder": "Print order",
+  "priority": "Sự ưu tiên",
+  "quantity": "Số lượng",
+  "reasonForCancellation": "Reason for cancellation",
+  "reasonForCancellationRequired": "Reason for cancellation is required",
+  "refills": "Nạp lại",
+  "result": "Kết quả",
+  "saveAndClose": "Save and close",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
+  "saveLabResults": "Save lab results",
+  "saving": "Đang lưu",
+  "searchTable": "Search table",
+  "selectOrderType": "Select order type",
+  "signAndClose": "Sign and close",
+  "startAVisitToRecordOrders": "Start a visit to order",
+  "startVisit": "Start visit",
+  "status": "Trạng thái",
+  "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
+  "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "Test Order_few": "Test orders",
+  "testType": "Test type",
+  "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
+  "unknownOrderType": "Unknown order type",
+  "updated": "Đã cập nhật"
+}
diff --git a/packages/esm-patient-orders-app/translations/zh.json b/packages/esm-patient-orders-app/translations/zh.json
index c071fef1e1..e176eb8618 100644
--- a/packages/esm-patient-orders-app/translations/zh.json
+++ b/packages/esm-patient-orders-app/translations/zh.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "放弃",
   "discontinued": "已停止",
+  "dosage": "Dosage",
   "dose": "剂量",
   "editResults": "编辑结果",
   "endDate": "结束日期",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "请填写所有必填字段",
   "print": "打印",
   "printedBy": "打印者",
+  "printOrder": "Print order",
   "priority": "优先级",
   "quantity": "数量",
   "reasonForCancellation": "取消原因",
diff --git a/packages/esm-patient-orders-app/translations/zh_CN.json b/packages/esm-patient-orders-app/translations/zh_CN.json
index c071fef1e1..e176eb8618 100644
--- a/packages/esm-patient-orders-app/translations/zh_CN.json
+++ b/packages/esm-patient-orders-app/translations/zh_CN.json
@@ -14,6 +14,7 @@
   "dateOfOrder": "Date of order",
   "discard": "放弃",
   "discontinued": "已停止",
+  "dosage": "Dosage",
   "dose": "剂量",
   "editResults": "编辑结果",
   "endDate": "结束日期",
@@ -51,6 +52,7 @@
   "pleaseFillRequiredFields": "请填写所有必填字段",
   "print": "打印",
   "printedBy": "打印者",
+  "printOrder": "Print order",
   "priority": "优先级",
   "quantity": "数量",
   "reasonForCancellation": "取消原因",
diff --git a/packages/esm-patient-programs-app/translations/de.json b/packages/esm-patient-programs-app/translations/de.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/de.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/hi.json b/packages/esm-patient-programs-app/translations/hi.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/hi.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/id.json b/packages/esm-patient-programs-app/translations/id.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/id.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/it.json b/packages/esm-patient-programs-app/translations/it.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/it.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/pt.json b/packages/esm-patient-programs-app/translations/pt.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/pt.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/si.json b/packages/esm-patient-programs-app/translations/si.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/si.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/sw.json b/packages/esm-patient-programs-app/translations/sw.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/sw.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/sw_KE.json b/packages/esm-patient-programs-app/translations/sw_KE.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/sw_KE.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/tr.json b/packages/esm-patient-programs-app/translations/tr.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/tr.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/tr_TR.json b/packages/esm-patient-programs-app/translations/tr_TR.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/tr_TR.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/uk.json b/packages/esm-patient-programs-app/translations/uk.json
new file mode 100644
index 0000000000..40df7b82b6
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/uk.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Actions",
+  "active": "Active",
+  "activePrograms": "Active programs",
+  "add": "Add",
+  "addPrograms": "Add programs",
+  "cancel": "Cancel",
+  "carePrograms": "Care Programs",
+  "chooseProgram": "Choose a program",
+  "chooseStatus": "Choose a program status",
+  "completedOn": "Completed On",
+  "configurePrograms": "Please configure programs to continue.",
+  "dateCompleted": "Date completed",
+  "dateEnrolled": "Date enrolled",
+  "editProgram": "Edit Program",
+  "enrollmentLocation": "Enrollment location",
+  "enrollmentNowVisible": "It is now visible in the Programs table",
+  "enrollmentSaved": "Program enrollment saved",
+  "enrollmentUpdated": "Program enrollment updated",
+  "enrollmentUpdatesNowVisible": "Changes to the program are now visible in the Programs table",
+  "fullyEnrolled": "Enrolled in all programs",
+  "location": "Location",
+  "noEligibleEnrollments": "There are no more programs left to enroll this patient in",
+  "noProgramsConfigured": "No programs configured",
+  "programEnrollments": "Program enrollments",
+  "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
+  "programName": "Program name",
+  "programRequired": "Program is required",
+  "programs": "Program enrollments",
+  "Programs": "Programs",
+  "programStatus": "Program status",
+  "saveAndClose": "Save and close",
+  "saving": "Saving",
+  "seeAll": "See all",
+  "state": "State",
+  "status": "Status"
+}
diff --git a/packages/esm-patient-programs-app/translations/vi.json b/packages/esm-patient-programs-app/translations/vi.json
new file mode 100644
index 0000000000..d644e5d1fa
--- /dev/null
+++ b/packages/esm-patient-programs-app/translations/vi.json
@@ -0,0 +1,38 @@
+{
+  "actions": "Hành động",
+  "active": "Kích hoạt",
+  "activePrograms": "Chương trình đang hoạt động",
+  "add": "Thêm",
+  "addPrograms": "Thêm chương trình",
+  "cancel": "Hủy",
+  "carePrograms": "Chương trình chăm sóc",
+  "chooseProgram": "Chọn một chương trình",
+  "chooseStatus": "Chọn trạng thái chương trình",
+  "completedOn": "Hoàn thành vào",
+  "configurePrograms": "Vui lòng cấu hình chương trình để tiếp tục.",
+  "dateCompleted": "Ngày hoàn thành",
+  "dateEnrolled": "Ngày ghi danh",
+  "editProgram": "Chỉnh sửa chương trình",
+  "enrollmentLocation": "Địa điểm đăng ký",
+  "enrollmentNowVisible": "Bây giờ nó có thể nhìn thấy trong bảng Chương trình",
+  "enrollmentSaved": "Đã lưu đăng ký chương trình",
+  "enrollmentUpdated": "Cập nhật thông tin đăng ký chương trình",
+  "enrollmentUpdatesNowVisible": "Những thay đổi đối với chương trình hiện có thể nhìn thấy trong bảng Chương trình",
+  "fullyEnrolled": "Đã đăng ký tất cả các chương trình",
+  "location": "Vị trí",
+  "noEligibleEnrollments": "Không còn chương trình nào để ghi danh bệnh nhân này nữa",
+  "noProgramsConfigured": "Không có chương trình nào được cấu hình",
+  "programEnrollments": "Đăng ký chương trình",
+  "programEnrollmentSaveError": "Lỗi khi lưu chương trình đăng ký",
+  "programEnrollmentWorkspaceTitle": "Ghi lại chương trình đăng ký",
+  "programName": "Tên chương trình",
+  "programRequired": "Chương trình là bắt buộc",
+  "programs": "Chương trình đăng ký",
+  "Programs": "Chương trình",
+  "programStatus": "Trạng thái chương trình",
+  "saveAndClose": "Lưu và đóng",
+  "saving": "Đang lưu",
+  "seeAll": "Xem tất cả",
+  "state": "State",
+  "status": "Trạng thái"
+}
diff --git a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
index 115aff7af8..a4eafcc043 100644
--- a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
+++ b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -64,8 +64,11 @@ jest.mock('@openmrs/esm-patient-common-lib', () => ({
   launchPatientWorkspace: (...args) => mockLaunchPatientWorkspace(...args),
 }));
 
-jest.mock('@openmrs/esm-patient-common-lib/src/get-patient-uuid-from-url', () => ({
-  getPatientUuidFromUrl: jest.fn(() => ptUuid),
+jest.mock('@openmrs/esm-patient-common-lib/src/store/patient-chart-store', () => ({
+  getPatientUuidFromStore: jest.fn(() => ptUuid),
+  usePatientChartStore: jest.fn(() => ({
+    patientUuid: ptUuid,
+  })),
 }));
 
 function renderAddLabOrderWorkspace() {
@@ -129,7 +132,8 @@ describe('AddLabOrder', () => {
     const priority = screen.getByRole('combobox', { name: 'Priority' });
     expect(priority).toBeInTheDocument();
     await user.click(priority);
-    await user.click(screen.getByText(/Stat/i));
+    await user.clear(priority);
+    await user.click(screen.getByRole('option', { name: /stat/i }));
 
     const additionalInstructions = screen.getByRole('textbox', { name: 'Additional instructions' });
     expect(additionalInstructions).toBeInTheDocument();
diff --git a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
index eedcd66017..7c9070d421 100644
--- a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
+++ b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -17,6 +17,7 @@ import {
   type OrderBasketItem,
   type LabOrderBasketItem,
   launchPatientWorkspace,
+  usePatientChartStore,
 } from '@openmrs/esm-patient-common-lib';
 import { LabOrderForm } from './lab-order-form.component';
 import { TestTypeSearch } from './test-type-search.component';
@@ -37,7 +38,8 @@ export default function AddLabOrderWorkspace({
 }: AddLabOrderWorkspace) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const { patient, isLoading: isLoadingPatient, patientUuid } = usePatient();
+  const { patientUuid } = usePatientChartStore();
+  const { patient, isLoading: isLoadingPatient } = usePatient(patientUuid);
   const [currentLabOrder, setCurrentLabOrder] = useState(initialOrder as LabOrderBasketItem);
 
   const patientName = patient ? getPatientName(patient) : '';
diff --git a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
index 3610a9f12b..7e646a3c15 100644
--- a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
+++ b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
@@ -106,6 +106,10 @@ export function LabOrderForm({
 
   const { orderReasons } = useOrderReasons(orderReasonUuids);
 
+  const filterItemsByName = useCallback((menu) => {
+    return menu?.item?.value?.toLowerCase().includes(menu?.inputValue?.toLowerCase());
+  }, []);
+
   const handleFormSubmission = useCallback(
     (data: LabOrderBasketItem) => {
       const finalizedOrder: LabOrderBasketItem = {
@@ -216,6 +220,7 @@ export function LabOrderForm({
                       onBlur={onBlur}
                       onChange={({ selectedItem }) => onChange(selectedItem?.value || '')}
                       selectedItem={priorityOptions.find((option) => option.value === value) || null}
+                      shouldFilterItem={filterItemsByName}
                       size={responsiveSize}
                       titleText={t('priority', 'Priority')}
                     />
@@ -241,6 +246,7 @@ export function LabOrderForm({
                         onBlur={onBlur}
                         onChange={({ selectedItem }) => onChange(selectedItem?.uuid || '')}
                         selectedItem={''}
+                        shouldFilterItem={filterItemsByName}
                         size={responsiveSize}
                         titleText={t('orderReason', 'Order reason')}
                       />
diff --git a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts
index aa5b20cb46..1769cf2ac9 100644
--- a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts
+++ b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 import useSWRImmutable from 'swr/immutable';
 import { renderHook, waitFor } from '@testing-library/react';
-import { getDefaultsFromConfigSchema, openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { getDefaultsFromConfigSchema, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject, configSchema } from '../../config-schema';
 import { useTestTypes } from './useTestTypes';
 
@@ -43,7 +43,7 @@ describe('useTestTypes is configurable', () => {
   it('should return all test concepts when no labOrderableConcepts are provided', async () => {
     const { result } = renderHook(() => useTestTypes());
     expect(mockOpenrsFetch).toHaveBeenCalledWith(
-      '/ws/rest/v1/concept?class=Test?v=custom:(display,names:(display),uuid,setMembers:(display,uuid,names:(display),setMembers:(display,uuid,names:(display))))',
+      `${restBaseUrl}/concept?class=Test?v=custom:(display,names:(display),uuid,setMembers:(display,uuid,names:(display),setMembers:(display,uuid,names:(display))))`,
     );
     await waitFor(() => expect(result.current.isLoading).toBeFalsy());
     expect(result.current.error).toBeFalsy();
@@ -54,7 +54,7 @@ describe('useTestTypes is configurable', () => {
     const { result } = renderHook(() => useTestTypes());
     expect(mockOpenrsFetch).toHaveBeenCalledWith(
       expect.stringContaining(
-        '/ws/rest/v1/concept?class=Test?v=custom:(display,names:(display),uuid,setMembers:(display,uuid,names:(display),setMembers:(display,uuid,names:(display))))',
+        `${restBaseUrl}/concept?class=Test?v=custom:(display,names:(display),uuid,setMembers:(display,uuid,names:(display),setMembers:(display,uuid,names:(display))))`,
       ),
     );
     await waitFor(() => expect(result.current.isLoading).toBeFalsy());
diff --git a/packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx b/packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx
index b3d48d7f34..b4b86b1855 100644
--- a/packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx
+++ b/packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx
@@ -87,7 +87,7 @@ const FilterNodeParent = ({ root, itemNumber }: filterNodeParentProps) => {
         <Button
           className={styles.button}
           kind="ghost"
-          size="sm"
+          size={tablet ? 'md' : 'sm'}
           onClick={() => setExpandAll((prevValue) => !prevValue)}
         >
           <span>{t(!expandAll ? `Expand all` : `Collapse all`)}</span>
@@ -112,7 +112,7 @@ const FilterNode = ({ root, level, open }: FilterNodeProps) => {
             id={root?.flatName}
             checked={root.hasData && allChildrenChecked}
             indeterminate={indeterminate}
-            labelText={`${root?.display} (${parents?.[root?.flatName]?.length ?? 0})`}
+            labelText={root?.display}
             onChange={() => updateParent(root.flatName)}
             disabled={!root.hasData}
           />
diff --git a/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts
index 4281aba00a..fc66502b53 100644
--- a/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts
+++ b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts
@@ -3,6 +3,7 @@ import useSWR from 'swr';
 import useSWRInfinite from 'swr/infinite';
 import { usePatient, openmrsFetch, restBaseUrl, type FetchResponse } from '@openmrs/esm-framework';
 import { assessValue, exist } from '../loadPatientTestData/helpers';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 export const getName = (prefix: string | undefined, name: string) => {
   return prefix ? `${prefix}-${name}` : name;
@@ -43,7 +44,7 @@ const augmentObstreeData = (node: ObsTreeNode, prefix: string | undefined) => {
 };
 
 const useGetObstreeData = (conceptUuid: string) => {
-  const { patientUuid } = usePatient();
+  const { patientUuid } = usePatientChartStore();
   const response = useSWR<FetchResponse<ObsTreeNode>, Error>(
     `${restBaseUrl}/obstree?patient=${patientUuid}&concept=${conceptUuid}`,
     openmrsFetch,
@@ -65,7 +66,7 @@ const useGetObstreeData = (conceptUuid: string) => {
 };
 
 const useGetManyObstreeData = (uuidArray: Array<string>) => {
-  const { patientUuid } = usePatient();
+  const { patientUuid } = usePatientChartStore();
   const getObstreeUrl = (index: number) => {
     if (index < uuidArray.length && patientUuid) {
       return `${restBaseUrl}/obstree?patient=${patientUuid}&concept=${uuidArray[index]}`;
diff --git a/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx b/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx
index 934c784ee2..efcc957724 100644
--- a/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx
+++ b/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx
@@ -14,7 +14,7 @@ import {
   TableRow,
 } from '@carbon/react';
 import { ArrowRightIcon, showModal, useLayoutType, isDesktop, formatDate } from '@openmrs/esm-framework';
-import { getPatientUuidFromUrl, type OBSERVATION_INTERPRETATION } from '@openmrs/esm-patient-common-lib';
+import { getPatientUuidFromStore, type OBSERVATION_INTERPRETATION } from '@openmrs/esm-patient-common-lib';
 import { type RowData } from '../filter/filter-types';
 import styles from './individual-results-table.scss';
 
@@ -56,7 +56,7 @@ const getClasses = (interpretation: OBSERVATION_INTERPRETATION) => {
 const IndividualResultsTable: React.FC<IndividualResultsTableProps> = ({ isLoading, parent, subRows, index }) => {
   const { t } = useTranslation();
   const layout = useLayoutType();
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
 
   const headerTitle = t(parent.display);
 
diff --git a/packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx b/packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx
index 82d0fea268..ed3b72ed30 100644
--- a/packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx
+++ b/packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import { formatDate, formatTime, parseDate, showModal } from '@openmrs/esm-framework';
-import { type OBSERVATION_INTERPRETATION, getPatientUuidFromUrl } from '@openmrs/esm-patient-common-lib';
+import { type OBSERVATION_INTERPRETATION, getPatientUuidFromStore } from '@openmrs/esm-patient-common-lib';
 import { type ParsedTimeType } from '../filter/filter-types';
 import type { ObsRecord } from '../../types';
 import styles from './timeline.scss';
@@ -121,7 +121,7 @@ export const TimelineCell: React.FC<{
 };
 
 export const RowStartCell = ({ title, range, units, shadow = false, testUuid, isString = false }) => {
-  const patientUuid = getPatientUuidFromUrl();
+  const patientUuid = getPatientUuidFromStore();
   const launchResultsDialog = (patientUuid: string, title: string, testUuid: string) => {
     const dispose = showModal('timeline-results-modal', {
       closeDeleteModal: () => dispose(),
diff --git a/packages/esm-patient-tests-app/translations/am.json b/packages/esm-patient-tests-app/translations/am.json
index 855a148ee6..ddf2a0cbc5 100644
--- a/packages/esm-patient-tests-app/translations/am.json
+++ b/packages/esm-patient-tests-app/translations/am.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "Date",
   "dateCollected": "Displaying date collected",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "observations",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "Results Viewer",
   "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Return to timeline",
   "saveOrder": "Save order",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "Test type",
   "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
   "tree": "Tree",
   "trend": "Trend",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/ar.json b/packages/esm-patient-tests-app/translations/ar.json
index 4b3c576bf5..c9163c1aa4 100644
--- a/packages/esm-patient-tests-app/translations/ar.json
+++ b/packages/esm-patient-tests-app/translations/ar.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "تاريخ",
   "dateCollected": "عرض تاريخ الجمع",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "ملاحظات",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "جديد",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "معاين النتائج",
   "resultsText": "نتائج",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "العودة إلى الجدول الزمني",
   "saveOrder": "حفظ الطلب",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "نوع الاختبار",
   "timeline": "الجدول الزمني",
+  "timelineData_lower": "timeline data",
   "tree": "شجرة",
   "trend": "اتجاه",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/de.json b/packages/esm-patient-tests-app/translations/de.json
new file mode 100644
index 0000000000..86e1dd39a3
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/de.json
@@ -0,0 +1,109 @@
+{
+  "add": "Hinzufügen",
+  "additionalInstructions": "Zusätzliche Anweisungen",
+  "addLabOrderWorkspaceTitle": "Laborauftrag hinzufügen",
+  "backToOrderBasket": "Zurück zum Warenkorb",
+  "backToTimeline": "Zurück zur Zeitleiste",
+  "cancel": "Abbrechen",
+  "checkFilters": "Überprüfen Sie die Filter oben",
+  "clear": "Clear",
+  "clearFilters": "Filter löschen",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Suche schließen",
+  "data": "Daten",
+  "dataLoadError": "Datenladefehler",
+  "dataTimeline": "Daten-Zeitleiste",
+  "dataTimelineText": "Daten-Zeitleiste",
+  "date": "Datum",
+  "dateCollected": "Anzeige des Erfassungsdatums",
+  "dateTime": "Datum und Uhrzeit",
+  "directlyAddToBasket": "In den Warenkorb legen",
+  "discard": "Verwerfen",
+  "endDate": "Enddatum",
+  "error": "Fehler",
+  "errorFetchingTestTypes": "Fehler beim Abrufen von Ergebnissen für „{{searchTerm}}“",
+  "errorLoadingTestTypes": "Beim Laden von Testarten ist ein Fehler aufgetreten",
+  "female": "Weiblich",
+  "goToDrugOrderForm": "Auftragsformular",
+  "hideResultsTable": "Ergebnistabelle ausblenden",
+  "individualTests": "Individuelle Tests",
+  "labOrders": "Laboraufträge",
+  "labReferenceNumber": "Labor-Referenznummer",
+  "male": "Männlich",
+  "moreResultsAvailable": "Weitere Ergebnisse verfügbar",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "Keine anzuzeigenden Ergebnisse für „{{searchTerm}}“",
+  "noResultsToDisplay": "Keine anzuzeigenden Ergebnisse",
+  "noTestResultsWithinSpecifiedRange": "Keine Testergebnisse innerhalb des angegebenen Bereichs gefunden",
+  "observationsDisplayText": "Beobachtungen",
+  "onDate": "on",
+  "or": "oder",
+  "orderActionDiscontinue": "Unterbrechen",
+  "orderActionIncomplete": "Unvollständig",
+  "orderActionNew": "Neu",
+  "orderActionRenew": "Erneuern",
+  "orderActionRevise": "Ändern",
+  "ordered": "Beauftragt",
+  "orderReason": "Auftragsgrund",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Bitte füllen Sie alle erforderlichen Felder aus",
+  "print": "Drucken",
+  "printedBy": "Gedruckt von",
+  "printTestResults": "Testergebnisse drucken",
+  "priority": "Priorität",
+  "recentResults": "Jüngste Ergebnisse",
+  "recentTestResults": "jüngste Testergebnisse",
+  "referenceRange": "Referenzbereich",
+  "removeFromBasket": "Aus dem Warenkorb entfernen",
+  "reset": "Zurücksetzen",
+  "resetTreeText": "Baum zurücksetzen",
+  "resetView": "um diese Ansicht zurückzusetzen",
+  "resulted": "Ergab",
+  "results": "Ergebnisse",
+  "Results Viewer": "Ergebnisbetrachter",
+  "resultsText": "Ergebnisse",
+  "returnToOrderBasket": "Zum Warenkorb zurückkehren",
+  "returnToTimeline": "Zur Zeitleiste zurückkehren",
+  "saveOrder": "Auftrag speichern",
+  "search": "Suchen",
+  "searchAgain": "erneut suchen",
+  "searchByTestName": "Nach Testname suchen",
+  "searchFieldPlaceholder": "Nach Testart suchen",
+  "searchResultsMatchesForTerm_one": "{{count}} Ergebnis für „{{searchTerm}}“",
+  "searchResultsMatchesForTerm_other": "{{count}} Ergebnisse für „{{searchTerm}}“",
+  "searchResultsTextFor_one": "{{count}} Suchergebnis für {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} Suchergebnisse für {{searchTerm}}",
+  "seeAllResults": "Alle Ergebnisse anzeigen",
+  "showResultsTable": "Ergebnistabelle anzeigen",
+  "showTree": "Baum anzeigen",
+  "startDate": "Startdatum",
+  "testName": "Testname",
+  "testResults": "Testergebnisse",
+  "testResults_title": "Testergebnisse",
+  "testResultsData": "Daten der Testergebnisse",
+  "tests": "Tests",
+  "testType": "Testart",
+  "timeline": "Zeitleiste",
+  "timelineData_lower": "Daten der Zeitleiste",
+  "tree": "Baum",
+  "trend": "Trend",
+  "trendline": "Trendlinie",
+  "trendlineRangeSelector1Day": "1 Tag",
+  "trendlineRangeSelector1Month": "1 Monat",
+  "trendlineRangeSelector1Year": "1 Jahr",
+  "trendlineRangeSelector5Days": "5 Tage",
+  "trendlineRangeSelector5Years": "5 Jahre",
+  "trendlineRangeSelectorAll": "Alle",
+  "trendlineRangeSelectorMonths": "6 Monate",
+  "tryReopeningTheForm": "Bitte versuchen Sie, das Formular erneut zu starten",
+  "trySearchingAgain": "Bitte versuchen Sie die Suche zu wiederholen",
+  "tryTo": "Versuchen Sie",
+  "unknown": "Unbekannt",
+  "usingADifferentTerm": "einen anderen Begriff verwenden",
+  "value": "Wert",
+  "view": "Ansicht",
+  "viewTimeline": "Zeitleiste ansehen"
+}
diff --git a/packages/esm-patient-tests-app/translations/es.json b/packages/esm-patient-tests-app/translations/es.json
index 6181e99e9c..a6d525bab6 100644
--- a/packages/esm-patient-tests-app/translations/es.json
+++ b/packages/esm-patient-tests-app/translations/es.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Cerrar búsqueda",
   "data": "datos",
   "dataLoadError": "Error en la carga de datos",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Calendario de datos",
   "date": "Fecha",
   "dateCollected": "Mostrando fecha de recogida",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No se encontraron resultados de pruebas dentro del rango especificado",
   "observationsDisplayText": "observaciones",
   "onDate": "en",
+  "or": "or",
   "orderActionDiscontinue": "Descontinuar",
   "orderActionIncomplete": "Incompleto",
   "orderActionNew": "Nuevo",
@@ -63,6 +65,7 @@
   "results": "Resultados",
   "Results Viewer": "Visualizador de Resultados",
   "resultsText": "resultados",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Volver al calendario",
   "saveOrder": "Guardar orden",
   "search": "Buscar",
@@ -84,6 +87,7 @@
   "tests": "Pruebas",
   "testType": "Tipo de prueba",
   "timeline": "Calendario",
+  "timelineData_lower": "timeline data",
   "tree": "Árbol",
   "trend": "Tendencia",
   "trendline": "Línea de tendencia",
diff --git a/packages/esm-patient-tests-app/translations/fr.json b/packages/esm-patient-tests-app/translations/fr.json
index 04227d9089..f64ade5806 100644
--- a/packages/esm-patient-tests-app/translations/fr.json
+++ b/packages/esm-patient-tests-app/translations/fr.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Fermer la recherche",
   "data": "donnée",
   "dataLoadError": "Erreur lors du chargement des données",
+  "dataTimeline": "Chronologie des Données",
   "dataTimelineText": "Chronologie des données",
   "date": "Date",
   "dateCollected": "Affichage de la date collectée",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "Aucun résultat de test trouvé dans la plage spécifiée",
   "observationsDisplayText": "observations",
   "onDate": "sur",
+  "or": "ou",
   "orderActionDiscontinue": "Annuler",
   "orderActionIncomplete": "Incomplet",
   "orderActionNew": "Nouveau",
@@ -63,6 +65,7 @@
   "results": "Résultats",
   "Results Viewer": "Visionneuse de résultats",
   "resultsText": "résultats",
+  "returnToOrderBasket": "Retour au panier de demandes",
   "returnToTimeline": "Retour à la chronologie",
   "saveOrder": "Enregistrer la commande",
   "search": "Rechercher",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "Type de test",
   "timeline": "Chronologie",
+  "timelineData_lower": "données chronologiques",
   "tree": "Arborescence",
   "trend": "Tendance",
   "trendline": "Ligne de Tendance",
diff --git a/packages/esm-patient-tests-app/translations/he.json b/packages/esm-patient-tests-app/translations/he.json
index 538dad24c3..9d9b03719c 100644
--- a/packages/esm-patient-tests-app/translations/he.json
+++ b/packages/esm-patient-tests-app/translations/he.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "תאריך",
   "dateCollected": "מציג תאריך איסוף",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "תצוגת מדדים",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "חדש",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "צופה תוצאות",
   "resultsText": "תוצאות",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "חזור לציר הזמן",
   "saveOrder": "שמור הזמנה",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "סוג הבדיקה",
   "timeline": "ציר זמן",
+  "timelineData_lower": "timeline data",
   "tree": "עץ",
   "trend": "טרנד",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/hi.json b/packages/esm-patient-tests-app/translations/hi.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/hi.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/hi_IN.json b/packages/esm-patient-tests-app/translations/hi_IN.json
index 855a148ee6..ddf2a0cbc5 100644
--- a/packages/esm-patient-tests-app/translations/hi_IN.json
+++ b/packages/esm-patient-tests-app/translations/hi_IN.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "Date",
   "dateCollected": "Displaying date collected",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "observations",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "Results Viewer",
   "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Return to timeline",
   "saveOrder": "Save order",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "Test type",
   "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
   "tree": "Tree",
   "trend": "Trend",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/id.json b/packages/esm-patient-tests-app/translations/id.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/id.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/it.json b/packages/esm-patient-tests-app/translations/it.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/it.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/km.json b/packages/esm-patient-tests-app/translations/km.json
index 94e04f0733..cebe57ef0b 100644
--- a/packages/esm-patient-tests-app/translations/km.json
+++ b/packages/esm-patient-tests-app/translations/km.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "កាលបរិច្ឆេទ",
   "dateCollected": "បង្ហាញកាលបរិច្ឆេទដែលប្រមូលទិន្នន័យបាន",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "ការសង្កេត",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "ថ្មី",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "មើលលទ្ធផល",
   "resultsText": "លទ្ធផល",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "ត្រឡប់ទៅបន្ទាត់ពេលវេលា",
   "saveOrder": "រក្សាទុកលំដាប់",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "ប្រភេទតេស្ត",
   "timeline": "បន្ទាត់ពេលវេលា",
+  "timelineData_lower": "timeline data",
   "tree": "មែកធាងទិន្នន័យ(Tree)",
   "trend": "និន្នាការ",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/pt.json b/packages/esm-patient-tests-app/translations/pt.json
new file mode 100644
index 0000000000..3494ef51cb
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/pt.json
@@ -0,0 +1,109 @@
+{
+  "add": "Adicionar",
+  "additionalInstructions": "Instruções adicionais",
+  "addLabOrderWorkspaceTitle": "Adicionar pedido de laboratório",
+  "backToOrderBasket": "Voltar ao carinho de pedidos",
+  "backToTimeline": "Voltar para a linha do tempo",
+  "cancel": "Cancelar",
+  "checkFilters": "Verifique os filtros acima",
+  "clear": "Limpar",
+  "clearFilters": "Limpar filtros",
+  "clearSearchResults": "Limpar resultados",
+  "closeSearchBar": "Fechar pesquisa",
+  "data": "dado",
+  "dataLoadError": "Erro ao carregar dados",
+  "dataTimeline": "Linha do Tempo dos Dados",
+  "dataTimelineText": "Linha do tempo dos dados",
+  "date": "Data",
+  "dateCollected": "Visualizando data de colheita",
+  "dateTime": "Data e hora",
+  "directlyAddToBasket": "Adicionar ao carrinho",
+  "discard": "Descartar",
+  "endDate": "Data de fim",
+  "error": "Erro",
+  "errorFetchingTestTypes": "Erro ao buscar resultados para \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Ocorreu erro ao carregar tipos de testes",
+  "female": "Feminino",
+  "goToDrugOrderForm": "Formulário de pedido",
+  "hideResultsTable": "Ocultar tabela de resultados",
+  "individualTests": "Testes individuais",
+  "labOrders": "Pedidos laboratóriais",
+  "labReferenceNumber": "Número de referência do laboratório",
+  "male": "Masculino",
+  "moreResultsAvailable": "Mais resultados disponíveis",
+  "noPanelsFound": "Nenhum painel encontrado",
+  "noResultsForTestTypeSearch": "Não há resultados a mostrar para  \"{{searchTerm}}\"",
+  "noResultsToDisplay": "Nenhum resultado para mostrar",
+  "noTestResultsWithinSpecifiedRange": "Nenhum resultado de teste encontrado dentro do intervalo especificado",
+  "observationsDisplayText": "Observações",
+  "onDate": "no",
+  "or": "ou",
+  "orderActionDiscontinue": "Discontinuar",
+  "orderActionIncomplete": "Incompleto",
+  "orderActionNew": "Novo",
+  "orderActionRenew": "Renovar",
+  "orderActionRevise": "Modificar",
+  "ordered": "Solicitado",
+  "orderReason": "Motivo do pedido",
+  "other": "Outro",
+  "overTime": "Ao longo do tempo",
+  "panel": "Painel",
+  "panels": "paineis",
+  "pleaseRequiredFields": "Favor de preencher todos campos obrigatórios",
+  "print": "Imprimir",
+  "printedBy": "Impresso por",
+  "printTestResults": "Imprimir resultados do teste",
+  "priority": "Prioridade",
+  "recentResults": "Resultados recentes",
+  "recentTestResults": "resultados de testes recentes",
+  "referenceRange": "Intervalo de referência",
+  "removeFromBasket": "Remover do carinho",
+  "reset": "Reiniciar",
+  "resetTreeText": "Redefinir árvore",
+  "resetView": "para redefinir esta visualização",
+  "resulted": "Resultado",
+  "results": "Resultados",
+  "Results Viewer": "Visualização de resultados",
+  "resultsText": "resultado",
+  "returnToOrderBasket": "Retornar à carinho de pedidos",
+  "returnToTimeline": "Voltar para a linha do tempo",
+  "saveOrder": "Gravar pedido",
+  "search": "Pesquisar",
+  "searchAgain": "Pesquisar novamente",
+  "searchByTestName": "Pesquisar pelo nome do teste",
+  "searchFieldPlaceholder": "Pesquisar pelo tipo de teste",
+  "searchResultsMatchesForTerm_one": "{{count}} resultado para \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} resultados para \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} resultado de pesquisa para {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} resultados de pesquisa para {{searchTerm}}",
+  "seeAllResults": "Visualizar todos resultados",
+  "showResultsTable": "Mostrar tabela de resultados",
+  "showTree": "Visualizar árvore",
+  "startDate": "Data inicial",
+  "testName": "Nome do teste",
+  "testResults": "resultados do teste",
+  "testResults_title": "Resultados do Teste",
+  "testResultsData": "Dados dos resultados de teste",
+  "tests": "Testes",
+  "testType": "Tipo de teste",
+  "timeline": "Linha do Tempo",
+  "timelineData_lower": "dados da linha do tempo",
+  "tree": "Árvore",
+  "trend": "Tendência",
+  "trendline": "Linha de tendência",
+  "trendlineRangeSelector1Day": "1 dia",
+  "trendlineRangeSelector1Month": "1 mês",
+  "trendlineRangeSelector1Year": "1 ano",
+  "trendlineRangeSelector5Days": "5 dias",
+  "trendlineRangeSelector5Years": "5 anos",
+  "trendlineRangeSelectorAll": "Todos",
+  "trendlineRangeSelectorMonths": "6 meses",
+  "tryReopeningTheForm": "Por favor, tente iniciar o formulário novamente",
+  "trySearchingAgain": "Por favor, tente pesquisar novamente",
+  "tryTo": "Tente para",
+  "unknown": "Desconhecido",
+  "usingADifferentTerm": "usando um termo diferente",
+  "value": "Valor",
+  "view": "Visualizar",
+  "viewTimeline": "Visualizar linha do tempo"
+}
diff --git a/packages/esm-patient-tests-app/translations/qu.json b/packages/esm-patient-tests-app/translations/qu.json
index 855a148ee6..ddf2a0cbc5 100644
--- a/packages/esm-patient-tests-app/translations/qu.json
+++ b/packages/esm-patient-tests-app/translations/qu.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "Date",
   "dateCollected": "Displaying date collected",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "observations",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "Discontinue",
   "orderActionIncomplete": "Incomplete",
   "orderActionNew": "New",
@@ -63,6 +65,7 @@
   "results": "Results",
   "Results Viewer": "Results Viewer",
   "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Return to timeline",
   "saveOrder": "Save order",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "Test type",
   "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
   "tree": "Tree",
   "trend": "Trend",
   "trendline": "Trendline",
diff --git a/packages/esm-patient-tests-app/translations/si.json b/packages/esm-patient-tests-app/translations/si.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/si.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/sw.json b/packages/esm-patient-tests-app/translations/sw.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/sw.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/sw_KE.json b/packages/esm-patient-tests-app/translations/sw_KE.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/sw_KE.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/tr.json b/packages/esm-patient-tests-app/translations/tr.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/tr.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/tr_TR.json b/packages/esm-patient-tests-app/translations/tr_TR.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/tr_TR.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/uk.json b/packages/esm-patient-tests-app/translations/uk.json
new file mode 100644
index 0000000000..ddf2a0cbc5
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/uk.json
@@ -0,0 +1,109 @@
+{
+  "add": "Add",
+  "additionalInstructions": "Additional instructions",
+  "addLabOrderWorkspaceTitle": "Add lab order",
+  "backToOrderBasket": "Back to order basket",
+  "backToTimeline": "Back to timeline",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "clear": "Clear",
+  "clearFilters": "Clear filters",
+  "clearSearchResults": "Clear results",
+  "closeSearchBar": "Close search",
+  "data": "data",
+  "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
+  "dataTimelineText": "Data timeline",
+  "date": "Date",
+  "dateCollected": "Displaying date collected",
+  "dateTime": "Date and time",
+  "directlyAddToBasket": "Add to basket",
+  "discard": "Discard",
+  "endDate": "End date",
+  "error": "Error",
+  "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Error occured when loading test types",
+  "female": "Female",
+  "goToDrugOrderForm": "Order form",
+  "hideResultsTable": "Hide results table",
+  "individualTests": "Individual tests",
+  "labOrders": "Lab orders",
+  "labReferenceNumber": "Lab reference number",
+  "male": "Male",
+  "moreResultsAvailable": "More results available",
+  "noPanelsFound": "No panels found",
+  "noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
+  "noResultsToDisplay": "No results to display",
+  "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "or",
+  "orderActionDiscontinue": "Discontinue",
+  "orderActionIncomplete": "Incomplete",
+  "orderActionNew": "New",
+  "orderActionRenew": "Renew",
+  "orderActionRevise": "Modify",
+  "ordered": "Ordered",
+  "orderReason": "Order reason",
+  "other": "Other",
+  "overTime": "Over time",
+  "panel": "Panel",
+  "panels": "panels",
+  "pleaseRequiredFields": "Please fill all required fields",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "printTestResults": "Print test results",
+  "priority": "Priority",
+  "recentResults": "Recent Results",
+  "recentTestResults": "recent test results",
+  "referenceRange": "Reference range",
+  "removeFromBasket": "Remove from basket",
+  "reset": "Reset",
+  "resetTreeText": "Reset tree",
+  "resetView": "to reset this view",
+  "resulted": "Resulted",
+  "results": "Results",
+  "Results Viewer": "Results Viewer",
+  "resultsText": "results",
+  "returnToOrderBasket": "Return to order basket",
+  "returnToTimeline": "Return to timeline",
+  "saveOrder": "Save order",
+  "search": "Search",
+  "searchAgain": "search again",
+  "searchByTestName": "Search by test name",
+  "searchFieldPlaceholder": "Search for a test type",
+  "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
+  "seeAllResults": "See all results",
+  "showResultsTable": "Show results table",
+  "showTree": "Show tree",
+  "startDate": "Start date",
+  "testName": "Test name",
+  "testResults": "test results",
+  "testResults_title": "Test Results",
+  "testResultsData": "Test results data",
+  "tests": "Tests",
+  "testType": "Test type",
+  "timeline": "Timeline",
+  "timelineData_lower": "timeline data",
+  "tree": "Tree",
+  "trend": "Trend",
+  "trendline": "Trendline",
+  "trendlineRangeSelector1Day": "1 day",
+  "trendlineRangeSelector1Month": "1 month",
+  "trendlineRangeSelector1Year": "1 year",
+  "trendlineRangeSelector5Days": "5 days",
+  "trendlineRangeSelector5Years": "5 years",
+  "trendlineRangeSelectorAll": "All",
+  "trendlineRangeSelectorMonths": "6 months",
+  "tryReopeningTheForm": "Please try launching the form again",
+  "trySearchingAgain": "Please try searching again",
+  "tryTo": "Try to",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "using a different term",
+  "value": "Value",
+  "view": "View",
+  "viewTimeline": "View timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/vi.json b/packages/esm-patient-tests-app/translations/vi.json
new file mode 100644
index 0000000000..27dd60f434
--- /dev/null
+++ b/packages/esm-patient-tests-app/translations/vi.json
@@ -0,0 +1,109 @@
+{
+  "add": "Thêm",
+  "additionalInstructions": "Hướng dẫn bổ sung",
+  "addLabOrderWorkspaceTitle": "Thêm lệnh phòng thí nghiệm",
+  "backToOrderBasket": "Quay lại giỏ hàng",
+  "backToTimeline": "Quay lại timeline",
+  "cancel": "Hủy",
+  "checkFilters": "Kiểm tra các bộ lọc ở trên",
+  "clear": "Dọn dẹp",
+  "clearFilters": "Xóa bộ lọc",
+  "clearSearchResults": "Xóa kết quả",
+  "closeSearchBar": "Đóng tìm kiếm",
+  "data": "dữ liệu",
+  "dataLoadError": "Lỗi tải dữ liệu",
+  "dataTimeline": "Dữ liệu Timeline",
+  "dataTimelineText": "Dữ liệu timeline",
+  "date": "Ngày",
+  "dateCollected": "Hiển thị ngày thu thập",
+  "dateTime": "Ngày và giờ",
+  "directlyAddToBasket": "Thêm vào giỏ hàng",
+  "discard": "Hủy bỏ",
+  "endDate": "Ngày kết thúc",
+  "error": "Lỗi",
+  "errorFetchingTestTypes": "Lỗi khi tìm kiếm kết quả cho \"{{searchTerm}}\"",
+  "errorLoadingTestTypes": "Đã xảy ra lỗi khi tải các loại thử nghiệm",
+  "female": "Nữ",
+  "goToDrugOrderForm": "Mẫu đơn đặt hàng",
+  "hideResultsTable": "Ẩn bảng kết quả",
+  "individualTests": "Kiểm tra cá nhân",
+  "labOrders": "Đơn đặt hàng phòng thí nghiệm",
+  "labReferenceNumber": "Số tham chiếu phòng thí nghiệm",
+  "male": "Nam",
+  "moreResultsAvailable": "Có thêm kết quả",
+  "noPanelsFound": "Không tìm thấy bảng điều khiển",
+  "noResultsForTestTypeSearch": "Không có kết quả nào để hiển thị cho \"{{searchTerm}}\"",
+  "noResultsToDisplay": "Không có kết quả để hiển thị",
+  "noTestResultsWithinSpecifiedRange": "Không tìm thấy kết quả kiểm tra trong phạm vi đã chỉ định",
+  "observationsDisplayText": "observations",
+  "onDate": "on",
+  "or": "hoặc",
+  "orderActionDiscontinue": "Dừng lại",
+  "orderActionIncomplete": "Chưa hoàn thành",
+  "orderActionNew": "Mới",
+  "orderActionRenew": "Làm mới",
+  "orderActionRevise": "Chỉnh sửa",
+  "ordered": "Đã đặt hàng",
+  "orderReason": "Lý do đặt hàng",
+  "other": "Khác",
+  "overTime": "Over time",
+  "panel": "Bảng điều khiển",
+  "panels": "bảng điều khiển",
+  "pleaseRequiredFields": "Vui lòng điền đầy đủ các trường bắt buộc",
+  "print": "In",
+  "printedBy": "Được in bởi",
+  "printTestResults": "In kết quả kiểm tra",
+  "priority": "Sự ưu tiên",
+  "recentResults": "Kết quả gần đây",
+  "recentTestResults": "kết quả kiểm tra gần đây",
+  "referenceRange": "Phạm vi tham chiếu",
+  "removeFromBasket": "Xóa khỏi giỏ hàng",
+  "reset": "Cài lại",
+  "resetTreeText": "Reset tree",
+  "resetView": "để thiết lập lại chế độ xem này",
+  "resulted": "Kết quả",
+  "results": "Kết quả",
+  "Results Viewer": "Trình xem kết quả",
+  "resultsText": "kết quả",
+  "returnToOrderBasket": "Quay lại giỏ hàng",
+  "returnToTimeline": "Quay lại timeline",
+  "saveOrder": "Lưu đơn hàng",
+  "search": "Tìm kiếm",
+  "searchAgain": "Tìm kiếm lại",
+  "searchByTestName": "Tìm kiếm theo tên bài kiểm tra",
+  "searchFieldPlaceholder": "Tìm kiếm loại bài kiểm tra",
+  "searchResultsMatchesForTerm_one": "{{count}} kết quả cho \"{{searchTerm}}\"",
+  "searchResultsMatchesForTerm_other": "{{count}} kết quả cho \"{{searchTerm}}\"",
+  "searchResultsTextFor_one": "{{count}} kết quả tìm kiếm cho {{searchTerm}}",
+  "searchResultsTextFor_other": "{{count}} kết quả tìm kiếm cho {{searchTerm}}",
+  "seeAllResults": "Xem tất cả kết quả",
+  "showResultsTable": "Hiển thị bảng kết quả",
+  "showTree": "Hiển thị tree",
+  "startDate": "Ngày bắt đầu",
+  "testName": "Tên bài kiểm tra",
+  "testResults": "kết quả kiểm tra",
+  "testResults_title": "Kết quả kiểm tra",
+  "testResultsData": "Dữ liệu kết quả kiểm tra",
+  "tests": "Kiểm tra",
+  "testType": "Loại kiểm tra",
+  "timeline": "Timeline",
+  "timelineData_lower": "dữ liệu timeline",
+  "tree": "Cây",
+  "trend": "Xu hướng",
+  "trendline": "Đường xu hướng",
+  "trendlineRangeSelector1Day": "1 ngày",
+  "trendlineRangeSelector1Month": "1 tháng",
+  "trendlineRangeSelector1Year": "1 năm",
+  "trendlineRangeSelector5Days": "5 ngày",
+  "trendlineRangeSelector5Years": "5 năm",
+  "trendlineRangeSelectorAll": "Tất cả",
+  "trendlineRangeSelectorMonths": "6 tháng",
+  "tryReopeningTheForm": "Vui lòng thử khởi chạy lại biểu mẫu",
+  "trySearchingAgain": "Vui lòng thử tìm kiếm lại",
+  "tryTo": "Cố gắng để",
+  "unknown": "Unknown",
+  "usingADifferentTerm": "sử dụng một thuật ngữ khác",
+  "value": "Giá trị",
+  "view": "Xem",
+  "viewTimeline": "Xem timeline"
+}
diff --git a/packages/esm-patient-tests-app/translations/zh.json b/packages/esm-patient-tests-app/translations/zh.json
index 1fd1332874..a8ebc475c9 100644
--- a/packages/esm-patient-tests-app/translations/zh.json
+++ b/packages/esm-patient-tests-app/translations/zh.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "日期",
   "dateCollected": "显示采集日期",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "观察记录",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "停止使用",
   "orderActionIncomplete": "不完整",
   "orderActionNew": "新增",
@@ -63,6 +65,7 @@
   "results": "结果",
   "Results Viewer": "结果查看器",
   "resultsText": "结果",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "返回时间线",
   "saveOrder": "保存医嘱",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "检验类型",
   "timeline": "时间线",
+  "timelineData_lower": "timeline data",
   "tree": "树状结构",
   "trend": "趋势",
   "trendline": "趋势线",
diff --git a/packages/esm-patient-tests-app/translations/zh_CN.json b/packages/esm-patient-tests-app/translations/zh_CN.json
index 1fd1332874..a8ebc475c9 100644
--- a/packages/esm-patient-tests-app/translations/zh_CN.json
+++ b/packages/esm-patient-tests-app/translations/zh_CN.json
@@ -12,6 +12,7 @@
   "closeSearchBar": "Close search",
   "data": "data",
   "dataLoadError": "Data load error",
+  "dataTimeline": "Data Timeline",
   "dataTimelineText": "Data timeline",
   "date": "日期",
   "dateCollected": "显示采集日期",
@@ -36,6 +37,7 @@
   "noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
   "observationsDisplayText": "观察记录",
   "onDate": "on",
+  "or": "or",
   "orderActionDiscontinue": "停止使用",
   "orderActionIncomplete": "不完整",
   "orderActionNew": "新增",
@@ -63,6 +65,7 @@
   "results": "结果",
   "Results Viewer": "结果查看器",
   "resultsText": "结果",
+  "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "返回时间线",
   "saveOrder": "保存医嘱",
   "search": "Search",
@@ -84,6 +87,7 @@
   "tests": "Tests",
   "testType": "检验类型",
   "timeline": "时间线",
+  "timelineData_lower": "timeline data",
   "tree": "树状结构",
   "trend": "趋势",
   "trendline": "趋势线",
diff --git a/packages/esm-patient-vitals-app/src/biometrics/biometrics-base.component.tsx b/packages/esm-patient-vitals-app/src/biometrics/biometrics-base.component.tsx
index d78dce49d4..1ee6608026 100644
--- a/packages/esm-patient-vitals-app/src/biometrics/biometrics-base.component.tsx
+++ b/packages/esm-patient-vitals-app/src/biometrics/biometrics-base.component.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ContentSwitcher, DataTableSkeleton, IconSwitch, InlineLoading } from '@carbon/react';
-import { Add, ChartLineSmooth, Table } from '@carbon/react/icons';
+import { Add, Analytics, Table } from '@carbon/react/icons';
 import { formatDatetime, parseDate, useConfig, useLayoutType } from '@openmrs/esm-framework';
 import { CardHeader, EmptyState, ErrorState, useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
 import { launchVitalsAndBiometricsForm } from '../utils';
@@ -9,8 +9,8 @@ import { useVitalsConceptMetadata, useVitalsAndBiometrics, withUnit } from '../c
 import { type ConfigObject } from '../config-schema';
 import BiometricsChart from './biometrics-chart.component';
 import PaginatedBiometrics from './paginated-biometrics.component';
-import styles from './biometrics-base.scss';
 import type { BiometricsTableHeader, BiometricsTableRow } from './types';
+import styles from './biometrics-base.scss';
 
 interface BiometricsBaseProps {
   pageSize: number;
@@ -101,7 +101,7 @@ const BiometricsBase: React.FC<BiometricsBaseProps> = ({ patientUuid, pageSize,
                 <Table size={16} />
               </IconSwitch>
               <IconSwitch name="chartView" text="Chart view">
-                <ChartLineSmooth size={16} />
+                <Analytics size={16} />
               </IconSwitch>
             </ContentSwitcher>
             <>
diff --git a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header-item.scss b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header-item.scss
index ab496c1d80..a76d8a5efb 100644
--- a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header-item.scss
+++ b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header-item.scss
@@ -7,7 +7,7 @@
   display: flex;
   flex-flow: row wrap;
   flex-direction: column;
-  margin: layout.$spacing-03 0;
+  margin: layout.$spacing-03 0 0;
   min-inline-size: max-content;
 }
 
@@ -46,7 +46,6 @@
 .label {
   @include type.type-style('label-01');
   color: $text-02;
-  margin-right: 0.375rem;
 }
 
 .danger-icon {
@@ -78,18 +77,27 @@
   }
 }
 
+.arrow {
+  color: colors.$gray-100;
+  font-weight: 500;
+}
+
 .low::after {
+  @extend .arrow;
   content: ' ↓';
 }
 
 .critically-low::after {
+  @extend .arrow;
   content: ' ↓↓';
 }
 
 .high::after {
+  @extend .arrow;
   content: ' ↑';
 }
 
 .critically-high::after {
+  @extend .arrow;
   content: ' ↑↑';
 }
diff --git a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.component.tsx b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.component.tsx
index 13535f3faa..3e8ab5a88b 100644
--- a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.component.tsx
@@ -5,9 +5,9 @@ import duration from 'dayjs/plugin/duration';
 import isToday from 'dayjs/plugin/isToday';
 dayjs.extend(isToday);
 dayjs.extend(duration);
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import { Button, InlineLoading, Tag } from '@carbon/react';
-import { ArrowRight, Time } from '@carbon/react/icons';
+import { ArrowRight } from '@carbon/react/icons';
 import { ConfigurableLink, formatDate, parseDate, useConfig, useWorkspaces } from '@openmrs/esm-framework';
 import { useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
 import {
@@ -37,13 +37,11 @@ const VitalsHeader: React.FC<VitalsHeaderProps> = ({ patientUuid }) => {
   const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
   const { workspaces } = useWorkspaces();
 
-  const isWorkspaceOpen = useCallback(() => {
-    return Boolean(workspaces?.length);
-  }, [workspaces]);
+  const isWorkspaceOpen = useCallback(() => Boolean(workspaces?.length), [workspaces]);
 
   const launchVitalsAndBiometricsForm = useCallback(
-    (e: Event) => {
-      e.stopPropagation();
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
       launchForm(currentVisit, config);
     },
     [config, currentVisit],
@@ -61,20 +59,34 @@ const VitalsHeader: React.FC<VitalsHeaderProps> = ({ patientUuid }) => {
     const vitalsOverdue = hasActiveVisit && !vitalsTakenToday;
     const now = dayjs();
     const vitalsOverdueDayCount = Math.round(dayjs.duration(now.diff(latestVitals?.date)).asDays());
-    let overdueVitalsTagContent = '';
 
-    switch (true) {
-      case vitalsOverdueDayCount >= 1 && vitalsOverdueDayCount <= 7:
-        overdueVitalsTagContent = t('daysOldVitals', 'These vitals are {{count}} days old', {
-          count: vitalsOverdueDayCount,
-        });
-        break;
-      case vitalsOverdueDayCount >= 8 && vitalsOverdueDayCount <= 14:
-        overdueVitalsTagContent = t('overOneWeekOldVitals', 'These vitals are over one week old');
-        break;
-      default:
-        overdueVitalsTagContent = t('outOfDateVitals', 'These vitals are out of date');
-        break;
+    let overdueVitalsTagContent: React.ReactNode = null;
+
+    if (vitalsOverdueDayCount >= 1 && vitalsOverdueDayCount < 7) {
+      overdueVitalsTagContent = (
+        <Trans i18nKey="daysOldVitals" count={vitalsOverdueDayCount}>
+          <span>
+            {/* @ts-ignore Workaround for i18next types issue (see https://github.com/i18next/react-i18next/issues/1543 and https://github.com/i18next/react-i18next/issues/465). Additionally, I can't find a way to get the proper plural suffix to be used in the translation file without amending the translation file by hand. */}
+            These vitals are <strong>{{ count: vitalsOverdueDayCount }} day old</strong>
+          </span>
+        </Trans>
+      );
+    } else if (vitalsOverdueDayCount >= 8 && vitalsOverdueDayCount <= 14) {
+      overdueVitalsTagContent = (
+        <Trans i18nKey="overOneWeekOldVitals">
+          <span>
+            These vitals are <strong>over one week old</strong>
+          </span>
+        </Trans>
+      );
+    } else {
+      overdueVitalsTagContent = (
+        <Trans i18nKey="outOfDateVitals">
+          <span>
+            These vitals are <strong>out of date</strong>
+          </span>
+        </Trans>
+      );
     }
 
     return (
@@ -86,11 +98,8 @@ const VitalsHeader: React.FC<VitalsHeaderProps> = ({ patientUuid }) => {
               {formatDate(parseDate(latestVitals?.date), { day: true, time: true })}
             </span>
             {vitalsOverdue ? (
-              <Tag type="red">
-                <span className={styles.overdueIndicator}>
-                  <Time />
-                  {`${t('overdue', 'Overdue')}: ${overdueVitalsTagContent}`}
-                </span>
+              <Tag className={styles.tag} type="red">
+                <span className={styles.overdueIndicator}>{overdueVitalsTagContent}</span>
               </Tag>
             ) : null}
             <ConfigurableLink
@@ -166,7 +175,7 @@ const VitalsHeader: React.FC<VitalsHeaderProps> = ({ patientUuid }) => {
             />
             <VitalsHeaderItem
               interpretation={assessValue(
-                latestVitals.temperature,
+                latestVitals?.temperature,
                 getReferenceRangesForConcept(config.concepts.temperatureUuid, conceptMetadata),
               )}
               unitName={t('temperatureAbbreviated', 'Temp')}
diff --git a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.scss b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.scss
index 004b3e5478..7b162531c9 100644
--- a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.scss
+++ b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.scss
@@ -1,51 +1,63 @@
+@use '@carbon/colors';
 @use '@carbon/layout';
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
 .container {
   background-color: $openmrs-background-grey;
+  padding: layout.$spacing-03 layout.$spacing-05 layout.$spacing-05;
+  border-bottom: 1px solid $ui-03;
 }
 
 .vitalsHeader {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  min-height: layout.$spacing-09;
-  padding-left: layout.$spacing-05;
+  min-height: layout.$spacing-07;
   outline: none;
   pointer-events: visibleFill;
 }
 
 .emptyStateVitalsHeader {
-  @extend .vitalsHeader;
-  background-color: $openmrs-background-grey;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 layout.$spacing-05;
+  min-height: layout.$spacing-09;
+  outline: none;
+  pointer-events: visibleFill;
   border-bottom: 1px solid $ui-03;
+
+  .container {
+    border-bottom: none;
+    padding: 0;
+  }
+
+  .bodyText {
+    margin-left: layout.$spacing-03;
+  }
 }
 
 .headerItems {
   display: flex;
-  align-items: center;
+  align-items: baseline;
   flex-flow: row wrap;
-  gap: layout.$spacing-02;
+  gap: layout.$spacing-02 layout.$spacing-04;
 }
 
 .heading {
   @include type.type-style('heading-compact-02');
-  margin-right: layout.$spacing-03;
-  color: $text-02;
+  color: $ui-05 !important;
 }
 
 .rowContainer {
   width: 100%;
-  border-bottom: 1px solid $ui-03;
-  padding-bottom: layout.$spacing-04;
 }
 
 .row {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin: 0 layout.$spacing-05;
   max-width: 100vw;
 }
 
@@ -65,10 +77,15 @@
   min-height: layout.$spacing-09;
 }
 
+.tag {
+  margin-right: 0;
+}
+
 .overdueIndicator {
   display: flex;
   align-items: center;
   min-inline-size: max-content;
+  color: colors.$red-70;
 
   svg {
     margin-right: layout.$spacing-02;
@@ -97,19 +114,12 @@
   margin-left: layout.$spacing-03;
 }
 
-.heading {
-  @include type.type-style('heading-compact-02');
-  margin-right: layout.$spacing-03;
-  color: $text-02;
-}
-
 .bodyText {
   @include type.type-style('label-01');
   color: $text-02;
 }
 
 .link {
-  margin-left: layout.$spacing-02;
   @extend .bodyText;
   text-decoration-line: none;
   color: $interactive-01;
diff --git a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.test.tsx b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.test.tsx
index 83b37f4254..47bb75fa97 100644
--- a/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.test.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-and-biometrics-header/vitals-header.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import dayjs from 'dayjs';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { type WorkspacesInfo, getDefaultsFromConfigSchema, useConfig, useWorkspaces } from '@openmrs/esm-framework';
@@ -88,7 +89,7 @@ describe('VitalsHeader', () => {
     expect(getByTextWithMarkup(/Height\s*-\s*/i)).toBeInTheDocument();
     expect(getByTextWithMarkup(/BMI\s*-\s*/i)).toBeInTheDocument();
     expect(getByTextWithMarkup(/Weight\s*-\s*/i)).toBeInTheDocument();
-    expect(screen.getByText(/overdue: these vitals are out of date/i)).toBeInTheDocument();
+    expect(getByTextWithMarkup(/these vitals are out of date/i)).toBeInTheDocument();
   });
 
   it('launches the vitals form when the `record vitals` button is clicked', async () => {
@@ -106,6 +107,27 @@ describe('VitalsHeader', () => {
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith(patientVitalsBiometricsFormWorkspace);
   });
 
+  it('displays correct overdue tag for vitals 5 days old', async () => {
+    const fiveDaysAgo = dayjs().subtract(5, 'days').toISOString();
+    const vitalsData = [
+      {
+        ...formattedVitals[0],
+        date: fiveDaysAgo,
+      },
+    ];
+
+    mockUseVitalsAndBiometrics.mockReturnValue({
+      data: vitalsData,
+    } as ReturnType<typeof useVitalsAndBiometrics>);
+
+    renderWithSwr(<VitalsHeader {...testProps} />);
+
+    await waitForLoadingToFinish();
+
+    // TODO: Fix pluralization so that the string reads "5 days old"
+    expect(getByTextWithMarkup(/These vitals are 5 day old/i)).toBeInTheDocument();
+  });
+
   it('does not flag normal values that lie within the provided reference ranges', async () => {
     mockUseVitalsAndBiometrics.mockReturnValue({
       data: formattedVitals,
diff --git a/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.scss b/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.scss
index 476df19dd1..04466d030a 100644
--- a/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.scss
+++ b/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.scss
@@ -74,6 +74,7 @@
 .high,
 .low {
   @include type.type-style('heading-compact-01');
+  color: colors.$gray-100 !important;
 }
 
 .criticallyLow::after {
diff --git a/packages/esm-patient-vitals-app/src/vitals/vitals-overview.component.tsx b/packages/esm-patient-vitals-app/src/vitals/vitals-overview.component.tsx
index d3e2d946ba..8be1730342 100644
--- a/packages/esm-patient-vitals-app/src/vitals/vitals-overview.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals/vitals-overview.component.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next';
 import { useReactToPrint } from 'react-to-print';
 import { Button, ContentSwitcher, DataTableSkeleton, IconSwitch, InlineLoading } from '@carbon/react';
-import { Add, ChartLineSmooth, Table, Printer } from '@carbon/react/icons';
+import { Add, Analytics, Table, Printer } from '@carbon/react/icons';
 import { CardHeader, EmptyState, ErrorState, useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
 import {
   age,
@@ -198,7 +198,7 @@ const VitalsOverview: React.FC<VitalsOverviewProps> = ({ patientUuid, pageSize,
                       <Table size={16} />
                     </IconSwitch>
                     <IconSwitch name="chartView" text="Chart view">
-                      <ChartLineSmooth size={16} />
+                      <Analytics size={16} />
                     </IconSwitch>
                   </ContentSwitcher>
                   <>
diff --git a/packages/esm-patient-vitals-app/translations/am.json b/packages/esm-patient-vitals-app/translations/am.json
index ad29ee4960..1711e690e2 100644
--- a/packages/esm-patient-vitals-app/translations/am.json
+++ b/packages/esm-patient-vitals-app/translations/am.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Some of the values entered are invalid",
   "date": "Date",
   "dateAndTime": "Date and time",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastolic",
   "discard": "Discard",
   "error": "Error",
@@ -28,9 +28,8 @@
   "noDataRecorded": "No data has been recorded for this patient",
   "notes": "Notes",
   "other": "Other",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "Overdue",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "Please fill at least one field",
   "print": "Print",
diff --git a/packages/esm-patient-vitals-app/translations/ar.json b/packages/esm-patient-vitals-app/translations/ar.json
index e57b0fb346..92c393bc7d 100644
--- a/packages/esm-patient-vitals-app/translations/ar.json
+++ b/packages/esm-patient-vitals-app/translations/ar.json
@@ -13,8 +13,8 @@
   "checkForValidity": "بعض القيم المدخلة غير صالحة",
   "date": "Date",
   "dateAndTime": "Date and time",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "الانقباضي",
   "discard": "تجاهل",
   "error": "خطأ",
@@ -28,9 +28,8 @@
   "noDataRecorded": "لم يتم تسجيل أي بيانات لهذا المريض",
   "notes": "ملاحظات",
   "other": "أخرى",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "متأخر",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "يرجى ملء حقل واحد على الأقل",
   "print": "طباعة",
diff --git a/packages/esm-patient-vitals-app/translations/de.json b/packages/esm-patient-vitals-app/translations/de.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/de.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/en.json b/packages/esm-patient-vitals-app/translations/en.json
index ad29ee4960..1711e690e2 100644
--- a/packages/esm-patient-vitals-app/translations/en.json
+++ b/packages/esm-patient-vitals-app/translations/en.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Some of the values entered are invalid",
   "date": "Date",
   "dateAndTime": "Date and time",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastolic",
   "discard": "Discard",
   "error": "Error",
@@ -28,9 +28,8 @@
   "noDataRecorded": "No data has been recorded for this patient",
   "notes": "Notes",
   "other": "Other",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "Overdue",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "Please fill at least one field",
   "print": "Print",
diff --git a/packages/esm-patient-vitals-app/translations/es.json b/packages/esm-patient-vitals-app/translations/es.json
index 2b23abe9ed..b4ea2cb2e4 100644
--- a/packages/esm-patient-vitals-app/translations/es.json
+++ b/packages/esm-patient-vitals-app/translations/es.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Algunos de los valores introducidos no son válidos",
   "date": "Fecha",
   "dateAndTime": "Fecha y hora",
-  "daysOldVitals_one": "Estos signos vitales tienen {{count}} día",
-  "daysOldVitals_other": "Estos signos vitales tienen {{count}} días",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastólica",
   "discard": "Descartar",
   "error": "Error",
@@ -28,9 +28,8 @@
   "noDataRecorded": "No se han registrado datos para este paciente",
   "notes": "Notas",
   "other": "Otro",
-  "outOfDateVitals": "Estos signos vitales están desactualizados.",
-  "overdue": "Atrasado",
-  "overOneWeekOldVitals": "Estos signos vitales tienen más de una semana.",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Saturación de oxígeno",
   "pleaseFillField": "Por favor, complete al menos un campo",
   "print": "Imprimir",
diff --git a/packages/esm-patient-vitals-app/translations/fr.json b/packages/esm-patient-vitals-app/translations/fr.json
index 89f739cdcd..97aced96f2 100644
--- a/packages/esm-patient-vitals-app/translations/fr.json
+++ b/packages/esm-patient-vitals-app/translations/fr.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Certaines des valeurs saisies ne sont pas valides.",
   "date": "Date",
   "dateAndTime": "Date et heure",
-  "daysOldVitals_one": "Ces signes vitaux datent de {{count}} jour",
-  "daysOldVitals_other": "Ces signes vitaux datent de {{count}} jours",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastolique",
   "discard": "Abandonner",
   "error": "Erreur",
@@ -28,9 +28,8 @@
   "noDataRecorded": "Aucune donnée n'a été enregistrée pour ce patient",
   "notes": "Notes",
   "other": "Autre",
-  "outOfDateVitals": "Ces signes vitaux sont obsolètes",
-  "overdue": "Périmé",
-  "overOneWeekOldVitals": "Ces signes vitaux datent de plus d'une semaine",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Saturation en oxgène",
   "pleaseFillField": "Please fill at least one field",
   "print": "Print",
diff --git a/packages/esm-patient-vitals-app/translations/he.json b/packages/esm-patient-vitals-app/translations/he.json
index d985d28e7e..d365843231 100644
--- a/packages/esm-patient-vitals-app/translations/he.json
+++ b/packages/esm-patient-vitals-app/translations/he.json
@@ -13,8 +13,8 @@
   "checkForValidity": "חלק מהערכים שהוזנו אינם תקפים",
   "date": "תאריך",
   "dateAndTime": "תאריך ושעה",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "דיאסטולי",
   "discard": "בטל",
   "error": "שגיאה",
@@ -28,9 +28,8 @@
   "noDataRecorded": "לא נרשמו נתונים עבור מטופל זה",
   "notes": "הערות",
   "other": "אחר",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "מאחר",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "מלא לפחות שדה אחד",
   "print": "הדפסה",
diff --git a/packages/esm-patient-vitals-app/translations/hi.json b/packages/esm-patient-vitals-app/translations/hi.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/hi.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/hi_IN.json b/packages/esm-patient-vitals-app/translations/hi_IN.json
index ad29ee4960..1711e690e2 100644
--- a/packages/esm-patient-vitals-app/translations/hi_IN.json
+++ b/packages/esm-patient-vitals-app/translations/hi_IN.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Some of the values entered are invalid",
   "date": "Date",
   "dateAndTime": "Date and time",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastolic",
   "discard": "Discard",
   "error": "Error",
@@ -28,9 +28,8 @@
   "noDataRecorded": "No data has been recorded for this patient",
   "notes": "Notes",
   "other": "Other",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "Overdue",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "Please fill at least one field",
   "print": "Print",
diff --git a/packages/esm-patient-vitals-app/translations/id.json b/packages/esm-patient-vitals-app/translations/id.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/id.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/it.json b/packages/esm-patient-vitals-app/translations/it.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/it.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/km.json b/packages/esm-patient-vitals-app/translations/km.json
index 79817a972e..4079e09ea0 100644
--- a/packages/esm-patient-vitals-app/translations/km.json
+++ b/packages/esm-patient-vitals-app/translations/km.json
@@ -13,8 +13,8 @@
   "checkForValidity": "តម្លៃមួយចំនួនដែលបានបញ្ចូលមិនត្រឹមត្រូវទេ",
   "date": "កាលបរិច្ឆេទ",
   "dateAndTime": "កាលបរិច្ឆេទ និងម៉ោង",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "ដឺដ្យាស្តូលីក",
   "discard": "បោះបង់",
   "error": "មានបញ្ហាបច្ចេកទេស",
@@ -28,9 +28,8 @@
   "noDataRecorded": "មិនមានទិន្នន័យត្រូវបានកត់ត្រាសម្រាប់អ្នកជំងឺនេះទេ",
   "notes": "កំណត់សម្គាល់",
   "other": "ផ្សេងៗ",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "ហួសពេលកំណត់",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "សូមបំពេញយ៉ាងហោចណាស់នៅក្នុងប្រអប់មួយ",
   "print": "បោះពុម្ព",
diff --git a/packages/esm-patient-vitals-app/translations/pt.json b/packages/esm-patient-vitals-app/translations/pt.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/pt.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/qu.json b/packages/esm-patient-vitals-app/translations/qu.json
index ad29ee4960..1711e690e2 100644
--- a/packages/esm-patient-vitals-app/translations/qu.json
+++ b/packages/esm-patient-vitals-app/translations/qu.json
@@ -13,8 +13,8 @@
   "checkForValidity": "Some of the values entered are invalid",
   "date": "Date",
   "dateAndTime": "Date and time",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "diastolic",
   "discard": "Discard",
   "error": "Error",
@@ -28,9 +28,8 @@
   "noDataRecorded": "No data has been recorded for this patient",
   "notes": "Notes",
   "other": "Other",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "Overdue",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "Oxygen saturation",
   "pleaseFillField": "Please fill at least one field",
   "print": "Print",
diff --git a/packages/esm-patient-vitals-app/translations/si.json b/packages/esm-patient-vitals-app/translations/si.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/si.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/sw.json b/packages/esm-patient-vitals-app/translations/sw.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/sw.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/sw_KE.json b/packages/esm-patient-vitals-app/translations/sw_KE.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/sw_KE.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/tr.json b/packages/esm-patient-vitals-app/translations/tr.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/tr.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/tr_TR.json b/packages/esm-patient-vitals-app/translations/tr_TR.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/tr_TR.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/uk.json b/packages/esm-patient-vitals-app/translations/uk.json
new file mode 100644
index 0000000000..1711e690e2
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/uk.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Add",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Biometrics",
+  "biometrics_lower": "biometrics",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "diastolic",
+  "discard": "Discard",
+  "error": "Error",
+  "female": "Female",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "loading": "Loading",
+  "male": "Male",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Notes",
+  "other": "Other",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/vi.json b/packages/esm-patient-vitals-app/translations/vi.json
new file mode 100644
index 0000000000..816f81fb38
--- /dev/null
+++ b/packages/esm-patient-vitals-app/translations/vi.json
@@ -0,0 +1,63 @@
+{
+  "abnormalValue": "Abnormal value",
+  "add": "Thêm",
+  "additionalNoteText": "Type any additional notes here",
+  "biometricDisplayed": "Biometric displayed",
+  "biometrics": "Sinh trắc học",
+  "biometrics_lower": "sinh trắc học",
+  "bloodPressure": "Blood Pressure",
+  "bloodPressureAbbreviated": "BP",
+  "bmi": "BMI",
+  "bp": "BP",
+  "calculatedBmi": "BMI (calc.)",
+  "checkForValidity": "Some of the values entered are invalid",
+  "date": "Ngày",
+  "dateAndTime": "Date and time",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
+  "diastolic": "tâm trương",
+  "discard": "Hủy bỏ",
+  "error": "Lỗi",
+  "female": "Nữ",
+  "goToSummary": "Go to Summary",
+  "heartRate": "Heart rate",
+  "height": "Chiều cao",
+  "loading": "Đang tải",
+  "male": "Nam",
+  "muac": "MUAC",
+  "noDataRecorded": "No data has been recorded for this patient",
+  "notes": "Ghi chú",
+  "other": "Khác",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
+  "oxygenSaturation": "Oxygen saturation",
+  "pleaseFillField": "Please fill at least one field",
+  "print": "Print",
+  "printedBy": "Printed by",
+  "pulse": "Pulse",
+  "recordBiometrics": "Record biometrics",
+  "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
+  "respirationRate": "Respiration rate",
+  "respiratoryRate": "R. rate",
+  "respiratoryRateAbbreviated": "R. Rate",
+  "saveAndClose": "Save and close",
+  "seeAll": "See all",
+  "spo2": "SpO2",
+  "systolic": "systolic",
+  "temp": "Temp",
+  "temperature": "Temperature",
+  "temperatureAbbreviated": "Temp",
+  "unknown": "Unknown",
+  "validationInputError": "Value must be between {{min}} and {{max}}",
+  "vitals": "Vitals",
+  "Vitals & Biometrics": "Vitals & Biometrics",
+  "vitalsAndBiometrics": "Vitals and biometrics",
+  "vitalsAndBiometricsNowAvailable": "They are now visible on the Vitals and Biometrics page",
+  "vitalsAndBiometricsRecorded": "Vitals and Biometrics saved",
+  "vitalsAndBiometricsSaveError": "Error saving vitals and biometrics",
+  "vitalsHistory": "Vitals history",
+  "vitalSignDisplayed": "Vital sign displayed",
+  "vitalSigns": "Vital signs",
+  "weight": "Weight"
+}
diff --git a/packages/esm-patient-vitals-app/translations/zh.json b/packages/esm-patient-vitals-app/translations/zh.json
index b31ac5aae5..184485de81 100644
--- a/packages/esm-patient-vitals-app/translations/zh.json
+++ b/packages/esm-patient-vitals-app/translations/zh.json
@@ -13,8 +13,8 @@
   "checkForValidity": "输入的一些值无效",
   "date": "日期",
   "dateAndTime": "日期和时间",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "舒张压",
   "discard": "放弃",
   "error": "错误",
@@ -28,9 +28,8 @@
   "noDataRecorded": "该患者尚未记录任何数据",
   "notes": "备注",
   "other": "其他",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "逾期",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "血氧饱和度",
   "pleaseFillField": "请至少填写一个字段",
   "print": "打印",
diff --git a/packages/esm-patient-vitals-app/translations/zh_CN.json b/packages/esm-patient-vitals-app/translations/zh_CN.json
index b31ac5aae5..184485de81 100644
--- a/packages/esm-patient-vitals-app/translations/zh_CN.json
+++ b/packages/esm-patient-vitals-app/translations/zh_CN.json
@@ -13,8 +13,8 @@
   "checkForValidity": "输入的一些值无效",
   "date": "日期",
   "dateAndTime": "日期和时间",
-  "daysOldVitals_one": "These vitals are {{count}} day old",
-  "daysOldVitals_other": "These vitals are {{count}} days old",
+  "daysOldVitals_one": "<0>These vitals are <1>{{count}} day old</1></0>",
+  "daysOldVitals_other": "<0>These vitals are <1>{{count}} days old</1></0>",
   "diastolic": "舒张压",
   "discard": "放弃",
   "error": "错误",
@@ -28,9 +28,8 @@
   "noDataRecorded": "该患者尚未记录任何数据",
   "notes": "备注",
   "other": "其他",
-  "outOfDateVitals": "These vitals are out of date",
-  "overdue": "逾期",
-  "overOneWeekOldVitals": "These vitals are over one week old",
+  "outOfDateVitals": "<0>These vitals are <1>out of date</1></0>",
+  "overOneWeekOldVitals": "<0>These vitals are <1>over one week old</1></0>",
   "oxygenSaturation": "血氧饱和度",
   "pleaseFillField": "请至少填写一个字段",
   "print": "打印",
diff --git a/yarn.lock b/yarn.lock
index ca9dca747b..8a6ae31ba5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5516,9 +5516,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-api@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-api@npm:5.8.2-pre.2369"
+"@openmrs/esm-api@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-api@npm:5.8.2-pre.2426"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
@@ -5527,17 +5527,17 @@ __metadata:
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 10/cf66b24879c3a4c754c59fea05de33628cba06a44ecb57b58da8dc673ff298fbf7953af4e36f0088cdad62b00d9fbf7e95cf2ee493c5422c17eb272d28f4a4d8
+  checksum: 10/ea9f3022622d196b42715d8e8b213d733e2528c66a7b69c6b64a1759bbe10e9ba6fc55f5c9f088e81653f23486936002ff995b15c0853ba257c18bdb9663ef39
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-app-shell@npm:5.8.2-pre.2369"
+"@openmrs/esm-app-shell@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-app-shell@npm:5.8.2-pre.2426"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2369"
+    "@openmrs/esm-framework": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2426"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -5562,13 +5562,13 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 10/994a0de0e78c2b6dcfe328afb4359f9e7f20434809c1ae0af4d5fe85ef3918403d2e9ca787f7c7ef546c09cb26b35fd341ed0175f22d81bf2e52dc3d74eb8e16
+  checksum: 10/175b9fc439b2e584bbf827fd1ac5ccb89ccc849d759ed74a85c30c4c5fe98d7c79e61aab413fcb30aeafbe19aca230ced28d145a4081b8ff077dced6ed566dc0
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-config@npm:5.8.2-pre.2369"
+"@openmrs/esm-config@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-config@npm:5.8.2-pre.2426"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
@@ -5576,44 +5576,44 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 10/93e73515ff872b26506d24176f9aa5b97a1c5d38860c41dcc1572975d5e2fb36e19750a3ecbc0149601cb926be886b0d9a714f9aee3529ace5545e0421182155
+  checksum: 10/a56aa89bcbeac0c5693745ff9352db886a3200cdd2b19481e4112c5e472aac4715a23f57fc53d587bba624f1981b755880d54f80ca067392eb26e49e00ee9056
   languageName: node
   linkType: hard
 
-"@openmrs/esm-context@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-context@npm:5.8.2-pre.2369"
+"@openmrs/esm-context@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-context@npm:5.8.2-pre.2426"
   dependencies:
     immer: "npm:^10.0.4"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
-  checksum: 10/3e751c7d458efb6b19f2bda340b5b399af21e6d387d871a4f32922f30790e56183f63d455e44b22c0e99951d66c22da26d518fdfff2f81e703fc669a931b588a
+  checksum: 10/7f839e937e58fe9f12e0cfe9e0ffde17e1baeda88e9aaf80f066f29ee4b092a48d0c3ef9f469a9aa9d78896bff4bf052737bf88194d3f3354363bd18198952ac
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2369"
+"@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2426"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-translations": 5.x
-  checksum: 10/762d33106bb2bca285fa239ed97a644e67fb6b68ef03621f6813bb429498a30400e616d440a2186957355b3142236d47128c42dc0fd247ca3e8b7a73d94d2051
+  checksum: 10/88860e7d094dbf46b7794f4870449e840f2e3bec9617603e254a919455464e62960e6cbb6f26a84c8404fc106f01b6523b82197a1b9f2b8db30c269d4d1bb7f3
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-error-handling@npm:5.8.2-pre.2369"
+"@openmrs/esm-error-handling@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-error-handling@npm:5.8.2-pre.2426"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/eaf94898c7860b2218868ec694128027ad40e27975f93088d5e1d7a658d05ddcdc12fd7a93d4641d8c0c265dc584cb359111e1fcf2c016c5fcd70c0fc016269a
+  checksum: 10/3a61356bc7201a8737c98a126e882647a39353bd1a8e7b811ef417bdc6711cec438b5d6a930c558d9f1e27654ca022314722a15c0746bb0489f775fd032698be
   languageName: node
   linkType: hard
 
-"@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2369"
+"@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2426"
   dependencies:
     "@jsep-plugin/arrow": "npm:^1.0.5"
     "@jsep-plugin/new": "npm:^1.0.3"
@@ -5622,13 +5622,13 @@ __metadata:
     "@jsep-plugin/template": "npm:^1.0.4"
     "@jsep-plugin/ternary": "npm:^1.1.3"
     jsep: "npm:^1.3.9"
-  checksum: 10/ee9b7b213afbb9db1358a8cc50aca3d4d52dd147bb9170f88da08a46345f5256977065a91c2e37844304c76d368bbcf2ab3e1f678f8dbe909fc7d0bab3656fbb
+  checksum: 10/2c764a92b8ecfe4db824828858838a8cae45d21fcddec880b1ad66061b6b9ac1397bb68b83668ad27aa2f19bd08aafb4515e83a78f08ec33b20ead1739feb7b5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-extensions@npm:5.8.2-pre.2369"
+"@openmrs/esm-extensions@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-extensions@npm:5.8.2-pre.2426"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -5639,20 +5639,20 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 10/c5c1822f735bd4527405a2c076f5a84c7db7e4b9fb249aeeaaa8f9ac4575cdba7162da062e26a5dd09d8843b926eed201d8c3d4e45ddcf6dc2ba505aaceb99fd
+  checksum: 10/996f7ad4082c9ff4424ce18d651b107036d990aa8a746a93b828877cbc623fa8d28dac04963958a857708379cd4ae27d85fc28b8a2fce3eee5c7ec979c480763
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-feature-flags@npm:5.8.2-pre.2369"
+"@openmrs/esm-feature-flags@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-feature-flags@npm:5.8.2-pre.2426"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/e06e5181e2c22c88c724aeb0dd01d3aacec7d144d185eaaa426a93f495f1c496efe77dd4326b10dc48a422dda6cfbad59e835e1297c679b74b80e830ac6bbf45
+  checksum: 10/db196574a696d4bee8733002cba332e894d66dc785c67f0852aefafa6a100423ecff8f1ecb275bba82a697bf3d91005ee4d856337deee71b2da24e0c357fe16a
   languageName: node
   linkType: hard
 
@@ -5678,8 +5678,8 @@ __metadata:
   linkType: soft
 
 "@openmrs/esm-form-engine-lib@npm:next":
-  version: 2.1.0-pre.1502
-  resolution: "@openmrs/esm-form-engine-lib@npm:2.1.0-pre.1502"
+  version: 2.1.0-pre.1526
+  resolution: "@openmrs/esm-form-engine-lib@npm:2.1.0-pre.1526"
   dependencies:
     "@carbon/react": "npm:>1.47.0 <1.50.0"
     classnames: "npm:^2.5.1"
@@ -5697,7 +5697,7 @@ __metadata:
     react: 18.x
     react-i18next: 11.x
     swr: 2.x
-  checksum: 10/642fe140439b52826fce09896a6e98dcda3e285bfd5051b73f621822ce0fa3245586407f2fab4633f4d73dd1d8d2fb1e1626d3a41cc673c1485088dade4305bd
+  checksum: 10/8aaf4e07ff29487c7559d708637d9064226f7e1f9830f53c30a77bb23a50752bde0cb7a42e157b9703d5fb7cd021d306dc84dc1c39bab3a5d6c137dced92235f
   languageName: node
   linkType: hard
 
@@ -5769,27 +5769,27 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-framework@npm:5.8.2-pre.2369, @openmrs/esm-framework@npm:next":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-framework@npm:5.8.2-pre.2369"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-config": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-context": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-dynamic-loading": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-error-handling": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-expression-evaluator": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-extensions": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-feature-flags": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-globals": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-navigation": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-offline": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-react-utils": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-routes": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-state": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-translations": "npm:5.8.2-pre.2369"
-    "@openmrs/esm-utils": "npm:5.8.2-pre.2369"
+"@openmrs/esm-framework@npm:5.8.2-pre.2426, @openmrs/esm-framework@npm:next":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-framework@npm:5.8.2-pre.2426"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-config": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-context": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-dynamic-loading": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-error-handling": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-expression-evaluator": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-extensions": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-feature-flags": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-globals": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-navigation": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-offline": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-react-utils": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-routes": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-state": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-translations": "npm:5.8.2-pre.2426"
+    "@openmrs/esm-utils": "npm:5.8.2-pre.2426"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -5800,7 +5800,7 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 10/c90af1d79d535fde43e46ee8cd126004366f264f02cc8377cc7569012345f55926dc6a9b930b2dfb83ba09f9ce189267d0f4ad07fa6b081ce439a1b48ae0d986
+  checksum: 10/a3a3b57d123c148010261d3d6c2eda980d683f1d83105b85f0acd076b8c30e3d4e6c29edbbdcc2f5f469d8f3f67f41febfc1a80a04c0d9e61c617e2ed2b890a8
   languageName: node
   linkType: hard
 
@@ -5826,31 +5826,31 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-globals@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-globals@npm:5.8.2-pre.2369"
+"@openmrs/esm-globals@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-globals@npm:5.8.2-pre.2426"
   dependencies:
     "@types/fhir": "npm:0.0.31"
   peerDependencies:
     single-spa: 5.x
-  checksum: 10/bd5e3ff2144a961617b97f0c43801d58f90cc675d8e5bb091da78a18119cbcfb03e328013489f4833f7e5378e44dc8130786a7734a0db0576ded0d8246c5d1cd
+  checksum: 10/2441e6b823d9278d9ad4f25e3b8839b883b6133260d8b6d4b1fe4cda611cc344fa259ae2558039aaebd2560f55d4572829d8f9c4a481ceacf4009b1c3e8fa392
   languageName: node
   linkType: hard
 
-"@openmrs/esm-navigation@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-navigation@npm:5.8.2-pre.2369"
+"@openmrs/esm-navigation@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-navigation@npm:5.8.2-pre.2426"
   dependencies:
     path-to-regexp: "npm:6.1.0"
   peerDependencies:
     "@openmrs/esm-state": 5.x
-  checksum: 10/2cefa7bf31cc0377b0b8bd489962fc31c7bd429b08831bc1bd45e0050e445b944fdada6076fc95f98d15c03ad23c5f9d6b24d4a45582dbe382825c2422b90949
+  checksum: 10/9b3a026a752ff2a797bad1913b4d96a7f3e4e6e8255b5e88b87145df26984279bc04ee84f32e2e8b68f9070eb38dc74154f0db52c644e1a00263b42110848f26
   languageName: node
   linkType: hard
 
-"@openmrs/esm-offline@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-offline@npm:5.8.2-pre.2369"
+"@openmrs/esm-offline@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-offline@npm:5.8.2-pre.2426"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -5861,7 +5861,7 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     rxjs: 6.x
-  checksum: 10/c1d67e084ea12c553fdf1ce0df845e329126b9aa84ac76353593e8b865c4f9e892972c5dd563f520ea4a2645326a64b901070db14cff161173166d27fe8853c8
+  checksum: 10/304110b170780f0ebfe1076a6c89649b6d018ebc27f67963d5b734cc394195b84f0216a54b2a60d783fd3d2e0a5b831f47842587d2c0da21c10256884ff74cba
   languageName: node
   linkType: hard
 
@@ -5957,7 +5957,7 @@ __metadata:
   dependencies:
     "@hookform/resolvers": "npm:^3.3.1"
     "@openmrs/esm-framework": "npm:next"
-    "@playwright/test": "npm:1.45.3"
+    "@playwright/test": "npm:1.48.2"
     "@swc/cli": "npm:^0.1.62"
     "@swc/core": "npm:^1.3.89"
     "@swc/jest": "npm:^0.2.29"
@@ -6007,7 +6007,7 @@ __metadata:
     sass: "npm:^1.54.3"
     swc-loader: "npm:^0.2.3"
     swr: "npm:^2.2.4"
-    turbo: "npm:^2.0.12"
+    turbo: "npm:^2.2.3"
     typescript: "npm:^4.0.3"
     webpack-cli: "npm:^4.10.0"
     webpack-dev-server: "npm:^4.15.1"
@@ -6255,9 +6255,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-react-utils@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-react-utils@npm:5.8.2-pre.2369"
+"@openmrs/esm-react-utils@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-react-utils@npm:5.8.2-pre.2426"
   dependencies:
     lodash-es: "npm:^4.17.21"
     single-spa-react: "npm:^6.0.0"
@@ -6278,13 +6278,13 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: 10/0f353a5659b9d94f0a03e7763fbf662c1bb01bb9f3b4ea49349d03b7e297035e4aeef1d92118cc4077eb9e8b63f2fe68f7ab122d2745aae1f789969d490269cb
+  checksum: 10/4fe4f31f3e7aec2a1b74c447fc422ef8cefd8a5993b3f75a8d6d89b08947b802197029b1356c8702582afb48920b2be38f684a7bdac084af18b0407f50f2ce5e
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-routes@npm:5.8.2-pre.2369"
+"@openmrs/esm-routes@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-routes@npm:5.8.2-pre.2426"
   peerDependencies:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-dynamic-loading": 5.x
@@ -6293,24 +6293,25 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 6.x
-  checksum: 10/38614f62f3910da5e103057972692d41e5fb8d2d4b694c9d93fd3d9699d2fd03ae1bb7b65bf5f7a6c5980f0c9b724a0306be51ed0481ce26e13a6de13fcf56f6
+  checksum: 10/4d63dbfeaf4c7ce2ffe484b2ffbd1fa0cd2e5182d875ed382ed2ad5f5fa2051d0227a1ee2738185ed1d80f03f3b3cc4cb305dbbc3ee746c1da5b98817246fd75
   languageName: node
   linkType: hard
 
-"@openmrs/esm-state@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-state@npm:5.8.2-pre.2369"
+"@openmrs/esm-state@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-state@npm:5.8.2-pre.2426"
   dependencies:
     zustand: "npm:^4.5.5"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/4329348f7b35fd6a6bf9580d8cfb45663b810af0e7043eee04aaa925248068579f469af3fde339657882fabd187b5a499ad077319c17e080ea6b06d3f0ffd6ba
+    "@openmrs/esm-utils": 5.x
+  checksum: 10/6674ff5711f4ac3d47406be49fe7481b816ca54a34cbe16912bea1e6b6165646661675bdeba3b97d757641fb397c4dfdf7b9f9b7a4f1b7b3f3d16aae76c2b163
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-styleguide@npm:5.8.2-pre.2369"
+"@openmrs/esm-styleguide@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-styleguide@npm:5.8.2-pre.2426"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
     "@carbon/react": "npm:~1.37.0"
@@ -6334,24 +6335,24 @@ __metadata:
     react-dom: 18.x
     react-i18next: 11.x
     rxjs: 6.x
-  checksum: 10/6279a3098d1b677379400012bc838c4d2313081f6e57c06ca114bdc25030532a750d9bd368913b258a85ab269ec871c46f275f1a9fd36d4f0b1ba366d19b29d9
+  checksum: 10/73c1063c4227aea68ed4ca6e83d9fce3569f9012c8098f4cee6e08ab50528c02bc51a23e45aded7a3db533ebefafc4656e243c898b6a95cff5db6fc5d824f39c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-translations@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-translations@npm:5.8.2-pre.2369"
+"@openmrs/esm-translations@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-translations@npm:5.8.2-pre.2426"
   dependencies:
     i18next: "npm:21.10.0"
   peerDependencies:
     i18next: 21.x
-  checksum: 10/ce3babb0f655d4f2b407595b0816489a959d0d16bd863daf51c49fdd40dd7347164c82423dbd01617b2027a31faf1f95555e2c394da2b3d37dcbaf2fddb34e23
+  checksum: 10/5be51b9a79130c63a99cbbf3e47875d07326b9a2c4891e91a7340f4191550c27d29cdb727d939589a197cdec1c4e19fea2f6f32f667fb2edc3d70a5d5fc14df0
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/esm-utils@npm:5.8.2-pre.2369"
+"@openmrs/esm-utils@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/esm-utils@npm:5.8.2-pre.2426"
   dependencies:
     "@formatjs/intl-durationformat": "npm:^0.2.4"
     "@internationalized/date": "npm:^3.5.5"
@@ -6361,7 +6362,7 @@ __metadata:
     dayjs: 1.x
     i18next: 21.x
     rxjs: 6.x
-  checksum: 10/22d3e463a911848547f88b3934285421e7fddbdbc6a8869437fee3911561c57d6e6e239641cd8f03db6bee5047382b967b8ab3bae2514d59273e5d01fc01acb1
+  checksum: 10/d538a80c592896c625564f27333f9c20a40398c8ac15ea7afc90144e851c54797e5737407a9c9c795d53a54786e417e9ce03eafd44e928d6ed800c2c671088f5
   languageName: node
   linkType: hard
 
@@ -6412,9 +6413,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.8.2-pre.2369":
-  version: 5.8.2-pre.2369
-  resolution: "@openmrs/webpack-config@npm:5.8.2-pre.2369"
+"@openmrs/webpack-config@npm:5.8.2-pre.2426":
+  version: 5.8.2-pre.2426
+  resolution: "@openmrs/webpack-config@npm:5.8.2-pre.2426"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -6432,7 +6433,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 10/cbc1fbb09c627bb5330c26822c5a0cc859e78f12ebf4c527d6367b3cd89b82c5cd1b98db3a9ced7dcd52af6d678c0ba79a10aed42fd43df321f4ae3b4fbce739
+  checksum: 10/497da49124a5490c8bb7c6c483cc6d59be66f55b1cbeccc2424bcfe141f63459abb03e0fb9afc477b4be06f23828a65c7b0b80067c23c6c4342c25842ad92876
   languageName: node
   linkType: hard
 
@@ -6443,14 +6444,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:1.45.3":
-  version: 1.45.3
-  resolution: "@playwright/test@npm:1.45.3"
+"@playwright/test@npm:1.48.2":
+  version: 1.48.2
+  resolution: "@playwright/test@npm:1.48.2"
   dependencies:
-    playwright: "npm:1.45.3"
+    playwright: "npm:1.48.2"
   bin:
     playwright: cli.js
-  checksum: 10/50b53fdaa495f734ce0dc21a9947513fd40b76672e7d8e4947124bb87bfa9cefdbb5da1ac53054802961dc82a408c5291aa3f7655732cfe8cf9d102dc8b1a501
+  checksum: 10/8557f9d60b93b9a60b66599d46f991b56df26b691f9285e8755298dabd9f42d1421c330a7d7578b76445fdd56040fe790d3f1081daa80e5e89a380170e0fd217
   languageName: node
   linkType: hard
 
@@ -11315,7 +11316,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.3":
+"body-parser@npm:1.20.3, body-parser@npm:^1.19.0":
   version: 1.20.3
   resolution: "body-parser@npm:1.20.3"
   dependencies:
@@ -11335,26 +11336,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:^1.19.0":
-  version: 1.20.2
-  resolution: "body-parser@npm:1.20.2"
-  dependencies:
-    bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.5"
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    on-finished: "npm:2.4.1"
-    qs: "npm:6.11.0"
-    raw-body: "npm:2.5.2"
-    type-is: "npm:~1.6.18"
-    unpipe: "npm:1.0.0"
-  checksum: 10/3cf171b82190cf91495c262b073e425fc0d9e25cc2bf4540d43f7e7bbca27d6a9eae65ca367b6ef3993eea261159d9d2ab37ce444e8979323952e12eb3df319a
-  languageName: node
-  linkType: hard
-
 "bonjour-service@npm:^1.0.11":
   version: 1.0.13
   resolution: "bonjour-service@npm:1.0.13"
@@ -20700,11 +20681,11 @@ __metadata:
   linkType: hard
 
 "openmrs@npm:next":
-  version: 5.8.2-pre.2369
-  resolution: "openmrs@npm:5.8.2-pre.2369"
+  version: 5.8.2-pre.2426
+  resolution: "openmrs@npm:5.8.2-pre.2426"
   dependencies:
-    "@openmrs/esm-app-shell": "npm:5.8.2-pre.2369"
-    "@openmrs/webpack-config": "npm:5.8.2-pre.2369"
+    "@openmrs/esm-app-shell": "npm:5.8.2-pre.2426"
+    "@openmrs/webpack-config": "npm:5.8.2-pre.2426"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.20"
@@ -20743,7 +20724,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 10/f2ac023ed7f6353454164385a74dae5c07950758986fa46b10453d820edb0e1e840516f1481e94d69a5bc959f46efbf7fd60791ef2a4cf6789fd14b74b64f9b9
+  checksum: 10/e1e388ccc3af13ec6b06e21e460dd9e6c60d134c4ce7c84123126d9269861325ffebb455174f07e2e234dcfb65a4738e7ee9c6d539ab2c087f614d39484c0e41
   languageName: node
   linkType: hard
 
@@ -21376,27 +21357,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.45.3":
-  version: 1.45.3
-  resolution: "playwright-core@npm:1.45.3"
+"playwright-core@npm:1.48.2":
+  version: 1.48.2
+  resolution: "playwright-core@npm:1.48.2"
   bin:
     playwright-core: cli.js
-  checksum: 10/6540ae149a8deaceb3dc6f60ea7a7052894aebb651b8c187c97c5532b50ee6c812e7f9644a15ecbfb146d5e7880dbb23010df2bac012493bd75b5624710df6bd
+  checksum: 10/dd029f797b1afb2240713a032fecc50e1ffc5464a39c075570cf10e929c145da3a8d0951a3f2b279e33b2f09cbeb8ff4330822cb1078452c0c75cc4ce34ca171
   languageName: node
   linkType: hard
 
-"playwright@npm:1.45.3":
-  version: 1.45.3
-  resolution: "playwright@npm:1.45.3"
+"playwright@npm:1.48.2":
+  version: 1.48.2
+  resolution: "playwright@npm:1.48.2"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.45.3"
+    playwright-core: "npm:1.48.2"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10/86959666c68f53b984df3d4a4aa3a7806fff95d5735dc4c16f5cef0889ab07180e1600792f0e66f9b84250931f5971077774cd8f2f077d8b02171f89a33ab588
+  checksum: 10/331af352504336f419cdf1369f0ef399c6f0e905fdb79a5e97c41f33e74766efd21430ab6ae2de0b237ae765ebfbe701e119a990d8dc01bcdac3bc43c1fa1fbf
   languageName: node
   linkType: hard
 
@@ -22170,15 +22151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:6.11.0":
-  version: 6.11.0
-  resolution: "qs@npm:6.11.0"
-  dependencies:
-    side-channel: "npm:^1.0.4"
-  checksum: 10/5a3bfea3e2f359ede1bfa5d2f0dbe54001aa55e40e27dc3e60fab814362d83a9b30758db057c2011b6f53a2d4e4e5150194b5bac45372652aecb3e3c0d4b256e
-  languageName: node
-  linkType: hard
-
 "qs@npm:6.13.0":
   version: 6.13.0
   resolution: "qs@npm:6.13.0"
@@ -23302,8 +23274,8 @@ __metadata:
   linkType: hard
 
 "rollup@npm:^2.43.1":
-  version: 2.75.7
-  resolution: "rollup@npm:2.75.7"
+  version: 2.79.2
+  resolution: "rollup@npm:2.79.2"
   dependencies:
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
@@ -23311,7 +23283,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10/7bbaa0a90a92d6aaa85342c3c18a0f4c4ea2fbb031679a4bf47bd721f7569d0ff51b08b7c0194d5daf1e0ee7970907613562234e75cd57a059cacb4cf57510c0
+  checksum: 10/095ba0a82811b1866a76d826987743278db0a87c45092656986bfff490326b66187d5f9ff0c24cf8d5682bc470aa00c36654e0044d6b6335ac0c1201b8280880
   languageName: node
   linkType: hard
 
@@ -25480,58 +25452,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-darwin-64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-darwin-64@npm:2.1.0"
+"turbo-darwin-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-darwin-64@npm:2.2.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-darwin-arm64@npm:2.1.0"
+"turbo-darwin-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-darwin-arm64@npm:2.2.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-linux-64@npm:2.1.0"
+"turbo-linux-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-linux-64@npm:2.2.3"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-linux-arm64@npm:2.1.0"
+"turbo-linux-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-linux-arm64@npm:2.2.3"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-windows-64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-windows-64@npm:2.1.0"
+"turbo-windows-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-windows-64@npm:2.2.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:2.1.0":
-  version: 2.1.0
-  resolution: "turbo-windows-arm64@npm:2.1.0"
+"turbo-windows-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-windows-arm64@npm:2.2.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:^2.0.12":
-  version: 2.1.0
-  resolution: "turbo@npm:2.1.0"
-  dependencies:
-    turbo-darwin-64: "npm:2.1.0"
-    turbo-darwin-arm64: "npm:2.1.0"
-    turbo-linux-64: "npm:2.1.0"
-    turbo-linux-arm64: "npm:2.1.0"
-    turbo-windows-64: "npm:2.1.0"
-    turbo-windows-arm64: "npm:2.1.0"
+"turbo@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "turbo@npm:2.2.3"
+  dependencies:
+    turbo-darwin-64: "npm:2.2.3"
+    turbo-darwin-arm64: "npm:2.2.3"
+    turbo-linux-64: "npm:2.2.3"
+    turbo-linux-arm64: "npm:2.2.3"
+    turbo-windows-64: "npm:2.2.3"
+    turbo-windows-arm64: "npm:2.2.3"
   dependenciesMeta:
     turbo-darwin-64:
       optional: true
@@ -25547,7 +25519,7 @@ __metadata:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: 10/e180ac4cf6a2df9c53b894a0ddd320686bd64a3afb3f686d28f04eeecca2642aa8f8b168104663debf3414014533b4b1178a36497ac47e3a9076dd5ae1813814
+  checksum: 10/ce7dc0b45d11ba9d2a435daad3357ad45e51a81583134912d1ff5b4569c6d233f56b5fc2459ad5c4a8d41ddec566574e34e5c8649ef64b7546348014bd371ea5
   languageName: node
   linkType: hard