@kenyaemr/esm-billing-app 5.4.5-pre.607 → 5.4.5-pre.609

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0","kenyaemr.cashier":"^4.2.6-SNAPSHOT"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"},{"component":"resubmitClaimPage","route":"billing/resubmit-claim"}],"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","component":"billingCheckInForm","slot":"billing-visit-attributes-slot","order":1},{"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":"extended-patient-info","order":1},{"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":"claims-admin-dashboard-link","component":"claimsAdminDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"claims-admin","title":"Claims Admin","slot":"claims-admin-dashboard-slot"}},{"name":"claims-admin-dashboard","component":"claimsAdminDashboard","slot":"claims-admin-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":[],"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-preview-modal","component":"claimPreviewModal"},{"name":"close-claim-modal","component":"claimCloseModal"},{"name":"resubmit-claim-line-modal","component":"claimResubmitModal"},{"name":"edit-claim-line-modal","component":"claimEditLineModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"delete-claim-line-modal","component":"claimDeleteLineModal"},{"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"},{"name":"replace-claim-attachment-modal","component":"replaceAttachmentModal"},{"name":"resubmit-confirm-modal","component":"resubmitConfirmModal"}],"workspaces2":[{"name":"visit-attributes-workspace","component":"visitAttributesWorkspace","window":"billing-extra-wide-workspace-window"},{"name":"create-bill-workspace","component":"createBillWorkspace","window":"billing-workspace-window"},{"name":"waive-bill-form","component":"waiveBillForm","window":"billing-workspace-window"},{"name":"edit-bill-form","component":"editBillForm","window":"billing-workspace-window"},{"name":"billable-service-form","component":"addServiceForm","window":"billing-workspace-window"},{"name":"commodity-form","component":"commodityForm","window":"billing-workspace-window"},{"name":"billing-form","component":"billingForm","window":"billing-extra-wide-workspace-window"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","window":"billing-workspace-window"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","window":"billing-workspace-window"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","window":"billing-workspace-window"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","window":"billing-workspace-window"},{"name":"payment-workspace","component":"paymentWorkspace","window":"billing-workspace-window"},{"name":"claim-attachments-workspace","component":"claimAttachmentsWorkspace","window":"billing-workspace-window"},{"name":"claim-doctors-workspace","component":"claimDoctorsWorkspace","window":"billing-workspace-window"},{"name":"claim-submission-workspace","component":"claimSubmissionWorkspace","window":"billing-workspace-window"},{"name":"claim-document-generator-workspace","component":"claimDocumentGeneratorWorkspace","window":"billing-extra-wide-workspace-window"},{"name":"edit-drug-order","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"billing-workspace-window"},{"name":"preauth-form-workspace","component":"preauthFormWorkspace","window":"billing-workspace-window"},{"name":"elective-preauth-form-workspace","component":"electivePreauthFormWorkspace","window":"billing-workspace-window"},{"name":"preauth-operation-workspace","component":"preauthOperationWorkspace","window":"billing-workspace-window"}],"workspaceWindows2":[{"name":"billing-workspace-window","group":"billing-workspace-group","canMaximize":true},{"name":"billing-extra-wide-workspace-window","group":"billing-workspace-group","canMaximize":true,"width":"extra-wide"}],"workspaceGroups2":[{"name":"billing-workspace-group","persistence":"closeable","closeable":true}],"version":"5.4.5-pre.607"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0","kenyaemr.cashier":"^4.2.6-SNAPSHOT"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"},{"component":"resubmitClaimPage","route":"billing/resubmit-claim"}],"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":"visit-form-bottom-slot","component":"billingCheckInForm","order":1},{"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":"extended-patient-info","order":1},{"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":"claims-admin-dashboard-link","component":"claimsAdminDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"claims-admin","title":"Claims Admin","slot":"claims-admin-dashboard-slot"}},{"name":"claims-admin-dashboard","component":"claimsAdminDashboard","slot":"claims-admin-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":[],"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-preview-modal","component":"claimPreviewModal"},{"name":"close-claim-modal","component":"claimCloseModal"},{"name":"resubmit-claim-line-modal","component":"claimResubmitModal"},{"name":"edit-claim-line-modal","component":"claimEditLineModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"delete-claim-line-modal","component":"claimDeleteLineModal"},{"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"},{"name":"replace-claim-attachment-modal","component":"replaceAttachmentModal"},{"name":"resubmit-confirm-modal","component":"resubmitConfirmModal"}],"workspaces2":[{"name":"create-bill-workspace","component":"createBillWorkspace","window":"billing-workspace-window"},{"name":"waive-bill-form","component":"waiveBillForm","window":"billing-workspace-window"},{"name":"edit-bill-form","component":"editBillForm","window":"billing-workspace-window"},{"name":"billable-service-form","component":"addServiceForm","window":"billing-workspace-window"},{"name":"commodity-form","component":"commodityForm","window":"billing-workspace-window"},{"name":"billing-form","component":"billingForm","window":"billing-extra-wide-workspace-window"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","window":"billing-workspace-window"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","window":"billing-workspace-window"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","window":"billing-workspace-window"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","window":"billing-workspace-window"},{"name":"payment-workspace","component":"paymentWorkspace","window":"billing-workspace-window"},{"name":"claim-attachments-workspace","component":"claimAttachmentsWorkspace","window":"billing-workspace-window"},{"name":"claim-doctors-workspace","component":"claimDoctorsWorkspace","window":"billing-workspace-window"},{"name":"claim-submission-workspace","component":"claimSubmissionWorkspace","window":"billing-workspace-window"},{"name":"claim-document-generator-workspace","component":"claimDocumentGeneratorWorkspace","window":"billing-extra-wide-workspace-window"},{"name":"edit-drug-order","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"billing-workspace-window"},{"name":"preauth-form-workspace","component":"preauthFormWorkspace","window":"billing-workspace-window"},{"name":"elective-preauth-form-workspace","component":"electivePreauthFormWorkspace","window":"billing-workspace-window"},{"name":"preauth-operation-workspace","component":"preauthOperationWorkspace","window":"billing-workspace-window"}],"workspaceWindows2":[{"name":"billing-workspace-window","group":"billing-workspace-group","canMaximize":true},{"name":"billing-extra-wide-workspace-window","group":"billing-workspace-group","canMaximize":true,"width":"extra-wide"}],"workspaceGroups2":[{"name":"billing-workspace-group","persistence":"closeable","closeable":true}],"version":"5.4.5-pre.609"}

