@flopay/react 1.1.3 → 1.1.5

package/dist/index.cjs

@@ -791,7 +791,7 @@ function DirectPayPalButton({
     if (!clientId) {
       appendDebug("FAIL: clientId empty \u2014 gateway misconfigured");
       setFailed(true);
-      onErrorChangeRef.current?.("Direct PayPal gateway is misconfigured.");
+      console.error("[FloPay] DirectPayPal: clientId empty \u2014 gateway misconfigured");
       return;
     }
     if (!containerRef.current) {
@@ -912,7 +912,7 @@ function DirectPayPalButton({
         return;
       }
       setFailed(true);
-      forwardError(message);
+      console.error("[FloPay] DirectPayPal load/render failure:", message);
     };
     setFailed(false);
     const dispatchTokenizedBody = async (body) => {
@@ -1759,12 +1759,14 @@ function SplitCardFormInner({
   showApplePay = true,
   showGooglePay = true,
   layout = "default",
+  theme,
   buttonsTheme,
   buttonsStyles: buttonsStylesOverride,
+  appearance: appearanceOverride,
   cardButtonContent,
   cardBackButtonContent,
   cardTitleContent,
-  showSecurityFooter = true,
+  showSecurityFooter: _showSecurityFooter,
   onButtonClick,
   onBeforeButtonClick,
   enableAVS: enableAVSProp,
@@ -1839,8 +1841,9 @@ function SplitCardFormInner({
   }, [paypalDirectRetry]);
   const resolvedBillingApiUrl = billingApiUrl || contextBillingUrl;
   const displayError = externalError ?? error;
+  const themeBundle = (0, import_react8.useMemo)(() => (0, import_shared6.resolveTheme)(theme), [theme]);
   const bStyles = (0, import_react8.useMemo)(() => {
-    const base = (0, import_shared5.resolveButtonsLayoutTheme)(buttonsTheme);
+    const base = themeBundle?.buttonsLayout ?? (0, import_shared5.resolveButtonsLayoutTheme)(buttonsTheme);
     if (!buttonsStylesOverride) return base;
     return {
       ...base,
@@ -1852,7 +1855,8 @@ function SplitCardFormInner({
       submitButton: { ...base.submitButton, ...buttonsStylesOverride.submitButton },
       title: { ...base.title, ...buttonsStylesOverride.title }
     };
-  }, [buttonsTheme, buttonsStylesOverride]);
+  }, [themeBundle, buttonsTheme, buttonsStylesOverride]);
+  const appearance = appearanceOverride ?? themeBundle?.appearance;
   const isInlineSessionPatchProcessing = checkout.inlineSessionPatchProcessing ?? false;
   const isSubmitting = (externalProcessing ?? processing) || isInlineSessionPatchProcessing;
   const isSelfContained = !onTokenizedBody;
@@ -2380,17 +2384,24 @@ function SplitCardFormInner({
     return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { "data-testid": "flopay-loading", "aria-busy": "true", children: "Loading payment form..." });
   }
   const isButtons = layout === "buttons";
-  const resolvedBorder = isButtons ? bStyles.cardInputBorder ?? "#e5e7eb" : "#A4A4FF";
-  const cardBg = isButtons ? bStyles.cardFormContainer?.backgroundColor ?? "white" : "#EDEDFF";
-  const cardInputBg = isButtons ? bStyles.cardInputBackground ?? "white" : "white";
+  const appearanceVars = appearance?.variables;
+  const SDK_DEFAULT_WHITES = /* @__PURE__ */ new Set(["#FFFFFF", "#ffffff", "#fff", "#FFF", "white"]);
+  const appearanceColorBg = appearanceVars?.colorBackground;
+  const themedWrapperBg = appearanceColorBg && !SDK_DEFAULT_WHITES.has(appearanceColorBg) ? appearanceColorBg : void 0;
+  const resolvedBorder = bStyles.cardInputBorder ?? (isButtons ? "#e5e7eb" : "#A4A4FF");
+  const cardBg = bStyles.cardFormContainer?.backgroundColor ?? themedWrapperBg ?? (isButtons ? "white" : "#EDEDFF");
+  const cardInputBg = bStyles.cardInputBackground ?? appearanceVars?.colorBackground ?? "white";
   const hideBackButtonLabel = isEmptySlotContent(cardBackButtonContent);
   const hideTitle = isEmptySlotContent(cardTitleContent);
-  const nameInputOverrides = isButtons ? bStyles.nameInput : void 0;
-  const resolvedInputFontSize = bStyles.cardInputFontSize ?? toCssSize(nameInputOverrides?.fontSize) ?? "16px";
-  const resolvedInputFontFamily = typeof nameInputOverrides?.fontFamily === "string" ? nameInputOverrides.fontFamily : "Poppins, sans-serif";
+  const nameInputOverrides = bStyles.nameInput;
+  const resolvedInputFontSize = bStyles.cardInputFontSize ?? toCssSize(nameInputOverrides?.fontSize) ?? appearanceVars?.fontSizeBase ?? "16px";
+  const resolvedInputFontFamily = typeof nameInputOverrides?.fontFamily === "string" ? nameInputOverrides.fontFamily : appearanceVars?.fontFamily ?? "Poppins, sans-serif";
   const resolvedInputFontWeight = toCssWeight(nameInputOverrides?.fontWeight) ?? 400;
-  const resolvedInputColor = bStyles.cardInputColor ?? (typeof nameInputOverrides?.color === "string" ? nameInputOverrides.color : void 0) ?? "#262833";
+  const resolvedInputColor = bStyles.cardInputColor ?? (typeof nameInputOverrides?.color === "string" ? nameInputOverrides.color : void 0) ?? appearanceVars?.colorText ?? "#262833";
   const resolvedPlaceholderColor = bStyles.cardInputPlaceholderColor ?? "#9ca3af";
+  const resolvedBorderRadius = appearanceVars?.borderRadius ?? "8px";
+  const resolvedPrimaryColor = appearanceVars?.colorPrimary ?? "#4A49FF";
+  const resolvedTitleColor = appearanceVars?.colorText ?? "#262833";
   const sharedInputTypography = {
     fontSize: resolvedInputFontSize,
     fontFamily: resolvedInputFontFamily,
@@ -2420,12 +2431,14 @@ function SplitCardFormInner({
       invalid: { color: "#ef4444" }
     }
   };
+  const containerOverrides = bStyles.cardFormContainer ?? {};
+  const containerPadding = containerOverrides.padding ?? (isButtons ? "0" : "1rem");
+  const containerRadius = containerOverrides.borderRadius ?? resolvedBorderRadius;
   const cardFormBlock = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { style: {
     backgroundColor: cardBg,
-    borderRadius: "8px",
-    padding: isButtons ? "0" : "1rem",
-    ...isButtons ? bStyles.cardFormContainer : {},
-    ...isButtons ? { padding: bStyles.cardFormContainer?.padding ?? "0" } : {},
+    borderRadius: containerRadius,
+    ...containerOverrides,
+    padding: containerPadding,
     ...sharedInputPlaceholderVars
   }, children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("style", { children: `
@@ -2489,7 +2502,14 @@ function SplitCardFormInner({
         ...bStyles.title
       }, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TitleContentSlot, { content: cardTitleContent }) })
     ] }),
-    !isButtons && !hideTitle && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { style: { textAlign: "center", fontWeight: 600, fontSize: "1.1rem", padding: "0.5rem 0", color: "#262833" }, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TitleContentSlot, { content: cardTitleContent }) }),
+    !isButtons && !hideTitle && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { style: {
+      textAlign: "center",
+      fontWeight: 600,
+      fontSize: "1.1rem",
+      padding: "0.5rem 0",
+      color: resolvedTitleColor,
+      ...bStyles.title
+    }, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TitleContentSlot, { content: cardTitleContent }) }),
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { style: {
       backgroundColor: cardInputBg,
       border: `1px solid ${resolvedBorder}`,
@@ -2746,7 +2766,7 @@ function SplitCardFormInner({
       display: "flex",
       alignItems: "center",
       gap: "0.5rem",
-      ...isButtons && bStyles.errorBanner ? bStyles.errorBanner : {}
+      ...bStyles.errorBanner ? bStyles.errorBanner : {}
     }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", style: { flexShrink: 0 }, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("path", { d: "M12 9v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z", stroke: "#DC2626", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }),
       displayError
@@ -2761,29 +2781,19 @@ function SplitCardFormInner({
           width: "100%",
           padding: "0.875rem",
           marginTop: "1rem",
-          backgroundColor: "#4A49FF",
+          backgroundColor: resolvedPrimaryColor,
           color: "white",
           border: "none",
-          borderRadius: "8px",
-          fontSize: isButtons && bStyles.submitButtonFontSize ? bStyles.submitButtonFontSize : "1rem",
+          borderRadius: resolvedBorderRadius,
+          fontSize: bStyles.submitButtonFontSize ?? "1rem",
           fontWeight: 600,
           cursor: !formReady || isSubmitting ? "not-allowed" : "pointer",
           opacity: !formReady || isSubmitting ? 0.5 : 1,
-          ...isButtons ? bStyles.submitButton : {}
+          ...bStyles.submitButton
         },
         children: isSubmitting ? "PROCESSING..." : submitLabel
       }
-    ),
-    !isButtons && showSecurityFooter && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { style: {
-      backgroundColor: "#EFF9F0",
-      borderRadius: "8px",
-      padding: "0.75rem",
-      marginTop: "0.75rem",
-      textAlign: "center",
-      fontSize: "0.85rem",
-      fontWeight: 600,
-      color: "#7DAD3A"
-    }, children: "Secure Card Checkout" })
+    )
   ] });
   if (layout === "buttons") {
     const isButtonsView = viewState === "buttons" || viewState === "expanding";
@@ -3300,105 +3310,6 @@ async function processSavedPaymentForMode({
     }
   );
 }
-async function processSavedPaymentWithIntent({
-  billingApiUrl,
-  sessionId,
-  session,
-  paymentMethodId,
-  flopay,
-  returnUrl
-}) {
-  const customerEmail = session.customer?.email ?? session.accountData?.email ?? "";
-  if (!customerEmail) {
-    throw Object.assign(
-      new import_shared7.FloPayError("Customer email is required to create a payment intent.", "validation_error", {
-        param: "email"
-      }),
-      { checkoutMethod: "card" }
-    );
-  }
-  const api = new import_js3.PaymentAPI(billingApiUrl);
-  const intentResponse = await retryOnceOnFetchFailure(() => api.createPaymentIntent(
-    sessionId,
-    customerEmail,
-    paymentMethodId
-  ));
-  const intentJson = await intentResponse.json().catch(() => null);
-  if (!intentResponse.ok) {
-    const intentError = buildFloPayApiError(
-      intentJson,
-      "Failed to create payment intent."
-    );
-    throw Object.assign(
-      intentError,
-      { checkoutMethod: "card" }
-    );
-  }
-  const intentClientSecret = getRedirectTokenFromProcessResponse(intentJson, {
-    requirePaymentIntentClientSecret: true
-  });
-  if (!intentClientSecret) {
-    throw Object.assign(
-      new import_shared7.FloPayError("No client secret in payment intent response.", "api_error"),
-      { checkoutMethod: "card" }
-    );
-  }
-  const confirmResult = await flopay.confirmCardPayment({
-    clientSecret: intentClientSecret,
-    paymentMethodId
-  });
-  if (confirmResult.error) {
-    throw Object.assign(
-      confirmResult.error,
-      { checkoutMethod: "card" }
-    );
-  }
-  const rawProvider = typeof flopay.getRawProvider === "function" ? flopay.getRawProvider() : null;
-  const confirmedPaymentIntent = await retrievePaymentIntentFromProvider(
-    rawProvider,
-    intentClientSecret
-  );
-  const confirmedPaymentIntentId = confirmResult.paymentIntentId ?? confirmedPaymentIntent?.id;
-  const confirmedPaymentMethodId = confirmResult.paymentMethodId ?? resolvePaymentIntentPaymentMethodId(confirmedPaymentIntent) ?? paymentMethodId;
-  if (!confirmedPaymentIntentId || confirmResult.status !== "succeeded" && confirmResult.status !== "processing" && confirmResult.status !== "requires_capture") {
-    throw Object.assign(
-      new import_shared7.FloPayError(
-        `Unfortunately, your payment could not be processed. Please try again using a different payment method or contact your bank for assistance. If the issue persists, feel free to reach out to us for support.`,
-        "api_error",
-        {
-          code: confirmResult.status === "requires_action" ? "authentication_required" : void 0
-        }
-      ),
-      { checkoutMethod: "card" }
-    );
-  }
-  const followUp = await processSavedPaymentForMode({
-    billingApiUrl,
-    sessionId,
-    session,
-    tokenizedData: {
-      id: confirmedPaymentMethodId,
-      type: "card",
-      threeDSecureActionResultTokenId: confirmedPaymentIntentId
-    },
-    returnUrl
-  });
-  const finalResult = followUp.type === "success" ? followUp.result : await handleSavedPaymentRedirectResult(followUp, {
-    flopay,
-    paypalFlopay: null,
-    attempt3DS: true,
-    billingApiUrl,
-    sessionId,
-    session,
-    returnUrl
-  });
-  return {
-    ...finalResult,
-    paymentIntentId: finalResult.paymentIntentId ?? confirmedPaymentIntentId,
-    paymentMethodId: finalResult.paymentMethodId ?? confirmedPaymentMethodId,
-    checkoutMethod: finalResult.checkoutMethod ?? "card"
-  };
-}
 async function handleSavedPaymentRedirectResult(redirectResult, {
   flopay,
   paypalFlopay,
@@ -3720,7 +3631,7 @@ function FloPayCheckout({
   sessionId: sessionIdProp,
   createSession: createSessionParams,
   billingApiUrl,
-  appearance,
+  appearance: appearanceOverride,
   locale,
   loading: loadingNode,
   error: errorNode,
@@ -3735,12 +3646,13 @@ function FloPayCheckout({
   showGooglePay = true,
   debug = false,
   layout,
+  theme,
   buttonsTheme,
   buttonsStyles,
   cardButtonContent,
   cardBackButtonContent,
   cardTitleContent,
-  showSecurityFooter = true,
+  showSecurityFooter: _showSecurityFooter,
   onButtonClick,
   onBeforeButtonClick,
   enableAVS,
@@ -3755,6 +3667,8 @@ function FloPayCheckout({
   onSessionCompleted
 }) {
   const resolvedBillingUrl = (0, import_shared8.resolveBillingApiUrl)(billingApiUrl);
+  const themeBundle = (0, import_react9.useMemo)(() => (0, import_shared8.resolveTheme)(theme), [theme]);
+  const appearance = appearanceOverride ?? themeBundle?.appearance;
   const checkoutType = createSessionParams ? "embedded_checkout" : "standard_checkout";
   const checkoutLayout = children ? "custom_layout" : layout === "buttons" ? "buttons_layout" : "default_layout";
   const [unified, setUnified] = (0, import_react9.useState)(null);
@@ -4517,6 +4431,7 @@ function FloPayCheckout({
           showPayPal,
           showApplePay,
           showGooglePay,
+          theme,
           buttonsTheme,
           buttonsStyles,
           cardButtonContent,
@@ -4661,12 +4576,13 @@ function FloPayCheckout({
         showApplePay,
         showGooglePay,
         layout,
+        theme,
         buttonsTheme,
         buttonsStyles,
+        appearance,
         cardButtonContent,
         cardBackButtonContent,
         cardTitleContent,
-        showSecurityFooter,
         onButtonClick,
         onBeforeButtonClick,
         enableAVS,
@@ -4723,6 +4639,7 @@ function InterimButtonsView({
   showPayPal,
   showApplePay,
   showGooglePay,
+  theme,
   buttonsTheme,
   buttonsStyles: stylesOverride,
   cardButtonContent,
@@ -4736,8 +4653,9 @@ function InterimButtonsView({
       setShowCardForm(cardOpen);
     }
   }, [cardOpen, isCardOpenControlled]);
+  const themeBundle = (0, import_react9.useMemo)(() => (0, import_shared8.resolveTheme)(theme), [theme]);
   const bStyles = (0, import_react9.useMemo)(() => {
-    const base = (0, import_shared8.resolveButtonsLayoutTheme)(buttonsTheme);
+    const base = themeBundle?.buttonsLayout ?? (0, import_shared8.resolveButtonsLayoutTheme)(buttonsTheme);
     if (!stylesOverride) return base;
     return {
       ...base,
@@ -4749,7 +4667,7 @@ function InterimButtonsView({
       submitButton: { ...base.submitButton, ...stylesOverride.submitButton },
       title: { ...base.title, ...stylesOverride.title }
     };
-  }, [buttonsTheme, stylesOverride]);
+  }, [themeBundle, buttonsTheme, stylesOverride]);
   const skeleton = (h) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { style: {
     height: h,
     borderRadius: 8,
@@ -5448,7 +5366,6 @@ var import_js7 = require("@flopay/js");
 var import_shared11 = require("@flopay/shared");
 var import_jsx_runtime10 = require("react/jsx-runtime");
 var DEFAULT_BUTTONS_LAYOUT_BUTTON_HEIGHT3 = 44;
-var PAYPAL_RESUME_STORAGE_KEY2 = "flopay_automatic_payment_button_resume";
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -5461,9 +5378,6 @@ function coerceError(err, fallbackMessage) {
     "api_error"
   );
 }
-function canUseStorage2() {
-  return typeof window !== "undefined" && typeof window.sessionStorage !== "undefined";
-}
 function shouldShowFallbackCheckout(error, sessionId) {
   if (!sessionId) return false;
   if (error.type === "validation_error") return false;
@@ -5472,47 +5386,6 @@ function shouldShowFallbackCheckout(error, sessionId) {
   }
   return true;
 }
-function readPayPalResumeState2() {
-  if (!canUseStorage2()) return null;
-  try {
-    const raw = window.sessionStorage.getItem(PAYPAL_RESUME_STORAGE_KEY2);
-    if (!raw) return null;
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-function persistPayPalResumeState2(state) {
-  if (!canUseStorage2()) return;
-  try {
-    window.sessionStorage.setItem(PAYPAL_RESUME_STORAGE_KEY2, JSON.stringify(state));
-  } catch (error) {
-    console.warn("[FloPayAutomaticPaymentButton] Failed to persist PayPal resume state.", error);
-  }
-}
-function clearPayPalResumeState2() {
-  if (!canUseStorage2()) return;
-  try {
-    window.sessionStorage.removeItem(PAYPAL_RESUME_STORAGE_KEY2);
-  } catch (error) {
-    console.warn("[FloPayAutomaticPaymentButton] Failed to clear PayPal resume state.", error);
-  }
-}
-function clearPayPalRedirectParams2() {
-  if (typeof window === "undefined") return;
-  const url = new URL(window.location.href);
-  const keys = ["payment_intent", "payment_intent_client_secret", "redirect_status"];
-  let changed = false;
-  for (const key of keys) {
-    if (url.searchParams.has(key)) {
-      url.searchParams.delete(key);
-      changed = true;
-    }
-  }
-  if (changed) {
-    window.history.replaceState({}, "", url.toString());
-  }
-}
 function resolveCreateSessionDraft(props) {
   if (props.createSession) {
     return {
@@ -5539,8 +5412,10 @@ function resolveCreateSessionDraft(props) {
 function FloPayAutomaticPaymentButton({
   sessionId,
   createSession,
-  paymentMethodId,
-  checkoutMethod,
+  // Deprecated — accepted for back-compat and silently ignored. Backend
+  // resolves the customer's latest payment method server-side.
+  paymentMethodId: _deprecatedPaymentMethodId,
+  checkoutMethod: _deprecatedCheckoutMethod,
   clientId,
   items,
   subscriptions,
@@ -5552,6 +5427,7 @@ function FloPayAutomaticPaymentButton({
   utmMetadata,
   billingApiUrl,
   locale,
+  theme,
   buttonsTheme,
   buttonsStyles: stylesOverride,
   onSuccess,
@@ -5597,20 +5473,7 @@ function FloPayAutomaticPaymentButton({
   const [overlayStatus, setOverlayStatus] = (0, import_react12.useState)(null);
   const [overlayError, setOverlayError] = (0, import_react12.useState)(null);
   const [fallbackSession, setFallbackSession] = (0, import_react12.useState)(null);
-  const automaticPaymentToken = (0, import_react12.useMemo)(
-    () => paymentMethodId ? {
-      id: paymentMethodId,
-      // Saved PayPal `user_payment_method` records are submitted with
-      // `type: 'paypal'` so the backend routes the upsell through the
-      // direct PayPal gateway's vaulted-token flow. Card and wallet PMs
-      // continue to use `type: 'card'`.
-      type: checkoutMethod === "paypal" ? "paypal" : "card",
-      ...checkoutMethod === "paypal" ? { isPaypal: true } : {}
-    } : void 0,
-    [checkoutMethod, paymentMethodId]
-  );
   const isMountedRef = (0, import_react12.useRef)(true);
-  const resumeAttemptedRef = (0, import_react12.useRef)(false);
   const fallbackSessionRef = (0, import_react12.useRef)(fallbackSession);
   const onSuccessRef = (0, import_react12.useRef)(onSuccess);
   const onErrorRef = (0, import_react12.useRef)(onError);
@@ -5691,10 +5554,6 @@ function FloPayAutomaticPaymentButton({
       });
     }
     try {
-      let paymentResult = null;
-      const redirectResult = getRedirectResultFromCheckoutProcessError(apiResult.autoProcessingError);
-      const shouldTreatCreateSessionFlowAsServerAutoAttempt = options?.fromCreateSession && (apiResult.autoProcessingAttempted === true || !!apiResult.autoProcessingError || !!redirectResult);
-      const shouldRetryPayPalClientSide = checkoutMethod === "paypal" && automaticPaymentToken?.isPaypal === true && options?.fromCreateSession === true;
       if (apiResult.autoProcessingPending) {
         const api = new import_js7.PaymentAPI(resolvedBillingUrl);
         const completed = await api.waitForCheckoutSessionCompletion(apiResult.autoProcessingPending.sessionId, {
@@ -5707,50 +5566,14 @@ function FloPayAutomaticPaymentButton({
           });
         }
         await showSuccess({
-          result: {
-            status: "succeeded",
-            paymentMethodId: paymentMethodId ?? void 0,
-            checkoutMethod
-          },
+          result: { status: "succeeded" },
           session: completedSession,
           sessionId: completedSession.id || resolvedSessionId,
           autoCompleted: false
         });
         return;
       }
-      if (redirectResult) {
-        const {
-          publishableKey,
-          paypalPublishableKey
-        } = resolveSavedPaymentPublishableKeys(apiResult);
-        if (redirectResult.type === "paypal_redirect_required" && publishableKey) {
-          persistPayPalResumeState2({
-            sessionId: session.id || resolvedSessionId,
-            publishableKey,
-            paypalPublishableKey
-          });
-        }
-        const {
-          flopay,
-          paypalFlopay
-        } = await loadSavedPaymentProviders({
-          publishableKey,
-          paypalPublishableKey,
-          billingApiUrl: resolvedBillingUrl,
-          locale
-        });
-        paymentResult = await handleSavedPaymentRedirectResult(redirectResult, {
-          flopay,
-          paypalFlopay,
-          attempt3DS: true,
-          billingApiUrl: resolvedBillingUrl,
-          sessionId: session.id || resolvedSessionId,
-          session
-        });
-        if (redirectResult.type === "paypal_redirect_required") {
-          clearPayPalResumeState2();
-        }
-      } else if (apiResult.autoProcessingError && !shouldRetryPayPalClientSide) {
+      if (apiResult.autoProcessingError) {
         throw checkoutProcessErrorToFloPayError(
           apiResult.autoProcessingError,
           "Automatic payment failed. Please try again.",
@@ -5758,7 +5581,22 @@ function FloPayAutomaticPaymentButton({
             checkoutMethod: apiResult.autoProcessingError.checkoutMethod
           }
         );
-      } else if (shouldTreatCreateSessionFlowAsServerAutoAttempt && !shouldRetryPayPalClientSide) {
+      }
+      if (options?.fromCreateSession && apiResult.autoProcessingAttempted === true) {
+        throw checkoutProcessErrorToFloPayError(
+          {
+            type: "unknown",
+            message: "Automatic payment failed. Please try again."
+          },
+          "Automatic payment failed. Please try again."
+        );
+      }
+      const result = await processSavedPaymentForMode({
+        billingApiUrl: resolvedBillingUrl,
+        sessionId: resolvedSessionId ?? session.id,
+        session
+      });
+      if (result.type !== "success") {
         throw checkoutProcessErrorToFloPayError(
           {
             type: "unknown",
@@ -5766,121 +5604,16 @@ function FloPayAutomaticPaymentButton({
           },
           "Automatic payment failed. Please try again."
         );
-      } else {
-        const result = await processSavedPaymentForMode({
-          billingApiUrl: resolvedBillingUrl,
-          sessionId: resolvedSessionId ?? session.id,
-          session,
-          tokenizedData: automaticPaymentToken
-        });
-        paymentResult = result.type === "success" ? result.result : null;
-        if (result.type !== "success") {
-          const {
-            publishableKey,
-            paypalPublishableKey
-          } = resolveSavedPaymentPublishableKeys(apiResult);
-          if (result.type === "paypal_redirect_required" && publishableKey) {
-            persistPayPalResumeState2({
-              sessionId: session.id || resolvedSessionId,
-              publishableKey,
-              paypalPublishableKey
-            });
-          }
-          const {
-            flopay,
-            paypalFlopay
-          } = await loadSavedPaymentProviders({
-            publishableKey,
-            paypalPublishableKey,
-            billingApiUrl: resolvedBillingUrl,
-            locale
-          });
-          paymentResult = await handleSavedPaymentRedirectResult(result, {
-            flopay,
-            paypalFlopay,
-            attempt3DS: true,
-            billingApiUrl: resolvedBillingUrl,
-            sessionId: session.id || resolvedSessionId,
-            session
-          });
-          if (result.type === "paypal_redirect_required") {
-            clearPayPalResumeState2();
-          }
-        }
       }
       await showSuccess({
-        result: paymentResult ? {
-          ...paymentResult,
-          paymentMethodId: paymentResult.paymentMethodId ?? paymentMethodId,
-          checkoutMethod: paymentResult.checkoutMethod ?? checkoutMethod
-        } : {
-          status: "succeeded",
-          paymentMethodId: paymentMethodId ?? void 0,
-          checkoutMethod
-        },
+        result: result.result,
         session,
         sessionId: session.id || resolvedSessionId,
         autoCompleted: false
       });
     } catch (err) {
-      let floPayErr = normalizeSavedPaymentError(err);
+      const floPayErr = normalizeSavedPaymentError(err);
       const fallbackSessionId = session.id || resolvedSessionId;
-      const shouldTreatCreateSessionFlowAsServerAutoAttempt = options?.fromCreateSession && apiResult.autoProcessingAttempted === true;
-      if (!shouldTreatCreateSessionFlowAsServerAutoAttempt && floPayErr.code === "authentication_required" && fallbackSessionId && automaticPaymentToken?.id && automaticPaymentToken.id.startsWith("pm_")) {
-        try {
-          const {
-            publishableKey,
-            paypalPublishableKey
-          } = resolveSavedPaymentPublishableKeys(apiResult);
-          const {
-            flopay
-          } = await loadSavedPaymentProviders({
-            publishableKey,
-            paypalPublishableKey,
-            billingApiUrl: resolvedBillingUrl,
-            locale
-          });
-          if (!flopay) {
-            throw new import_shared11.FloPayError(
-              "Stripe is not available for 3DS authentication.",
-              "api_error",
-              { code: "authentication_required" }
-            );
-          }
-          const paymentResult = await processSavedPaymentWithIntent({
-            billingApiUrl: resolvedBillingUrl,
-            sessionId: fallbackSessionId,
-            session,
-            paymentMethodId: automaticPaymentToken.id,
-            flopay
-          });
-          await showSuccess({
-            result: {
-              ...paymentResult,
-              paymentMethodId: paymentResult.paymentMethodId ?? paymentMethodId,
-              checkoutMethod: paymentResult.checkoutMethod ?? checkoutMethod
-            },
-            session,
-            sessionId: fallbackSessionId,
-            autoCompleted: false
-          });
-          return;
-        } catch (intentRecoveryErr) {
-          floPayErr = normalizeSavedPaymentError(intentRecoveryErr);
-        }
-      }
-      const inResumeWindow = typeof window !== "undefined" && new URLSearchParams(window.location.search).has("payment_intent_client_secret") && !!readPayPalResumeState2();
-      if (floPayErr.code === "payment_intent_unexpected_state" && inResumeWindow) {
-        return;
-      }
-      const isSilentFallbackCase = (floPayErr.code === "paypal_requires_user_interaction" || floPayErr.code === "payment_intent_unexpected_state") && shouldShowFallbackCheckout(floPayErr, fallbackSessionId) && !!fallbackSessionId && isMountedRef.current;
-      if (isSilentFallbackCase) {
-        setFallbackSession({
-          sessionId: fallbackSessionId,
-          errorMessage: ""
-        });
-        return;
-      }
       await showError(floPayErr, {
         emitDecline: true,
         method: floPayErr.checkoutMethod ?? DEFAULT_SAVED_PAYMENT_DECLINE_METHOD
@@ -5893,10 +5626,6 @@ function FloPayAutomaticPaymentButton({
       }
     }
   }, [
-    checkoutMethod,
-    locale,
-    automaticPaymentToken,
-    paymentMethodId,
     resolvedBillingUrl,
     showError,
     showSuccess
@@ -5943,8 +5672,7 @@ function FloPayAutomaticPaymentButton({
       }
       try {
         const result = await api.createAndFetchSession({
-          ...createSessionDraft,
-          ...automaticPaymentToken ? { tokenizedData: automaticPaymentToken } : {}
+          ...createSessionDraft
         });
         await processResolvedSession(result, result.data.session?.id ?? null, {
           fromCreateSession: true
@@ -5999,146 +5727,16 @@ function FloPayAutomaticPaymentButton({
   const handleFallbackDecline = (0, import_react12.useCallback)((decline) => {
     onDeclineRef.current?.(decline);
   }, []);
-  (0, import_react12.useEffect)(() => {
-    if (typeof window === "undefined" || resumeAttemptedRef.current) {
-      return;
-    }
-    const params = new URLSearchParams(window.location.search);
-    const clientSecret = params.get("payment_intent_client_secret");
-    if (!clientSecret) {
-      return;
-    }
-    const resumeState = readPayPalResumeState2();
-    if (!resumeState) {
-      return;
-    }
-    resumeAttemptedRef.current = true;
-    void (async () => {
-      setIsProcessing(true);
-      setOverlayError(null);
-      setOverlayStatus("processing");
-      try {
-        if (params.get("redirect_status") === "failed") {
-          throw Object.assign(
-            new import_shared11.FloPayError("PayPal payment was declined. Please try again.", "api_error"),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        const {
-          flopay,
-          paypalFlopay
-        } = await loadSavedPaymentProviders({
-          publishableKey: resumeState.publishableKey,
-          paypalPublishableKey: resumeState.paypalPublishableKey,
-          billingApiUrl: resolvedBillingUrl,
-          locale
-        });
-        const paypalStripe = (paypalFlopay ?? flopay)?.getRawProvider();
-        if (!paypalStripe) {
-          throw Object.assign(
-            new import_shared11.FloPayError("PayPal is not available.", "api_error"),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        const { paymentIntent, error } = await paypalStripe.retrievePaymentIntent(clientSecret);
-        if (error) {
-          throw Object.assign(
-            new import_shared11.FloPayError(
-              error.message ?? "Failed to retrieve PayPal payment status.",
-              "api_error",
-              { code: error.code }
-            ),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        const resultStatus = mapPayPalIntentStatusToPaymentResult(paymentIntent?.status);
-        if (!paymentIntent || resultStatus === "failed") {
-          throw Object.assign(
-            new import_shared11.FloPayError("PayPal payment was not completed. Please try again.", "api_error"),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        const paymentMethodId2 = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
-        if (!resumeState.sessionId) {
-          throw Object.assign(
-            new import_shared11.FloPayError("Missing session id on PayPal resume.", "api_error"),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        const api = new import_js7.PaymentAPI(resolvedBillingUrl);
-        const sessionResult = await api.getUnifiedCheckoutSession(resumeState.sessionId);
-        let resumeSession = sessionResult.data.session;
-        if (!resumeSession) {
-          throw Object.assign(
-            new import_shared11.FloPayError("Could not load session to capture PayPal payment.", "api_error"),
-            { checkoutMethod: "paypal" }
-          );
-        }
-        let finalResultStatus = resultStatus;
-        if (resumeSession.status !== "complete") {
-          const processResult = await processSavedPaymentForMode({
-            billingApiUrl: resolvedBillingUrl,
-            sessionId: resumeState.sessionId,
-            session: resumeSession,
-            tokenizedData: {
-              id: paymentMethodId2 ?? paymentIntent.id,
-              type: "card",
-              threeDSecureActionResultTokenId: paymentIntent.id,
-              isPaypal: true
-            }
-          });
-          if (processResult.type !== "success") {
-            throw Object.assign(
-              new import_shared11.FloPayError("Failed to finalize PayPal payment.", "api_error"),
-              { checkoutMethod: "paypal" }
-            );
-          }
-          finalResultStatus = processResult.result.status;
-          try {
-            const refreshed = await api.getUnifiedCheckoutSession(resumeState.sessionId);
-            if (refreshed.data.session) {
-              resumeSession = refreshed.data.session;
-            }
-          } catch {
-          }
-        }
-        await showSuccess({
-          result: {
-            status: finalResultStatus,
-            paymentIntentId: paymentIntent.id,
-            paymentMethodId: paymentMethodId2,
-            checkoutMethod: "paypal"
-          },
-          session: resumeSession,
-          sessionId: resumeState.sessionId,
-          autoCompleted: false
-        });
-      } catch (err) {
-        const floPayErr = normalizeSavedPaymentError(err);
-        await showError(floPayErr, {
-          emitDecline: true,
-          method: floPayErr.checkoutMethod ?? "paypal"
-        });
-      } finally {
-        clearPayPalResumeState2();
-        clearPayPalRedirectParams2();
-        if (isMountedRef.current) {
-          setOverlayStatus(null);
-          setOverlayError(null);
-          setIsProcessing(false);
-        }
-      }
-    })();
-  }, [locale, resolvedBillingUrl, showError, showSuccess]);
+  const themeBundle = (0, import_react12.useMemo)(() => (0, import_shared11.resolveTheme)(theme), [theme]);
   const bStyles = (0, import_react12.useMemo)(() => {
-    const base = (0, import_shared11.resolveButtonsLayoutTheme)(buttonsTheme);
+    const base = themeBundle?.buttonsLayout ?? (0, import_shared11.resolveButtonsLayoutTheme)(buttonsTheme);
     if (!stylesOverride) return base;
     return {
       ...base,
       ...stylesOverride,
       cardButton: { ...base.cardButton, ...stylesOverride.cardButton }
     };
-  }, [buttonsTheme, stylesOverride]);
+  }, [themeBundle, buttonsTheme, stylesOverride]);
   const cardButtonSizing = children === void 0 ? { boxSizing: "border-box", height: DEFAULT_BUTTONS_LAYOUT_BUTTON_HEIGHT3, padding: "0 1rem" } : { padding: "0.9rem 1rem" };
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
@@ -6235,9 +5833,12 @@ function FloPayAutomaticPaymentButton({
                 sessionId: fallbackSession.sessionId,
                 checkoutMode: "full",
                 billingApiUrl: resolvedBillingUrl,
+                locale,
+                theme,
+                buttonsTheme,
+                buttonsStyles: stylesOverride,
                 initialErrorMessage: fallbackSession.errorMessage,
                 cardTitleContent: null,
-                showSecurityFooter: false,
                 onComplete: handleFallbackComplete,
                 onError: handleFallbackError,
                 onDecline: handleFallbackDecline