diff --git a/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx b/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx
index 279549ec..1566ada4 100644
--- a/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx
+++ b/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx
@@ -6,6 +6,7 @@ import { Link, useLocation, useNavigate } from 'react-router-dom';
import { CompanyName } from 'src/icons/brand/CompanyName';
import { LogoSmall } from 'src/icons/brand/LogoSmall';
import { EncountersIcon } from 'src/icons/menu/EncountersIcon';
+import { InvoicesIcon } from 'src/icons/menu/InvoicesIcon';
import { PatientsIcon } from 'src/icons/menu/PatientsIcon';
import { PractitionersIcon } from 'src/icons/menu/PractitionersIcon';
import { QuestionnairesIcon } from 'src/icons/menu/QuestionnairesIcon';
@@ -40,7 +41,7 @@ export function SidebarTop(props: Props) {
const menuItems: RouteItem[] = !isAnonymousUser
? matchCurrentUserRole({
[Role.Admin]: () => [
- { label: t`Invoices`, path: '/invoices', icon: },
+ { label: t`Invoices`, path: '/invoices', icon: },
{ label: t`Services`, path: '/healthcare-services', icon: },
{ label: t`Encounters`, path: '/encounters', icon: },
{ label: t`Patients`, path: '/patients', icon: },
diff --git a/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx b/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx
index dd4f3863..f7e65043 100644
--- a/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx
+++ b/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx
@@ -30,6 +30,7 @@ export const ChooseDocumentToCreateModal = (props: Props) => {
mapSuccess(
await getFHIRResources('Questionnaire', {
'subject-type': subjectType ? [subjectType] : [],
+ _sort: 'title',
}),
(bundle) => extractBundleResources(bundle).Questionnaire,
),
diff --git a/src/containers/InvoiceList/tableUtils.tsx b/src/containers/InvoiceList/tableUtils.tsx
index c6d7bde1..b29d54ea 100644
--- a/src/containers/InvoiceList/tableUtils.tsx
+++ b/src/containers/InvoiceList/tableUtils.tsx
@@ -1,9 +1,9 @@
import {
CheckCircleOutlined,
- IssuesCloseOutlined,
- InfoCircleOutlined,
FormOutlined,
StopOutlined,
+ ClockCircleOutlined,
+ ExclamationCircleOutlined,
} from '@ant-design/icons';
import { Tag, Row, Col } from 'antd';
import { Invoice } from 'fhir/r4b';
@@ -21,12 +21,12 @@ export function InvoiceStatus({ invoice }: { invoice: Invoice }) {
name: 'Balanced',
},
cancelled: {
- icon: ,
+ icon: ,
color: 'warning',
name: 'Cancelled',
},
issued: {
- icon: ,
+ icon: ,
color: 'processing',
name: 'Issued',
},
@@ -36,7 +36,7 @@ export function InvoiceStatus({ invoice }: { invoice: Invoice }) {
name: 'Draft',
},
'entered-in-error': {
- icon: ,
+ icon: ,
color: 'error',
name: 'Entered in error',
},
diff --git a/src/icons/menu/InvoicesIcon.tsx b/src/icons/menu/InvoicesIcon.tsx
new file mode 100644
index 00000000..029fbf67
--- /dev/null
+++ b/src/icons/menu/InvoicesIcon.tsx
@@ -0,0 +1,58 @@
+export function InvoicesIcon() {
+ return (
+
+ );
+}