@flopay/react 0.5.5 → 0.5.6

package/dist/index.mjs

@@ -773,8 +773,9 @@ function PayPalButtonInner({
       accountPatch: beforeClick.accountPatch,
       sessionId: beforeClick.sessionId
     };
+    onButtonClick?.("paypal");
     event.resolve();
-  }, [isProcessing, runBeforeButtonClick, submitting]);
+  }, [isProcessing, onButtonClick, runBeforeButtonClick, submitting]);
   const handlePayPalConfirm = useCallback(async (event) => {
     if (!stripe || !elements) return;
     let prepared = beforeClickRef.current;
@@ -792,7 +793,6 @@ function PayPalButtonInner({
     }
     const effectiveSessionId = prepared?.sessionId ?? sessionId;
     const effectiveEmail = prepared?.accountPatch?.email ?? email;
-    onButtonClick?.("paypal");
     try {
       setSubmitting(true);
       onErrorChange?.(null);
@@ -867,7 +867,7 @@ function PayPalButtonInner({
     } finally {
       setSubmitting(false);
     }
-  }, [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, onButtonClick, runBeforeButtonClick]);
+  }, [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, runBeforeButtonClick]);
   return /* @__PURE__ */ jsxs3(Fragment2, { children: [
     /* @__PURE__ */ jsx5(ExpressCheckoutReadySwap, { state: loadState, placeholderTestId: "flopay-paypal-placeholder", children: /* @__PURE__ */ jsx5(
       ExpressCheckoutElement,
@@ -938,7 +938,6 @@ function WalletButtonInner({
       const method = walletType === "apple_pay" ? "apple_pay" : "google_pay";
       const effectiveSessionId = prepared?.sessionId ?? sessionId;
       const effectiveEmail = prepared?.accountPatch?.email ?? email;
-      onButtonClick?.(walletType === "apple_pay" ? "apple_pay" : "google_pay");
       try {
         setSubmitting(true);
         onErrorChange?.(null);
@@ -1004,7 +1003,7 @@ function WalletButtonInner({
         setSubmitting(false);
       }
     },
-    [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, onButtonClick, runBeforeButtonClick]
+    [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, runBeforeButtonClick]
   );
   return /* @__PURE__ */ jsxs3(Fragment2, { children: [
     /* @__PURE__ */ jsx5(ExpressCheckoutReadySwap, { state: loadState, placeholderTestId: "flopay-wallet-placeholder", children: /* @__PURE__ */ jsx5(
@@ -1024,6 +1023,7 @@ function WalletButtonInner({
             accountPatch: beforeClick.accountPatch,
             sessionId: beforeClick.sessionId
           };
+          onButtonClick?.(lastWalletMethodRef.current);
           event.resolve();
         },
         onConfirm: handleWalletConfirm,
@@ -2740,6 +2740,7 @@ async function loadSavedPaymentProviders({
 import { Fragment as Fragment3, jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
 var DEFAULT_BUTTONS_LAYOUT_BUTTON_HEIGHT2 = 44;
 var PAYPAL_RESUME_STORAGE_KEY = "flopay_checkout_saved_payment_resume";
+var sessionInflightMap = /* @__PURE__ */ new Map();
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -3106,7 +3107,6 @@ function FloPayCheckout({
       }
     })();
   }, [emitDecline, locale, normalizeSavedPaymentError, resolvedBillingUrl]);
-  const inflightRef = useRef3(/* @__PURE__ */ new Map());
   const initializedHashRef = useRef3(null);
   function hashCreateParams(params) {
     const key = JSON.stringify({
@@ -3188,16 +3188,16 @@ function FloPayCheckout({
       }
       const mergedParams = mergeInlineSessionPatch(baseParams, patch);
       const cacheKey = hashCreateParams(mergedParams);
-      let promise = inflightRef.current.get(cacheKey);
+      let promise = sessionInflightMap.get(cacheKey);
       if (!promise) {
         promise = resolveInlineSession(mergedParams, cacheKey);
-        inflightRef.current.set(cacheKey, promise);
+        sessionInflightMap.set(cacheKey, promise);
       }
       let resolved;
       try {
         resolved = await promise;
       } finally {
-        inflightRef.current.delete(cacheKey);
+        sessionInflightMap.delete(cacheKey);
       }
       initializedHashRef.current = cacheKey;
       try {