@kenyaemr/esm-billing-app 5.4.2-pre.2805 → 5.4.2-pre.2806

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":"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.2805"}
+{"$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":"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.2806"}

package/package.json

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

package/src/claims/dashboard/form/claims-form.component.tsx

@@ -20,6 +20,7 @@ import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { z } from 'zod';
+import debounce from 'lodash-es/debounce';
 import SHABenefitPackangesAndInterventions from '../../../benefits-package/forms/packages-and-interventions-form.component';
 import { BillingConfig } from '../../../config-schema';
 import { useSystemSetting } from '../../../hooks/getMflCode';
@@ -29,9 +30,7 @@ import useProviderList from '../../../hooks/useProviderList';
 import { ClaimSummary, LineItem, MappedBill, OTPVerificationModalOptions } from '../../../types';
 import ClaimExplanationAndJusificationInput from './claims-explanation-and-justification-form-input.component';
 import { ClaimsFormSchema, ClaimsFormSchemaBase, processClaims, useVisit } from './claims-form.resource';
-
-import debounce from 'lodash-es/debounce';
-import { otpManager } from '../../../hooks/useOTP';
+import { otpManager, useOtpSource } from '../../../hooks/useOTP';
 import { usePhoneNumberAttribute } from '../../../hooks/usePhoneNumber';
 import { formatDateTime } from '../../utils';
 import styles from './claims-form.scss';
@@ -63,6 +62,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
   const { providers, providersLoading } = useProviderList();
   const { phoneNumber } = usePhoneNumberAttribute(patientUuid);
   const { nationalId, isLoading: isLoadingNationalId, error: errorNationalId } = usePatientIdentifier(patientUuid);
+  const { otpSource, isLoading: isLoadingOtpSource } = useOtpSource();
 
   const [otpState, setOtpState] = useState<OTPState>(OTPState.NOT_STARTED);
   const [pendingClaimData, setPendingClaimData] = useState<z.infer<typeof ClaimsFormSchema> | null>(null);
@@ -77,6 +77,12 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
   const patientName = `${bill.patientName}`;
   const otpExpiryMinutes = 5;
 
+  useEffect(() => {
+    if (otpSource) {
+      otpManager.setOtpSource(otpSource);
+    }
+  }, [otpSource]);
+
   const form = useForm<z.infer<typeof ClaimsFormSchema>>({
     mode: 'onTouched',
     resolver: zodResolver(validationEnabled ? ClaimsFormSchema : ClaimsFormSchemaBase),
@@ -207,7 +213,14 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
             throw new Error('No claim data available for OTP request');
           }
 
-          await otpManager.requestOTP(phoneNumber, patientName, currentSummary, otpExpiryMinutes, nationalId || null);
+          await otpManager.requestOTP(
+            phoneNumber,
+            patientName,
+            currentSummary,
+            otpExpiryMinutes,
+            nationalId || null,
+            t,
+          );
         },
         onVerify: async (otp: string): Promise<void> => {
           const phoneForVerification = currentPhoneRef.current;
@@ -444,6 +457,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
 
   const isFormValid = isValid && packages?.length > 0 && interventions?.length > 0 && selectedLineItems?.length > 0;
   const displayPhoneNumber = currentOtpPhoneNumber || phoneNumber;
+  const isOtpDisabled = !isFormValid || !displayPhoneNumber || isLoadingOtpSource;
 
   return (
     <FormProvider {...form}>
@@ -667,10 +681,10 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
                 className={styles.button}
                 kind="primary"
                 onClick={handleSubmit(handleInitiateOTPVerification)}
-                disabled={!isFormValid || !displayPhoneNumber}
+                disabled={isOtpDisabled}
                 tooltipPosition="top"
                 tooltipAlignment="center">
-                {t('sendOtp', 'Send OTP')}
+                {isLoadingOtpSource ? t('loading', 'Loading...') : t('sendOtp', 'Send OTP')}
               </Button>
             )}
 

package/src/hooks/useOTP.ts

@@ -1,6 +1,22 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { ClaimSummary } from '../types';
+import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import useSWR from 'swr';
+import { ClaimSummary, OTPSource } from '../types';
 import { formatKenyanPhoneNumber } from '../invoice/payments/utils';
