From 88b360b2acdc5fe585434f09ed819f90141ce828 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Tue, 1 Dec 2020 20:30:51 +0200
Subject: [PATCH] fix: currency_code in Expense.

---
 client/src/containers/Expenses/ExpenseDataTable.js  | 4 ++--
 client/src/containers/Expenses/ExpenseFormHeader.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/containers/Expenses/ExpenseDataTable.js b/client/src/containers/Expenses/ExpenseDataTable.js
index a8eea0755..347704cef 100644
--- a/client/src/containers/Expenses/ExpenseDataTable.js
+++ b/client/src/containers/Expenses/ExpenseDataTable.js
@@ -187,7 +187,7 @@ function ExpensesDataTable({
       {
         id: 'total_amount',
         Header: formatMessage({ id: 'full_amount' }),
-        accessor: (r) => <Money amount={r.total_amount} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.total_amount} currency={r.currency_code} />,
         className: 'total_amount',
         width: 150,
       },
@@ -209,7 +209,7 @@ function ExpensesDataTable({
         id: 'publish',
         Header: formatMessage({ id: 'publish' }),
         accessor: (r) => {
-          return !!r.is_published ? (
+          return r.is_published ? (
             <Tag minimal={true}>
               <T id={'published'} />
             </Tag>
diff --git a/client/src/containers/Expenses/ExpenseFormHeader.js b/client/src/containers/Expenses/ExpenseFormHeader.js
index 1e9122607..5ce47164a 100644
--- a/client/src/containers/Expenses/ExpenseFormHeader.js
+++ b/client/src/containers/Expenses/ExpenseFormHeader.js
@@ -23,7 +23,7 @@ export default function ExpenseFormHeader() {
       <PageFormBigNumber
         label={'Expense Amount'}
         amount={totalExpenseAmount}
-        currencyCode={'LYD'}
+        currencyCode={values?.currency_code}
       />
     </div>
   );