@oasisprotocol/privana-sdk 0.4.0 → 0.4.1

package/dist/on-ramp.js

@@ -1,8 +1,9 @@
 "use client";
-import { usePrivanaContext, usePrivateReadRequest, useDepositVerification, getTransactionReceipt, Button } from './chunk-ZVNC4FTJ.js';
+import { usePrivanaContext, usePrivateReadRequest, useDepositVerification, waitForTransactionReceipt, Skeleton, Button } from './chunk-ZXFQJ5MG.js';
 import { useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { parseAbiItem, zeroAddress, parseUnits, decodeEventLog, formatUnits } from 'viem';
 import { useConfig, useAccount } from 'wagmi';
+import { Loader2 } from 'lucide-react';
 import { MoonPayBuyWidget } from '@moonpay/moonpay-react';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
@@ -28,6 +29,7 @@ function useFiatOnRamp(options) {
   const [depositAddress, setDepositAddress] = useState();
   const [minDepositBaseUnits, setMinDepositBaseUnits] = useState();
   const [activeIntentId, setActiveIntentId] = useState(null);
+  const [finalityProgress, setFinalityProgress] = useState({});
   const onCreditedRef = useRef(onCredited);
   const onErrorRef = useRef(onError);
   const onDebugEventRef = useRef(onDebugEvent);
@@ -37,6 +39,7 @@ function useFiatOnRamp(options) {
   const activeVerificationKeyRef = useRef(null);
   const triggeredVerificationKeysRef = useRef(/* @__PURE__ */ new Set());
   const closeReconcilePromiseRef = useRef(null);
+  const purchaseInitiatedRef = useRef(false);
   useEffect(() => {
     onCreditedRef.current = onCredited;
     onErrorRef.current = onError;
@@ -132,13 +135,32 @@ function useFiatOnRamp(options) {
     pollTimeout: verificationTimeout,
     pollInterval: options.verificationPollInterval,
     finalityRetryInterval,
+    onCheckRetry: (message) => {
+      const record = activeVerificationRecordRef.current;
+      if (!record) return;
+      emitDebug("verification:check-retry", {
+        message,
+        record: summariseOnRampRecord(record)
+      });
+      setFinalityProgress((prev) => ({ ...prev, [record.transaction_id]: message }));
+    },
     onCredited: (depositTxHash) => {
       const record = activeVerificationRecordRef.current;
       emitDebug("verification:credited", {
         depositTxHash,
         record: record ? summariseOnRampRecord(record) : null
       });
-      setStatus("credited");
+      if (record && activeIntentIdRef.current === record.transaction_id) {
+        setStatus("credited");
+      }
+      if (record) {
+        setFinalityProgress((prev) => {
+          if (!(record.transaction_id in prev)) return prev;
+          const next = { ...prev };
+          delete next[record.transaction_id];
+          return next;
+        });
+      }
       void (async () => {
         try {
           if (record && depositTxHash.startsWith("0x")) {
@@ -170,21 +192,27 @@ function useFiatOnRamp(options) {
       onCreditedRef.current?.(depositTxHash);
     },
     onCheckTimeout: (depositTxHash) => {
+      const record = activeVerificationRecordRef.current;
       const err = new Error(
         "Privana verification is still pending. Retry from the pending on-ramp list if it does not complete."
       );
       emitDebug("verification:timeout", { depositTxHash, message: err.message });
       clearActiveVerification();
-      setStatus("failed");
-      setError(err);
+      if (!record || activeIntentIdRef.current === record.transaction_id) {
+        setStatus("failed");
+        setError(err);
+      }
       void refreshPending();
       onErrorRef.current?.(err);
     },
     onError: (err) => {
+      const record = activeVerificationRecordRef.current;
       emitDebug("verification:error", errorPayload(err));
       clearActiveVerification();
-      setStatus("failed");
-      setError(err);
+      if (!record || activeIntentIdRef.current === record.transaction_id) {
+        setStatus("failed");
+        setError(err);
+      }
       onErrorRef.current?.(err);
     }
   });
@@ -196,6 +224,7 @@ function useFiatOnRamp(options) {
     }) => {
       try {
         setError(null);
+        purchaseInitiatedRef.current = false;
         const token = enabledTokens.find((t) => t.id.toLowerCase() === tokenId.toLowerCase());
         if (!token) throw new Error(`Unknown token: ${tokenId}`);
         if (!depositAddress) throw new Error("Privana deposit address is not ready");
@@ -278,6 +307,7 @@ function useFiatOnRamp(options) {
   const handleTransactionCreated = useCallback(
     async (props) => {
       emitDebug("moonpay:onTransactionCreated", summariseMoonPayEventProps(props));
+      purchaseInitiatedRef.current = true;
       await registerOnRampTokenMapping(props.id);
     },
     [emitDebug, registerOnRampTokenMapping]
@@ -356,6 +386,12 @@ function useFiatOnRamp(options) {
       triggeredVerificationKeysRef.current.add(verificationKey);
       activeVerificationKeyRef.current = verificationKey;
       activeVerificationRecordRef.current = record;
+      setFinalityProgress((prev) => {
+        if (!(record.transaction_id in prev)) return prev;
+        const next = { ...prev };
+        delete next[record.transaction_id];
+        return next;
+      });
       emitDebug("verification:start", {
         verificationKey,
         record: summariseOnRampRecord(record)
@@ -396,7 +432,9 @@ function useFiatOnRamp(options) {
             `Delivered amount (${record.quote_currency_amount}) is below the minimum deposit.`
           );
         }
-        setStatus("verifying");
+        if (activeIntentIdRef.current === record.transaction_id) {
+          setStatus("verifying");
+        }
         emitDebug("verification:check-deposit-request", {
           hash: record.on_chain_tx_hash,
           chainId: record.chain_id,
@@ -464,6 +502,17 @@ function useFiatOnRamp(options) {
         await refreshPending();
         return;
       }
+      if (!purchaseInitiatedRef.current) {
+        emitDebug("moonpay:widget-closed-without-purchase", {
+          previousStatus,
+          transactionId
+        });
+        await refreshPending();
+        if (previousStatus === "awaiting-purchase" || previousStatus === "awaiting-delivery") {
+          setStatus("idle");
+        }
+        return;
+      }
       try {
         setStatus("awaiting-delivery");
         const record = await waitForOnChainHash(transactionId);
@@ -502,15 +551,39 @@ function useFiatOnRamp(options) {
         setStatus("failed");
         setError(e);
         onErrorRef.current?.(e);
+        throw e;
       }
     },
     [emitDebug, triggerVerification]
   );
+  const triggerVerificationRef = useRef(triggerVerification);
+  useEffect(() => {
+    triggerVerificationRef.current = triggerVerification;
+  }, [triggerVerification]);
+  useEffect(() => {
+    let cancelled = false;
+    void (async () => {
+      for (const record of pending) {
+        if (cancelled) break;
+        if (!record.on_chain_tx_hash || !record.quote_currency_amount) continue;
+        const key = getOnRampVerificationKey(record);
+        if (triggeredVerificationKeysRef.current.has(key)) continue;
+        try {
+          await triggerVerificationRef.current(record);
+        } catch {
+        }
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [pending]);
   return {
     status,
     activeIntentId,
     pending,
     error,
+    finalityProgress,
     depositAddress,
     minDepositBaseUnits,
     selectedToken,
@@ -562,9 +635,11 @@ async function resolveDeliveredAmount({
   }
   let receiptError;
   try {
-    const receipt = await getTransactionReceipt(wagmiConfig, {
+    const receipt = await waitForTransactionReceipt(wagmiConfig, {
       hash: onChainTxHash,
-      chainId
+      chainId,
+      timeout: 6e4,
+      pollingInterval: 4e3
     });
     let delivered = 0n;
     for (const log of receipt.logs) {
@@ -669,11 +744,13 @@ function FiatOnRampForm({
   const { address } = useAccount();
   const [visible, setVisible] = useState(false);
   const [isPreparing, setIsPreparing] = useState(false);
+  const [rowError, setRowError] = useState(null);
   const {
     status,
     activeIntentId,
     pending,
     error,
+    finalityProgress,
     depositAddress,
     minDepositBaseUnits,
     selectedToken,
@@ -700,15 +777,17 @@ function FiatOnRampForm({
   );
   const minFiatGate = minDepositBaseUnits !== void 0 && decimals !== void 0 ? Number(formatUnits(minDepositBaseUnits, decimals)) * 1.05 : void 0;
   const isBelowMin = minFiatGate !== void 0 && Number(defaultBaseCurrencyAmount) < minFiatGate;
-  const isBusy = isPreparing || status === "awaiting-purchase" || status === "awaiting-delivery" || status === "verifying";
+  const isBusy = isPreparing || status === "awaiting-purchase";
+  const isInitializing = !!address && !depositAddress;
   const blockReasons = useMemo(
     () => [
       !address ? "wallet-not-connected" : null,
       !depositAddress ? "deposit-address-not-loaded" : null,
       isBusy ? `busy:${isPreparing ? "preparing" : status}` : null,
+      visible ? "widget-open" : null,
       isBelowMin ? "below-minimum" : null
     ].filter((reason) => Boolean(reason)),
-    [address, depositAddress, isBelowMin, isBusy, isPreparing, status]
+    [address, depositAddress, isBelowMin, isBusy, isPreparing, status, visible]
   );
   const canBuy = blockReasons.length === 0;
   const handleOpen = useCallback(async () => {
@@ -783,11 +862,10 @@ function FiatOnRampForm({
   const handleReady = useCallback(async () => {
     emitFormDebug("moonpay:onReady");
   }, [emitFormDebug]);
-  return /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4", children: [
-    /* @__PURE__ */ jsx(Button, { type: "button", onClick: handleOpen, children: isPreparing ? "Preparing MoonPay\u2026" : isBusy ? statusLabel(status) : `Buy ${displaySymbol}` }),
-    !canBuy && !isBusy && /* @__PURE__ */ jsxs("p", { className: "text-muted-foreground text-xs", children: [
-      "Button blocked: ",
-      blockReasons.join(", ")
+  return /* @__PURE__ */ jsxs("div", { "data-privana": true, className: "flex flex-col gap-4", children: [
+    isInitializing ? /* @__PURE__ */ jsx(Skeleton, { className: "h-9 w-full rounded-md" }) : /* @__PURE__ */ jsxs(Button, { type: "button", onClick: handleOpen, disabled: !canBuy, children: [
+      (isBusy || visible) && /* @__PURE__ */ jsx(Loader2, { className: "animate-spin", "aria-hidden": true }),
+      "Buy"
     ] }),
     error && /* @__PURE__ */ jsx("p", { className: "text-destructive text-sm", role: "alert", children: error.message }),
     isBelowMin && minFiatGate !== void 0 && /* @__PURE__ */ jsxs("p", { className: "text-destructive text-sm", role: "alert", children: [
@@ -796,24 +874,54 @@ function FiatOnRampForm({
       "."
     ] }),
     pending.length > 0 && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2 rounded-md border p-3", children: [
-      /* @__PURE__ */ jsx("p", { className: "text-sm font-medium", children: "Finish verification" }),
-      /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-xs", children: "MoonPay delivered your purchase, but Privana hasn't verified it yet. Resume verification now to credit your balance." }),
-      pending.map((record) => /* @__PURE__ */ jsxs(
-        Button,
-        {
-          type: "button",
-          variant: "outline",
-          size: "sm",
-          disabled: isBusy,
-          onClick: () => finishPendingVerification(record),
-          children: [
-            record.quote_currency_amount ?? "?",
-            " ",
-            displaySymbol
-          ]
-        },
-        record.transaction_id
-      ))
+      /* @__PURE__ */ jsx("p", { className: "text-sm font-medium", children: "Pending payments" }),
+      pending.map((record) => {
+        const progress = parseFinalityProgress(finalityProgress[record.transaction_id]);
+        const hasProgress = !!finalityProgress[record.transaction_id];
+        const isStalled = !hasProgress && Date.now() / 1e3 - (record.updated_at ?? 0) > 60;
+        const showRetry = rowError?.id === record.transaction_id || isStalled;
+        return /* @__PURE__ */ jsxs(
+          "div",
+          {
+            className: "border-border flex flex-col gap-1 rounded-md border p-2",
+            children: [
+              /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
+                /* @__PURE__ */ jsxs("p", { className: "text-muted-foreground flex items-center gap-1 text-xs", children: [
+                  /* @__PURE__ */ jsx(Loader2, { className: "size-3 animate-spin", "aria-hidden": true }),
+                  progress ?? "Verifying\u2026"
+                ] }),
+                /* @__PURE__ */ jsxs("p", { className: "text-muted-foreground text-xs", children: [
+                  record.quote_currency_amount ?? "?",
+                  " ",
+                  displaySymbol
+                ] })
+              ] }),
+              rowError?.id === record.transaction_id && /* @__PURE__ */ jsx("p", { className: "text-destructive text-xs", children: rowError.message }),
+              showRetry && /* @__PURE__ */ jsx(
+                Button,
+                {
+                  type: "button",
+                  variant: "outline",
+                  size: "sm",
+                  onClick: async () => {
+                    setRowError(null);
+                    try {
+                      await finishPendingVerification(record);
+                    } catch (err) {
+                      setRowError({
+                        id: record.transaction_id,
+                        message: err instanceof Error ? err.message : "Verification failed"
+                      });
+                    }
+                  },
+                  children: "Retry"
+                }
+              )
+            ]
+          },
+          record.transaction_id
+        );
+      })
     ] }),
     visible && depositAddress && activeIntentId && /* @__PURE__ */ jsx(
       MoonPayBuyWidget,
@@ -836,21 +944,10 @@ function FiatOnRampForm({
     )
   ] });
 }
-function statusLabel(status) {
-  switch (status) {
-    case "awaiting-purchase":
-      return "Complete your purchase\u2026";
-    case "awaiting-delivery":
-      return "Waiting for on-chain delivery\u2026";
-    case "verifying":
-      return "Verifying with Privana\u2026";
-    case "credited":
-      return "Credited";
-    case "failed":
-      return "Failed";
-    default:
-      return "";
-  }
+function parseFinalityProgress(message) {
+  if (!message) return null;
+  const match = message.match(/(\d+\/\d+)\s+confirmations/i);
+  return match ? `${match[1]} confirmations` : null;
 }
 
 export { FiatOnRampForm, useFiatOnRamp };