feat: add creationDate for all connectors

getAlby · Jan 9, 2025 · a8478b8 · a8478b8
1 parent d9ddb2d
commit a8478b8
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 12 deletions.
diff --git a/src/app/hooks/useTransactions.ts b/src/app/hooks/useTransactions.ts
@@ -23,8 +23,7 @@ export const useTransactions = () => {
             date: dayjs(
               transaction.settleDate || transaction.creationDate
             ).fromNow(),
-            timestamp:
-              transaction.settleDate || transaction.creationDate || Date.now(),
+            timestamp: transaction.settleDate || transaction.creationDate,
           })
         );
 

diff --git a/src/extension/background-script/connectors/alby.ts b/src/extension/background-script/connectors/alby.ts
@@ -123,6 +123,7 @@ export default class Alby implements Connector {
           payment_hash: invoice.payment_hash,
           settled: invoice.settled,
           settleDate: new Date(invoice.settled_at).getTime(),
+          creationDate: new Date(invoice.created_at).getTime(),
           totalAmount: invoice.amount,
           type: invoice.type == "incoming" ? "received" : "sent",
         })

diff --git a/src/extension/background-script/connectors/commando.ts b/src/extension/background-script/connectors/commando.ts
@@ -4,6 +4,7 @@ import LnMessage from "lnmessage";
 import { v4 as uuidv4 } from "uuid";
 import { Account } from "~/types";
 
