add ampinvoice db and fixed suggestions

hsjoberg · May 8, 2024 · 74f871d · 74f871d
1 parent cd7a577
commit 74f871d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/state/Send.ts b/src/state/Send.ts
@@ -245,7 +245,7 @@ export const send: ISendModel = {
           multiPathPaymentsEnabled,
           maxLNFeePercentage,
           outgoingChannelId,
-          payload && payload.isAmpInvoice ? true : false,
+          (payload && payload.isAmpInvoice) ?? false,
         );
       } catch (error) {
         await dispatch.transaction.syncTransaction({

diff --git a/src/state/Transaction.ts b/src/state/Transaction.ts
@@ -54,16 +54,18 @@ export const transaction: ITransactionModel = {
     }
 
     // Don't insert open transactions for AMP invoices
-    if (tx.status === "OPEN" && tx.ampInvoice) {
-      return;
-    }
+    if (tx.ampInvoice) {
+      if (tx.status === "OPEN") {
+        return;
+      }
 
-    // If AMP invoice settles, insert a new tx
-    if (tx.status === "SETTLED" && tx.ampInvoice) {
-      const id = await createTransaction(db, tx);
-      actions.addTransaction({ ...tx, id });
+      // If AMP invoice settles, insert a new tx
+      if (tx.status === "SETTLED") {
+        const id = await createTransaction(db, tx);
+        actions.addTransaction({ ...tx, id });
 
-      return;
+        return;
+      }
     }
 
     const transactions = getState().transactions;

diff --git a/src/storage/database/transaction.ts b/src/storage/database/transaction.ts
@@ -21,6 +21,7 @@ export interface IDBTransaction {
   status: "ACCEPTED" | "CANCELED" | "OPEN" | "SETTLED" | "UNKNOWN" | "EXPIRED";
   paymentRequest: string;
   rHash: string;
+  ampInvoice: boolean;
   nodeAliasCached: string | null;
   payer: string | null;
   valueUSD: number | null;
@@ -173,6 +174,7 @@ export const createTransaction = async (
       ?,
       ?,
       ?,
+      ?,
       ?
     )`,
     [
@@ -190,6 +192,7 @@ export const createTransaction = async (
       transaction.status,
       transaction.paymentRequest,
       transaction.rHash,
+      transaction.ampInvoice.toString(),
       transaction.nodeAliasCached ?? null,
       transaction.payer ?? null,
       transaction.valueUSD,
@@ -390,6 +393,7 @@ const convertDBTransaction = (transaction: IDBTransaction): ITransaction => {
     paymentRequest: transaction.paymentRequest,
     status: transaction.status,
     rHash: transaction.rHash,
+    ampInvoice: transaction.ampInvoice,
     nodeAliasCached: transaction.nodeAliasCached,
     payer: transaction.payer,
     valueUSD: transaction.valueUSD,