@openreceive/browser 0.4.10 → 0.4.12

package/dist/{chunk-FIAYCDZO.js → chunk-XDFN6BT3.js}

@@ -950,8 +950,8 @@ function createSwapDisplayModel(invoice, options = {}) {
   const depositAmount = formatDepositAmount(swap.deposit_amount);
   const networkWarningEmphasis = `${depositAmount} ${asset.assetLabel} on the ${asset.networkLabel} network`;
   const depositRisk = swapDepositRisk(swap.pay_in_asset);
-  const doubleSpendWarning = `Pay with one method only \u2014 if you already sent ${asset.assetLabel}, do not also pay the Lightning invoice.`;
   const settled = invoice.transaction_state === "settled";
+  const instructionsExpired = expiresInSeconds === 0 && swap.provider_state === "awaiting_deposit";
   const feeBreakdown = createSwapFeeBreakdown(swap.fee, swap);
   return {
     provider: swap.provider,
@@ -962,7 +962,8 @@ function createSwapDisplayModel(invoice, options = {}) {
     depositRisk,
     networkWarningTitle: depositRisk === "pinned" ? checkoutLabels.sendExactAmountTitle : checkoutLabels.wrongCurrencyOrNetworkTitle,
     networkWarningEmphasis,
-    networkWarning: depositRisk === "pinned" ? `Send exactly ${networkWarningEmphasis}. ${doubleSpendWarning}` : `Be sure you are sending exactly ${networkWarningEmphasis}. If you send the wrong currency or send on the wrong network, your funds will be lost! ${doubleSpendWarning}`,
+    // The lost-funds sentence is claimed only where it is reachable.
+    networkWarning: depositRisk === "pinned" ? `Send exactly ${networkWarningEmphasis}.` : `Be sure you are sending exactly ${networkWarningEmphasis}. If you send the wrong currency or send on the wrong network, your funds will be lost!`,
     depositAddress: swap.deposit_address,
     ...swap.deposit_memo === void 0 ? {} : { depositMemo: swap.deposit_memo },
     depositAmount,
@@ -987,14 +988,14 @@ function createSwapDisplayModel(invoice, options = {}) {
       ],
       { label: checkoutLabels.swapCopyAmount, value: depositAmount, selectable: true }
     ],
-    providerStateLabel: settled ? "Payment complete" : getSwapProviderStateLabel(swap.provider_state),
-    providerStateDetail: settled ? "Your payment is confirmed and your order is complete." : getSwapProviderStateDetail(swap.provider_state, swap.pay_in_asset, {
+    providerStateLabel: instructionsExpired ? "Payment window closed" : settled ? "Payment complete" : getSwapProviderStateLabel(swap.provider_state),
+    providerStateDetail: instructionsExpired ? "Do not send another payment. We are checking for an existing deposit and any recovery options." : settled ? "Your payment is confirmed and your order is complete." : getSwapProviderStateDetail(swap.provider_state, swap.pay_in_asset, {
       refundReason: swap.refund_reason,
       depositAmount: swap.deposit_amount,
       depositReceivedAmount: swap.deposit_received_amount,
       refundAmount: swap.refund_amount
     }),
-    state: settled ? "settled" : getSwapPanelState(swap.provider_state),
+    state: settled ? "settled" : instructionsExpired ? "progress" : getSwapPanelState(swap.provider_state),
     expiresInSeconds,
     countdownLabel: formatCountdown(expiresInSeconds),
     qrPayload: createSwapQrPayload(swap),
@@ -1046,10 +1047,13 @@ function overlaySwapRefundStagingIntoSnapshot(snapshot, staged) {
 function selectCurrentSwapInvoice(snapshot, options = {}) {
   const dismissedInvoiceId = options.dismissedInvoiceId ?? null;
   const started = options.started ?? null;
-  const fromSnapshot = snapshot?.invoices.find(
-    (invoice) => invoice.rail === "swap" && invoice.swap !== void 0 && invoice.invoice_id !== dismissedInvoiceId
-  );
-  if (started === null || started.invoice_id === dismissedInvoiceId) return fromSnapshot;
+  if (started === null) {
+    if (dismissedInvoiceId !== null) return void 0;
+    return snapshot?.invoices.find(
+      (invoice) => invoice.rail === "swap" && invoice.swap !== void 0
+    );
+  }
+  if (started.invoice_id === dismissedInvoiceId) return void 0;
   const matched = snapshot?.invoices.find((invoice) => invoice.invoice_id === started.invoice_id) ?? started;
   return overlaySwapRefundStaging(matched, started);
 }
@@ -1087,7 +1091,7 @@ function getSwapProviderStateDetail(state, payInAsset, refundContext = {}) {
     return "Your payment is confirmed and being converted. This usually finishes within a minute.";
   }
   if (state === "paying_invoice" || state === "completed") {
-    return "The provider is sending the Lightning payment. This usually takes a few seconds.";
+    return "We are checking whether the wallet received the payment. Provider completion alone does not confirm payment.";
   }
   if (state === "expired") return "No payment was received before the payment window closed.";
   if (state === "refund_required" || state === "refund_pending" || state === "refunded") {
@@ -1361,6 +1365,127 @@ function isCheckoutStateSource(value) {
   return "checkout_id" in value && "reference" in value && "invoice_id" in value && "invoice" in value && "transaction_state" in value && "phase" in value;
 }
 
+// src/internal/console-logger.ts
+import { isSensitiveLogKey, sanitizeLogValue } from "@openreceive/core";
+
+// src/internal/log-level.ts
+var BROWSER_LOG_LEVEL_ORDER = {
+  debug: 10,
+  info: 20,
+  warn: 30,
+  error: 40
+};
+var BROWSER_LOG_LEVEL_ALIASES = {
+  debug: "debug",
+  info: "info",
+  warn: "warn",
+  warning: "warn",
+  error: "error"
+};
+function browserLogLevelOrder(level) {
+  return BROWSER_LOG_LEVEL_ORDER[level];
+}
+function parseBrowserLogLevel(value) {
+  if (value === void 0 || value === null) return void 0;
+  const normalized = value.trim().toLowerCase();
+  if (normalized.length === 0) return void 0;
+  return BROWSER_LOG_LEVEL_ALIASES[normalized];
+}
+function resolveBrowserLogLevel(value, fallback = "info") {
+  return parseBrowserLogLevel(value) ?? fallback;
+}
+function readBrowserLogLevelFromEnvironment(source) {
+  if (source !== void 0) {
+    return resolveBrowserLogLevel(
+      source.LOG_LEVEL ?? source.VITE_LOG_LEVEL ?? source.NEXT_PUBLIC_LOG_LEVEL
+    );
+  }
+  const fromGlobal = parseBrowserLogLevel(readGlobalLogLevel());
+  if (fromGlobal !== void 0) return fromGlobal;
+  const metaEnv = readImportMetaEnv();
+  const parsedMeta = parseBrowserLogLevel(
+    metaEnv?.LOG_LEVEL ?? metaEnv?.VITE_LOG_LEVEL ?? metaEnv?.NEXT_PUBLIC_LOG_LEVEL
+  );
+  if (parsedMeta !== void 0) return parsedMeta;
+  const processEnv = typeof process !== "undefined" ? process.env : void 0;
+  return resolveBrowserLogLevel(processEnv?.LOG_LEVEL);
+}
+function readGlobalLogLevel() {
+  try {
+    const value = globalThis.__OPENRECEIVE_LOG_LEVEL__;
+    return typeof value === "string" ? value : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function readImportMetaEnv() {
+  try {
+    return import.meta.env;
+  } catch {
+    return void 0;
+  }
+}
+
+// src/internal/console-logger.ts
+function createConsoleWriter(options) {
+  const target = options.console ?? console;
+  const now = options.now ?? (() => /* @__PURE__ */ new Date());
+  return (level, prefix, event, message, fields) => {
+    const minLevel = options.minLevel === void 0 ? readBrowserLogLevelFromEnvironment() : resolveBrowserLogLevel(options.minLevel);
+    if (browserLogLevelOrder(level) < browserLogLevelOrder(minLevel)) {
+      return;
+    }
+    const method = level === "error" ? "error" : level === "warn" ? "warn" : level === "debug" ? "debug" : "info";
+    const sink = target[method] ?? target.log;
+    const {
+      level: _level,
+      event: _event,
+      message: cleanMessage,
+      ...cleanFields
+    } = sanitizeBrowserLogEntry({ level, event, message, ...fields });
+    sink.call(
+      target,
+      `[${now().toISOString()}] ${level.toUpperCase()} [${prefix}] ${event}: ${cleanMessage}`,
+      cleanFields
+    );
+  };
+}
+function sanitizeBrowserLogEntry(entry) {
+  const clean = {};
+  for (const [key, value] of Object.entries(entry)) {
+    if (isSensitiveLogKey(key)) {
+      clean[key] = "[REDACTED]";
+    } else {
+      clean[key] = sanitizeLogValue(value);
+    }
+  }
+  return clean;
+}
+function createBrowserConsoleLogger(options = {}) {
+  const prefix = options.prefix ?? "openreceive";
+  const write = createConsoleWriter(options);
+  return (entry) => {
+    const { level, event, message, ...fields } = entry;
+    write(level, prefix, event, message, fields);
+  };
+}
+function createAppBrowserConsoleLogger(options) {
+  const write = createConsoleWriter(options);
+  return (event, message, fields = {}, level = "info") => {
+    write(level, options.prefix, event, message, fields);
+  };
+}
+var defaultBrowserConsoleLogger;
+function getDefaultBrowserConsoleLogger() {
+  defaultBrowserConsoleLogger ??= createBrowserConsoleLogger();
+  return defaultBrowserConsoleLogger;
+}
+function resolveBrowserLogger(logger) {
+  if (logger === false) return void 0;
+  if (logger !== void 0) return logger;
+  return getDefaultBrowserConsoleLogger();
+}
+
 // src/internal/wizard.ts
 import { getSwapRefundAddressError } from "@openreceive/core/swap-address";
 import {
@@ -1956,176 +2081,6 @@ function createPaymentWizardController(options = {}) {
   return new BrowserPaymentWizardController(options);
 }
 
-// src/internal/log-level.ts
-var BROWSER_LOG_LEVEL_ORDER = {
-  debug: 10,
-  info: 20,
-  warn: 30,
-  error: 40
-};
-var BROWSER_LOG_LEVEL_ALIASES = {
-  debug: "debug",
-  info: "info",
-  warn: "warn",
-  warning: "warn",
-  error: "error"
-};
-function browserLogLevelOrder(level) {
-  return BROWSER_LOG_LEVEL_ORDER[level];
-}
-function parseBrowserLogLevel(value) {
-  if (value === void 0 || value === null) return void 0;
-  const normalized = value.trim().toLowerCase();
-  if (normalized.length === 0) return void 0;
-  return BROWSER_LOG_LEVEL_ALIASES[normalized];
-}
-function resolveBrowserLogLevel(value, fallback = "info") {
-  return parseBrowserLogLevel(value) ?? fallback;
-}
-function readBrowserLogLevelFromEnvironment(source) {
-  if (source !== void 0) {
-    return resolveBrowserLogLevel(
-      source.LOG_LEVEL ?? source.VITE_LOG_LEVEL ?? source.NEXT_PUBLIC_LOG_LEVEL
-    );
-  }
-  const fromGlobal = parseBrowserLogLevel(readGlobalLogLevel());
-  if (fromGlobal !== void 0) return fromGlobal;
-  const metaEnv = readImportMetaEnv();
-  const parsedMeta = parseBrowserLogLevel(
-    metaEnv?.LOG_LEVEL ?? metaEnv?.VITE_LOG_LEVEL ?? metaEnv?.NEXT_PUBLIC_LOG_LEVEL
-  );
-  if (parsedMeta !== void 0) return parsedMeta;
-  const processEnv = typeof process !== "undefined" ? process.env : void 0;
-  return resolveBrowserLogLevel(processEnv?.LOG_LEVEL);
-}
-function readGlobalLogLevel() {
-  try {
-    const value = globalThis.__OPENRECEIVE_LOG_LEVEL__;
-    return typeof value === "string" ? value : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function readImportMetaEnv() {
-  try {
-    return import.meta.env;
-  } catch {
-    return void 0;
-  }
-}
-
-// src/internal/console-logger.ts
-function createConsoleWriter(options) {
-  const target = options.console ?? console;
-  const now = options.now ?? (() => /* @__PURE__ */ new Date());
-  return (level, prefix, event, message, fields) => {
-    const minLevel = options.minLevel === void 0 ? readBrowserLogLevelFromEnvironment() : resolveBrowserLogLevel(options.minLevel);
-    if (browserLogLevelOrder(level) < browserLogLevelOrder(minLevel)) {
-      return;
-    }
-    const method = level === "error" ? "error" : level === "warn" ? "warn" : level === "debug" ? "debug" : "info";
-    const sink = target[method] ?? target.log;
-    const {
-      level: _level,
-      event: _event,
-      message: cleanMessage,
-      ...cleanFields
-    } = sanitizeBrowserLogEntry({ level, event, message, ...fields });
-    sink.call(
-      target,
-      `[${now().toISOString()}] ${level.toUpperCase()} [${prefix}] ${event}: ${cleanMessage}`,
-      cleanFields
-    );
-  };
-}
-function sanitizeBrowserLogEntry(entry) {
-  const clean = {};
-  for (const [key, value] of Object.entries(entry)) {
-    if (/secret|token|authorization|cookie|nwc/i.test(key)) {
-      clean[key] = "[REDACTED]";
-    } else {
-      clean[key] = sanitizeBrowserLogValue(value);
-    }
-  }
-  return clean;
-}
-function sanitizeBrowserLogValue(value) {
-  if (typeof value === "string") return redactBrowserSecrets(value);
-  if (Array.isArray(value)) return value.map(sanitizeBrowserLogValue);
-  if (typeof value !== "object" || value === null) return value;
-  const clean = {};
-  for (const [key, nested] of Object.entries(value)) {
-    if (/secret|token|authorization|cookie|nwc/i.test(key)) {
-      clean[key] = "[REDACTED]";
-    } else {
-      clean[key] = sanitizeBrowserLogValue(nested);
-    }
-  }
-  return clean;
-}
-function redactBrowserSecrets(value) {
-  return value.replace(/nostr\+walletconnect:\/\/[^\s"'`<>]+/g, "[REDACTED_NWC]").replace(/([?&](?:_or_evt|token|secret)=)[^&\s"'`<>]+/gi, "$1[REDACTED]");
-}
-function createBrowserConsoleLogger(options = {}) {
-  const prefix = options.prefix ?? "openreceive";
-  const write = createConsoleWriter(options);
-  return (entry) => {
-    const { level, event, message, ...fields } = entry;
-    write(level, prefix, event, message, fields);
-  };
-}
-function createAppBrowserConsoleLogger(options) {
-  const write = createConsoleWriter(options);
-  return (event, message, fields = {}, level = "info") => {
-    write(level, options.prefix, event, message, fields);
-  };
-}
-var defaultBrowserConsoleLogger;
-function getDefaultBrowserConsoleLogger() {
-  defaultBrowserConsoleLogger ??= createBrowserConsoleLogger();
-  return defaultBrowserConsoleLogger;
-}
-function resolveBrowserLogger(logger) {
-  if (logger === false) return void 0;
-  if (logger !== void 0) return logger;
-  return getDefaultBrowserConsoleLogger();
-}
-
-// src/internal/checkout-read.ts
-import { nonEmptyString } from "@openreceive/core";
-function optionalRecord(value) {
-  if (value === void 0) return void 0;
-  if (value === null || typeof value !== "object" || Array.isArray(value)) {
-    throw new Error("OpenReceive metadata must be an object.");
-  }
-  return value;
-}
-function requiredInvoiceRail(value) {
-  if (value === "lightning" || value === "swap" || value === "checkout_lock") return value;
-  throw new TypeError("OpenReceive invoice rail must be lightning, swap, or checkout_lock.");
-}
-function requiredString(value, fieldName) {
-  const text = nonEmptyString(value);
-  if (text === void 0) {
-    throw new TypeError(`OpenReceive checkout response requires ${fieldName}.`);
-  }
-  return text;
-}
-function optionalSafeInteger(value, fieldName = "integer") {
-  if (value === void 0 || value === null) return void 0;
-  if (typeof value !== "number" || !Number.isSafeInteger(value)) {
-    throw new TypeError(`OpenReceive checkout response ${fieldName} must be a safe integer.`);
-  }
-  return value;
-}
-function requiredSafeInteger(value, fieldName) {
-  const integer = optionalSafeInteger(value, fieldName);
-  if (integer === void 0) {
-    throw new TypeError(`OpenReceive checkout response requires ${fieldName}.`);
-  }
-  return integer;
-}
-
 // src/internal/checkout-log.ts
 import { compact } from "@openreceive/core";
 function checkoutLogFields(state) {
@@ -2206,6 +2161,41 @@ function emitBrowserLog(logger, level, event, message, fields = {}) {
   }
 }
 
+// src/internal/checkout-read.ts
+import { nonEmptyString } from "@openreceive/core";
+function optionalRecord(value) {
+  if (value === void 0) return void 0;
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("OpenReceive metadata must be an object.");
+  }
+  return value;
+}
+function requiredInvoiceRail(value) {
+  if (value === "lightning" || value === "swap" || value === "checkout_lock") return value;
+  throw new TypeError("OpenReceive invoice rail must be lightning, swap, or checkout_lock.");
+}
+function requiredString(value, fieldName) {
+  const text = nonEmptyString(value);
+  if (text === void 0) {
+    throw new TypeError(`OpenReceive checkout response requires ${fieldName}.`);
+  }
+  return text;
+}
+function optionalSafeInteger(value, fieldName = "integer") {
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value !== "number" || !Number.isSafeInteger(value)) {
+    throw new TypeError(`OpenReceive checkout response ${fieldName} must be a safe integer.`);
+  }
+  return value;
+}
+function requiredSafeInteger(value, fieldName) {
+  const integer = optionalSafeInteger(value, fieldName);
+  if (integer === void 0) {
+    throw new TypeError(`OpenReceive checkout response requires ${fieldName}.`);
+  }
+  return integer;
+}
+
 // src/internal/checkout-state.ts
 function selectCheckoutDisplayInvoice(snapshot) {
   if (snapshot.active !== void 0 && snapshot.active.rail !== "checkout_lock") {
@@ -2380,15 +2370,14 @@ function normalizeCheckoutState(state, now) {
   const expiresInSeconds = base.expires_at === void 0 || now === void 0 ? void 0 : Math.max(0, base.expires_at - now);
   const phase = statePhase === "invoice_created" || statePhase === "verifying" ? expiresInSeconds === 0 ? "expired" : statePhase : statePhase;
   const settled = base.paid || base.transaction_state === "settled";
+  const monitoring = checkoutMonitoring(base);
   return {
     ...base,
     ...deriveCheckoutStateLabels(base),
     phase,
     settled,
-    // A swap that expired, refunded, failed, or needs support review is over:
-    // the shadow invoice behind it will not be paid, so watchers stop polling
-    // both /payments/check and the provider instead of asking forever.
-    terminal: isTerminalPhase(phase) || !settled && isTerminalSwapProviderState(base.swap?.provider_state),
+    // A local instruction deadline says nothing about wallet or refund finality.
+    terminal: !monitoring.payment && !monitoring.provider,
     ...expiresInSeconds === void 0 ? {} : { expires_in_seconds: expiresInSeconds }
   };
 }
@@ -2409,8 +2398,13 @@ function getCheckoutPhase(transactionState, workflowState) {
   }
   return "invoice_created";
 }
-function isTerminalPhase(phase) {
-  return phase === "expired" || phase === "failed" || phase === "cancelled";
+function checkoutMonitoring(state) {
+  if (state.workflow_state === "cancelled") return { payment: false, provider: false };
+  const payment = !state.paid && !["settled", "expired", "failed", "attention"].includes(state.transaction_state ?? "pending") && !["expired", "failed", "attention"].includes(state.workflow_state ?? "invoice_created");
+  const providerState = state.swap?.provider_state;
+  const recovery = providerState === "refund_required" || providerState === "refund_pending";
+  const provider = providerState !== void 0 && !isTerminalSwapProviderState(providerState) && providerState !== "completed" && (recovery || !state.paid && state.transaction_state !== "settled");
+  return { payment, provider };
 }
 function snapshotFromCheckoutState(state) {
   const invoice = {
@@ -2570,6 +2564,7 @@ function normalizeRequestCheckoutOptions(options) {
   const reference = nonEmptyString2(options.reference);
   const metadata = optionalRecord(options.metadata);
   return {
+    signal: options.signal,
     routes: checkoutRoutes(options.prefix),
     reference: reference ?? "",
     fetch: options.fetch,
@@ -2599,6 +2594,7 @@ async function requestCheckout(options) {
   const headers = request.headers === void 0 ? {} : request.headers;
   const response = await fetcher(request.routes.checkouts, {
     method: "POST",
+    signal: request.signal,
     headers: requestHeaders(headers, request.csrfHeader),
     body: JSON.stringify(requestBody)
   });
@@ -2622,6 +2618,7 @@ async function prepareCheckout(options) {
   const headers = request.headers === void 0 ? {} : request.headers;
   const response = await fetcher(request.routes.checkoutsPrepare, {
     method: "POST",
+    signal: request.signal,
     headers: requestHeaders(headers, request.csrfHeader),
     body: JSON.stringify({ reference: request.reference })
   });
@@ -2645,50 +2642,57 @@ function createStatusFetcher(options) {
     if (activePaymentHash === void 0 || !/^[0-9a-f]{64}$/i.test(activePaymentHash)) {
       return snapshot;
     }
-    const response = await fetcher(routes.paymentsCheck, {
-      method: "POST",
-      headers: requestHeaders(headers, options.csrfHeader),
-      body: JSON.stringify({
-        reference,
-        payment_hash: activePaymentHash
-      })
-    });
-    const body = await readJsonResponse(response, "Could not refresh invoice status.");
-    const payment = recordOrEmpty(body);
     const next = structuredClone(snapshot);
     if (next.active === void 0) return next;
-    const state = nonEmptyString2(payment.status) ?? "pending";
-    const paidAt = optionalSafeInteger(payment.paid_at, "paid_at");
-    let active = {
-      ...next.active,
-      transaction_state: state === "not_found" ? "pending" : state,
-      ...paidAt === void 0 ? {} : { settled_at: paidAt }
-    };
-    if (active.rail === "swap" && active.swap !== void 0 && state !== "settled" && // A terminal provider state is final; re-reading it only adds provider load.
-    !isTerminalSwapProviderState(nonEmptyString2(active.swap.provider_state))) {
+    let active = next.active;
+    let payment = {};
+    let paymentError;
+    if (checkoutMonitoring(active).payment) {
+      try {
+        const response = await fetcher(routes.paymentsCheck, {
+          method: "POST",
+          headers: requestHeaders(headers, options.csrfHeader),
+          body: JSON.stringify({ reference, payment_hash: activePaymentHash })
+        });
+        payment = recordOrEmpty(
+          await readJsonResponse(response, "Could not refresh invoice status.")
+        );
+        const state2 = nonEmptyString2(payment.status) ?? "pending";
+        const paidAt = optionalSafeInteger(payment.paid_at, "paid_at");
+        active = {
+          ...active,
+          transaction_state: state2 === "not_found" ? "pending" : state2,
+          ...paidAt === void 0 ? {} : { settled_at: paidAt }
+        };
+      } catch (error) {
+        paymentError = error;
+      }
+    }
+    if (active.rail === "swap" && checkoutMonitoring(active).provider) {
       try {
         const swapResponse = await fetcher(routes.swapsStatus, {
           method: "POST",
           headers: requestHeaders(headers, options.csrfHeader),
           body: JSON.stringify({ reference, payment_hash: activePaymentHash })
         });
-        const swapBody = recordOrEmpty(
-          await readJsonResponse(swapResponse, "Could not refresh swap status.")
+        active = mergeSwapStatusIntoInvoice(
+          active,
+          recordOrEmpty(await readJsonResponse(swapResponse, "Could not refresh swap status."))
         );
-        active = mergeSwapStatusIntoInvoice(active, swapBody);
         swapStatusFailures = 0;
       } catch (error) {
         swapStatusFailures += 1;
         const definitive = error instanceof BrowserRequestError && error.retryable === false;
-        const swap = active.swap;
-        if (swap !== void 0 && (definitive || swapStatusFailures >= SWAP_STATUS_FAILURE_LIMIT)) {
+        if (active.swap !== void 0 && (definitive || swapStatusFailures >= SWAP_STATUS_FAILURE_LIMIT)) {
           active = {
             ...active,
-            swap: { ...swap, attention: true, attention_reason: "swap_status_unavailable" }
+            swap: { ...active.swap, attention: true, attention_reason: "swap_status_unavailable" }
           };
         }
+        if (paymentError === void 0 && !checkoutMonitoring(active).payment) paymentError = error;
       }
     }
+    const state = active.transaction_state;
     const paymentMethods2 = normalizePaymentMethods(payment.payment_methods);
     const others = next.invoices.filter(
       (entry) => entry.invoice_id !== active.invoice_id && entry.rail !== "checkout_lock"
@@ -2700,6 +2704,7 @@ function createStatusFetcher(options) {
       status: state === "settled" ? "paid" : state === "expired" || state === "failed" ? "expired" : "open",
       ...paymentMethods2 === void 0 ? {} : { payment_methods: paymentMethods2 }
     };
+    if (paymentError !== void 0 && active.swap === void 0) throw paymentError;
     return snapshot;
   };
 }
@@ -3095,6 +3100,7 @@ async function requestJson(options, url, body) {
   const fetcher = options.fetch;
   const response = await fetcher(url, {
     method: "POST",
+    signal: options.signal,
     headers: requestHeaders(options.headers, options.csrfHeader),
     body: JSON.stringify(body)
   });
@@ -3176,6 +3182,8 @@ var CheckoutWatcher = class {
   countdownTimer;
   pollTimer;
   running = false;
+  generation = 0;
+  pendingRefresh;
   pollInFlight = false;
   pollFailureCount = 0;
   pollBackoffUntil;
@@ -3242,6 +3250,9 @@ var CheckoutWatcher = class {
   }
   stop() {
     this.running = false;
+    this.generation += 1;
+    this.pollInFlight = false;
+    this.pendingRefresh = void 0;
     this.stopCountdown();
     this.stopPolling();
   }
@@ -3280,8 +3291,10 @@ var CheckoutWatcher = class {
     if (refreshStatus === void 0 || current.reference.length === 0) {
       return current;
     }
+    const generation = this.generation;
     try {
-      const fetched = await refreshStatus(current.reference);
+      const fetched = await this.fetchSnapshot(current.reference);
+      if (generation !== this.generation) return this.state ?? current;
       if (fetched === null) return current;
       const next = this.publishSnapshot(fetched);
       const nextState = createCheckoutState(next, {
@@ -3297,10 +3310,20 @@ var CheckoutWatcher = class {
       }
       return nextState;
     } catch (error) {
+      if (generation !== this.generation) return this.state ?? current;
       this.options.onError?.(error);
       throw error;
     }
   }
+  fetchSnapshot(reference) {
+    if (this.pendingRefresh !== void 0) return this.pendingRefresh;
+    const pending = Promise.resolve(this.options.refreshStatus?.(reference) ?? null);
+    this.pendingRefresh = pending;
+    void pending.finally(() => {
+      if (this.pendingRefresh === pending) this.pendingRefresh = void 0;
+    }).catch(() => void 0);
+    return pending;
+  }
   applyState(state) {
     if (!this.running) return;
     this.state = state;
@@ -3314,7 +3337,7 @@ var CheckoutWatcher = class {
       this.stop();
       return;
     }
-    if (state.settled || state.expires_at === void 0) {
+    if (state.settled || state.expires_at === void 0 || state.expires_in_seconds === 0) {
       this.stopCountdown();
     } else if (this.countdownTimer === void 0) {
       this.countdownTimer = this.setInterval()(() => {
@@ -3330,7 +3353,7 @@ var CheckoutWatcher = class {
       }, 1e3);
     }
     const canPollAttempt = state.rail !== "checkout_lock" && typeof state.payment_hash === "string" && /^[0-9a-f]{64}$/i.test(state.payment_hash);
-    if (state.settled || this.options.refreshStatus === void 0 || state.reference.length === 0 || !canPollAttempt) {
+    if (this.options.refreshStatus === void 0 || state.reference.length === 0 || !canPollAttempt) {
       this.stopPolling();
     } else if (this.pollTimer === void 0) {
       this.pollTimer = this.setInterval()(() => {
@@ -3342,20 +3365,22 @@ var CheckoutWatcher = class {
     const refreshStatus = this.options.refreshStatus;
     const current = this.state;
     if (!this.running || refreshStatus === void 0 || current === void 0) return;
-    if (current.terminal || current.settled) {
+    if (current.terminal) {
       this.stopPolling();
       return;
     }
     if (this.pollInFlight) return;
     if (this.pollBackoffUntil !== void 0 && this.now() < this.pollBackoffUntil) return;
     this.pollInFlight = true;
+    const generation = this.generation;
     try {
-      const fetched = await refreshStatus(current.reference);
+      const fetched = await this.fetchSnapshot(current.reference);
+      if (generation !== this.generation) return;
       this.pollFailureCount = 0;
       this.pollBackoffUntil = void 0;
       if (fetched === null) return;
       if (!this.running || this.state === void 0) return;
-      if (this.state.settled || this.state.terminal) return;
+      if (this.state.terminal) return;
       const next = this.publishSnapshot(fetched);
       this.applyState(
         createCheckoutState(next, {
@@ -3366,13 +3391,14 @@ var CheckoutWatcher = class {
         })
       );
     } catch (error) {
+      if (generation !== this.generation) return;
       this.pollFailureCount += 1;
       const retryAfterSeconds = error instanceof BrowserRequestError ? error.retryAfterSeconds : void 0;
       const backoffSeconds = retryAfterSeconds ?? Math.min(60, 2 ** Math.min(this.pollFailureCount, 6));
       this.pollBackoffUntil = this.now() + backoffSeconds;
       this.options.onError?.(error);
     } finally {
-      this.pollInFlight = false;
+      if (generation === this.generation) this.pollInFlight = false;
     }
   }
   stopCountdown() {
@@ -3399,6 +3425,7 @@ var BrowserCheckoutController = class {
   options;
   watcher;
   state;
+  generation = 0;
   constructor(options) {
     this.options = options;
     this.watcher = this.createWatcher(options);
@@ -3408,6 +3435,7 @@ var BrowserCheckoutController = class {
     return this.state;
   }
   stop() {
+    this.generation += 1;
     this.watcher.stop();
   }
   getState() {
@@ -3469,6 +3497,7 @@ var BrowserCheckoutController = class {
     if (paymentHash === void 0) {
       throw new Error(`No swap attempt ${options.attemptId} in this checkout.`);
     }
+    const generation = this.generation;
     const invoice = await requestSwapRefund({
       fetch: this.options.fetch ?? globalThis.fetch,
       prefix,
@@ -3480,10 +3509,12 @@ var BrowserCheckoutController = class {
       refundAddress: options.refundAddress,
       confirm
     });
+    if (generation !== this.generation) throw new DOMException("Checkout changed.", "AbortError");
     this.watcher.stageSwapInvoice(invoice);
     return invoice;
   }
   cancel() {
+    this.generation += 1;
     this.state = this.watcher.cancel();
     emitBrowserLog(
       this.options.logger,
@@ -3759,6 +3790,7 @@ export {
   createTransactionDetails,
   createTransactionDetailsFromState,
   resolveTransactionDetailRows,
+  createAppBrowserConsoleLogger,
   getWizardEmptyMessage,
   getRouteNetworkLabel,
   createWizardRouteAssetDisplays,
@@ -3790,7 +3822,6 @@ export {
   createPaymentWizardModel,
   updatePaymentWizardSelection,
   createPaymentWizardController,
-  createAppBrowserConsoleLogger,
   selectCheckoutDisplayInvoice,
   isPaidCheckoutSnapshot,
   isReusableLightningInvoice,