+import { TFunction } from 'i18next';
+import { getCurrencyForLocale } from '../helpers/currency';
+
+/**
+ * Generates a random OTP of a specified length.
+ */
+export function generateOTP(length = 5): string {
+  let otpNumbers = '0123456789';
+  let OTP = '';
+  const len = otpNumbers.length;
+  for (let i = 0; i < length; i++) {
+    OTP += otpNumbers[Math.floor(Math.random() * len)];
+  }
+  return OTP;
+}
 
 /**
  * Replaces placeholders in a template string with values from a given context.
@@ -42,62 +58,218 @@ function validateOtpInputs(receiver: string, patientName: string): void {
 }
 
 /**
- * Verifies the OTP by calling the server's validation endpoint.
+ * Hook to get OTP source configuration
+ */
+export const useOtpSource = () => {
+  const url = `${restBaseUrl}/kenyaemr/checkotpsource`;
+
+  const { data, error, isLoading } = useSWR<FetchResponse<OTPSource>>(url, openmrsFetch);
+
+  return {
+    otpSource: data?.data?.otpSource,
+    data,
+    error,
+    isLoading,
+  };
+};
+
+/**
+ * Sends OTP via SMS for KEHMIS workflow (client generates OTP)
  */
-export async function verifyOtpWithServer(otpId: string, otp: string): Promise<boolean> {
+async function sendOtpKehmis(
+  otp: string,
+  receiver: string,
+  patientName: string,
+  claimSummary: ClaimSummary,
+  expiryMinutes: number = 5,
+  nationalId: string | null = null,
+  t: TFunction,
+): Promise<void> {
+  validateOtpInputs(receiver, patientName);
+
+  // Get currency based on current locale
+  const currency = getCurrencyForLocale();
+
+  const context = {
+    patientName: patientName,
+    claimAmount: `${currency} ${claimSummary.totalAmount.toLocaleString()}`,
+    servicesSummary:
+      claimSummary.services.length > 100 ? claimSummary.services.substring(0, 97) + '...' : claimSummary.services,
+    startDate: claimSummary.startDate,
+    endDate: claimSummary.endDate,
+    facility: claimSummary.facility,
+    expiryTime: expiryMinutes,
+    otp: otp,
+  };
+
+  const claimConsentTemplate =
+    'Dear {{patientName}}, ' +
+    'We are submitting a claim to your insurance for services provided from {{startDate}} to {{endDate}} at {{facility}}. ' +
+    'Total claim amount: {{claimAmount}}. ' +
+    'Services: {{servicesSummary}}. ' +
+    'Your OTP for consent is {{otp}} (valid {{expiryTime}} mins). ';
+
   try {
-    const url = `${restBaseUrl}/kenyaemr/validate-otp`;
+    const message = parseMessage(context, claimConsentTemplate);
+    const url = buildSmsUrl(message, receiver, nationalId);
 
     const response = await openmrsFetch(url, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        id: otpId,
-        otp: otp.trim(),
-      }),
+      redirect: 'follow',
     });
 
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
+  } catch (error) {
+    const errorMessage =
+      error instanceof Error
+        ? error.message
+        : t?.('unknownErrorOccurred', 'Unknown error occurred') || 'Unknown error occurred';
+    throw new Error(`Failed to send OTP: ${errorMessage}`);
+  }
+}
 
