fix(self-custodial): close inFlightInvoicesRef race between live and replay paths

Author: esaugomez31

__tests__/self-custodial/hooks/use-auto-convert-listener.spec.ts

@@ -685,4 +685,43 @@ describe("useAutoConvertListener — mount replay", () => {
     })
     expect(sdk.listPayments).not.toHaveBeenCalled()
   })
+
+  it("dedups live and replay racing the same paymentRequest via inFlightInvoicesRef (Important #1)", async () => {
+    // Both effects fire on mount; both target the same invoice. Only one
+    // convert must run — the second path should see the inFlight ref populated
+    // by the first and skip cleanly.
+    const sdk = makeSdk({
+      getPayment: jest.fn().mockResolvedValue({ payment: makeLightningPayment("lnbc1") }),
+      listPayments: jest.fn().mockResolvedValue({
+        payments: [
+          {
+            id: "pid-lnbc1",
+            amount: 5000n,
+            details: { tag: "Lightning", inner: { invoice: "lnbc1" } },
+          },
+        ],
+      }),
+    })
+    setupDefaults(sdk)
+    mockUseSelfCustodialWallet.mockReturnValue({
+      sdk,
+      lastReceivedPaymentId: "pid-lnbc1",
+      isStableBalanceActive: false,
+    })
+    mockFindPendingAutoConvert.mockResolvedValue(makeRecord({ paymentRequest: "lnbc1" }))
+    mockListPendingAutoConverts.mockResolvedValue([
+      makeRecord({ paymentRequest: "lnbc1" }),
+    ])
+
+    renderHook(() => useAutoConvertListener())
+
+    await waitFor(() => {
+      expect(mockExecuteAutoConvert).toHaveBeenCalled()
+    })
+    // Give any pending replay-path microtasks a chance to flush.
+    await new Promise((resolve) => {
+      setTimeout(resolve, 10)
+    })
+    expect(mockExecuteAutoConvert).toHaveBeenCalledTimes(1)
+  })
 })

app/self-custodial/hooks/use-auto-convert-listener.ts

@@ -274,14 +274,17 @@ export const useAutoConvertListener = (): void => {
       if (inFlightInvoicesRef.current.has(invoice)) return
       if (!isRetryableNow(record, Date.now())) return
 
-      const { claimedConversionIds, pairedReceiveIds } = await buildClaimedConversionIds()
-      if (pairedReceiveIds.has(lastReceivedPaymentId)) {
-        await removePendingAutoConvert(invoice)
-        return
-      }
-
+      // Reserve the invoice synchronously so the replay path can't race past
+      // the `has` check during the awaits below.
       inFlightInvoicesRef.current.add(invoice)
       try {
+        const { claimedConversionIds, pairedReceiveIds } =
+          await buildClaimedConversionIds()
+        if (pairedReceiveIds.has(lastReceivedPaymentId)) {
+          await removePendingAutoConvert(invoice)
+          return
+        }
+
         await runAutoConvert({
           sdk,
           record,
@@ -332,27 +335,29 @@ export const useAutoConvertListener = (): void => {
         if (inFlightInvoicesRef.current.has(record.paymentRequest)) return
         if (!isRetryableNow(record, nowMs)) return
 
-        const paid = await findPaidAmountForInvoice(sdk, record.paymentRequest)
-        // Bound the replay loop on busy wallets where the matching payment has
-        // aged off the recent listPayments page.
-        if (!paid) {
-          if (record.attempts + 1 >= autoConvertMaxAttempts) {
-            await removePendingAutoConvert(record.paymentRequest)
+        // Reserve the invoice synchronously so the live path can't race past
+        // the `has` check during the awaits below.
+        inFlightInvoicesRef.current.add(record.paymentRequest)
+        try {
+          const paid = await findPaidAmountForInvoice(sdk, record.paymentRequest)
+          // Bound the replay loop on busy wallets where the matching payment has
+          // aged off the recent listPayments page.
+          if (!paid) {
+            if (record.attempts + 1 >= autoConvertMaxAttempts) {
+              await removePendingAutoConvert(record.paymentRequest)
+              return
+            }
+            await recordAutoConvertAttempt(record.paymentRequest, nowMs)
             return
           }
-          await recordAutoConvertAttempt(record.paymentRequest, nowMs)
-          return
-        }
 
-        const { claimedConversionIds, pairedReceiveIds } =
-          await buildClaimedConversionIds()
-        if (pairedReceiveIds.has(paid.paymentId)) {
-          await removePendingAutoConvert(record.paymentRequest)
-          return
-        }
+          const { claimedConversionIds, pairedReceiveIds } =
+            await buildClaimedConversionIds()
+          if (pairedReceiveIds.has(paid.paymentId)) {
+            await removePendingAutoConvert(record.paymentRequest)
+            return
+          }
 
-        inFlightInvoicesRef.current.add(record.paymentRequest)
-        try {
           await runAutoConvert({
             sdk,
             record,