fix: typescript

src/common/utils/helpers.ts

@@ -68,7 +68,7 @@ export function mergeTransactions(
   payments: ConnectorTransaction[]
 ): ConnectorTransaction[] {
   const mergedTransactions = [...invoices, ...payments].sort((a, b) => {
-    return (b.settleDate ?? Date.now()) - (a.settleDate ?? Date.now());
+    return (b.settleDate ?? 0) - (a.settleDate ?? 0);
   });
 
   return mergedTransactions;

src/extension/background-script/connectors/connector.interface.ts

@@ -31,7 +31,7 @@ export interface ConnectorTransaction {
   /**
    * Settle date in UNIX milliseconds
    */
-  settleDate?: number;
+  settleDate: number | null;
   creationDate?: number;
   totalAmount: number;
   displayAmount?: [number, ACCOUNT_CURRENCIES];

src/extension/background-script/connectors/lawallet.ts

@@ -128,7 +128,7 @@ export default class LaWallet implements Connector {
     return {
       data: {
         transactions: parsedTransactions.sort(
-          (a, b) => (b.settleDate ?? Date.now()) - (a.settleDate ?? Date.now())
+          (a, b) => (b.settleDate ?? 0) - (a.settleDate ?? 0)
         ),
       },
     };

src/extension/background-script/connectors/lndhub.ts

@@ -120,7 +120,7 @@ export default class LndHub implements Connector {
         })
       )
       .sort((a, b) => {
-        return (b.settleDate ?? Date.now()) - (a.settleDate ?? Date.now());
+        return (b.settleDate ?? 0) - (a.settleDate ?? 0);
       });
 
     return invoices;

src/extension/background-script/connectors/nwc.ts

@@ -99,9 +99,7 @@ class NWCConnector implements Connector {
           preimage: transaction.preimage,
           payment_hash: transaction.payment_hash,
           settled: transaction.state == "settled",
-          ...(transaction.state == "settled" && transaction.settled_at
-            ? { settleDate: transaction.settled_at * 1000 }
-            : {}),
+          settleDate: transaction.settled_at * 1000,
           creationDate: transaction.created_at * 1000,
           totalAmount: Math.floor(transaction.amount / 1000),
           type: transaction.type == "incoming" ? "received" : "sent",

src/types.ts

@@ -959,7 +959,7 @@ export interface Invoice {
   memo?: string;
   type: "received" | "sent";
   settled: boolean;
-  settleDate?: number;
+  settleDate: number | null;
   creationDate?: number;
   totalAmount: number;
   totalAmountFiat?: string;