@openmrs/esm-billing-app 1.0.2-pre.834 → 1.0.2-pre.838

package/dist/openmrs-esm-billing-app.js.buildmanifest.json

@@ -547,9 +547,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 8890,
+      "size": 8971,
       "sizes": {
-        "javascript": 8890
+        "javascript": 8971
       },
       "names": [],
       "idHints": [],
@@ -561,7 +561,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "78058774c4fea3fd",
+      "hash": "141498f23f6a5d9f",
       "childrenByOrder": {}
     },
     {
@@ -591,9 +591,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1177606,
+      "size": 1177948,
       "sizes": {
-        "javascript": 1177564,
+        "javascript": 1177906,
         "consume-shared": 42
       },
       "names": [],
@@ -607,7 +607,7 @@
       "auxiliaryFiles": [
         "4344.js.map"
       ],
-      "hash": "8f70c43832a1c75b",
+      "hash": "c7fea203c75a305b",
       "childrenByOrder": {}
     },
     {
@@ -686,9 +686,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 43598,
+      "size": 43608,
       "sizes": {
-        "javascript": 43598
+        "javascript": 43608
       },
       "names": [],
       "idHints": [],
@@ -702,7 +702,7 @@
       "auxiliaryFiles": [
         "4739.js.map"
       ],
-      "hash": "d1c777178a6f760b",
+      "hash": "0506434628a69e0e",
       "childrenByOrder": {}
     },
     {
@@ -1236,10 +1236,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5461060,
+      "size": 5461402,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5438404,
+        "javascript": 5438746,
         "share-init": 336,
         "runtime": 22110
       },
@@ -1256,7 +1256,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "009ffa3a12559b3b",
+      "hash": "311d3f6d2c9ae9d6",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"},"featureFlag":"billing"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing history"},"featureFlag":"billing"},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm","featureFlag":"billing"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.834"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"},"featureFlag":"billing"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing history"},"featureFlag":"billing"},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm","featureFlag":"billing"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.838"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.834",
+  "version": "1.0.2-pre.838",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

package/src/bill-history/bill-history.component.tsx

@@ -81,7 +81,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
     return (
       <div className={styles.errorContainer}>
         <Layer>
-          <ErrorState error={error} headerTitle={t('billsList', 'Bill list')} />
+          <ErrorState error={error} headerTitle={t('billList', 'Bill list')} />
         </Layer>
       </div>
     );
@@ -107,7 +107,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
     <div>
       <CardHeader title={t('billingHistory', 'Billing History')}>
         <Button renderIcon={Add} onClick={() => launchWorkspace('billing-form-workspace', {})} kind="ghost">
-          {t('addBill', 'Add bill item(s)')}
+          {t('addBill', 'Add bill items')}
         </Button>
       </CardHeader>
       <div className={styles.billHistoryContainer}>
