From d6d0092f109ff1ef5ba8a2399f82a6da1f03393a Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Tue, 16 Jul 2024 13:55:10 +0800
Subject: [PATCH] Update combined column field, updated display of settle Date
 and Amount received

---
 src/app/utils/formatUtil.ts                           | 3 +++
 src/components/InvoiceSearch/InvoiceSearch.tsx        | 2 +-
 src/components/InvoiceSearch/InvoiceSearchWrapper.tsx | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/utils/formatUtil.ts b/src/app/utils/formatUtil.ts
index d5edb6f..32ccc76 100644
--- a/src/app/utils/formatUtil.ts
+++ b/src/app/utils/formatUtil.ts
@@ -131,6 +131,9 @@ export function convertLocaleStringToNumber(numberString: string): number {
 }
 
 export function timestampToDateString(timestamp: string): string {
+  if (timestamp === null){
+    return "-"
+  }
   const date = new Date(timestamp);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, "0");
diff --git a/src/components/InvoiceSearch/InvoiceSearch.tsx b/src/components/InvoiceSearch/InvoiceSearch.tsx
index f76db96..acc7b4a 100644
--- a/src/components/InvoiceSearch/InvoiceSearch.tsx
+++ b/src/components/InvoiceSearch/InvoiceSearch.tsx
@@ -236,7 +236,7 @@ const InvoiceSearch: React.FC<Props> = ({ issuedInvoice, receivedInvoice, invoic
       { name: "projectName", label: t("Project Name") },
       { name: "team", label: t("Team") },
       { name: "issuedDate", label: t("Issue Date") },
-      { name: "receivedAmount", label: t("Amount (HKD)") },
+      { name: "issuedAmount", label: t("Amount (HKD)") },
       { name: "receiptDate", label: t("Settle Date") },
       { name: "receivedAmount", label: t("Actual Received Amount (HKD)") },
     ],
diff --git a/src/components/InvoiceSearch/InvoiceSearchWrapper.tsx b/src/components/InvoiceSearch/InvoiceSearchWrapper.tsx
index ad3c49c..f155c03 100644
--- a/src/components/InvoiceSearch/InvoiceSearchWrapper.tsx
+++ b/src/components/InvoiceSearch/InvoiceSearchWrapper.tsx
@@ -56,9 +56,9 @@ const InvoiceSearchWrapper: React.FC & SubComponents = async () => {
       projectName: invoice.projectName,
       team: invoice.team,
       issuedDate: timestampToDateString(invoice.invoiceDate)!!,
-      receiptDate: timestampToDateString(invoice.receiptDate??0)!!,
+      receiptDate: timestampToDateString(invoice.receiptDate??null)!!,
       issuedAmount: moneyFormatter.format(invoice.issueAmount),
-      receivedAmount: moneyFormatter.format(invoice.paidAmount)
+      receivedAmount: invoice.paidAmount === null ? "-" : moneyFormatter.format(invoice.paidAmount)
     }
   })