1 files changed, 7 insertions, 3 deletions

diff --git a/src/ark/manager.js b/src/ark/manager.js
index caece44..a1c1390 100644
--- a/src/ark/manager.js
+++ b/src/ark/manager.js
@@ -1496,9 +1496,13 @@ export class ArkManager {
     if (expectNet && dec.network && dec.network !== expectNet) throw new Error(`invoice is for ${dec.network}, wallet is on ${expectNet}`);
     const amountSat = dec.amountSat ?? userAmountSat;
     if (!amountSat || amountSat <= 0) throw new Error('invoice has no amount');
-    if (this.state.actions.some((a) =>
-      a.type === 'ln-pay' && a.paymentHash === dec.paymentHash && a.step !== 'failed')) {
-      throw new Error('this invoice was already paid or is being paid');
+    const prior = this.state.actions.find((a) =>
+      a.type === 'ln-pay' && a.paymentHash === dec.paymentHash && a.step !== 'failed');
+    if (prior) {
+      // two messages, so a caller can tell a settled payment from one still
+      // on its way (an NWC client once read "already paid or is being paid"
+      // as paid, hours before the money moved)
+      throw new Error(prior.step === 'done' ? 'this invoice was already paid' : 'a payment for this invoice is already in progress');
     }
     const tip = await this.chain.tipHeight();
     const routing = routingFeeSat != null ? routingFeeSat : await this.lnRouteFee(invoice, amountSat);