@flopay/react 0.5.1 → 0.5.3

package/dist/index.mjs

@@ -245,7 +245,8 @@ import {
   getStateOptions,
   COUNTRY_OPTIONS,
   resolveAVSConfig,
-  isAVSFieldVisible
+  isAVSFieldVisible,
+  getStateFromPostalCode
 } from "@flopay/shared";
 import { forwardRef, useCallback, useContext as useContext3, useEffect as useEffect3, useImperativeHandle, useMemo as useMemo2, useRef as useRef2, useState as useState2 } from "react";
 
@@ -1232,12 +1233,17 @@ function SplitCardFormInner({
               lastName: effectiveAccount.lastName ?? fullName.trim().split(/\s+/).slice(1).join(" ") ?? "",
               ...avsConfig ? (() => {
                 const c = selectedCountryRef.current;
+                const stateVisible = isAVSFieldVisible(avsConfig.state, c);
+                const line1Visible = isAVSFieldVisible(avsConfig.address_line_1, c);
+                const zipVisible = isAVSFieldVisible(avsConfig.postal_code, c);
+                const derivedState = line1Visible && !stateVisible && zipVisible ? getStateFromPostalCode(c, zipCodeRef.current ?? "") : null;
+                const stateValue2 = stateVisible ? stateRef.current : derivedState;
                 return {
                   country: c,
-                  ...isAVSFieldVisible(avsConfig.postal_code, c) && zipCodeRef.current ? { zip: zipCodeRef.current } : {},
+                  ...zipVisible && zipCodeRef.current ? { zip: zipCodeRef.current } : {},
                   ...isAVSFieldVisible(avsConfig.city, c) && cityRef.current ? { city: cityRef.current } : {},
-                  ...isAVSFieldVisible(avsConfig.state, c) && stateRef.current ? { state: stateRef.current } : {},
-                  ...isAVSFieldVisible(avsConfig.address_line_1, c) && addressLine1Ref.current ? { addressLine1: addressLine1Ref.current } : {},
+                  ...stateValue2 ? { state: stateValue2 } : {},
+                  ...line1Visible && addressLine1Ref.current ? { addressLine1: addressLine1Ref.current } : {},
                   ...isAVSFieldVisible(avsConfig.address_line_2, c) && addressLine2Ref.current ? { addressLine2: addressLine2Ref.current } : {}
                 };
               })() : {}
@@ -1292,7 +1298,12 @@ function SplitCardFormInner({
             if (avsConfig && isAVSFieldVisible(avsConfig.address_line_1, retryCC) && addressLine1Ref.current.trim()) retryBillingAddress["line1"] = addressLine1Ref.current.trim();
             if (avsConfig && isAVSFieldVisible(avsConfig.address_line_2, retryCC) && addressLine2Ref.current.trim()) retryBillingAddress["line2"] = addressLine2Ref.current.trim();
             if (avsConfig && isAVSFieldVisible(avsConfig.city, retryCC) && cityRef.current.trim()) retryBillingAddress["city"] = cityRef.current.trim();
-            if (avsConfig && isAVSFieldVisible(avsConfig.state, retryCC) && stateRef.current.trim()) retryBillingAddress["state"] = stateRef.current.trim();
+            if (avsConfig && isAVSFieldVisible(avsConfig.state, retryCC) && stateRef.current.trim()) {
+              retryBillingAddress["state"] = stateRef.current.trim();
+            } else if (avsConfig && isAVSFieldVisible(avsConfig.address_line_1, retryCC) && !isAVSFieldVisible(avsConfig.state, retryCC) && isAVSFieldVisible(avsConfig.postal_code, retryCC)) {
+              const derivedRetryState = getStateFromPostalCode(retryCC, zipCodeRef.current.trim());
+              if (derivedRetryState) retryBillingAddress["state"] = derivedRetryState;
+            }
             const result = await flopay.confirmPayment({
               clientSecret: secret,
               returnUrl: window.location.href,
@@ -1487,7 +1498,12 @@ function SplitCardFormInner({
         if (avsConfig && isAVSFieldVisible(avsConfig.address_line_1, cc) && addressLine1Ref.current.trim()) billingAddress["line1"] = addressLine1Ref.current.trim();
         if (avsConfig && isAVSFieldVisible(avsConfig.address_line_2, cc) && addressLine2Ref.current.trim()) billingAddress["line2"] = addressLine2Ref.current.trim();
         if (avsConfig && isAVSFieldVisible(avsConfig.city, cc) && cityRef.current.trim()) billingAddress["city"] = cityRef.current.trim();
-        if (avsConfig && isAVSFieldVisible(avsConfig.state, cc) && stateRef.current.trim()) billingAddress["state"] = stateRef.current.trim();
+        if (avsConfig && isAVSFieldVisible(avsConfig.state, cc) && stateRef.current.trim()) {
+          billingAddress["state"] = stateRef.current.trim();
+        } else if (avsConfig && isAVSFieldVisible(avsConfig.address_line_1, cc) && !isAVSFieldVisible(avsConfig.state, cc) && isAVSFieldVisible(avsConfig.postal_code, cc)) {
+          const derivedSubmitState = getStateFromPostalCode(cc, zipCodeRef.current.trim());
+          if (derivedSubmitState) billingAddress["state"] = derivedSubmitState;
+        }
         const billingDetails = {
           ...resolvedAccount.email ? { email: resolvedAccount.email } : {},
           ...fullName.trim() ? { name: fullName.trim() } : {},
@@ -3004,7 +3020,6 @@ function FloPayCheckout({
       cancelUrl: params?.cancelUrl,
       i: params?.items?.map((x) => `${x.providerItemId}:${x.totalAmount}:${x.overrideAmount ?? ""}:${x.quantity ?? 1}`).sort(),
       s: params?.subscriptions?.map((x) => `${x.providerPlanId}:${x.totalAmount}:${x.overrideAmount ?? ""}:${x.quantity ?? 1}`).sort(),
-      account: params?.account,
       couponCodes: params?.couponCodes,
       tagsData: params?.tagsData,
       utmMetadata: params?.utmMetadata,
@@ -3162,7 +3177,8 @@ function FloPayCheckout({
         };
       }
       (async () => {
-        const shouldAutoProcessInlineSession = effectiveCreateSessionMode === "auto" && !autoCheckoutAttempted.current;
+        const hasPayPalRedirectParams = typeof window !== "undefined" && new URLSearchParams(window.location.search).has("payment_intent");
+        const shouldAutoProcessInlineSession = effectiveCreateSessionMode === "auto" && !autoCheckoutAttempted.current && !hasPayPalRedirectParams;
         if (shouldAutoProcessInlineSession) {
           setModeError(null);
           setModeOverlayError(null);
@@ -3540,8 +3556,6 @@ function FloPayCheckout({
         country: session?.customer?.country,
         city: session?.customer?.city,
         state: session?.customer?.state,
-        addressLine1: session?.customer?.line1,
-        addressLine2: session?.customer?.line2,
         onCountryChange,
         onZipChange,
         avsCheck: !!enableAVS,