@volr/react-ui 0.1.98 → 0.1.99

package/dist/index.js

@@ -3451,7 +3451,9 @@ var initialState = {
   isBalanceLoading: true,
   isConfigLoading: true,
   isPaying: false,
-  currentPayment: null,
+  payOptions: null,
+  tokenInfo: null,
+  createdPayment: null,
   txHash: void 0,
   error: void 0,
   logoUrl: void 0,
@@ -3462,13 +3464,15 @@ function paymentModalReducer(state, action) {
   switch (action.type) {
     case "RESET":
       return { ...initialState };
-    case "INIT_PAYMENT":
+    case "INIT":
       return {
         ...initialState,
-        currentPayment: action.payment,
+        payOptions: action.options,
         isBalanceLoading: true,
         isConfigLoading: true
       };
+    case "SET_TOKEN_INFO":
+      return { ...state, tokenInfo: action.tokenInfo };
     case "SET_BALANCE":
       return { ...state, balance: action.balance };
     case "SET_BALANCE_LOADING":
@@ -3487,6 +3491,8 @@ function paymentModalReducer(state, action) {
         processingStep: "signing",
         error: void 0
       };
+    case "SET_CREATED_PAYMENT":
+      return { ...state, createdPayment: action.payment };
     case "SET_PROCESSING_STEP":
       return { ...state, processingStep: action.step };
     case "SET_TX_HASH":
@@ -3496,7 +3502,7 @@ function paymentModalReducer(state, action) {
         ...state,
         isPaying: false,
         step: "result",
-        currentPayment: action.payment
+        createdPayment: action.payment
       };
     case "PAYMENT_ERROR":
       return {
@@ -3525,33 +3531,32 @@ function usePaymentModalState(open, onOpenChange) {
   const { client } = useInternalAuth();
   const { evm } = useVolr();
   const { paymentOptions } = useVolrModal();
-  const { updatePaymentToProcessing, pollPaymentStatus } = useVolrPaymentApi();
+  const { createPayment, updatePaymentToProcessing, pollPaymentStatus, failPendingPayment } = useVolrPaymentApi();
   const [state, dispatch] = useReducer(paymentModalReducer, initialState);
   const fetchBalance = useCallback(
-    async (payment) => {
+    async (tokenInfo) => {
       if (!user?.evmAddress) {
         dispatch({ type: "SET_BALANCE_LOADING", loading: false });
         return;
       }
       dispatch({ type: "SET_BALANCE_LOADING", loading: true });
       try {
-        const evmClient = evm(payment.token.chainId);
-        const tokenAddress = payment.token.id.split("_")[1];
+        const evmClient = evm(tokenInfo.chainId);
         let balanceRaw;
-        if (tokenAddress === "native") {
+        if (tokenInfo.address === "native") {
           balanceRaw = await evmClient.getBalance(user.evmAddress);
         } else {
           balanceRaw = await evmClient.readContract({
-            address: tokenAddress,
+            address: tokenInfo.address,
             abi: erc20Abi,
             functionName: "balanceOf",
             args: [user.evmAddress]
           });
         }
-        const balanceNum = Number(balanceRaw) / Math.pow(10, payment.token.decimals);
+        const balanceNum = Number(balanceRaw) / Math.pow(10, tokenInfo.decimals);
         const formattedBalance = balanceNum.toLocaleString(void 0, {
           minimumFractionDigits: 0,
-          maximumFractionDigits: payment.token.decimals > 6 ? 6 : payment.token.decimals
+          maximumFractionDigits: tokenInfo.decimals > 6 ? 6 : tokenInfo.decimals
         });
         dispatch({ type: "SET_BALANCE", balance: formattedBalance });
       } catch (err) {
@@ -3573,72 +3578,74 @@ function usePaymentModalState(open, onOpenChange) {
   const fetchPaymentConfig = useCallback(async () => {
     dispatch({ type: "SET_CONFIG_LOADING", loading: true });
     try {
-      const response = await client.get(
-        "/payments/config"
-      );
-      dispatch({
-        type: "SET_RECEIVER_ADDRESS",
-        receiverAddress: response.receiverAddress
-      });
+      const response = await client.get("/payments/config");
+      dispatch({ type: "SET_RECEIVER_ADDRESS", receiverAddress: response.receiverAddress });
+      dispatch({ type: "SET_TOKEN_INFO", tokenInfo: response.token });
+      if (response.token) {
+        fetchBalance(response.token);
+      }
     } catch (err) {
       console.error("Failed to fetch payment config:", err);
       dispatch({ type: "SET_RECEIVER_ADDRESS", receiverAddress: null });
     } finally {
       dispatch({ type: "SET_CONFIG_LOADING", loading: false });
     }
-  }, [client]);
+  }, [client, fetchBalance]);
   useEffect(() => {
-    if (open && paymentOptions) {
+    if (open && paymentOptions?.options) {
       if (state.step === "processing" || state.step === "result") {
         return;
       }
-      dispatch({ type: "INIT_PAYMENT", payment: paymentOptions.payment });
-      fetchBalance(paymentOptions.payment);
+      dispatch({ type: "INIT", options: paymentOptions.options });
       fetchBranding();
       fetchPaymentConfig();
     } else if (!open) {
       dispatch({ type: "RESET" });
     }
-  }, [open, paymentOptions?.payment?.id]);
+  }, [open, paymentOptions?.options?.amount]);
   const handlePay = useCallback(async () => {
-    const { currentPayment, receiverAddress } = state;
-    if (!currentPayment || !user?.evmAddress || !paymentOptions || !receiverAddress) {
+    const { payOptions, receiverAddress, tokenInfo } = state;
+    if (!payOptions || !user?.evmAddress || !paymentOptions || !receiverAddress || !tokenInfo) {
       return;
     }
     dispatch({ type: "START_PAYMENT" });
+    let createdPaymentId = null;
     try {
-      const evmClient = evm(currentPayment.token.chainId);
-      const tokenAddress = currentPayment.token.id.split("_")[1];
+      const payment = await createPayment(payOptions);
+      createdPaymentId = payment.id;
+      dispatch({ type: "SET_CREATED_PAYMENT", payment });
+      paymentOptions.options.handlers?.onCreated?.({ id: payment.id });
+      const evmClient = evm(tokenInfo.chainId);
       dispatch({ type: "SET_PROCESSING_STEP", step: "broadcasting" });
       let result;
-      if (tokenAddress === "native") {
+      if (tokenInfo.address === "native") {
         result = await evmClient.sendTransaction({
           to: receiverAddress,
           data: "0x",
-          value: BigInt(currentPayment.amount)
+          value: BigInt(payment.amount)
         });
       } else {
         result = await evmClient.sendBatch([
           {
-            target: tokenAddress,
+            target: tokenInfo.address,
             abi: erc20Abi,
             functionName: "transfer",
             args: [
               receiverAddress,
-              BigInt(currentPayment.amount)
+              BigInt(payment.amount)
             ]
           }
         ]);
       }
       dispatch({ type: "SET_TX_HASH", txHash: result.txHash ?? "" });
       dispatch({ type: "SET_PROCESSING_STEP", step: "confirming" });
-      await updatePaymentToProcessing(currentPayment.id, result.txId);
+      await updatePaymentToProcessing(payment.id, result.txId);
       paymentOptions.onProcessing?.({
-        ...currentPayment,
+        ...payment,
         txHash: result.txHash ?? "",
         status: "PROCESSING"
       });
-      const confirmedPayment = await pollPaymentStatus(currentPayment.id);
+      const confirmedPayment = await pollPaymentStatus(payment.id);
       dispatch({ type: "PAYMENT_SUCCESS", payment: confirmedPayment });
       if (confirmedPayment.status === "CONFIRMED") {
         paymentOptions.onComplete?.(confirmedPayment);
@@ -3652,6 +3659,13 @@ function usePaymentModalState(open, onOpenChange) {
       }
     } catch (err) {
       console.error("Payment failed:", err);
+      if (createdPaymentId) {
+        try {
+          await failPendingPayment(createdPaymentId);
+        } catch (failErr) {
+          console.error("Failed to mark payment as failed:", failErr);
+        }
+      }
       const paymentError = {
         code: err.code || "PAYMENT_FAILED",
         message: err.message || "Payment failed. Please try again."
@@ -3664,8 +3678,10 @@ function usePaymentModalState(open, onOpenChange) {
     user,
     paymentOptions,
     evm,
+    createPayment,
     updatePaymentToProcessing,
-    pollPaymentStatus
+    pollPaymentStatus,
+    failPendingPayment
   ]);
   const handleDeposit = useCallback(() => {
     dispatch({ type: "SHOW_DEPOSIT" });
@@ -3674,25 +3690,25 @@ function usePaymentModalState(open, onOpenChange) {
     (depositOpen) => {
       if (!depositOpen) {
         dispatch({ type: "HIDE_DEPOSIT" });
-        if (state.currentPayment) {
-          fetchBalance(state.currentPayment);
+        if (state.tokenInfo) {
+          fetchBalance(state.tokenInfo);
         }
       }
     },
-    [state.currentPayment, fetchBalance]
+    [state.tokenInfo, fetchBalance]
   );
   const handleDone = useCallback(() => {
-    if (state.currentPayment?.status === "CONFIRMED") {
-      paymentOptions?.onComplete?.(state.currentPayment);
+    if (state.createdPayment?.status === "CONFIRMED") {
+      paymentOptions?.onComplete?.(state.createdPayment);
     }
     onOpenChange(false);
-  }, [state.currentPayment, paymentOptions, onOpenChange]);
+  }, [state.createdPayment, paymentOptions, onOpenChange]);
   const handleRetry = useCallback(() => {
     dispatch({ type: "RETRY" });
-    if (state.currentPayment) {
-      fetchBalance(state.currentPayment);
+    if (state.tokenInfo) {
+      fetchBalance(state.tokenInfo);
     }
-  }, [state.currentPayment, fetchBalance]);
+  }, [state.tokenInfo, fetchBalance]);
   const handleClose = useCallback(() => {
     if (state.step === "processing") {
       return;
@@ -3703,19 +3719,19 @@ function usePaymentModalState(open, onOpenChange) {
     onOpenChange(false);
   }, [state.step, paymentOptions, onOpenChange]);
   const handleReport = useCallback(async () => {
-    const { currentPayment, error, step, txHash } = state;
-    if (!currentPayment || !error) return;
+    const { createdPayment, error, step, txHash, tokenInfo } = state;
+    if (!createdPayment || !error) return;
     try {
-      await client.post(`/payments/${currentPayment.id}/report`, {
+      await client.post(`/payments/${createdPayment.id}/report`, {
         errorCode: error.code,
         errorMessage: error.message,
         platform: "web",
         context: {
           step,
           txHash,
-          tokenId: currentPayment.token.id,
-          chainId: currentPayment.token.chainId,
-          amount: currentPayment.amount
+          tokenId: tokenInfo?.id,
+          chainId: tokenInfo?.chainId,
+          amount: createdPayment.amount
         }
       });
       alert("Error report submitted. Thank you for your feedback.");
@@ -3731,7 +3747,8 @@ Please contact support with this information.`
     }
   }, [state, client]);
   const canClose = state.step !== "processing";
-  const isConfigured = state.receiverAddress !== null;
+  const isConfigured = state.receiverAddress !== null && state.tokenInfo !== null;
+  const isReady = !state.isConfigLoading && !state.isBalanceLoading && isConfigured;
   return {
     state,
     handlePay,
@@ -3742,7 +3759,8 @@ Please contact support with this information.`
     handleClose,
     handleReport,
     canClose,
-    isConfigured
+    isConfigured,
+    isReady
   };
 }
 var PaymentSkeleton = () => {
@@ -3845,7 +3863,12 @@ var ItemDisplay = ({
   ] });
 };
 var PaymentInfoView = ({
-  payment,
+  amount,
+  tokenSymbol,
+  tokenDecimals,
+  itemName,
+  itemDescription,
+  itemImage,
   balance,
   isBalanceLoading,
   logoUrl,
@@ -3853,22 +3876,20 @@ var PaymentInfoView = ({
   onDeposit,
   isPaying
 }) => {
-  const { token, itemName, itemDescription, itemImage } = payment;
-  const amountInUnits = Number(payment.amount) / Math.pow(10, token.decimals);
-  const formattedAmount = amountInUnits.toLocaleString(void 0, {
+  const formattedAmount = amount.toLocaleString(void 0, {
     minimumFractionDigits: 0,
-    maximumFractionDigits: token.decimals > 6 ? 6 : token.decimals
+    maximumFractionDigits: tokenDecimals > 6 ? 6 : tokenDecimals
   });
   const balanceNum = parseFloat(balance.replace(/,/g, "") || "0");
-  const isInsufficient = !isBalanceLoading && balanceNum < amountInUnits;
+  const isInsufficient = !isBalanceLoading && balanceNum < amount;
   return /* @__PURE__ */ jsxs("div", { className: "volr:space-y-6", children: [
     itemName && /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         ItemDisplay,
         {
           name: itemName,
-          description: itemDescription ?? void 0,
-          image: itemImage ?? void 0,
+          description: itemDescription,
+          image: itemImage,
           logoUrl
         }
       ),
@@ -3878,12 +3899,7 @@ var PaymentInfoView = ({
       /* @__PURE__ */ jsx("p", { className: "volr:text-sm volr:text-slate-500", children: "Amount to Pay" }),
       /* @__PURE__ */ jsxs("div", { className: "volr:flex volr:items-baseline volr:gap-2", children: [
         /* @__PURE__ */ jsx("span", { className: "volr:text-2xl volr:font-bold volr:text-slate-900", children: formattedAmount }),
-        /* @__PURE__ */ jsx("span", { className: "volr:text-lg volr:font-medium volr:text-slate-600", children: token.symbol })
-      ] }),
-      payment.totalUsd && /* @__PURE__ */ jsxs("p", { className: "volr:text-sm volr:text-slate-400", children: [
-        "\u2248 $",
-        parseFloat(payment.totalUsd).toFixed(2),
-        " USD"
+        /* @__PURE__ */ jsx("span", { className: "volr:text-lg volr:font-medium volr:text-slate-600", children: tokenSymbol })
       ] })
     ] }),
     isBalanceLoading ? /* @__PURE__ */ jsxs("div", { className: "volr:flex volr:justify-between volr:items-center volr:p-3 volr:bg-slate-50 volr:rounded-lg volr:animate-pulse", children: [
@@ -3893,7 +3909,7 @@ var PaymentInfoView = ({
       BalanceDisplay,
       {
         balance,
-        symbol: token.symbol,
+        symbol: tokenSymbol,
         required: formattedAmount,
         isInsufficient
       }
@@ -3929,12 +3945,12 @@ var PaymentInfoView = ({
               )
             ] }),
             "Processing..."
-          ] }) : isInsufficient ? "Insufficient Balance" : `Pay ${formattedAmount} ${token.symbol}`
+          ] }) : isInsufficient ? "Insufficient Balance" : `Pay ${formattedAmount} ${tokenSymbol}`
         }
       ),
       isInsufficient && /* @__PURE__ */ jsxs(Button, { variant: "secondary", onClick: onDeposit, className: "volr:w-full", children: [
         "Deposit ",
-        token.symbol
+        tokenSymbol
       ] })
     ] }),
     /* @__PURE__ */ jsx(PoweredBy, {})
@@ -4113,8 +4129,7 @@ var PaymentModal = ({
     handleClose,
     handleReport,
     canClose,
-    isConfigured
-  } = usePaymentModalState(open, onOpenChange);
+    isConfigured} = usePaymentModalState(open, onOpenChange);
   const {
     step,
     processingStep,
@@ -4122,26 +4137,28 @@ var PaymentModal = ({
     isBalanceLoading,
     isConfigLoading,
     isPaying,
-    currentPayment,
+    payOptions,
+    tokenInfo,
+    createdPayment,
     txHash,
     error,
     logoUrl,
     showDeposit
   } = state;
-  if (showDeposit && currentPayment) {
+  if (showDeposit && tokenInfo) {
     return /* @__PURE__ */ jsx(
       DepositModal,
       {
         open: true,
         onOpenChange: handleDepositClose,
         asset: {
-          chainId: currentPayment.token.chainId,
-          symbol: currentPayment.token.symbol
+          chainId: tokenInfo.chainId,
+          symbol: tokenInfo.symbol
         }
       }
     );
   }
-  if (!paymentOptions || !currentPayment || isConfigLoading) {
+  if (!paymentOptions || !payOptions || isConfigLoading) {
     return /* @__PURE__ */ jsxs(Modal, { open, onOpenChange, children: [
       /* @__PURE__ */ jsx(ModalHeader, { onClose: () => onOpenChange(false) }),
       /* @__PURE__ */ jsx(PaymentSkeleton, {})
@@ -4161,10 +4178,15 @@ var PaymentModal = ({
         title: step === "info" ? "Confirm Payment" : void 0
       }
     ),
-    step === "info" && /* @__PURE__ */ jsx(
+    step === "info" && tokenInfo && /* @__PURE__ */ jsx(
       PaymentInfoView,
       {
-        payment: currentPayment,
+        amount: payOptions.amount,
+        tokenSymbol: tokenInfo.symbol,
+        tokenDecimals: tokenInfo.decimals,
+        itemName: payOptions.item?.name,
+        itemDescription: payOptions.item?.description,
+        itemImage: payOptions.item?.image,
         balance,
         isBalanceLoading,
         logoUrl,
@@ -4174,10 +4196,10 @@ var PaymentModal = ({
       }
     ),
     step === "processing" && /* @__PURE__ */ jsx(PaymentProcessingView, { step: processingStep, txHash }),
-    step === "result" && /* @__PURE__ */ jsx(
+    step === "result" && createdPayment && /* @__PURE__ */ jsx(
       PaymentResultView,
       {
-        payment: currentPayment,
+        payment: createdPayment,
         error,
         onDone: handleDone,
         onRetry: handleRetry,
@@ -4623,42 +4645,32 @@ async function getCurrentChainId() {
   });
   return parseInt(chainIdHex, 16);
 }
-var paymentPromiseResolvers = /* @__PURE__ */ new Map();
+var paymentPromiseResolver = null;
 function useVolrPay() {
-  const { open: openModal } = useVolrModal();
-  const { createPayment, checkPayment, getPaymentHistory, cancelPayment } = useVolrPaymentApi();
-  const currentPaymentIdRef = useRef(null);
+  const { open: openModal, close: closeModal } = useVolrModal();
+  const { checkPayment, getPaymentHistory } = useVolrPaymentApi();
+  const isInProgressRef = useRef(false);
   const pay = useCallback(
-    async (options) => {
-      const payment = await createPayment({
-        amount: options.amount,
-        item: options.item,
-        referenceId: options.referenceId,
-        metadata: options.metadata,
-        idempotencyKey: options.idempotencyKey,
-        expiresInSec: options.expiresInSec
-      });
-      currentPaymentIdRef.current = payment.id;
-      options.handlers?.onCreated?.({ id: payment.id });
+    (options) => {
+      isInProgressRef.current = true;
       const waitPromise = new Promise((resolve, reject) => {
-        paymentPromiseResolvers.set(payment.id, { resolve, reject });
+        paymentPromiseResolver = { resolve, reject };
       });
       const modalOptions = {
-        payment,
         options: {
           amount: options.amount,
           item: options.item,
           referenceId: options.referenceId,
           metadata: options.metadata,
           idempotencyKey: options.idempotencyKey,
-          expiresInSec: options.expiresInSec
+          expiresInSec: options.expiresInSec,
+          handlers: options.handlers
         },
         onComplete: (result) => {
-          currentPaymentIdRef.current = null;
-          const resolver = paymentPromiseResolvers.get(payment.id);
-          if (resolver) {
-            resolver.resolve(result);
-            paymentPromiseResolvers.delete(payment.id);
+          isInProgressRef.current = false;
+          if (paymentPromiseResolver) {
+            paymentPromiseResolver.resolve(result);
+            paymentPromiseResolver = null;
           }
           if (result.status === "CONFIRMED") {
             options.handlers?.onSuccess?.(result);
@@ -4671,54 +4683,43 @@ function useVolrPay() {
           });
         },
         onError: (error) => {
-          currentPaymentIdRef.current = null;
-          const resolver = paymentPromiseResolvers.get(payment.id);
-          if (resolver) {
-            resolver.reject(new Error(error.message));
-            paymentPromiseResolvers.delete(payment.id);
+          isInProgressRef.current = false;
+          if (paymentPromiseResolver) {
+            paymentPromiseResolver.reject(new Error(error.message));
+            paymentPromiseResolver = null;
           }
           options.handlers?.onError?.(error);
         },
         onCancel: () => {
-          currentPaymentIdRef.current = null;
-          const resolver = paymentPromiseResolvers.get(payment.id);
-          if (resolver) {
-            resolver.resolve({
-              ...payment,
-              status: "CANCELLED"
-            });
-            paymentPromiseResolvers.delete(payment.id);
+          isInProgressRef.current = false;
+          if (paymentPromiseResolver) {
+            paymentPromiseResolver.reject(new Error("Payment cancelled by user"));
+            paymentPromiseResolver = null;
           }
           options.handlers?.onCancel?.();
         }
       };
       openModal({ mode: "payment", payment: modalOptions });
       return {
-        id: payment.id,
-        status: payment.status,
         wait: () => waitPromise,
-        cancel: async () => {
-          await cancelPayment(payment.id);
-          currentPaymentIdRef.current = null;
-          const resolver = paymentPromiseResolvers.get(payment.id);
-          if (resolver) {
-            resolver.resolve({
-              ...payment,
-              status: "CANCELLED"
-            });
-            paymentPromiseResolvers.delete(payment.id);
+        cancel: () => {
+          closeModal();
+          isInProgressRef.current = false;
+          if (paymentPromiseResolver) {
+            paymentPromiseResolver.reject(new Error("Payment cancelled by user"));
+            paymentPromiseResolver = null;
           }
           options.handlers?.onCancel?.();
         }
       };
     },
-    [createPayment, cancelPayment, openModal]
+    [openModal, closeModal]
   );
   return {
     pay,
     checkPayment,
     getPaymentHistory,
-    isPaymentInProgress: currentPaymentIdRef.current !== null
+    isPaymentInProgress: isInProgressRef.current
   };
 }