From 3c8956fedff5100b9af6e7877b7aa7e73bbc3bda Mon Sep 17 00:00:00 2001
From: Camilo Oviedo <caol29ster@gmail.com>
Date: Sat, 17 Aug 2024 10:09:44 +1000
Subject: [PATCH 1/3] fix: Correctly display Date, Published At, and Created At
 fields

---
 .../Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
index 84aadd48d..9d47cfb38 100644
--- a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
+++ b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
@@ -10,7 +10,6 @@ import {
   Col,
   DetailItem,
   DetailsMenu,
-  FormatDate,
   ExchangeRateDetailItem,
   FormattedMessage as T,
 } from '@/components';
@@ -41,7 +40,7 @@ export default function ExpenseDrawerHeader() {
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem name={'date'} label={<T id={'date'} />}>
-              {expense.formatted_payment_date}
+              {expense.formatted_date || '—'}
             </DetailItem>
 
             <DetailItem name={'reference'} label={<T id={'reference_no'} />}>
@@ -65,11 +64,11 @@ export default function ExpenseDrawerHeader() {
             minLabelSize={'180px'}
           >
             <DetailItem label={<T id={'published_at'} />}>
-              {expense.formatted_date}
+              {expense.formatted_published_at || '—'}
             </DetailItem>
 
             <DetailItem label={<T id={'created_at'} />}>
-              {expense.formatted_created_at}
+              {expense.formatted_created_at || '—'}
             </DetailItem>
           </DetailsMenu>
         </Col>

From 021520622022b2b89c2304f699b92b79167684ce Mon Sep 17 00:00:00 2001
From: Camilo Oviedo <caol29ster@gmail.com>
Date: Sat, 17 Aug 2024 10:11:05 +1000
Subject: [PATCH 2/3] add: Created attribute formattedPublishedAt to display on
 Expense Drawer

---
 .../src/services/Expenses/CRUD/ExpenseTransformer.ts   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts b/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts
index 3f566b87b..fa9bec75a 100644
--- a/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts
+++ b/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts
@@ -16,6 +16,7 @@ export class ExpenseTransfromer extends Transformer {
       'formattedAllocatedCostAmount',
       'formattedDate',
       'formattedCreatedAt',
+      'formattedPublishedAt',
       'categories',
       'attachments',
     ];
@@ -91,4 +92,13 @@ export class ExpenseTransfromer extends Transformer {
   protected attachments = (expense: IExpense) => {
     return this.item(expense.attachments, new AttachmentTransformer());
   };
+
+  /**
+   * Retrieve formatted published at date.
+   * @param {IExpense} expense 
+   * @returns {string}
+   */
+  protected formattedPublishedAt = (expense: IExpense): string => {
+    return this.formatDate(expense.publishedAt);
+  }
 }

From 169f115fa06181318c80b714e028eb829a16087d Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Sun, 18 Aug 2024 11:19:06 +0200
Subject: [PATCH 3/3] fix: remove the default value from date and createdAt
 because always required

---
 .../containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
index 9d47cfb38..91fa0c497 100644
--- a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
+++ b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx
@@ -40,7 +40,7 @@ export default function ExpenseDrawerHeader() {
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem name={'date'} label={<T id={'date'} />}>
-              {expense.formatted_date || '—'}
+              {expense.formatted_date}
             </DetailItem>
 
             <DetailItem name={'reference'} label={<T id={'reference_no'} />}>
@@ -68,7 +68,7 @@ export default function ExpenseDrawerHeader() {
             </DetailItem>
 
             <DetailItem label={<T id={'created_at'} />}>
-              {expense.formatted_created_at || '—'}
+              {expense.formatted_created_at} 
             </DetailItem>
           </DetailsMenu>
         </Col>