@kenyaemr/esm-billing-app 5.4.2-pre.2892 → 5.4.2-pre.2898

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slots":["homepage-dashboard-slot"],"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"},{"name":"payments-points-dashboard-link","component":"paymentPointDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"cashier-points","title":"Payment Point","slot":"payment-point-dashboard-slot"}},{"name":"payment-points-dashboard","component":"paymentPoints","slot":"payment-point-dashboard-slot"},{"name":"payment-mode-dashboard-link","component":"paymentModeLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-modes","title":"Payment Mode","slot":"payment-mode-dashboard-slot"}},{"name":"payment-mode-dashboard","component":"paymentModeDashboard","slot":"payment-mode-dashboard-slot"},{"name":"bill-deposit-dashboard-link","component":"billDepositDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"bill-deposit","title":"Bill Deposit","slot":"billing-deposit-dashboard-slot"}},{"name":"bill-deposit-dashboard","component":"billDepositDashboard","slot":"billing-deposit-dashboard-slot"},{"name":"billable-exemptions-dashboard-link","component":"billableExemptionsLink","slot":"billing-admin-dashboard-slot","meta":{"name":"billable-exemptions","title":"Billable Exemptions","slot":"billing-exemptions-dashboard-slot"}},{"name":"billable-exemptions-dashboard","component":"billableExemptions","slot":"billing-exemptions-dashboard-slot"},{"name":"clinical-charges-dashboard-link","component":"clinicalChargesLink","slot":"billing-admin-dashboard-slot","meta":{"name":"clinical-charges","title":"Clinical Charges","slot":"clinical-charges-dashboard-slot"}},{"name":"clinical-charges-dashboard","component":"clinicalCharges","slot":"clinical-charges-dashboard-slot"},{"name":"payment-history-dashboard-link","component":"paymentHistoryLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-history","title":"Payment History","slot":"payment-history-dashboard-slot"}},{"name":"payment-history-dashboard","component":"paymentHistoryDashboard","slot":"payment-history-dashboard-slot"},{"name":"patient-billing-dashboard-link","component":"patientBillingLink","slot":"billing-admin-dashboard-slot","meta":{"name":"patient-billing","title":"Patient Billing","slot":"patient-billing-dashboard-slot"}},{"name":"patient-billing-dashboard","component":"patientBilling","slot":"patient-billing-dashboard-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"commodityForm","title":"Charge Commodity Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"claim-summary-modal","component":"claimSummaryModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2892"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slots":["homepage-dashboard-slot"],"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"},{"name":"payments-points-dashboard-link","component":"paymentPointDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"cashier-points","title":"Payment Point","slot":"payment-point-dashboard-slot"}},{"name":"payment-points-dashboard","component":"paymentPoints","slot":"payment-point-dashboard-slot"},{"name":"payment-mode-dashboard-link","component":"paymentModeLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-modes","title":"Payment Mode","slot":"payment-mode-dashboard-slot"}},{"name":"payment-mode-dashboard","component":"paymentModeDashboard","slot":"payment-mode-dashboard-slot"},{"name":"bill-deposit-dashboard-link","component":"billDepositDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"bill-deposit","title":"Bill Deposit","slot":"billing-deposit-dashboard-slot"}},{"name":"bill-deposit-dashboard","component":"billDepositDashboard","slot":"billing-deposit-dashboard-slot"},{"name":"billable-exemptions-dashboard-link","component":"billableExemptionsLink","slot":"billing-admin-dashboard-slot","meta":{"name":"billable-exemptions","title":"Billable Exemptions","slot":"billing-exemptions-dashboard-slot"}},{"name":"billable-exemptions-dashboard","component":"billableExemptions","slot":"billing-exemptions-dashboard-slot"},{"name":"clinical-charges-dashboard-link","component":"clinicalChargesLink","slot":"billing-admin-dashboard-slot","meta":{"name":"clinical-charges","title":"Clinical Charges","slot":"clinical-charges-dashboard-slot"}},{"name":"clinical-charges-dashboard","component":"clinicalCharges","slot":"clinical-charges-dashboard-slot"},{"name":"payment-history-dashboard-link","component":"paymentHistoryLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-history","title":"Payment History","slot":"payment-history-dashboard-slot"}},{"name":"payment-history-dashboard","component":"paymentHistoryDashboard","slot":"payment-history-dashboard-slot"},{"name":"patient-billing-dashboard-link","component":"patientBillingLink","slot":"billing-admin-dashboard-slot","meta":{"name":"patient-billing","title":"Patient Billing","slot":"patient-billing-dashboard-slot"}},{"name":"patient-billing-dashboard","component":"patientBilling","slot":"patient-billing-dashboard-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"commodityForm","title":"Charge Commodity Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"claim-summary-modal","component":"claimSummaryModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2898"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.2-pre.2892",
+  "version": "5.4.2-pre.2898",
   "description": "Billing app for KenyaEMR",
   "keywords": [
     "openmrs"

package/src/bill-administration/bill-deposit/components/forms/deposit-transactions/deposit-transaction.workspace.tsx

@@ -20,7 +20,8 @@ import { type FormattedDeposit } from '../../../types/bill-deposit.types';
 import { addDepositTransaction } from '../../../utils/bill-deposit.utils';
 import { usePatientBills } from '../../../../../prompt-payment/prompt-payment.resource';
 import { LineItem, PaymentStatus } from '../../../../../types';
-import { extractString, convertToCurrency } from '../../../../../helpers';
+import { extractString } from '../../../../../helpers';
+import { useCurrencyFormatting } from '../../../../../helpers/currency';
 
 type DepositTransactionWorkspaceProps = DefaultWorkspaceProps & {
   deposit: FormattedDeposit;
@@ -35,6 +36,8 @@ const DepositTransactionWorkspace: React.FC<DepositTransactionWorkspaceProps> =
   promptBeforeClosing,
 }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const isTablet = useLayoutType() === 'tablet';
   const { isLoading, patientBills, error } = usePatientBills(patientUuid);
   const pendingLineItems: Array<LineItem> = uniqBy(
@@ -162,7 +165,7 @@ const DepositTransactionWorkspace: React.FC<DepositTransactionWorkspaceProps> =
               <ComboBox
                 id="billLineItem"
                 itemToString={(item: LineItem) =>
-                  item ? `${extractString(item.billableService)} - ${convertToCurrency(item.price)}` : ''
+                  item ? `${extractString(item.billableService)} - ${formatCurrency(item.price)}` : ''
                 }
                 items={pendingLineItems ?? []}
                 onChange={({ selectedItem }) => field.onChange(selectedItem?.uuid)}

package/src/bill-administration/bill-deposit/components/search/components/transaction-list/transaction-list.component.tsx

@@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { ContainedList, ContainedListItem, OverflowMenu, OverflowMenuItem, InlineNotification } from '@carbon/react';
 import { BillDepositTransaction } from '../../../../types/bill-deposit.types';
 import { formatDate, parseDate, showModal } from '@openmrs/esm-framework';
-import { convertToCurrency } from '../../../../../../helpers';
 import styles from './transaction-list.scss';
+import { useCurrencyFormatting } from '../../../../../../helpers/currency';
 
 type TransactionListProps = {
   transactions: Array<BillDepositTransaction>;
@@ -13,6 +13,7 @@ type TransactionListProps = {
 
 const TransactionList: React.FC<TransactionListProps> = ({ transactions, depositUuid }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   const handleReverse = (transaction: BillDepositTransaction) => {
     const dispose = showModal('reverse-transaction-modal', {
@@ -53,7 +54,7 @@ const TransactionList: React.FC<TransactionListProps> = ({ transactions, deposit
               <OverflowMenuItem itemText={t('remove', 'Remove')} isDelete hasDivider />
             </OverflowMenu>
           }>
-          {`${formatDate(parseDate(transaction.dateCreated))} - ${transaction.transactionType} - ${convertToCurrency(
+          {`${formatDate(parseDate(transaction.dateCreated))} - ${transaction.transactionType} - ${formatCurrency(
             transaction.amount,
           )}${transaction.reason ? ' - ' + transaction.reason : ''}`}
         </ContainedListItem>

package/src/bill-administration/patient-billing/bill-line-items.component.tsx

@@ -9,10 +9,11 @@ import {
   OverflowMenu,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { convertToCurrency, extractString } from '../../helpers';
+import { extractString } from '../../helpers';
 import { LineItem, MappedBill, PaymentStatus } from '../../types';
 import styles from './patient-billing.scss';
 import { ExtensionSlot } from '@openmrs/esm-framework';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 const BillLineItems: React.FC<{ bill: MappedBill }> = ({ bill }) => {
   const { t } = useTranslation();
@@ -42,6 +43,8 @@ const BillLineItems: React.FC<{ bill: MappedBill }> = ({ bill }) => {
 
 const LineItemRow = ({ lineItem, bill }: { lineItem: LineItem; bill: MappedBill }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const refundedLineItemUUIDs = bill.lineItems.filter((li) => Math.sign(li.price) === -1).map((li) => li.uuid);
   const isRefundedLineItem = refundedLineItemUUIDs.includes(lineItem.uuid);
 
@@ -61,8 +64,8 @@ const LineItemRow = ({ lineItem, bill }: { lineItem: LineItem; bill: MappedBill
         {lineItem.item === '' ? lineItem.billableService.split(':')[1] : extractString(lineItem.item)}
       </StructuredListCell>
       <StructuredListCell>{lineItem.quantity}</StructuredListCell>
-      <StructuredListCell>{convertToCurrency(lineItem.price)}</StructuredListCell>
-      <StructuredListCell>{convertToCurrency(lineItem.price * lineItem.quantity)}</StructuredListCell>
+      <StructuredListCell>{formatCurrency(lineItem.price)}</StructuredListCell>
+      <StructuredListCell>{formatCurrency(lineItem.price * lineItem.quantity)}</StructuredListCell>
       <StructuredListCell>{lineItem.paymentStatus}</StructuredListCell>
 
       <StructuredListCell>

package/src/bill-administration/patient-billing/patient-bills.component.tsx

@@ -12,14 +12,13 @@ import {
   TableCell,
   TableExpandedRow,
 } from '@carbon/react';
-import { convertToCurrency } from '../../helpers';
 import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
 import { MappedBill, PaymentStatus } from '../../types';
 import styles from '../../bills-table/bills-table.scss';
 import BillLineItems from './bill-line-items.component';
 import { ExtensionSlot } from '@openmrs/esm-framework';
 import EmptyPatientBill from '../../past-patient-bills/patient-bills-dashboard/empty-patient-bill.component';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 type PatientBillsProps = {
   bills: Array<MappedBill>;
@@ -27,6 +26,7 @@ type PatientBillsProps = {
 
 const PatientBills: React.FC<PatientBillsProps> = ({ bills }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   const hasRefundedItems = bills.some((bill) => bill.lineItems.some((li) => Math.sign(li.price) === -1));
 
@@ -44,16 +44,16 @@ const PatientBills: React.FC<PatientBillsProps> = ({ bills }) => {
   const tableRows = bills.map((bill) => ({
     id: `${bill.uuid}`,
     date: bill.dateCreated,
-    totalAmount: convertToCurrency(bill.totalAmount),
+    totalAmount: formatCurrency(bill.totalAmount),
     status:
       bill.totalAmount === bill.tenderedAmount
         ? PaymentStatus.PAID
         : bill.tenderedAmount === 0
         ? PaymentStatus.PENDING
         : PaymentStatus.POSTED,
-    amountPaid: convertToCurrency(bill.tenderedAmount),
+    amountPaid: formatCurrency(bill.tenderedAmount),
     ...(hasRefundedItems && {
-      creditAmount: convertToCurrency(
+      creditAmount: formatCurrency(
         bill.lineItems.filter((li) => Math.sign(li.price) === -1).reduce((acc, curr) => acc + Math.abs(curr.price), 0),
       ),
     }),

package/src/bill-administration/patient-billing/workspaces/cancel-bill/cancel-bill.workspace.tsx

@@ -14,10 +14,10 @@ import { Form, Button, ButtonSet, InlineLoading, TextArea, InlineNotification }
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { convertToCurrency } from '../../../../helpers';
 import { createCancelBillPayload } from './cance-bill.resource';
 import { processBillPayment } from '../../../../billing.resource';
 import { mutate } from 'swr';
+import { useCurrencyFormatting } from '../../../../helpers/currency';
 
 type CancelBillWorkspaceProps = DefaultWorkspaceProps & {
   patientUuid: string;
@@ -33,6 +33,8 @@ const CancelBillWorkspace: React.FC<CancelBillWorkspaceProps> = ({
   closeWorkspaceWithSavedChanges,
 }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const isTablet = useLayoutType() === 'tablet';
 
   const cancelSchema = z.object({
@@ -81,7 +83,7 @@ const CancelBillWorkspace: React.FC<CancelBillWorkspaceProps> = ({
   const subtitleText = `${t('currentPriceAndQuantity', 'Current price and quantity')}: ${t(
     'price',
     'Price',
-  )}: ${convertToCurrency(lineItem?.price)} ${t('quantity', 'Quantity')}: ${lineItem?.quantity}`;
+  )}: ${formatCurrency(lineItem?.price)} ${t('quantity', 'Quantity')}: ${lineItem?.quantity}`;
 
   return (
     <Form className={styles.form} onSubmit={handleSubmit(onSubmit)}>

package/src/bill-administration/patient-billing/workspaces/create-bill/create-bill.workspace.tsx

@@ -24,10 +24,10 @@ import {
 import { type Order } from '@openmrs/esm-patient-common-lib';
 import { useBillableItem } from '../../../../billable-services/billable-orders/useBillableItem';
 import styles from './create-bill.style.scss';
-import { convertToCurrency } from '../../../../helpers';
 import { BillingConfig } from '../../../../config-schema';
 import { processBillItems } from '../../../../billing.resource';
 import { mutate } from 'swr';
+import { useCurrencyFormatting } from '../../../../helpers/currency';
 
 type CreateBillWorkspaceProps = DefaultWorkspaceProps & {
   patientUuid: string;
@@ -75,6 +75,7 @@ const BillForm: React.FC<BillFormProps> = ({
   comboBoxItems,
 }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   return (
     <Stack gap={4}>
@@ -128,7 +129,7 @@ const BillForm: React.FC<BillFormProps> = ({
       <Column>
         <div className={styles.formField}>
           <label className={styles.label}>{t('total', 'Total')}</label>
-          <div className={styles.value}>{convertToCurrency(calculateTotal())}</div>
+          <div className={styles.value}>{formatCurrency(calculateTotal())}</div>
         </div>
       </Column>
     </Stack>
@@ -153,6 +154,7 @@ const CreateBillWorkspace: React.FC<CreateBillWorkspaceProps> = ({
   medicationRequestBundle,
 }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
   const defaultPaymentStatus = 'PENDING';
   const isTablet = useLayoutType() === 'tablet';
   const { cashPointUuid, cashierUuid } = useConfig<BillingConfig>();
@@ -162,7 +164,7 @@ const CreateBillWorkspace: React.FC<CreateBillWorkspaceProps> = ({
   const comboBoxItems =
     billableItem?.servicePrices?.map((item) => ({
       id: item.uuid,
-      text: `${item.paymentMode.name} - ${convertToCurrency(item.price)}`,
+      text: `${item.paymentMode.name} - ${formatCurrency(item.price)}`,
       unitPrice: item.price,
     })) ?? [];
 

package/src/bill-administration/patient-billing/workspaces/waive-bill/waive-bill-form.workspace.tsx

@@ -14,7 +14,6 @@ import { useTranslation } from 'react-i18next';
 import styles from './waive-bill-form.scss';
 import { MappedBill } from '../../../../types';
 import { createBillWaiverPayload, extractErrorMessagesFromResponse } from '../../../../utils';
-import { convertToCurrency, extractString } from '../../../../helpers';
 import { processBillPayment, usePaymentModes } from '../../../../billing.resource';
 import { restBaseUrl, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
 import { mutate } from 'swr';
@@ -24,6 +23,8 @@ import { Controller, SubmitHandler, useForm } from 'react-hook-form';
 import { DefaultPatientWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 import first from 'lodash-es/first';
 import classNames from 'classnames';
+import { useCurrencyFormatting } from '../../../../helpers/currency';
+import { extractString } from '../../../../helpers';
 
 type BillWaiverFormProps = DefaultPatientWorkspaceProps & {
   bill: MappedBill;
@@ -39,6 +40,7 @@ export const WaiveBillForm: React.FC<BillWaiverFormProps> = ({
   const isTablet = useLayoutType() === 'tablet';
 
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   const totalAmount = lineItems.reduce((acc, curr) => acc + curr.price * curr.quantity, 0);
   const { isLoading, paymentModes = [] } = usePaymentModes(false);
@@ -167,12 +169,12 @@ export const WaiveBillForm: React.FC<BillWaiverFormProps> = ({
           </section>
           <section className={styles.billWaiverDescription}>
             <label className={styles.label}>{t('billTotal', 'Bill total')}</label>
-            <p className={styles.value}>{convertToCurrency(totalAmount)}</p>
+            <p className={styles.value}>{formatCurrency(totalAmount)}</p>
           </section>
           {amountAlreadyWaivedOrPaid > 0 && (
             <section className={styles.billWaiverDescription}>
               <label className={styles.label}>{t('amountAlreadyWaivedOrPaid', 'Total paid / waived')}</label>
-              <p className={styles.value}>{convertToCurrency(amountAlreadyWaivedOrPaid)}</p>
+              <p className={styles.value}>{formatCurrency(amountAlreadyWaivedOrPaid)}</p>
             </section>
           )}
           <Controller

package/src/bill-administration/payment-history/payment-history-table.component.tsx

@@ -17,10 +17,10 @@ import { Download } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
 import { useDebounce, useLayoutType, usePagination } from '@openmrs/esm-framework';
 import { usePaginationInfo } from '@openmrs/esm-patient-common-lib';
-import { convertToCurrency } from '../../helpers/functions';
 import { DataTableRow, MappedBill } from '../../types';
 import { exportToExcel } from '../../helpers/excelExport';
 import dayjs from 'dayjs';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 export const PaymentHistoryTable = ({
   headers,
@@ -30,6 +30,8 @@ export const PaymentHistoryTable = ({
   rows: Array<MappedBill>;
 }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const [pageSize, setPageSize] = useState(10);
   const responsiveSize = useLayoutType() !== 'tablet' ? 'sm' : 'md';
   const [searchString, setSearchString] = useState('');
@@ -61,7 +63,7 @@ export const PaymentHistoryTable = ({
       ...row,
       id: `${row.id}`,
       billingService: row.lineItems.map((item) => item.billableService).join(', '),
-      totalAmount: convertToCurrency(row.payments.reduce((acc, payment) => acc + payment.amountTendered, 0)),
+      totalAmount: formatCurrency(row.payments.reduce((acc, payment) => acc + payment.amountTendered, 0)),
       referenceCodes: row.payments
         .map(({ attributes }) => attributes.map(({ value }) => value).join(', '))
         .filter((code) => code !== '')
@@ -73,7 +75,7 @@ export const PaymentHistoryTable = ({
     const dataForExport = rows.map((row) => {
       return {
         ...row,
-        totalAmount: convertToCurrency(row.payments.reduce((acc, payment) => acc + payment.amountTendered, 0)),
+        totalAmount: formatCurrency(row.payments.reduce((acc, payment) => acc + payment.amountTendered, 0)),
       };
     });
     const data = dataForExport.map((row) => {

package/src/bill-administration/payment-history/payment-method-distribution.component.tsx

@@ -11,15 +11,17 @@ import {
   DataTableSkeleton,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { convertToCurrency } from '../../helpers';
 import { usePaymentModeGroupTotals } from './usePaymentModeGroupTotals';
 import { usePaymentFilterContext } from './usePaymentFilterContext';
 import EmptyPatientBill from '../../past-patient-bills/patient-bills-dashboard/empty-patient-bill.component';
 import { useLayoutType } from '@openmrs/esm-framework';
 import { usePaymentTransactionHistory } from './usePaymentTransactionHistory';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 const PaymentMethodDistribution = () => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const responsiveSize = useLayoutType() !== 'tablet' ? 'sm' : 'md';
   const { filters } = usePaymentFilterContext();
   const { bills: filteredBills, isLoading } = usePaymentTransactionHistory(filters);
@@ -28,7 +30,7 @@ const PaymentMethodDistribution = () => {
   const rows = paymentModesGroupTotals.map((total, index) => ({
     id: index.toString(),
     paymentMode: total?.type,
-    total: convertToCurrency(total?.total as number),
+    total: formatCurrency(total?.total as number),
   }));
 
   const headers = [

package/src/bill-administration/service-catalog/charge-summary-table.component.tsx

@@ -23,15 +23,17 @@ import { ErrorState, launchWorkspace, showModal, useLayoutType, usePagination }
 import { EmptyState, usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 import React, { ChangeEvent, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { convertToCurrency } from '../../helpers';
 import styles from './charge-summary-table.scss';
 import { type ChargeAble, useChargeSummaries } from './charge-summary.resource';
 import { downloadExcelTemplateFile, searchTableData } from './form-helper';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 const defaultPageSize = 10;
 
 const ChargeSummaryTable: React.FC = () => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const layout = useLayoutType();
   const size = layout === 'tablet' ? 'lg' : 'md';
   const { isLoading, isValidating, error, mutate, chargeSummaryItems } = useChargeSummaries();
@@ -76,9 +78,7 @@ const ChargeSummaryTable: React.FC = () => {
       shortName: service.shortName,
       serviceStatus: service.serviceStatus,
       serviceType: service?.serviceType?.display ?? t('stockItem', 'Stock Item'),
-      servicePrices: service.servicePrices
-        .map((price) => `${price.name} : ${convertToCurrency(price.price)}`)
-        .join(', '),
+      servicePrices: service.servicePrices.map((price) => `${price.name} : ${formatCurrency(price.price)}`).join(', '),
     };
   });
 

package/src/billable-services/billable-orders/drug-order/drug-order.component.tsx

@@ -4,7 +4,7 @@ import { DosingUnit, MedicationFrequency, MedicationRoute, QuantityUnit } from '
 import { useBillableItem, useSockItemInventory } from '../useBillableItem';
 import { useTranslation } from 'react-i18next';
 import styles from './drug-order.scss';
-import { convertToCurrency } from '../../../helpers';
+import { useCurrencyFormatting } from '../../../helpers/currency';
 
 type DrugOrderProps = {
   order: {
@@ -23,6 +23,8 @@ type DrugOrderProps = {
 
 const DrugOrder: React.FC<DrugOrderProps> = ({ order }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const { stockItem, isLoading: isLoadingInventory } = useSockItemInventory(order?.drug?.uuid);
   const { billableItem, isLoading } = useBillableItem(order?.drug.concept.uuid, order?.drug.uuid);
   if (isLoading || isLoadingInventory) {
@@ -52,7 +54,7 @@ const DrugOrder: React.FC<DrugOrderProps> = ({ order }) => {
           billableItem?.servicePrices.map((item) => (
             <div key={item.uuid} className={styles.itemContainer}>
               <span className={styles.bold}>{item.paymentMode.name}</span>
-              <span>{convertToCurrency(item.price)}</span>
+              <span>{formatCurrency(item.price)}</span>
             </div>
           ))}
       </div>

package/src/billable-services/billable-orders/test-order/price-info-order.componet.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { convertToCurrency } from '../../../helpers';
 import { useTranslation } from 'react-i18next';
 import styles from './price-info-order.scss';
 import {
@@ -11,6 +10,7 @@ import {
   Tile,
   InlineNotification,
 } from '@carbon/react';
+import { useCurrencyFormatting } from '../../../helpers/currency';
 
 type PriceInfoOrderProps = {
   billableItem: any;
@@ -19,6 +19,7 @@ type PriceInfoOrderProps = {
 
 const PriceInfoOrder: React.FC<PriceInfoOrderProps> = ({ billableItem, error }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   const hasPrice = billableItem?.servicePrices?.length > 0;
 
@@ -46,7 +47,7 @@ const PriceInfoOrder: React.FC<PriceInfoOrderProps> = ({ billableItem, error })
             {billableItem.servicePrices.map((priceItem: any) => (
               <StructuredListRow key={priceItem.uuid}>
                 <StructuredListCell className={styles.cell}>{priceItem.paymentMode.name}</StructuredListCell>
-                <StructuredListCell className={styles.cell}>{convertToCurrency(priceItem.price)}</StructuredListCell>
+                <StructuredListCell className={styles.cell}>{formatCurrency(priceItem.price)}</StructuredListCell>
               </StructuredListRow>
             ))}
           </StructuredListBody>

package/src/claims/metrics/metrics.component.tsx

@@ -5,7 +5,8 @@ import MetricsHeader from './metrics-header.component';
 import MetricsCard from './metrics-card.component';
 import { computeTotalPrice } from '../../utils';
 import { LineItem, MappedBill } from '../../types';
-import { convertToCurrency, formatDate } from '../../helpers';
+import { formatDate } from '../../helpers';
+import { useCurrencyFormatting } from '../../helpers/currency';
 
 interface MainMetricsProps {
   selectedLineItems: LineItem[];
@@ -14,6 +15,7 @@ interface MainMetricsProps {
 
 const MainMetrics: React.FC<MainMetricsProps> = ({ selectedLineItems, bill }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   const numberOfLineItems = selectedLineItems.length;
 
@@ -26,7 +28,7 @@ const MainMetrics: React.FC<MainMetricsProps> = ({ selectedLineItems, bill }) =>
       <div className={styles.cardContainer} data-testid="claims-metrics">
         <MetricsCard
           label={t('total', 'Amount')}
-          value={convertToCurrency(computedTotal)}
+          value={formatCurrency(computedTotal)}
           headerLabel={t('totalAmount', 'Total Amount')}
         />
         <MetricsCard

package/src/config-schema.ts

@@ -230,6 +230,7 @@ export const configSchema: ConfigSchema = {
       'en-KE': 'KES',
       'sw-KE': 'KES',
       'am-ET': 'ETB',
+      'en-GB': 'KES',
     },
   },
 };

package/src/helpers/currency.ts

@@ -119,7 +119,6 @@ export const useCurrencyFormatting = () => {
   const formatSimple = (amount: number, options: Intl.NumberFormatOptions = {}) => {
     const currentLocale = getLocale();
     const currency = getCurrency();
-
     const formatter = new Intl.NumberFormat(currentLocale, {
       style: 'currency',
       currency: currency,

package/src/invoice/invoice-actions.component.tsx

@@ -18,12 +18,12 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { mutate } from 'swr';
-import { convertToCurrency } from '../helpers';
 import { MappedBill, LineItem } from '../types';
 import { spaBasePath } from '../constants';
 import { useCheckShareGnum } from './invoice.resource';
 import styles from './invoice.scss';
 import startCase from 'lodash-es/startCase';
+import { useCurrencyFormatting } from '../helpers/currency';
 
 interface InvoiceActionsProps {
   readonly bill: MappedBill;
@@ -33,6 +33,8 @@ interface InvoiceActionsProps {
 
 export function InvoiceActions({ bill, selectedLineItems = [], activeVisit }: InvoiceActionsProps) {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const [isOpen, setIsOpen] = useState(false);
   const { billUuid, patientUuid } = useParams();
   const { checkSHARegNum } = useCheckShareGnum();
@@ -222,7 +224,7 @@ export function InvoiceActions({ bill, selectedLineItems = [], activeVisit }: In
           launchWorkspace('payment-workspace', {
             bill,
             workspaceTitle: t('additionalPayment', 'Additional Payment (Balance {{billBalance}})', {
-              billBalance: convertToCurrency(bill.balance),
+              billBalance: formatCurrency(bill.balance),
             }),
           })
         }>

package/src/invoice/invoice.component.tsx

@@ -5,7 +5,6 @@ import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { useBill } from '../billing.resource';
-import { convertToCurrency } from '../helpers';
 import { usePaymentsReconciler } from '../hooks/use-payments-reconciler';
 import { LineItem, MappedBill } from '../types';
 import InvoiceTable from './invoice-table.component';
@@ -13,6 +12,7 @@ import styles from './invoice.scss';
 import Payments from './payments/payments.component';
 import capitalize from 'lodash-es/capitalize';
 import { InvoiceActions } from './invoice-actions.component';
+import { useCurrencyFormatting } from '../helpers/currency';
 
 const Invoice: React.FC = () => {
   const { t } = useTranslation();
@@ -79,6 +79,7 @@ export function InvoiceSummary({
   readonly activeVisit?: any;
 }) {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
 
   return (
     <>
@@ -99,20 +100,20 @@ export function InvoiceSummary({
         </div>
         <div className={styles.divider} />
         <div className={styles.invoiceCard}>
-          <InvoiceSummaryItem label={t('totalAmount', 'Total Amount')} value={convertToCurrency(bill?.totalAmount)} />
+          <InvoiceSummaryItem label={t('totalAmount', 'Total Amount')} value={formatCurrency(bill?.totalAmount)} />
           <InvoiceSummaryItem
             label={t('totalExempted', 'Total Exempted')}
-            value={convertToCurrency(bill?.totalExempted)}
+            value={formatCurrency(bill?.totalExempted)}
           />
           <InvoiceSummaryItem
             label={t('totalPayments', 'Total Payments')}
-            value={convertToCurrency(bill?.totalPayments)}
+            value={formatCurrency(bill?.totalPayments)}
           />
           <InvoiceSummaryItem
             label={t('totalDeposits', 'Total Deposits')}
-            value={convertToCurrency(bill?.totalDeposits)}
+            value={formatCurrency(bill?.totalDeposits)}
           />
-          <InvoiceSummaryItem label={t('balance', 'Balance')} value={convertToCurrency(bill?.balance)} />
+          <InvoiceSummaryItem label={t('balance', 'Balance')} value={formatCurrency(bill?.balance)} />
         </div>
       </div>
     </>

package/src/invoice/payments/payment-history/payment-history.component.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { DataTable, Table, TableHead, TableRow, TableHeader, TableBody, TableCell } from '@carbon/react';
 import { MappedBill } from '../../../types';
 import { formatDate } from '@openmrs/esm-framework';
-import { convertToCurrency } from '../../../helpers';
 import { useTranslation } from 'react-i18next';
+import { useCurrencyFormatting } from '../../../helpers/currency';
 
 type PaymentHistoryProps = {
   bill: MappedBill;
@@ -11,6 +11,8 @@ type PaymentHistoryProps = {
 
 const PaymentHistory: React.FC<PaymentHistoryProps> = ({ bill }) => {
   const { t } = useTranslation();
+  const { format: formatCurrency } = useCurrencyFormatting();
+
   const headers = [
     {
       key: 'dateCreated',
@@ -28,8 +30,8 @@ const PaymentHistory: React.FC<PaymentHistoryProps> = ({ bill }) => {
   const rows = bill?.payments?.map((payment) => ({
     id: `${payment.uuid}`,
     dateCreated: formatDate(new Date(payment.dateCreated)),
-    amountTendered: convertToCurrency(payment.amountTendered),
-    amount: convertToCurrency(payment.amount),
+    amountTendered: formatCurrency(payment.amountTendered),
+    amount: formatCurrency(payment.amount),
     paymentMethod: payment.instanceType.name,
   }));