@@ -122,7 +122,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
             rows,
           }) => (
             <TableContainer {...getTableContainerProps}>
-              <Table className={styles.table} {...getTableProps()} aria-label="Bill list">
+              <Table className={styles.table} {...getTableProps()} aria-label={t('billList', 'Bill list')}>
                 <TableHead>
                   <TableRow>
                     <TableExpandHeader enableToggle {...getExpandHeaderProps()} />

package/src/bill-item-actions/edit-bill-item.modal.tsx

@@ -191,7 +191,7 @@ const EditBillLineItemModal: React.FC<EditBillLineItemModalProps> = ({ bill, clo
                     className={styles.controlField}
                     helperText={t('unitPriceHelperText', 'This is the unit price for this item')}
                     id="priceInput"
-                    labelText={t('price', 'Unit Price')}
+                    labelText={t('unitPrice', 'Unit price')}
                     readOnly
                     value={value}
                   />

package/src/bill-item-actions/edit-bill-item.test.tsx

@@ -94,24 +94,24 @@ describe('EditBillItem', () => {
   test('renders the form with correct fields and default values', () => {
     render(<EditBillLineItemModal bill={mockBill} item={mockItem} closeModal={mockCloseModal} />);
 
-    expect(screen.getByText('Edit bill line item')).toBeInTheDocument();
+    expect(screen.getByText(/edit bill line item/i)).toBeInTheDocument();
     expect(screen.getByText(/John Doe/)).toBeInTheDocument();
     expect(screen.getByText(/Main Cashpoint/)).toBeInTheDocument();
     expect(screen.getByText(/123456/)).toBeInTheDocument();
-    expect(screen.getByRole('spinbutton', { name: /Quantity/ })).toHaveValue(2);
-    expect(screen.getByLabelText(/Unit Price/)).toHaveValue('100');
-    expect(screen.getByText(/Total/)).toHaveTextContent(/200/);
+    expect(screen.getByRole('spinbutton', { name: /quantity/i })).toHaveValue(2);
+    expect(screen.getByLabelText(/unit price/i)).toHaveValue('100');
+    expect(screen.getByText(/total/i)).toHaveTextContent(/200/);
   });
 
   test('updates total when quantity is changed', async () => {
     const user = userEvent.setup();
     render(<EditBillLineItemModal bill={mockBill} item={mockItem} closeModal={mockCloseModal} />);
 
-    const quantityInput = screen.getByRole('spinbutton', { name: /Quantity/ });
+    const quantityInput = screen.getByRole('spinbutton', { name: /quantity/i });
     await user.clear(quantityInput);
     await user.type(quantityInput, '3');
 
-    expect(screen.getByText(/Total/)).toHaveTextContent(/300/);
+    expect(screen.getByText(/total/i)).toHaveTextContent(/300/);
   });
 
   test('submits the form and shows a success notification', async () => {
@@ -120,7 +120,7 @@ describe('EditBillItem', () => {
 
     render(<EditBillLineItemModal bill={mockBill} item={mockItem} closeModal={mockCloseModal} />);
 
-    await user.click(screen.getByText(/Save/));
+    await user.click(screen.getByText(/save/i));
 
     await waitFor(() => {
       expect(mockUpdateBillItems).toHaveBeenCalled();

package/src/billable-services/bill-waiver/bill-selection.component.tsx

@@ -42,7 +42,7 @@ const PatientBillsSelections: React.FC<{ bills: MappedBill; setPatientUuid: (pat
           <StructuredListRow head>
             <StructuredListCell head>{t('billItem', 'Bill item')}</StructuredListCell>
             <StructuredListCell head>{t('quantity', 'Quantity')}</StructuredListCell>
-            <StructuredListCell head>{t('unitPrice', 'Unit Price')}</StructuredListCell>
+            <StructuredListCell head>{t('unitPrice', 'Unit price')}</StructuredListCell>
             <StructuredListCell head>{t('total', 'Total')}</StructuredListCell>
             <StructuredListCell head>{getCoreTranslation('actions')}</StructuredListCell>
           </StructuredListRow>

package/src/billable-services/bill-waiver/bill-waiver-form.component.tsx

@@ -68,7 +68,7 @@ const BillWaiverForm: React.FC<BillWaiverFormProps> = ({ bill, lineItems, setPat
           <section className={styles.billWaiverDescription}>
             <label className={styles.label}>{t('billItems', 'Bill Items')}</label>
             <p className={styles.value}>
-              {t('billName', ' {{billName}} ', {
+              {t('billName', '{{billName}}', {
                 billName: lineItems.map((item) => item.item || item.billableService).join(', ') ?? '--',
               })}
             </p>
@@ -80,7 +80,7 @@ const BillWaiverForm: React.FC<BillWaiverFormProps> = ({ bill, lineItems, setPat
 
           <Layer className={styles.formControlLayer}>
             <NumberInput
-              label={t('amountToWaiveLabel', 'Amount to Waive')}
+              label={t('amountToWaiveLabel', 'Amount to waive')}
               helperText={t('amountToWaiveHelper', 'Specify the amount to be deducted from the bill')}
               aria-label={t('amountToWaiveAriaLabel', 'Enter amount to waive')}
               hideSteppers

package/src/billable-services/bill-waiver/patient-bills.component.tsx

@@ -38,8 +38,8 @@ const PatientBills: React.FC<PatientBillsProps> = ({ patientUuid, bills, setPati
 
   const tableHeaders = [
     { header: t('date', 'Date'), key: 'date' },
-    { header: t('billableService', 'Billable Service'), key: 'billableService' },
-    { header: t('totalAmount', 'Total Amount'), key: 'totalAmount' },
+    { header: t('billableService', 'Billable service'), key: 'billableService' },
+    { header: t('totalAmount', 'Total amount'), key: 'totalAmount' },
   ];
 
   const tableRows = bills.map((bill) => ({
@@ -58,7 +58,7 @@ const PatientBills: React.FC<PatientBillsProps> = ({ patientUuid, bills, setPati
               <div className={styles.illo}>
                 <EmptyDataIllustration />
               </div>
-              <p className={styles.content}>{t('noBilltoDisplay', 'There are no bills to display for this patient')}</p>
+              <p className={styles.content}>{t('noBillToDisplay', 'There are no bills to display for this patient')}</p>
             </Tile>
           </Layer>
         </div>
@@ -84,13 +84,13 @@ const PatientBills: React.FC<PatientBillsProps> = ({ patientUuid, bills, setPati
           getTableContainerProps,
         }) => (
           <TableContainer
-            title={t('patientBills', 'Patient bill')}
+            title={t('patientBills', 'Patient bills')}
             description={t('patientBillsDescription', 'List of patient bills')}
             {...getTableContainerProps()}>
-            <Table {...getTableProps()} aria-label="sample table">
+            <Table {...getTableProps()} aria-label={t('billsTable', 'Bills table')}>
               <TableHead>
                 <TableRow>
-                  <TableExpandHeader enableToggle={true} {...getExpandHeaderProps()} />
+                  <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
                   {headers.map((header, i) => (
                     <TableHeader
                       key={i}

package/src/billable-services/billable-services-home.component.tsx

@@ -37,12 +37,12 @@ const BillableServiceHome: React.FC = () => {
                 <SideNavLink onClick={() => handleNavigation('waive-bill')} renderIcon={Money}>
                   {t('billWaiver', 'Bill waiver')}
                 </SideNavLink>
-                <SideNavMenu title={t('billingSettings', 'Billing Settings')} renderIcon={Settings}>
+                <SideNavMenu title={t('billingSettings', 'Billing settings')} renderIcon={Settings}>
                   <SideNavMenuItem onClick={() => handleNavigation('cash-point-config')}>
-                    {t('cashPointConfig', 'Cash Point Config')}
+                    {t('cashPointConfig', 'Cash point configuration')}
                   </SideNavMenuItem>
                   <SideNavMenuItem onClick={() => handleNavigation('payment-modes-config')}>
-                    {t('paymentModesConfig', 'Payment Modes Config')}
+                    {t('paymentModesConfig', 'Payment modes configuration')}
                   </SideNavMenuItem>
                 </SideNavMenu>
               </UserHasAccess>

package/src/billable-services/billable-services.component.tsx

@@ -57,19 +57,19 @@ const BillableServices = () => {
 
   const headerData = [
     {
-      header: t('serviceName', 'Service Name'),
+      header: t('serviceName', 'Service name'),
       key: 'serviceName',
     },
     {
-      header: t('shortName', 'Short Name'),
+      header: t('shortName', 'Short name'),
       key: 'shortName',
     },
     {
-      header: t('serviceType', 'Service Type'),
+      header: t('serviceType', 'Service type'),
       key: 'serviceType',
     },
     {
-      header: t('serviceStatus', 'Service Status'),
+      header: t('serviceStatus', 'Service status'),
       key: 'status',
     },
     {
@@ -138,7 +138,11 @@ const BillableServices = () => {
 
   if (isLoading) {
     return (
-      <InlineLoading status="active" iconDescription={getCoreTranslation('loading')} description="Loading data..." />
+      <InlineLoading
+        status="active"
+        iconDescription={getCoreTranslation('loading')}
+        description={t('loading', 'Loading data') + '...'}
+      />
     );
   }
 
@@ -174,7 +178,7 @@ const BillableServices = () => {
         useZebraStyles={rowData?.length > 1}>
         {({ rows, headers, getHeaderProps, getRowProps, getTableProps }) => (
           <TableContainer>
-            <Table {...getTableProps()} aria-label="service list">
+            <Table {...getTableProps()} aria-label={t('serviceList', 'Service list')}>
               <TableHead>
                 <TableRow>
                   {headers.map((header) => (

package/src/billable-services/billable-services.test.tsx

@@ -57,10 +57,10 @@ describe('BillableService', () => {
     render(<BillableServices />);
 
     // Check table headers
-    expect(screen.getByText('Service Name')).toBeInTheDocument();
-    expect(screen.getByText('Short Name')).toBeInTheDocument();
-    expect(screen.getByText('Service Type')).toBeInTheDocument();
-    expect(screen.getByText('Service Status')).toBeInTheDocument();
+    expect(screen.getByText('Service name')).toBeInTheDocument();
+    expect(screen.getByText('Short name')).toBeInTheDocument();
+    expect(screen.getByText('Service type')).toBeInTheDocument();
+    expect(screen.getByText('Service status')).toBeInTheDocument();
 
     // Check service data
     expect(screen.getByText('Service 1')).toBeInTheDocument();

package/src/billable-services/cash-point/add-cash-point.modal.tsx

@@ -114,7 +114,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ closeModal, onCas
               <TextInput
                 id="cash-point-name"
                 labelText={t('cashPointName', 'Cash Point Name')}
-                placeholder={t('cashPointNamePlaceholder', 'e.g., Pharmacy Cash Point')}
+                placeholder={t('cashPointNamePlaceholder', 'For example, Pharmacy Cash Point')}
                 invalid={!!errors.name}
                 invalidText={errors.name?.message}
                 {...field}

package/src/billable-services/cash-point/cash-point-configuration.component.tsx

@@ -61,9 +61,9 @@ const CashPointConfiguration: React.FC = () => {
   return (
     <div className={styles.container}>
       <div className={styles.card}>
-        <CardHeader title={t('cashPointHistory', 'Cash Point History')}>
+        <CardHeader title={t('cashPointHistory', 'Cash point history')}>
           <Button renderIcon={Add} onClick={handleAddCashPoint} kind="ghost">
-            {t('addNewCashPoint', 'Add New Cash Point')}
+            {t('addNewCashPoint', 'Add new cash point')}
           </Button>
         </CardHeader>
         <div>

package/src/billable-services/create-edit/add-billable-service.component.tsx

@@ -79,7 +79,7 @@ const createBillableServiceSchema = (t: TFunction) => {
       if (isNaN(numValue) || numValue <= 0) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: t('priceMustBeGreaterThanZero', 'Price must be greater than 0'),
+          message: t('priceMustBePositive', 'Price must be greater than 0'),
         });
       }
     }),
@@ -246,7 +246,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
       <InlineLoading
         status="active"
         iconDescription={t('loadingDescription', 'Loading')}
-        description={t('loadingData', 'Loading data') + '...'}
+        description={t('loading', 'Loading data') + '...'}
       />
     );
   }
@@ -256,8 +256,8 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
       <Stack gap={5}>
         <h4>
           {serviceToEdit
-            ? t('editBillableServices', 'Edit Billable Services')
-            : t('addBillableServices', 'Add Billable Services')}
+            ? t('editBillableService', 'Edit billable service')
+            : t('addBillableService', 'Add billable service')}
         </h4>
         <section>
           {serviceToEdit ? (
@@ -294,7 +294,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
                   value={field.value || ''}
                   id="serviceShortName"
                   type="text"
-                  labelText={t('serviceShortName', 'Short Name')}
+                  labelText={t('shortName', 'Short name')}
                   placeholder={t('enterServiceShortName', 'Enter service short name')}
                   maxLength={MAX_NAME_LENGTH}
                   invalid={!!errors.shortName}
@@ -310,7 +310,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
             <Search
               ref={searchInputRef}
               id="conceptsSearch"
-              labelText={t('enterConcept', 'Associated concept')}
+              labelText={t('associatedConcept', 'Associated concept')}
               placeholder={t('searchConcepts', 'Search associated concept')}
               onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(e.target.value)}
               onClear={() => {
@@ -349,9 +349,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
             return (
               <Layer>
                 <Tile className={styles.emptyResults}>
-                  <span>
-                    {t('noResultsFor', 'No results for')} <strong>"{debouncedSearchTerm}"</strong>
-                  </span>
+                  <span>{t('noResultsFor', 'No results for {searchTerm}', { searchTerm: debouncedSearchTerm })}</span>
                 </Tile>
               </Layer>
             );
@@ -413,7 +411,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
                         id={`price-${index}`}
                         invalid={!!errors?.payment?.[index]?.price}
                         invalidText={errors?.payment?.[index]?.price?.message}
-                        label={t('sellingPrice', 'Selling Price')}
+                        label={t('sellingPrice', 'Selling price')}
                         placeholder={t('enterSellingPrice', 'Enter selling price')}
                         min={0}
                         step={0.01}

package/src/billable-services/create-edit/add-billable-service.test.tsx

@@ -85,10 +85,10 @@ const fillRequiredFields = async (user, options: FillOptions = {}) => {
   const { serviceName = 'Test Service Name', shortName = 'Test Short Name', skipPrice = false } = options;
 
   if (serviceName) {
-    await user.type(screen.getByRole('textbox', { name: /Service Name/i }), serviceName);
+    await user.type(screen.getByRole('textbox', { name: /Service name/i }), serviceName);
   }
   if (shortName) {
-    await user.type(screen.getByRole('textbox', { name: /Short Name/i }), shortName);
+    await user.type(screen.getByRole('textbox', { name: /Short name/i }), shortName);
   }
 
   await user.click(screen.getByRole('combobox', { name: /Service type/i }));
@@ -114,7 +114,7 @@ describe('AddBillableService', () => {
     const mockOnClose = jest.fn();
     renderAddBillableService({ onClose: mockOnClose });
 
-    const formTitle = screen.getByRole('heading', { name: /Add Billable Services/i });
+    const formTitle = screen.getByRole('heading', { name: /Add billable service/i });
     expect(formTitle).toBeInTheDocument();
 
     await fillRequiredFields(user);
@@ -188,7 +188,7 @@ describe('AddBillableService', () => {
       renderAddBillableService();
 
       // Fill all fields except service name
-      await user.type(screen.getByRole('textbox', { name: /Short Name/i }), 'Test Short Name');
+      await user.type(screen.getByRole('textbox', { name: /Short name/i }), 'Test Short Name');
 
       await user.click(screen.getByRole('combobox', { name: /Service type/i }));
       await user.click(screen.getByRole('option', { name: /Lab service/i }));

package/src/billable-services/create-edit/edit-billable-service.modal.tsx

@@ -20,7 +20,7 @@ const EditBillableServiceModal: React.FC<EditBillableServiceModalProps> = ({
 
   return (
     <>
-      <ModalHeader closeModal={closeModal} title={t('billableService', 'Billable Service')} />
+      <ModalHeader closeModal={closeModal} title={t('billableService', 'Billable service')} />
       <ModalBody>
         <AddBillableService
           serviceToEdit={serviceToEdit}

package/src/billable-services/dashboard/service-metrics.component.tsx

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { InlineLoading } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
+import { getCoreTranslation } from '@openmrs/esm-framework';
 import { useBillableServices } from '../billable-service.resource';
 import Card from '../../metrics-cards/card.component';
 import styles from '../../metrics-cards/metrics-cards.scss';
@@ -22,7 +23,11 @@ export default function ServiceMetrics() {
   if (isLoading) {
     return (
       <section className={styles.container}>
-        <InlineLoading status="active" iconDescription="Loading" description="Loading service metrics..." />
+        <InlineLoading
+          status="active"
+          iconDescription={getCoreTranslation('loading')}
+          description={t('loadingServiceMetrics', 'Loading service metrics') + '...'}
+        />
       </section>
     );
   }

package/src/billable-services/payment-modes/add-payment-mode.modal.tsx

@@ -81,8 +81,8 @@ const AddPaymentModeModal: React.FC<AddPaymentModeModalProps> = ({ closeModal, o
               render={({ field }) => (
                 <TextInput
                   id="payment-mode-name"
-                  labelText={t('paymentModeName', 'Payment Mode Name')}
-                  placeholder={t('paymentModeNamePlaceholder', 'e.g., Cash, Credit Card')}
+                  labelText={t('paymentModeNameLabel', 'Payment Mode Name')}
+                  placeholder={t('paymentModeNamePlaceholder', 'For example, Cash, Credit Card')}
                   invalid={!!errors.name}
                   invalidText={errors.name?.message}
                   {...field}
@@ -96,7 +96,7 @@ const AddPaymentModeModal: React.FC<AddPaymentModeModalProps> = ({ closeModal, o
                 <TextInput
                   id="payment-mode-description"
                   labelText={t('description', 'Description')}
-                  placeholder={t('descriptionPlaceholder', 'e.g., Used for all cash transactions')}
+                  placeholder={t('descriptionPlaceholder', 'For example, Used for all cash transactions')}
                   invalid={!!errors.description}
                   invalidText={errors.description?.message}
                   {...field}

package/src/billable-services/payment-modes/payment-modes-config.component.tsx

@@ -71,9 +71,9 @@ const PaymentModesConfig: React.FC = () => {
   return (
     <div className={styles.container}>
       <div className={styles.card}>
-        <CardHeader title={t('paymentModeHistory', 'Payment Mode History')}>
+        <CardHeader title={t('paymentModeHistory', 'Payment mode history')}>
           <Button renderIcon={Add} onClick={handleAddPaymentMode} kind="ghost">
-            {t('addNewPaymentMode', 'Add New Payment Mode')}
+            {t('addNewPaymentMode', 'Add new payment mode')}
           </Button>
         </CardHeader>
         <DataTable rows={rowData} headers={headerData} isSortable size="lg">

package/src/billing-form/billing-checkin-form.component.tsx

@@ -101,7 +101,7 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
       <InlineNotification
         kind="error"
         lowContrast
-        title={t('billErrorService', 'Bill service error')}
+        title={t('billErrorService', 'Billing service error')}
         subtitle={t('errorLoadingBillServices', 'Error loading bill services')}
       />
     );

package/src/billing-form/billing-checkin-form.test.tsx

@@ -132,8 +132,8 @@ describe('BillingCheckInForm', () => {
     mockUseCashPoint.mockReturnValueOnce({ cashPoints: [], isLoading: false, error });
     renderBillingCheckinForm();
 
-    expect(screen.getByText('Bill service error')).toBeInTheDocument();
-    expect(screen.getByText('Error loading bill services')).toBeInTheDocument();
+    expect(screen.getByText(/billing service error/i)).toBeInTheDocument();
+    expect(screen.getByText(/error loading bill services/i)).toBeInTheDocument();
   });
 
   test('should render the form correctly and generate the required payload', async () => {

package/src/billing-form/billing-form.component.tsx

@@ -95,8 +95,8 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
     for (const item of selectedItems) {
       if (item.availablePaymentMethods && item.availablePaymentMethods.length > 1 && !item.selectedPaymentMethod) {
         showSnackbar({
-          title: t('validationError', 'Validation Error'),
-          subtitle: t('selectPaymentMethodRequired', 'Please select a payment method for all items'),
+          title: t('validationError', 'Validation error'),
+          subtitle: t('paymentMethodRequired', 'Payment method is required for all items'),
           kind: 'error',
         });
         return false;
@@ -138,8 +138,8 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
       closeWorkspace();
       mutate((key) => typeof key === 'string' && key.startsWith(url), undefined, { revalidate: true });
       showSnackbar({
-        title: t('saveBill', 'Save Bill'),
-        subtitle: t('billProcessingSuccess', 'Bill processing has been successful'),
+        title: t('saveBill', 'Save bill'),
+        subtitle: t('billProcessedSuccessfully', 'Bill processed successfully'),
         kind: 'success',
       });
     } catch (error) {
@@ -162,8 +162,8 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
           <InlineNotification
             kind="error"
             lowContrast
-            title={t('billErrorService', 'Bill service error')}
-            subtitle={t('errorLoadingBillServices', 'Error loading bill services')}
+            title={t('errorLoadingBillableServices', 'Error loading billable services')}
+            subtitle={error?.message}
           />
         ) : (
           <ComboBox
@@ -176,7 +176,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
         )}
         {selectedItems && selectedItems.length > 0 && (
           <div className={styles.selectedItemsContainer}>
-            <h4>{t('selectedItems', 'Selected Items')}</h4>
+            <h4>{t('selectedItems', 'Selected items')}</h4>
             {selectedItems.map((item) => (
               <div key={item.uuid} className={styles.itemCard}>
                 <div className={styles.itemHeader}>
@@ -218,7 +218,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
                     </div>
                   ) : (
                     <div className={styles.controlSection}>
-                      <label>{t('unitPrice', 'Unit Price')}</label>
+                      <label>{t('unitPrice', 'Unit price')}</label>
                       <span className={styles.priceDisplay}>{convertToCurrency(item.price, defaultCurrency)}</span>
                     </div>
                   )}

package/src/billing-form/visit-attributes/visit-attributes-form.component.tsx

@@ -100,7 +100,7 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
       <InlineLoading
         status="active"
         iconDescription={t('loadingDescription', 'Loading')}
-        description={t('loading', 'Loading data...')}
+        description={t('loading', 'Loading data') + '...'}
       />
     );
   }