Merge branch 'main' of github.com:RequestNetwork/web-components into 70-add-column-for-payment-chain-in-the-invoice-dashboard

Author: sstefdev

packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte

@@ -23,6 +23,7 @@
   import Download from "@requestnetwork/shared-icons/download.svelte";
   // Utils
   import { formatDate } from "@requestnetwork/shared-utils/formatDate";
+  import { checkStatus } from "@requestnetwork/shared-utils/checkStatus";
   import { calculateItemTotal } from "@requestnetwork/shared-utils/invoiceTotals";
   import { exportToPDF } from "@requestnetwork/shared-utils/generateInvoice";
   import { getCurrencyFromManager } from "@requestnetwork/shared-utils/getCurrency";
@@ -73,6 +74,8 @@
     | Types.Extension.IPaymentNetworkState<any>
     | undefined;
 
+  let status = checkStatus(requestData || request);
+
   const generateDetailParagraphs = (info: any) => {
     const fullName = [info?.firstName, info?.lastName]
       .filter(Boolean)
@@ -186,7 +189,8 @@
       } else {
         approved = true;
       }
-      isPaid = requestData?.balance?.balance! >= requestData?.expectedAmount;
+
+      status = checkStatus(requestData || request);
     } catch (err: any) {
       console.error("Error while checking invoice: ", err);
       if (String(err).includes("Unsupported payment")) {
@@ -368,7 +372,7 @@
   <h2 class="invoice-number">
     Invoice #{request?.contentData?.invoiceNumber || "-"}
     <p class={`invoice-status ${isPaid ? "bg-green" : "bg-zinc"}`}>
-      {isPaid ? "Paid" : "Created"}
+      {status}
     </p>
     <Tooltip text="Download PDF">
       <Download

packages/invoice-dashboard/src/lib/view-requests.svelte

@@ -32,6 +32,7 @@
   import type { IConfig } from "@requestnetwork/shared-types";
   import type { RequestNetwork } from "@requestnetwork/request-client.js";
   // Utils
+  import { checkStatus } from "@requestnetwork/shared-utils/checkStatus";
   import { config as defaultConfig } from "@requestnetwork/shared-utils/config";
   import { initializeCurrencyManager } from "@requestnetwork/shared-utils/initCurrencyManager";
   import { checkStatus } from "@requestnetwork/shared-utils/checkStatus";

shared/utils/checkStatus.ts

@@ -5,9 +5,23 @@ export const checkStatus = (request: Types.IRequestDataWithEvents | null) => {
   const balance = BigInt(request?.balance?.balance ?? 0);
   const expectedAmount = BigInt(request?.expectedAmount ?? 0);
   const today = new Date();
-  const dueDate = new Date(request?.contentData?.paymentTerms?.dueDate);
+  let dueDate: Date | null = null;
   const isPaid = balance >= expectedAmount ? "Paid" : "Partially Paid";
 
+  try {
+    const rawDueDate = request?.contentData?.paymentTerms?.dueDate;
+    if (rawDueDate) {
+      dueDate = new Date(rawDueDate);
+      if (isNaN(dueDate.getTime())) {
+        console.warn("Invalid due date format");
+        dueDate = null;
+      }
+    }
+  } catch (e) {
+    console.error("Error parsing due date:", e);
+    dueDate = null;
+  }
+
   const eventStatus = {
     reject: "Rejected",
     cancel: "Canceled",
@@ -23,7 +37,7 @@ export const checkStatus = (request: Types.IRequestDataWithEvents | null) => {
     }
   }
 
-  if (dueDate < today) {
+  if (dueDate && dueDate < today) {
     if (balance === BigInt(0)) {
       return "Overdue";
     }