fix: return preimage for ln settlement

getAlby · Dec 21, 2023 · 935895c · 935895c
1 parent a5181a7
commit 935895c
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/src/extension/background-script/connectors/galoy.ts b/src/extension/background-script/connectors/galoy.ts
@@ -273,6 +273,21 @@ class Galoy implements Connector {
             errors {
               message
             }
+            transaction {
+              settlementVia {
+                ... on SettlementViaLn {
+                  ${
+                    this.config.apiCompatibilityMode
+                      ? "paymentSecret"
+                      : "preImage"
+                  }
+                }
+                ... on SettlementViaIntraLedger {
+                  counterPartyUsername
+                  counterPartyWalletId
+                }
+              }
+            }
           }
         }
       `,
@@ -295,6 +310,17 @@ class Galoy implements Connector {
         throw new Error(errs[0].message || JSON.stringify(errs));
       }
 
+      const transaction = data.lnInvoicePaymentSend.transaction;
+      let preimageMessage = "No preimage received";
+
+      if (transaction && transaction.settlementVia) {
+        if ('preImage' in transaction.settlementVia || 'paymentSecret' in transaction.settlementVia) {
+          preimageMessage = transaction.settlementVia.preImage || transaction.settlementVia.paymentSecret;
+        } else if ('counterPartyUsername' in transaction.settlementVia || 'counterPartyWalletId' in transaction.settlementVia) {
+          preimageMessage = "No preimage, the payment was settled intraledger";
+        }
+      }
+
       switch (data.lnInvoicePaymentSend.status) {
         case "ALREADY_PAID":
           throw new Error("Invoice was already paid.");
@@ -311,7 +337,7 @@ class Galoy implements Connector {
         default:
           return {
             data: {
-              preimage: "No preimage received",
+              preimage: preimageMessage,
               paymentHash,
               route: { total_amt: amountInSats, total_fees: 0 },
             },