-    const rawText = await response.text();
+class KehmisOTPManager {
+  private otpStore: Map<
+    string,
+    { otp: string; timestamp: number; attempts: number; expiryTime: number; claimSummary: ClaimSummary }
+  > = new Map();
+  private readonly MAX_ATTEMPTS = 3;
 
-    let parsedResponse;
-    try {
-      parsedResponse = JSON.parse(rawText);
-    } catch (e) {
-      throw new Error('Invalid response from server');
+  async requestOTP(
+    phoneNumber: string,
+    patientName: string,
+    claimSummary: ClaimSummary,
+    expiryMinutes: number = 5,
+    nationalId: string | null = null,
+    t: TFunction,
+  ): Promise<void> {
+    const otp = generateOTP(5);
+    const expiryTime = expiryMinutes * 60 * 1000;
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+
+    const otpData = {
+      otp,
+      timestamp: Date.now(),
+      attempts: 0,
+      expiryTime,
+      claimSummary,
+    };
+
+    this.otpStore.set(formattedPhone, otpData);
+
+    await sendOtpKehmis(otp, formattedPhone, patientName, claimSummary, expiryMinutes, nationalId, t);
+  }
+
+  async verifyOTP(phoneNumber: string, inputOtp: string): Promise<boolean> {
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+    const storedData = this.otpStore.get(formattedPhone);
+
+    if (!storedData) {
+      throw new Error('No OTP found for this phone number. Please request a new OTP.');
     }
 
-    let data = parsedResponse;
-    if (parsedResponse.response && typeof parsedResponse.response === 'string') {
-      try {
-        data = JSON.parse(parsedResponse.response);
-      } catch (e) {
-        throw new Error('Invalid nested response from server');
-      }
+    if (Date.now() - storedData.timestamp > storedData.expiryTime) {
+      this.otpStore.delete(formattedPhone);
+      throw new Error('OTP has expired. Please request a new OTP.');
     }
 
-    if (data.status === 'success' || data.valid === true) {
+    storedData.attempts++;
+
+    if (storedData.attempts > this.MAX_ATTEMPTS) {
+      this.otpStore.delete(formattedPhone);
+      throw new Error('Maximum OTP attempts exceeded. Please request a new OTP.');
+    }
+
+    if (storedData.otp === inputOtp.trim()) {
+      this.otpStore.delete(formattedPhone);
       return true;
     } else {
-      const errorMessage = data.message || 'Invalid OTP';
-      throw new Error(errorMessage);
+      this.otpStore.set(formattedPhone, storedData);
+      throw new Error(`Invalid OTP. ${this.MAX_ATTEMPTS - storedData.attempts} attempts remaining.`);
     }
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : 'OTP verification failed';
-    throw new Error(errorMessage);
+  }
+
+  clearOTP(phoneNumber: string): void {
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+    this.otpStore.delete(formattedPhone);
+  }
+
+  clearAllOTPs(): void {
+    this.otpStore.clear();
+  }
+
+  cleanupExpiredOTPs(): void {
+    const now = Date.now();
+    for (const [phoneNumber, data] of this.otpStore.entries()) {
+      if (now - data.timestamp > data.expiryTime) {
+        this.otpStore.delete(phoneNumber);
+      }
+    }
+  }
+
+  hasValidOTP(phoneNumber: string): boolean {
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+    const storedData = this.otpStore.get(formattedPhone);
+    if (!storedData) {
+      return false;
+    }
+    return Date.now() - storedData.timestamp <= storedData.expiryTime;
+  }
+
+  getRemainingTimeMinutes(phoneNumber: string): number {
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+    const storedData = this.otpStore.get(formattedPhone);
+    if (!storedData) {
+      return 0;
+    }
+    const elapsed = Date.now() - storedData.timestamp;
+    const remaining = Math.max(0, storedData.expiryTime - elapsed);
+    return Math.ceil(remaining / (60 * 1000));
+  }
+
+  getRemainingAttempts(phoneNumber: string): number {
+    const formattedPhone = formatKenyanPhoneNumber(phoneNumber);
+    const storedData = this.otpStore.get(formattedPhone);
+    if (!storedData) {
+      return 0;
+    }
+    return Math.max(0, this.MAX_ATTEMPTS - storedData.attempts);
+  }
+
+  transferOTP(oldPhoneNumber: string, newPhoneNumber: string): boolean {
+    const oldFormatted = formatKenyanPhoneNumber(oldPhoneNumber);
+    const newFormatted = formatKenyanPhoneNumber(newPhoneNumber);
+
+    if (oldFormatted === newFormatted) {
+      return true;
+    }
+
+    const sessionData = this.otpStore.get(oldFormatted);
+    if (!sessionData) {
+      return false;
+    }
+
+    this.otpStore.set(newFormatted, sessionData);
+    this.otpStore.delete(oldFormatted);
+
+    return true;
+  }
+
+  formatPhone(phoneNumber: string): string {
+    return formatKenyanPhoneNumber(phoneNumber);
   }
 }
 
+// ============================================================================
+// HIE STRATEGY (Server-side OTP generation and validation)
+// ============================================================================
+
 /**
- * Sends an OTP request to the server with claim details which generates and sends the OTP via SMS.
- * Returns the OTP session ID needed for verification.
+ * Requests OTP from server (server generates and sends OTP)
  */
-export async function requestOtpFromServer(
+async function requestOtpFromServer(
   receiver: string,
   patientName: string,
   claimSummary: ClaimSummary,
@@ -108,9 +280,12 @@ export async function requestOtpFromServer(
 
   const formattedPhone = formatKenyanPhoneNumber(receiver);
 
+  // Get currency based on current locale
+  const currency = getCurrencyForLocale();
+
   const context = {
     patientName: patientName,
-    claimAmount: `KES ${claimSummary.totalAmount.toLocaleString()}`,
+    claimAmount: `${currency} ${claimSummary.totalAmount.toLocaleString()}`,
     servicesSummary:
       claimSummary.services.length > 100 ? claimSummary.services.substring(0, 97) + '...' : claimSummary.services,
     startDate: claimSummary.startDate,
@@ -177,12 +352,63 @@ export async function requestOtpFromServer(
       }
       throw new Error(`Failed to send OTP: ${error.message}`);
     }
-
     throw new Error('Failed to send OTP: Unknown error occurred');
   }
 }
 
-export class OTPManager {
+/**
+ * Verifies OTP with server
+ */
+async function verifyOtpWithServer(otpId: string, otp: string): Promise<boolean> {
+  try {
+    const url = `${restBaseUrl}/kenyaemr/validate-otp`;
+
+    const response = await openmrsFetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        id: otpId,
+        otp: otp.trim(),
+      }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+
+    const rawText = await response.text();
+
+    let parsedResponse;
+    try {
+      parsedResponse = JSON.parse(rawText);
+    } catch (e) {
+      throw new Error('Invalid response from server');
+    }
+
+    let data = parsedResponse;
+    if (parsedResponse.response && typeof parsedResponse.response === 'string') {
+      try {
+        data = JSON.parse(parsedResponse.response);
+      } catch (e) {
+        throw new Error('Invalid nested response from server');
+      }
+    }
+
+    if (data.status === 'success' || data.valid === true) {
+      return true;
+    } else {
+      const errorMessage = data.message || 'Invalid OTP';
+      throw new Error(errorMessage);
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'OTP verification failed';
+    throw new Error(errorMessage);
+  }
+}
+
+class HieOTPManager {
   private otpSessions: Map<
     string,
     {
@@ -192,6 +418,7 @@ export class OTPManager {
       expiryTime: number;
       nationalId?: string | null;
       phoneNumber: string;
+      claimSummary: ClaimSummary;
     }
   > = new Map();
   private readonly MAX_ATTEMPTS = 3;
@@ -222,6 +449,7 @@ export class OTPManager {
         expiryTime,
         nationalId,
         phoneNumber: formattedPhone,
+        claimSummary,
       };
 
       this.otpSessions.set(formattedPhone, sessionData);
@@ -299,7 +527,6 @@ export class OTPManager {
     if (!sessionData) {
       return false;
     }
-
     return Date.now() - sessionData.timestamp <= sessionData.expiryTime;
   }
 
@@ -309,7 +536,6 @@ export class OTPManager {
     if (!sessionData) {
       return 0;
     }
-
     const elapsed = Date.now() - sessionData.timestamp;
     const remaining = Math.max(0, sessionData.expiryTime - elapsed);
     return Math.ceil(remaining / (60 * 1000));
@@ -321,7 +547,6 @@ export class OTPManager {
     if (!sessionData) {
       return 0;
     }
-
     return Math.max(0, this.MAX_ATTEMPTS - sessionData.attempts);
   }
 
@@ -343,13 +568,110 @@ export class OTPManager {
 
     return true;
   }
+
+  formatPhone(phoneNumber: string): string {
+    return formatKenyanPhoneNumber(phoneNumber);
+  }
+}
+
+// ============================================================================
+// ADAPTER - Unified OTP Manager Interface
+// ============================================================================
+
+interface IOTPManager {
+  requestOTP(
+    phoneNumber: string,
+    patientName: string,
+    claimSummary: ClaimSummary,
+    expiryMinutes?: number,
+    nationalId?: string | null,
+    t?: TFunction,
+  ): Promise<void>;
+  verifyOTP(phoneNumber: string, inputOtp: string): Promise<boolean>;
+  clearOTP(phoneNumber: string): void;
+  clearAllOTPs(): void;
+  cleanupExpiredOTPs(): void;
+  hasValidOTP(phoneNumber: string): boolean;
+  getRemainingTimeMinutes(phoneNumber: string): number;
+  getRemainingAttempts(phoneNumber: string): number;
+  transferOTP(oldPhoneNumber: string, newPhoneNumber: string): boolean;
+  formatPhone(phoneNumber: string): string;
+}
+
+class OTPManagerAdapter implements IOTPManager {
+  private kehmisManager: KehmisOTPManager;
+  private hieManager: HieOTPManager;
+  private currentSource: string;
+
+  constructor(otpSource: string = 'kehmis') {
+    this.kehmisManager = new KehmisOTPManager();
+    this.hieManager = new HieOTPManager();
+    this.currentSource = otpSource;
+  }
+
+  setOtpSource(source: string) {
+    this.currentSource = source;
+  }
+
+  private getManager(): IOTPManager {
+    return this.currentSource === 'hie' ? this.hieManager : this.kehmisManager;
+  }
+
+  async requestOTP(
+    phoneNumber: string,
+    patientName: string,
+    claimSummary: ClaimSummary,
+    expiryMinutes: number = 5,
+    nationalId: string | null = null,
+    t: TFunction,
+  ): Promise<void> {
+    return this.getManager().requestOTP(phoneNumber, patientName, claimSummary, expiryMinutes, nationalId, t);
+  }
+
+  async verifyOTP(phoneNumber: string, inputOtp: string): Promise<boolean> {
+    return this.getManager().verifyOTP(phoneNumber, inputOtp);
+  }
+
+  clearOTP(phoneNumber: string): void {
+    this.kehmisManager.clearOTP(phoneNumber);
+    this.hieManager.clearOTP(phoneNumber);
+  }
+
+  clearAllOTPs(): void {
+    this.kehmisManager.clearAllOTPs();
+    this.hieManager.clearAllOTPs();
+  }
+
+  cleanupExpiredOTPs(): void {
+    this.kehmisManager.cleanupExpiredOTPs();
+    this.hieManager.cleanupExpiredOTPs();
+  }
+
+  hasValidOTP(phoneNumber: string): boolean {
+    return this.getManager().hasValidOTP(phoneNumber);
+  }
+
+  getRemainingTimeMinutes(phoneNumber: string): number {
+    return this.getManager().getRemainingTimeMinutes(phoneNumber);
+  }
+
+  getRemainingAttempts(phoneNumber: string): number {
+    return this.getManager().getRemainingAttempts(phoneNumber);
+  }
+
+  transferOTP(oldPhoneNumber: string, newPhoneNumber: string): boolean {
+    return this.getManager().transferOTP(oldPhoneNumber, newPhoneNumber);
+  }
+
   formatPhone(phoneNumber: string): string {
     return formatKenyanPhoneNumber(phoneNumber);
   }
 }
 
-export const otpManager = new OTPManager();
+// Export singleton instance
+export const otpManager = new OTPManagerAdapter();
 
+// Cleanup interval
 setInterval(() => {
   otpManager.cleanupExpiredOTPs();
 }, 2 * 60 * 1000);

package/src/types/index.ts

@@ -689,3 +689,7 @@ interface PatientIdentifier {
 export interface PatientIdentifierResponse {
   results: Array<PatientIdentifier>;
 }
+
+export interface OTPSource {
+  otpSource?: string;
+}