package/package.json

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

package/src/billing-form/social-health-authority/sha-virtual-claim.resource.ts

@@ -7,7 +7,6 @@ import {
   Person,
 } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { useMemo } from 'react';
 import {
   AuthorizingDeviceOS,
   BatchLinesResponse,
@@ -379,9 +378,8 @@ export const useOtpWhitelistReasons = () => {
     openmrsFetch,
     { revalidateOnFocus: false, dedupingInterval: 5 * 60_000 },
   );
-  const reasons = useMemo(() => data?.data?.reasons ?? [], [data]);
   return {
-    reasons,
+    reasons: data?.data?.reasons ?? [],
     isLoading,
     error,
   };

package/src/billing-tabs/billling-tabs.component.tsx

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Tab, TabList, TabPanel, TabPanels, Tabs } from '@carbon/react';
-import { List, Search, BaggageClaim, TwoFactorAuthentication, User } from '@carbon/react/icons';
+import { List, Search, BaggageClaim, TwoFactorAuthentication } from '@carbon/react/icons';
 
 import BillsTable from '../bills-table/bills-table.component';
 import PatientBillsScreen from '../past-patient-bills/patient-bills-dashboard/patient-bills-dashboard';
+import ClaimsManagementTable from '../claims/claims-management/table/claims-list-table.component';
 import PreauthQueueTable from '../claims/claims-management/table/virtual-claim-preauth/preauth-queue-table.component';
 import MainTable from '../claims/claims-management/main-table/main-table.component';
