From f1fec69d52ebc4714728a3ba2de0010d48992fb7 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 27 Oct 2021 18:06:26 +0200 Subject: [PATCH] feat: fix cash flow drawer. --- .../CashflowTransactionDrawerFooter.js | 10 ++++---- .../CashflowTransactionDrawerHeader.js | 4 +-- .../CashflowTransactionDetailDrawer/utils.js | 25 ------------------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.js b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.js index e22d2de93..77b61c8e2 100644 --- a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.js +++ b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.js @@ -4,7 +4,7 @@ import { T, FormatNumber } from '../../../components'; export default function CashflowTransactionDrawerFooter() { const { - cashflowTransaction: { amount }, + cashflowTransaction: { formatted_amount }, } = useCashflowTransactionDrawerContext(); return ( @@ -15,18 +15,18 @@ export default function CashflowTransactionDrawerFooter() {
- +
- +
-
{amount}
-
{amount}
+
{formatted_amount}
+
{formatted_amount}
diff --git a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js index 88c8c7bdd..713bc1888 100644 --- a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js +++ b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js @@ -14,7 +14,7 @@ import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawer export default function CashflowTransactionDrawerHeader() { const { cashflowTransaction: { - amount, + formatted_amount, transaction_type, transaction_number, reference_no, @@ -27,7 +27,7 @@ export default function CashflowTransactionDrawerHeader() {
}> -

{amount}

+

{formatted_amount}

- - - - - ); -} - /** * Retrieve cashflow transaction entries columns. */ @@ -42,13 +24,6 @@ export const useCashflowTransactionColumns = () => disableSortBy: true, className: 'contact', }, - { - Header: intl.get('note'), - accessor: NoteAccessor, - width: 80, - disableSortBy: true, - className: 'note', - }, { Header: intl.get('credit'), accessor: 'credit',