2 files changed, 4 insertions, 3 deletions

diff --git a/lib/nwc.ts b/lib/nwc.ts
index 791f18f5..82c9870d 100644
--- a/lib/nwc.ts
+++ b/lib/nwc.ts
@@ -223,23 +223,23 @@ const handle = (method, params, user, ev) =>
           amount_received_msat: amount,
           description,
           expires_at,
-          payment_preimage,
           paid_at: settled_at,
         } = invoices[0];
 
         ({ bolt11: invoice, payment_hash } = invoices[0]);
+        const { preimage, settled } = await getInvoice(invoice);
 
         return result({
           type: "incoming",
           invoice,
           description,
-          preimage: payment_preimage,
+          preimage,
           payment_hash,
           amount,
           fees_paid: 0,
           created_at: expires_at - week,
           expires_at,
-          settled_at,
+          settled_at: settled_at || Math.round(settled / 1000),
         });
       }
 
diff --git a/lib/payments.ts b/lib/payments.ts
index 7536d923..d88dc6aa 100644
--- a/lib/payments.ts
+++ b/lib/payments.ts
@@ -217,6 +217,7 @@ export const credit = async ({
   else {
     inv.received += amount;
     inv.preimage = ref;
+    inv.settled = Date.now();
   }
 
   let balanceKey = "balance";