-import ActiveVisit from '../visits/visits.component';
 
 type BillingTabsProps = {
   onTabChange?: (index: number) => void;
@@ -27,7 +27,6 @@ const BillingTabs = ({ onTabChange }: BillingTabsProps) => {
       <Tabs selectedIndex={activeTabIndex} onChange={handleTabChange}>
         <div style={{ display: 'flex' }}>
           <TabList style={{ paddingLeft: '1rem' }} aria-label={t('billingTabs', 'Billing tabs')} contained>
-            <Tab renderIcon={User}>{t('activeVisit', 'Active Visit')}</Tab>
             <Tab renderIcon={Search}>{t('patientBills', 'Patient Bills')}</Tab>
             <Tab renderIcon={List}>{t('billsToday', 'Bills Today')}</Tab>
             <Tab renderIcon={BaggageClaim}>{t('claims', 'Claims')}</Tab>
@@ -35,11 +34,10 @@ const BillingTabs = ({ onTabChange }: BillingTabsProps) => {
           </TabList>
         </div>
         <TabPanels>
-          <TabPanel>{<ActiveVisit />}</TabPanel>
           <TabPanel>{<PatientBillsScreen />}</TabPanel>
-          <TabPanel>{<BillsTable isOnActiveTab={activeTabIndex === 2} />}</TabPanel>
-          <TabPanel>{activeTabIndex === 3 && <MainTable />}</TabPanel>
-          <TabPanel>{activeTabIndex === 4 && <PreauthQueueTable />}</TabPanel>
+          <TabPanel>{<BillsTable isOnActiveTab={activeTabIndex === 1} />}</TabPanel>
+          <TabPanel>{activeTabIndex === 2 && <MainTable />}</TabPanel>
+          <TabPanel>{activeTabIndex === 3 && <PreauthQueueTable />}</TabPanel>
         </TabPanels>
       </Tabs>
     </div>

package/src/billing.resource.ts

@@ -12,7 +12,7 @@ import {
 import dayjs from 'dayjs';
 import isEmpty from 'lodash-es/isEmpty';
 import sortBy from 'lodash-es/sortBy';
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import useSWR from 'swr';
 import { z } from 'zod';
 import { BillingConfig } from './config-schema';
@@ -322,10 +322,8 @@ export const useBillableItems = () => {
   const url = `${restBaseUrl}/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price,paymentMode))`;
   const { data, isLoading, error } = useSWR<{ data: { results: Array<OpenmrsResource> } }>(url, openmrsFetch);
   const [searchTerm, setSearchTerm] = useState('');
-  const filteredItems = useMemo(
-    () => data?.data?.results?.filter((item) => item.name.toLowerCase().includes(searchTerm.toLowerCase())) ?? [],
-    [data, searchTerm],
-  );
+  const filteredItems =
+    data?.data?.results?.filter((item) => item.name.toLowerCase().includes(searchTerm.toLowerCase())) ?? [];
   return {
     lineItems: filteredItems,
     isLoading,
@@ -337,9 +335,8 @@ export const useBillableItems = () => {
 export const useCashPoint = () => {
   const url = `${restBaseUrl}/cashier/cashPoint`;
   const { data, isLoading, error } = useSWR<{ data: { results: Array<OpenmrsResource> } }>(url, openmrsFetch);
-  const cashPoints = useMemo(() => data?.data?.results ?? [], [data]);
 
-  return { isLoading, error, cashPoints };
+  return { isLoading, error, cashPoints: data?.data?.results ?? [] };
 };
 
 export const createPatientBill = (payload) => {

package/src/claims/claims-management/pages/resubmit-claim-page.scss

@@ -7,34 +7,6 @@
   flex-direction: column;
   height: 100%;
   background-color: $ui-01;
-
-  // Table styling
-  :global(.cds--data-table) {
-    width: 100%;
-    margin: layout.$spacing-04 0;
-    border-collapse: collapse;
-
-    th,
-    td {
-      padding: layout.$spacing-03;
-      text-align: left;
-      border-bottom: 1px solid $ui-03;
-    }
-
-    th {
-      background-color: $ui-02;
-      font-weight: 600;
-      color: #161616;
-    }
-
-    td {
-      color: #161616;
-    }
-
-    tr:hover {
-      background-color: #f4f4f4;
-    }
-  }
 }
 
 .pageHeader {
@@ -314,6 +286,34 @@
   }
 }
 
+// Table styling
+:global(.cds--data-table) {
+  width: 100%;
+  margin: layout.$spacing-04 0;
+  border-collapse: collapse;
+
+  th,
+  td {
+    padding: layout.$spacing-03;
+    text-align: left;
+    border-bottom: 1px solid $ui-03;
+  }
+
+  th {
+    background-color: $ui-02;
+    font-weight: 600;
+    color: #161616;
+  }
+
+  td {
+    color: #161616;
+  }
+
+  tr:hover {
+    background-color: #f4f4f4;
+  }
+}
+
 // Responsive
 @media (max-width: 768px) {
   .pageHeader {

package/src/index.ts

@@ -22,7 +22,6 @@ export const billingCheckInForm = getAsyncLifecycle(
   options,
 );
 export const billingForm = getAsyncLifecycle(() => import('./billing-form/billing-form.component'), options);
-export const visitAttributesWorkspace = getAsyncLifecycle(() => import('./visits/visit-attributes.workspace'), options);
 export const billingDashboard = getAsyncLifecycle(
   () => import('./billing-dashboard/billing-dashboard.component'),
   options,

package/src/routes.json

@@ -95,8 +95,8 @@
     },
     {
       "name": "billing-check-in-form",
+      "slot": "visit-form-bottom-slot",
       "component": "billingCheckInForm",
-      "slot": "billing-visit-attributes-slot",
       "order": 1
     },
     {
@@ -411,11 +411,6 @@
     }
   ],
   "workspaces2": [
-    {
-      "name": "visit-attributes-workspace",
-      "component": "visitAttributesWorkspace",
-      "window": "billing-extra-wide-workspace-window"
-    },
     {
       "name": "create-bill-workspace",
       "component": "createBillWorkspace",

package/translations/am.json

@@ -8,8 +8,6 @@
   "activeSchemes": "Active Schemes:",
   "activeVisit": "Active visit",
   "activeVisitRequired": "ለመቀየር ጉብኝት ይጀምሩ",
-  "activeVisits": "Active visits",
-  "activeVisitsDescription": "Patients with an ongoing visit within the selected date range.",
   "add": "Add",
   "addAttachment": "+ Add attachment",
   "addAttributeType": "Add attribute type",
@@ -266,22 +264,17 @@
   "claimResubmitted": "Claim resubmitted",
   "claimResubmittedDescription": "Claim resubmission request sent successfully.",
   "claims": "ጥያቄዎች",
-  "claimsAdmin": "Claims Admin",
-  "claimsAnalytics": "Claims Analytics",
-  "claimsByStatus": "Claims by Status",
   "claimsItems": "የጥያቄ ዕቃዎች",
   "claimsManagement": "የጥያቄዎች አስተዳደር",
   "claimsMetrics": "Claims metrics",
   "claimsOverview": "Claims Overview",
   "claimsTabs": "Claims tabs",
   "claimStatus": "Claim status",
-  "claimsTotals": "Claims Totals",
   "claimSubmitted": "Claim submitted",
   "claimSubmittedDesc": "Claim {{code}} sent to payer for review",
   "claimSummary": "የጥያቄ ማጠቃለያ",
   "claimSummaryMissing": "Claim summary is missing. Please try again.",
   "clear": "ይጽዳ",
-  "clearFilters": "Clear filters",
   "clearSearch": "የፍለጋ ግቤት ይጽዳ",
   "clinicalCharges": "የክሊኒክ ክፍያዎች",
   "clinicalDetails": "Clinical details",
@@ -296,7 +289,6 @@
   "closeBill": "ሂሳብ ይዝጋ",
   "closeBillExplanation": "Closing this bill will prevent any new items from being added to this bill",
   "closed": "Closed",
-  "closedClaims": "Closed Claims",
   "closeModal": "Close modal",
   "code": "Code",
   "commodityBillableCreated": "Commodity price created successfully",
@@ -333,13 +325,10 @@
   "createPreauthGuidance": "Submit an elective preauth to SHA for review.",
   "creating": "እየተፈጠረ",
   "currentPriceAndQuantity": "Current price and quantity",
-  "custom": "Custom",
-  "customRange": "Custom range",
   "date": "የጥያቄ ቀን",
   "dateAndTime": "ቀን እና ሰዓት",
   "dateCreated": "የተፈጠረበት ቀን",
   "dateOfPayment": "የክፍያ ቀን",
-  "dateRange": "Date range",
   "day": "day",
   "days": "Days",
   "delete": "ይሰርዝ",
@@ -596,8 +585,6 @@
   "keepBilledLinesHelper": "Keep existing billed lines on the retired intervention (will still bill alongside the new one)",
   "keepPreauth": "Keep preauth",
   "kephLevelTr": "Tariff",
-  "last30Days": "Last 30 days",
-  "last7Days": "Last 7 days",
   "lensPrescription": "Lens prescription",
   "license": "License",
   "licenseNumber": "License number *",
@@ -621,7 +608,6 @@
   "loadingDiagnoses": "Loading diagnoses...",
   "loadingDoctors": "Loading doctors…",
   "loadingInterventions": "ጣልቃ ገብነቶች እየተጫኑ",
-  "loadingMetrics": "Loading metrics...",
   "loadingPatient": "Loading patient...",
   "loadingPatientSHA": "Checking SHA eligibility...",
   "loadingPayerPreview": "Loading payer preview...",
@@ -636,7 +622,6 @@
   "male": "Male",
   "manageBillLines": "Manage bill line items",
   "manageInterventions": "Manage interventions",
-  "manageVisit": "Manage visit",
   "maxPayableForDays": "Maximum payable is {{max}} (accrued so far) for {{days}} {{dayLabel}} admitted",
   "member": "Member",
   "memberNumber": "Member Number",
@@ -665,7 +650,6 @@
   "next": "Next",
   "nextPage": "ቀጣይ ገጽ",
   "no": "አይ",
-  "noActiveVisitsInRange": "There are no active visits within the selected date range.",
   "noApplicableDocuments": "No applicable documents listed",
   "noAttachmentsToUpload": "No attachments to upload",
   "noAttachmentUuid": "No attachment selected",
@@ -914,7 +898,6 @@
   "previewClaim": "Preview Claim",
   "previewDocuments": "Preview documents",
   "previewError": "Preview Error",
-  "previewUploadedFile": "Preview uploaded file",
   "previouslySubmittedDocs": "Previously submitted documents",
   "previouslyUsedUseRestore": "Previously used — use Restore instead",
   "previousPage": "ቀዳሚ ገጽ",
@@ -963,7 +946,6 @@
   "regExp": "መደበኛ አገላለጽ",
   "regulationBody": "Regulation body *",
   "rejected": "ውድቅ ተደርጓል",
-  "rejectedClaims": "Rejected Claims",
   "rejectedNeedsAction": "REJECTED_NEED_ACTION",
   "rejectedOn": "Rejected On",
   "rejectedPreauths": "Rejected Pre-Authorizations",
@@ -1038,8 +1020,6 @@
   "retryFailedCount_one": "Retry {{count}} failed",
   "retryFailedCount_other": "Retry {{count}} failed",
   "return": "Return",
-  "returned": "Returned",
-  "returnedClaims": "Returned Claims",
   "reverse": "ያገለብጡ",
   "reverseTransaction": "Reverse Transaction",
   "reverseTransactionConfirmation": "Are you sure you want to reverse this transaction?",
@@ -1081,7 +1061,6 @@
   "searchServices": "አገልግሎቶች ይፈልጉ",
   "searchThisTable": "ይህን ሰንጠረዥ ይፈልጉ",
   "searchTransactions": "የግብይቶች ሰንጠረዥ ይፈልጉ",
-  "searchVisits": "Search visits",
   "select": "Select",
   "selectAttributeFormat": "የባህርይ ቅርጸት ይምረጡ",
   "selectBenefitPackage": "Select a benefit package",
@@ -1175,7 +1154,6 @@
   "submitNetworkError": "Could not submit claim",
   "submitPreauth": "Submit preauth",
   "submitted": "Submitted",
-  "submittedClaims": "Submitted Claims",
   "submittedDocuments": "Submitted documents",
   "submitting": "Submitting...",
   "success": "ተሳክቷል",
@@ -1204,11 +1182,9 @@
   "syncStatus": "Sync status",
   "tariff": "Tariff (KES)",
   "tenderedOfTotal": "{{tendered}} of {{total}} allocated {{remaining}} remaining",
-  "thisMonth": "This month",
   "time": "Time",
   "timesheet": "የሰዓት ሉህ",
   "toDate": "To",
-  "today": "Today",
   "todayPreauths": "Today's preauths",
   "total": "ጠቅላላ",
   "totalAmount": "ጠቅላላ መጠን",
@@ -1217,7 +1193,6 @@
   "totalBilled": "Total billed",
   "totalBillsLabel": "Total Bills",
   "totalClaimNetAmount": "Total Claim Net Amount",
-  "totalClaims": "Total Claims",
   "totalDeposits": "ጠቅላላ ተቀማጭ ገንዘቦች",
   "totalExempted": "ጠቅላላ ነጻ የወጡ",
   "totalPayments": "ጠቅላላ ክፍያዎች",
@@ -1251,7 +1226,6 @@
   "unknownPatient": "Unknown patient",
   "unnamedIntervention": "Unnamed intervention",
   "unnamedScheme": "Unnamed scheme",
-  "unpaidClaims": "Unpaid Claims",
   "unsettledBill": "Unsettled bill",
   "update": "Update",
   "updateAllError": "Failed to update claim statuses, please try again",
@@ -1297,11 +1271,8 @@
   "virtualClaimFailed": "Failed to create virtual claim",
   "virtualClaimNoAuthCode": "SHA returned a claim with no authorization code. Cannot proceed — please retry.",
   "visit": "Visit",
-  "visitActions": "Visit actions",
   "visitAttributesError": "Visit Attributes Error",
   "visitDate": "Visit date",
-  "visitDetailsSaved": "Visit details saved",
-  "visitDetailsSavedSubtitle": "The details were attached to the visit successfully.",
   "visitEnd": "Visit End",
   "visitInfo": "Visit info",
   "visitLinked": "Visit linked",
@@ -1323,6 +1294,5 @@
   "waiverReasonRequired": "Waiver reason is required",
   "willRestore": "Will be restored to active",
   "workflowState": "Workflow State",
-  "yes": "አዎ",
-  "yesterday": "Yesterday"
+  "yes": "አዎ"
 }

package/translations/en.json

@@ -8,8 +8,6 @@
   "activeSchemes": "Active Schemes:",
   "activeVisit": "Active visit",
   "activeVisitRequired": "Start visit to modify",
-  "activeVisits": "Active visits",
-  "activeVisitsDescription": "Patients with an ongoing visit within the selected date range.",
   "add": "Add",
   "addAttachment": "+ Add attachment",
   "addAttributeType": "Add attribute type",
@@ -266,22 +264,17 @@
   "claimResubmitted": "Claim resubmitted",
   "claimResubmittedDescription": "Claim resubmission request sent successfully.",
   "claims": "Claims",
-  "claimsAdmin": "Claims Admin",
-  "claimsAnalytics": "Claims Analytics",
-  "claimsByStatus": "Claims by Status",
   "claimsItems": "Claims Items",
   "claimsManagement": "Claims management",
   "claimsMetrics": "Claims metrics",
   "claimsOverview": "Claims Overview",
   "claimsTabs": "Claims tabs",
   "claimStatus": "Claim status",
-  "claimsTotals": "Claims Totals",
   "claimSubmitted": "Claim submitted",
   "claimSubmittedDesc": "Claim {{code}} sent to payer for review",
   "claimSummary": "Claim Summary",
   "claimSummaryMissing": "Claim summary is missing. Please try again.",
   "clear": "Clear",
-  "clearFilters": "Clear filters",
   "clearSearch": "Clear search input",
   "clinicalCharges": "Clinical Charges",
   "clinicalDetails": "Clinical details",
@@ -296,7 +289,6 @@
   "closeBill": "Close Bill",
   "closeBillExplanation": "Closing this bill will prevent any new items from being added to this bill",
   "closed": "Closed",
-  "closedClaims": "Closed Claims",
   "closeModal": "Close modal",
   "code": "Code",
   "commodityBillableCreated": "Commodity price created successfully",
@@ -333,13 +325,10 @@
   "createPreauthGuidance": "Submit an elective preauth to SHA for review.",
   "creating": "Creating",
   "currentPriceAndQuantity": "Current price and quantity",
-  "custom": "Custom",
-  "customRange": "Custom range",
   "date": "Date of Claim",
   "dateAndTime": "Date And Time",
   "dateCreated": "Date Created",
   "dateOfPayment": "Date of payment",
-  "dateRange": "Date range",
   "day": "day",
   "days": "Days",
   "delete": "Delete",
@@ -596,8 +585,6 @@
   "keepBilledLinesHelper": "Keep existing billed lines on the retired intervention (will still bill alongside the new one)",
   "keepPreauth": "Keep preauth",
   "kephLevelTr": "Tariff",
-  "last30Days": "Last 30 days",
-  "last7Days": "Last 7 days",
   "lensPrescription": "Lens prescription",
   "license": "License",
   "licenseNumber": "License number *",
@@ -621,7 +608,6 @@
   "loadingDiagnoses": "Loading diagnoses...",
   "loadingDoctors": "Loading doctors…",
   "loadingInterventions": "Loading interventions",
-  "loadingMetrics": "Loading metrics...",
   "loadingPatient": "Loading patient...",
   "loadingPatientSHA": "Checking SHA eligibility...",
   "loadingPayerPreview": "Loading payer preview...",
@@ -636,7 +622,6 @@
   "male": "Male",
   "manageBillLines": "Manage bill line items",
   "manageInterventions": "Manage interventions",
-  "manageVisit": "Manage visit",
   "maxPayableForDays": "Maximum payable is {{max}} (accrued so far) for {{days}} {{dayLabel}} admitted",
   "member": "Member",
   "memberNumber": "Member Number",
@@ -665,7 +650,6 @@
   "next": "Next",
   "nextPage": "Next page",
   "no": "No",
-  "noActiveVisitsInRange": "There are no active visits within the selected date range.",
   "noApplicableDocuments": "No applicable documents listed",
   "noAttachmentsToUpload": "No attachments to upload",
   "noAttachmentUuid": "No attachment selected",
@@ -914,7 +898,6 @@
   "previewClaim": "Preview Claim",
   "previewDocuments": "Preview documents",
   "previewError": "Preview Error",
-  "previewUploadedFile": "Preview uploaded file",
   "previouslySubmittedDocs": "Previously submitted documents",
   "previouslyUsedUseRestore": "Previously used — use Restore instead",
   "previousPage": "Previous page",
@@ -963,7 +946,6 @@
   "regExp": "Regular expression",
   "regulationBody": "Regulation body *",
   "rejected": "Rejected",
-  "rejectedClaims": "Rejected Claims",
   "rejectedNeedsAction": "REJECTED_NEED_ACTION",
   "rejectedOn": "Rejected On",
   "rejectedPreauths": "Rejected Pre-Authorizations",
@@ -1038,8 +1020,6 @@
   "retryFailedCount_one": "Retry {{count}} failed",
   "retryFailedCount_other": "Retry {{count}} failed",
   "return": "Return",
-  "returned": "Returned",
-  "returnedClaims": "Returned Claims",
   "reverse": "Reverse",
   "reverseTransaction": "Reverse Transaction",
   "reverseTransactionConfirmation": "Are you sure you want to reverse this transaction?",
@@ -1081,7 +1061,6 @@
   "searchServices": "Search services",
   "searchThisTable": "Search this table",
   "searchTransactions": "Search transactions table",
-  "searchVisits": "Search visits",
   "select": "Select",
   "selectAttributeFormat": "Select attribute format",
   "selectBenefitPackage": "Select a benefit package",
@@ -1175,7 +1154,6 @@
   "submitNetworkError": "Could not submit claim",
   "submitPreauth": "Submit preauth",
   "submitted": "Submitted",
-  "submittedClaims": "Submitted Claims",
   "submittedDocuments": "Submitted documents",
   "submitting": "Submitting...",
   "success": "Success",
@@ -1204,11 +1182,9 @@
   "syncStatus": "Sync status",
   "tariff": "Tariff (KES)",
   "tenderedOfTotal": "{{tendered}} of {{total}} allocated {{remaining}} remaining",
-  "thisMonth": "This month",
   "time": "Time",
   "timesheet": "Timesheet",
   "toDate": "To",
-  "today": "Today",
   "todayPreauths": "Today's preauths",
   "total": "Total",
   "totalAmount": "Total Amount",
@@ -1217,7 +1193,6 @@
   "totalBilled": "Total billed",
   "totalBillsLabel": "Total Bills",
   "totalClaimNetAmount": "Total Claim Net Amount",
-  "totalClaims": "Total Claims",
   "totalDeposits": "Total Deposits",
   "totalExempted": "Total Exempted",
   "totalPayments": "Total Payments",
@@ -1251,7 +1226,6 @@
   "unknownPatient": "Unknown patient",
   "unnamedIntervention": "Unnamed intervention",
   "unnamedScheme": "Unnamed scheme",
-  "unpaidClaims": "Unpaid Claims",
   "unsettledBill": "Unsettled bill",
   "update": "Update",
   "updateAllError": "Failed to update claim statuses, please try again",
@@ -1297,11 +1271,8 @@
   "virtualClaimFailed": "Failed to create virtual claim",
   "virtualClaimNoAuthCode": "SHA returned a claim with no authorization code. Cannot proceed — please retry.",
   "visit": "Visit",
-  "visitActions": "Visit actions",
   "visitAttributesError": "Visit Attributes Error",
   "visitDate": "Visit date",
-  "visitDetailsSaved": "Visit details saved",
-  "visitDetailsSavedSubtitle": "The details were attached to the visit successfully.",
   "visitEnd": "Visit End",
   "visitInfo": "Visit info",
   "visitLinked": "Visit linked",
@@ -1323,6 +1294,5 @@
   "waiverReasonRequired": "Waiver reason is required",
   "willRestore": "Will be restored to active",
   "workflowState": "Workflow State",
-  "yes": "Yes",
-  "yesterday": "Yesterday"
+  "yes": "Yes"
 }