+import lightningPayReq from "bolt11-signet";
 import { mergeTransactions } from "~/common/utils/helpers";
 import Connector, {
   CheckPaymentArgs,
@@ -238,18 +239,28 @@ export default class Commando implements Connector {
       .then((resp) => {
         const parsed = resp as CommandoListInvoicesResponse;
         return parsed.invoices
-          .map(
-            (invoice, index): ConnectorTransaction => ({
+          .map((invoice, index): ConnectorTransaction => {
+            const decoded = invoice.bolt11
+              ? lightningPayReq.decode(invoice.bolt11)
+              : null;
+
+            const creationDate =
+              decoded && decoded.timestamp
+                ? decoded.timestamp * 1000
+                : new Date(0).getTime();
+
+            return {
               id: invoice.label,
               memo: invoice.description,
               settled: invoice.status === "paid",
+              creationDate: creationDate,
               preimage: invoice.payment_preimage,
               payment_hash: invoice.payment_hash,
               settleDate: invoice.paid_at * 1000,
               type: "received",
               totalAmount: Math.floor(invoice.amount_received_msat / 1000),
-            })
-          )
+            };
+          })
           .filter((invoice) => invoice.settled);
       });
   }
@@ -280,18 +291,28 @@ export default class Commando implements Connector {
       .then((resp) => {
         const parsed = resp as CommandoListSendPaysResponse;
         return parsed.payments
-          .map(
-            (payment, index): ConnectorTransaction => ({
+          .map((payment, index): ConnectorTransaction => {
+            const decoded = payment.bolt11
+              ? lightningPayReq.decode(payment.bolt11)
+              : null;
+
+            const creationDate =
+              decoded && decoded.timestamp
+                ? decoded.timestamp * 1000
+                : new Date(0).getTime();
+
+            return {
               id: `${payment.id}`,
               memo: payment.description ?? "",
               settled: payment.status === "complete",
               preimage: payment.payment_preimage,
+              creationDate: creationDate,
               payment_hash: payment.payment_hash,
               settleDate: payment.created_at * 1000,
               type: "sent",
               totalAmount: payment.amount_sent_msat / 1000,
-            })
-          )
+            };
+          })
           .filter((payment) => payment.settled);
       });
   }

diff --git a/src/extension/background-script/connectors/connector.interface.ts b/src/extension/background-script/connectors/connector.interface.ts
@@ -32,7 +32,7 @@ export interface ConnectorTransaction {
    * Settle date in UNIX milliseconds
    */
   settleDate: number | null;
-  creationDate?: number;
+  creationDate: number;
   totalAmount: number;
   displayAmount?: [number, ACCOUNT_CURRENCIES];
   type: "received" | "sent";

diff --git a/src/extension/background-script/connectors/galoy.ts b/src/extension/background-script/connectors/galoy.ts
@@ -246,6 +246,7 @@ class Galoy implements Connector {
             payment_hash: tx.initiationVia.paymentHash || "",
             settled: tx.status === "SUCCESS",
             settleDate: createdAtDate.getTime(),
+            creationDate: createdAtDate.getTime(),
             totalAmount: absSettlementAmount,
             type: transactionType,
             displayAmount,

diff --git a/src/extension/background-script/connectors/lawallet.ts b/src/extension/background-script/connectors/lawallet.ts
@@ -476,6 +476,7 @@ export async function parseTransaction(
     preimage: await extractPreimage(event, privateKey),
     settled: true,
     settleDate: event.created_at * 1000,
+    creationDate: event.created_at * 1000,
     totalAmount: content.tokens.BTC / 1000,
     type: event.tags[1][1] === userPubkey ? "received" : "sent",
     custom_records: {},

diff --git a/src/extension/background-script/connectors/lnbits.ts b/src/extension/background-script/connectors/lnbits.ts
@@ -124,6 +124,12 @@ class LnBits implements Connector {
       ) => {
         const transactions: ConnectorTransaction[] = data
           .map((transaction, index): ConnectorTransaction => {
+            const decoded = lightningPayReq.decode(transaction.bolt11);
+
+            const creationDate = decoded.timestamp
+              ? decoded.timestamp * 1000
+              : new Date(0).getTime();
+
             return {
               id: `${transaction.checking_id}-${index}`,
               memo: transaction.memo,
@@ -135,6 +141,7 @@ class LnBits implements Connector {
               payment_hash: transaction.payment_hash,
               settled: !transaction.pending,
               settleDate: transaction.time * 1000,
+              creationDate: creationDate,
               totalAmount: Math.abs(Math.floor(transaction.amount / 1000)),
               type: transaction.amount > 0 ? "received" : "sent",
             };

diff --git a/src/extension/background-script/connectors/lnc.ts b/src/extension/background-script/connectors/lnc.ts
@@ -266,6 +266,7 @@ class Lnc implements Connector {
           preimage: invoice.rPreimage.toString(),
           settled: invoice.state === "SETTLED",
           settleDate: parseInt(invoice.settleDate) * 1000,
+          creationDate: parseInt(invoice.creationDate) * 1000,
           totalAmount: parseInt(invoice.value),
           type: "received",
         };
@@ -313,6 +314,7 @@ class Lnc implements Connector {
             payment_hash: payment.paymentHash,
             settled: true,
             settleDate: parseInt(payment.creationTimeNs) / 1_000_000,
+            creationDate: parseInt(payment.creationTimeNs) / 1_000_000,
             totalAmount: parseInt(payment.valueSat),
             type: "sent",
           };

diff --git a/src/extension/background-script/connectors/lnd.ts b/src/extension/background-script/connectors/lnd.ts
@@ -467,6 +467,7 @@ class Lnd implements Connector {
           payment_hash: utils.base64ToHex(invoice.r_hash),
           settled: invoice.settled,
           settleDate: parseInt(invoice.settle_date) * 1000,
+          creationDate: parseInt(invoice.creation_date) * 1000,
           totalAmount: parseInt(invoice.value),
           type: "received",
           custom_records,
@@ -533,6 +534,7 @@ class Lnd implements Connector {
           payment_hash: payment.payment_hash,
           settled: true,
           settleDate: parseInt(payment.creation_date) * 1000,
+          creationDate: parseInt(payment.creation_date) * 1000,
           totalAmount: payment.value_sat,
           type: "sent",
         };

diff --git a/src/extension/background-script/connectors/lndhub.ts b/src/extension/background-script/connectors/lndhub.ts
@@ -115,6 +115,7 @@ export default class LndHub implements Connector {
           payment_hash: invoice.payment_hash,
           settled: invoice.ispaid,
           settleDate: invoice.timestamp * 1000,
+          creationDate: invoice.timestamp * 1000,
           totalAmount: invoice.amt,
           type: "received",
         })
@@ -176,6 +177,7 @@ export default class LndHub implements Connector {
         ),
         settled: true,
         settleDate: transaction.timestamp * 1000,
+        creationDate: transaction.timestamp * 1000,
         totalAmount: transaction.value,
         type: "sent",
       })

diff --git a/src/types.ts b/src/types.ts
@@ -960,7 +960,7 @@ export interface Invoice {
   type: "received" | "sent";
   settled: boolean;
   settleDate: number | null;
-  creationDate?: number;
+  creationDate: number;
   totalAmount: number;
   totalAmountFiat?: string;
   displayAmount?: [number, ACCOUNT_CURRENCIES];