@flopay/react 0.4.11 → 0.5.1

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FloPay, FloPayElements } from '@flopay/js';
 import * as _flopay_shared from '@flopay/shared';
-import { FloPayAppearance, InlineSessionDraft, FloPayError, PaymentResult, DeclineEvent, CheckoutButtonMethod, BeforeButtonClickEvent, InlineSessionPatch, CheckoutMode, CheckoutSession, ElementOptions, ElementChangeEvent, TokenizedBody, CheckoutItem, CheckoutSubscription, ButtonsLayoutTheme, ButtonsLayoutStyles } from '@flopay/shared';
+import { FloPayAppearance, InlineSessionDraft, FloPayError, PaymentResult, DeclineEvent, CheckoutButtonMethod, BeforeButtonClickEvent, InlineSessionPatch, CheckoutMode, CheckoutSession, ElementOptions, ElementChangeEvent, TokenizedBody, AVSFieldConfig, CheckoutItem, CheckoutSubscription, ButtonsLayoutTheme, ButtonsLayoutStyles } from '@flopay/shared';
 export { BeforeButtonClickEvent, CheckoutButtonMethod, DeclineEvent, InlineSessionDraft, InlineSessionPatch } from '@flopay/shared';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
@@ -111,10 +111,12 @@ interface FloPayCheckoutProps {
      */
     onBeforeButtonClick?: (event: BeforeButtonClickEvent) => void | false | Promise<void | false | InlineSessionPatch> | InlineSessionPatch;
     /**
-     * Enable AVS (Address Verification). Shows country dropdown + ZIP/postcode input
-     * in the card form. When enabled, billing_details are passed to Stripe for AVS checks.
+     * Enable AVS (Address Verification).
+     * - `true` — show country + postal code (backward compatible default)
+     * - `AVSFieldConfig` — granular per-field control, optionally scoped to country codes
+     * - `false` / omitted — AVS disabled
      */
-    enableAVS?: boolean;
+    enableAVS?: boolean | _flopay_shared.AVSFieldConfig;
     /** Layout for AVS fields: 'row' (side-by-side, default) or 'column' (stacked). */
     avsLayout?: 'row' | 'column';
     /** Label for the submit button. */
@@ -442,20 +444,36 @@ interface SplitCardFormProps {
      */
     onBeforeButtonClick?: (event: BeforeButtonClickEvent) => MaybePromise<void | false | InlineSessionPatch>;
     /**
-     * Enable AVS (Address Verification). Shows country dropdown + ZIP/postcode input.
-     * When enabled, billing_details are passed to Stripe's createPaymentMethod for AVS checks.
+     * Enable AVS (Address Verification).
+     * - `true` — show country + postal code (backward compatible default)
+     * - `AVSFieldConfig` — granular per-field control, optionally scoped to country codes
+     * - `false` / omitted — AVS disabled
      */
-    enableAVS?: boolean;
+    enableAVS?: boolean | AVSFieldConfig;
     /** Layout for AVS fields: 'row' (side-by-side, default) or 'column' (stacked). */
     avsLayout?: 'row' | 'column';
     /** Pre-filled country code (ISO 3166-1 alpha-2) for AVS. */
     country?: string;
     /** Pre-filled ZIP/postal code for AVS. */
     zip?: string;
+    /** Pre-filled street address (line 1) for AVS. Typically from a partner GeoIP / profile lookup. */
+    addressLine1?: string;
+    /** Pre-filled apt/suite/unit (line 2) for AVS. */
+    addressLine2?: string;
+    /** Pre-filled city for AVS. Typically from a partner GeoIP / profile lookup. */
+    city?: string;
+    /** Pre-filled state/province for AVS. Typically from a partner GeoIP / profile lookup. */
+    state?: string;
     /** Callback when AVS country changes. */
     onCountryChange?: (country: string) => void;
     /** Callback when AVS ZIP/postal code changes. */
     onZipChange?: (zip: string) => void;
+    /** Whether AVS was enabled (sent to backend for analytics). */
+    avsCheck?: boolean;
+    /** Checkout type: 'standard_checkout' or 'embedded_checkout'. */
+    checkoutType?: string;
+    /** Checkout layout: 'default_layout', 'buttons_layout', or 'custom_layout'. */
+    checkoutLayout?: string;
     /** Total amount in cents (smallest currency unit). Used for wallet/PayPal Elements config. */
     totalAmount?: number;
     /** Currency code (used for PayPal Elements config). */

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FloPay, FloPayElements } from '@flopay/js';
 import * as _flopay_shared from '@flopay/shared';
-import { FloPayAppearance, InlineSessionDraft, FloPayError, PaymentResult, DeclineEvent, CheckoutButtonMethod, BeforeButtonClickEvent, InlineSessionPatch, CheckoutMode, CheckoutSession, ElementOptions, ElementChangeEvent, TokenizedBody, CheckoutItem, CheckoutSubscription, ButtonsLayoutTheme, ButtonsLayoutStyles } from '@flopay/shared';
+import { FloPayAppearance, InlineSessionDraft, FloPayError, PaymentResult, DeclineEvent, CheckoutButtonMethod, BeforeButtonClickEvent, InlineSessionPatch, CheckoutMode, CheckoutSession, ElementOptions, ElementChangeEvent, TokenizedBody, AVSFieldConfig, CheckoutItem, CheckoutSubscription, ButtonsLayoutTheme, ButtonsLayoutStyles } from '@flopay/shared';
 export { BeforeButtonClickEvent, CheckoutButtonMethod, DeclineEvent, InlineSessionDraft, InlineSessionPatch } from '@flopay/shared';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
@@ -111,10 +111,12 @@ interface FloPayCheckoutProps {
      */
     onBeforeButtonClick?: (event: BeforeButtonClickEvent) => void | false | Promise<void | false | InlineSessionPatch> | InlineSessionPatch;
     /**
-     * Enable AVS (Address Verification). Shows country dropdown + ZIP/postcode input
-     * in the card form. When enabled, billing_details are passed to Stripe for AVS checks.
+     * Enable AVS (Address Verification).
+     * - `true` — show country + postal code (backward compatible default)
+     * - `AVSFieldConfig` — granular per-field control, optionally scoped to country codes
+     * - `false` / omitted — AVS disabled
      */
-    enableAVS?: boolean;
+    enableAVS?: boolean | _flopay_shared.AVSFieldConfig;
     /** Layout for AVS fields: 'row' (side-by-side, default) or 'column' (stacked). */
     avsLayout?: 'row' | 'column';
     /** Label for the submit button. */
@@ -442,20 +444,36 @@ interface SplitCardFormProps {
      */
     onBeforeButtonClick?: (event: BeforeButtonClickEvent) => MaybePromise<void | false | InlineSessionPatch>;
     /**
-     * Enable AVS (Address Verification). Shows country dropdown + ZIP/postcode input.
-     * When enabled, billing_details are passed to Stripe's createPaymentMethod for AVS checks.
+     * Enable AVS (Address Verification).
+     * - `true` — show country + postal code (backward compatible default)
+     * - `AVSFieldConfig` — granular per-field control, optionally scoped to country codes
+     * - `false` / omitted — AVS disabled
      */
-    enableAVS?: boolean;
+    enableAVS?: boolean | AVSFieldConfig;
     /** Layout for AVS fields: 'row' (side-by-side, default) or 'column' (stacked). */
     avsLayout?: 'row' | 'column';
     /** Pre-filled country code (ISO 3166-1 alpha-2) for AVS. */
     country?: string;
     /** Pre-filled ZIP/postal code for AVS. */
     zip?: string;
+    /** Pre-filled street address (line 1) for AVS. Typically from a partner GeoIP / profile lookup. */
+    addressLine1?: string;
+    /** Pre-filled apt/suite/unit (line 2) for AVS. */
+    addressLine2?: string;
+    /** Pre-filled city for AVS. Typically from a partner GeoIP / profile lookup. */
+    city?: string;
+    /** Pre-filled state/province for AVS. Typically from a partner GeoIP / profile lookup. */
+    state?: string;
     /** Callback when AVS country changes. */
     onCountryChange?: (country: string) => void;
     /** Callback when AVS ZIP/postal code changes. */
     onZipChange?: (zip: string) => void;
+    /** Whether AVS was enabled (sent to backend for analytics). */
+    avsCheck?: boolean;
+    /** Checkout type: 'standard_checkout' or 'embedded_checkout'. */
+    checkoutType?: string;
+    /** Checkout layout: 'default_layout', 'buttons_layout', or 'custom_layout'. */
+    checkoutLayout?: string;
     /** Total amount in cents (smallest currency unit). Used for wallet/PayPal Elements config. */
     totalAmount?: number;
     /** Currency code (used for PayPal Elements config). */

package/dist/index.mjs

@@ -238,7 +238,15 @@ import {
   useElements as useStripeElements,
   useStripe as useStripeRaw
 } from "@stripe/react-stripe-js";
-import { resolveButtonsLayoutTheme, getPostalCodeLabel, COUNTRY_OPTIONS } from "@flopay/shared";
+import {
+  resolveButtonsLayoutTheme,
+  getPostalCodeLabel,
+  getStateLabel,
+  getStateOptions,
+  COUNTRY_OPTIONS,
+  resolveAVSConfig,
+  isAVSFieldVisible
+} from "@flopay/shared";
 import { forwardRef, useCallback, useContext as useContext3, useEffect as useEffect3, useImperativeHandle, useMemo as useMemo2, useRef as useRef2, useState as useState2 } from "react";
 
 // src/hooks.ts
@@ -1010,12 +1018,19 @@ function SplitCardFormInner({
   showSecurityFooter = true,
   onButtonClick,
   onBeforeButtonClick,
-  enableAVS = false,
+  enableAVS: enableAVSProp,
   avsLayout: avsLayoutProp = "row",
   country: countryProp,
   zip: zipProp,
+  addressLine1: addressLine1Prop,
+  addressLine2: addressLine2Prop,
+  city: cityProp,
+  state: stateProp,
   onCountryChange,
   onZipChange,
+  avsCheck: avsCheckProp,
+  checkoutType: checkoutTypeProp,
+  checkoutLayout: checkoutLayoutProp,
   totalAmount = 0,
   currency = "usd",
   initialCardOpen = false,
@@ -1031,9 +1046,19 @@ function SplitCardFormInner({
   const [is3DSActive, setIs3DSActive] = useState2(false);
   const [selectedCountry, setSelectedCountry] = useState2(countryProp ?? "US");
   const [zipCode, setZipCode] = useState2(zipProp ?? "");
+  const [addressLine1, setAddressLine1] = useState2(addressLine1Prop ?? "");
+  const [addressLine2, setAddressLine2] = useState2(addressLine2Prop ?? "");
+  const [city, setCity] = useState2(cityProp ?? "");
+  const [stateValue, setStateValue] = useState2(stateProp ?? "");
   const [accountPatch, setAccountPatch] = useState2({});
   const zipCodeRef = useRef2(zipProp ?? "");
   const selectedCountryRef = useRef2(countryProp ?? "US");
+  const addressLine1Ref = useRef2(addressLine1Prop ?? "");
+  const addressLine2Ref = useRef2(addressLine2Prop ?? "");
+  const cityRef = useRef2(cityProp ?? "");
+  const stateRef = useRef2(stateProp ?? "");
+  const avsConfig = useMemo2(() => resolveAVSConfig(enableAVSProp), [enableAVSProp]);
+  const enableAVS = avsConfig !== null;
   const [viewState, setViewState] = useState2(initialCardOpen ? "card" : "buttons");
   const showCardForm = viewState === "expanding" || viewState === "card";
   const TRANSITION_MS = 280;
@@ -1205,9 +1230,33 @@ function SplitCardFormInner({
               email: effectiveAccount.email ?? "",
               firstName: effectiveAccount.firstName ?? fullName.trim().split(/\s+/)[0] ?? "",
               lastName: effectiveAccount.lastName ?? fullName.trim().split(/\s+/).slice(1).join(" ") ?? "",
-              ...enableAVS ? { zip: zipCodeRef.current, country: selectedCountryRef.current } : {}
+              ...avsConfig ? (() => {
+                const c = selectedCountryRef.current;
+                return {
+                  country: c,
+                  ...isAVSFieldVisible(avsConfig.postal_code, c) && 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 } : {},
+                  ...isAVSFieldVisible(avsConfig.address_line_2, c) && addressLine2Ref.current ? { addressLine2: addressLine2Ref.current } : {}
+                };
+              })() : {}
             },
-            chv
+            chv,
+            // Checkout analytics metadata
+            avsCheck: avsCheckProp ?? false,
+            checkoutType: checkoutTypeProp,
+            checkoutLayout: checkoutLayoutProp,
+            // Resolved exposure: which fields were actually shown for the active country.
+            // Country-scoped rules (e.g. ['US', 'CA']) are flattened to booleans here.
+            avsConfig: avsConfig ? {
+              country: isAVSFieldVisible(avsConfig.country, selectedCountryRef.current),
+              postal_code: isAVSFieldVisible(avsConfig.postal_code, selectedCountryRef.current),
+              address_line_1: isAVSFieldVisible(avsConfig.address_line_1, selectedCountryRef.current),
+              address_line_2: isAVSFieldVisible(avsConfig.address_line_2, selectedCountryRef.current),
+              city: isAVSFieldVisible(avsConfig.city, selectedCountryRef.current),
+              state: isAVSFieldVisible(avsConfig.state, selectedCountryRef.current)
+            } : void 0
           })
         });
         if (response.ok) {
@@ -1231,14 +1280,19 @@ function SplitCardFormInner({
           }
           setIs3DSActive(true);
           try {
-            const retryBillingAddress = {
-              ...(enableAVS ? selectedCountryRef.current : effectiveAccount.country) ? {
-                country: enableAVS ? selectedCountryRef.current : effectiveAccount.country
-              } : {},
-              ...(enableAVS ? zipCodeRef.current.trim() : effectiveAccount.zip) || "" ? {
-                postal_code: enableAVS ? zipCodeRef.current.trim() : effectiveAccount.zip
-              } : {}
-            };
+            const retryBillingAddress = {};
+            const retryCC = selectedCountryRef.current;
+            const retryCountry = enableAVS ? retryCC : effectiveAccount.country;
+            if (retryCountry) retryBillingAddress["country"] = retryCountry;
+            if (avsConfig && isAVSFieldVisible(avsConfig.postal_code, retryCC) && zipCodeRef.current.trim()) {
+              retryBillingAddress["postal_code"] = zipCodeRef.current.trim();
+            } else if (!avsConfig && effectiveAccount.zip) {
+              retryBillingAddress["postal_code"] = effectiveAccount.zip;
+            }
+            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();
             const result = await flopay.confirmPayment({
               clientSecret: secret,
               returnUrl: window.location.href,
@@ -1396,9 +1450,24 @@ function SplitCardFormInner({
       updateError(null);
       let handedOff = false;
       try {
-        if (enableAVS && !zipCodeRef.current.trim()) {
-          updateError(getPostalCodeLabel(selectedCountryRef.current) + " is required");
-          return;
+        if (avsConfig) {
+          const country = selectedCountryRef.current;
+          if (isAVSFieldVisible(avsConfig.postal_code, country) && !zipCodeRef.current.trim()) {
+            updateError(getPostalCodeLabel(country) + " is required");
+            return;
+          }
+          if (isAVSFieldVisible(avsConfig.address_line_1, country) && !addressLine1Ref.current.trim()) {
+            updateError("Street address is required");
+            return;
+          }
+          if (isAVSFieldVisible(avsConfig.city, country) && !cityRef.current.trim()) {
+            updateError("City is required");
+            return;
+          }
+          if (isAVSFieldVisible(avsConfig.state, country) && !stateRef.current.trim()) {
+            updateError(getStateLabel(country) + " is required");
+            return;
+          }
         }
         const submitResult = await flopay.submitElements();
         if (submitResult.error) {
@@ -1406,14 +1475,19 @@ function SplitCardFormInner({
           onError?.(submitResult.error);
           return;
         }
-        const billingAddress = {
-          ...(enableAVS ? selectedCountryRef.current : resolvedAccount.country) ? {
-            country: enableAVS ? selectedCountryRef.current : resolvedAccount.country
-          } : {},
-          ...(enableAVS ? zipCodeRef.current.trim() : resolvedAccount.zip) || "" ? {
-            postal_code: enableAVS ? zipCodeRef.current.trim() : resolvedAccount.zip
-          } : {}
-        };
+        const billingAddress = {};
+        const cc = selectedCountryRef.current;
+        const avsCountry = enableAVS ? cc : resolvedAccount.country;
+        if (avsCountry) billingAddress["country"] = avsCountry;
+        if (avsConfig && isAVSFieldVisible(avsConfig.postal_code, cc) && zipCodeRef.current.trim()) {
+          billingAddress["postal_code"] = zipCodeRef.current.trim();
+        } else if (!avsConfig && resolvedAccount.zip) {
+          billingAddress["postal_code"] = resolvedAccount.zip;
+        }
+        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();
         const billingDetails = {
           ...resolvedAccount.email ? { email: resolvedAccount.email } : {},
           ...fullName.trim() ? { name: fullName.trim() } : {},
@@ -1640,80 +1714,198 @@ function SplitCardFormInner({
         }
       }
     ) }),
-    enableAVS && /* @__PURE__ */ jsxs3("div", { style: {
-      display: "flex",
-      flexDirection: avsLayoutProp === "column" ? "column" : "row",
-      gap: avsLayoutProp === "column" ? "0.5rem" : "0",
-      marginTop: "0.5rem"
-    }, children: [
-      /* @__PURE__ */ jsx5("div", { style: {
-        flex: avsLayoutProp === "row" ? 1 : void 0,
+    avsConfig && (() => {
+      const cc = selectedCountry;
+      const inputWrapStyle = (extraStyle) => ({
         backgroundColor: cardInputBg,
         border: `1px solid ${resolvedBorder}`,
+        borderRadius: "8px",
+        marginTop: "0.5rem",
         padding: "10px",
-        ...avsLayoutProp === "row" ? { borderRadius: "0", borderTopLeftRadius: "8px", borderBottomLeftRadius: "8px", borderRight: "none" } : { borderRadius: "8px" },
-        ...isButtons && bStyles.countrySelect ? bStyles.countrySelect : {}
-      }, children: /* @__PURE__ */ jsx5(
-        "select",
-        {
-          value: selectedCountry,
-          onChange: (e) => {
-            selectedCountryRef.current = e.target.value;
-            setSelectedCountry(e.target.value);
-            onCountryChange?.(e.target.value);
-          },
-          disabled: isSubmitting,
-          autoComplete: "country",
-          "data-testid": "flopay-country",
-          style: {
-            width: "100%",
-            border: "none",
-            outline: "none",
-            background: "transparent",
-            ...sharedInputTypography,
-            cursor: "pointer",
-            ...isButtons && bStyles.nameInput ? bStyles.nameInput : {}
-          },
-          children: COUNTRY_OPTIONS.map((c) => /* @__PURE__ */ jsxs3("option", { value: c.code, children: [
-            c.flag,
-            " ",
-            c.name
-          ] }, c.code))
-        }
-      ) }),
-      /* @__PURE__ */ jsx5("div", { style: {
-        flex: avsLayoutProp === "row" ? 1 : void 0,
-        backgroundColor: cardInputBg,
-        border: `1px solid ${resolvedBorder}`,
-        padding: "10px",
-        ...avsLayoutProp === "row" ? { borderRadius: "0", borderTopRightRadius: "8px", borderBottomRightRadius: "8px" } : { borderRadius: "8px" },
-        ...isButtons && bStyles.zipInput ? bStyles.zipInput : {}
-      }, children: /* @__PURE__ */ jsx5(
-        "input",
-        {
-          className: "flopay-shared-input",
-          placeholder: getPostalCodeLabel(selectedCountry),
-          autoComplete: "postal-code",
-          value: zipCode,
-          onChange: (e) => {
-            zipCodeRef.current = e.target.value;
-            setZipCode(e.target.value);
-            onZipChange?.(e.target.value);
-          },
-          disabled: isSubmitting,
-          required: true,
-          "data-testid": "flopay-zip",
-          style: {
-            width: "100%",
-            border: "none",
-            outline: "none",
-            background: "transparent",
-            ...sharedInputTypography,
-            ...isButtons && bStyles.nameInput ? bStyles.nameInput : {}
+        ...isButtons && extraStyle ? extraStyle : {}
+      });
+      const inputFieldStyle = () => ({
+        width: "100%",
+        border: "none",
+        outline: "none",
+        background: "transparent",
+        ...sharedInputTypography,
+        ...isButtons && bStyles.nameInput ? bStyles.nameInput : {}
+      });
+      const stateOpts = getStateOptions(cc);
+      return /* @__PURE__ */ jsxs3(Fragment2, { children: [
+        isAVSFieldVisible(avsConfig.address_line_1, cc) && /* @__PURE__ */ jsx5("div", { style: inputWrapStyle(bStyles.addressLine1Input), children: /* @__PURE__ */ jsx5(
+          "input",
+          {
+            className: "flopay-shared-input",
+            placeholder: "Street Address (e.g. 123 Main St)",
+            autoComplete: "address-line1",
+            value: addressLine1,
+            onChange: (e) => {
+              addressLine1Ref.current = e.target.value;
+              setAddressLine1(e.target.value);
+            },
+            disabled: isSubmitting,
+            required: true,
+            "data-testid": "flopay-address-line1",
+            style: inputFieldStyle()
           }
-        }
-      ) })
-    ] }),
+        ) }),
+        isAVSFieldVisible(avsConfig.address_line_2, cc) && /* @__PURE__ */ jsx5("div", { style: inputWrapStyle(bStyles.addressLine2Input), children: /* @__PURE__ */ jsx5(
+          "input",
+          {
+            className: "flopay-shared-input",
+            placeholder: "Apt, Suite, Unit (optional)",
+            autoComplete: "address-line2",
+            value: addressLine2,
+            onChange: (e) => {
+              addressLine2Ref.current = e.target.value;
+              setAddressLine2(e.target.value);
+            },
+            disabled: isSubmitting,
+            "data-testid": "flopay-address-line2",
+            style: inputFieldStyle()
+          }
+        ) }),
+        (isAVSFieldVisible(avsConfig.city, cc) || isAVSFieldVisible(avsConfig.state, cc)) && /* @__PURE__ */ jsxs3("div", { style: {
+          display: "flex",
+          gap: "0",
+          marginTop: "0.5rem"
+        }, children: [
+          isAVSFieldVisible(avsConfig.city, cc) && /* @__PURE__ */ jsx5("div", { style: {
+            flex: 1,
+            backgroundColor: cardInputBg,
+            border: `1px solid ${resolvedBorder}`,
+            padding: "10px",
+            borderTopLeftRadius: "8px",
+            borderBottomLeftRadius: "8px",
+            ...isAVSFieldVisible(avsConfig.state, cc) ? { borderRight: "none", borderTopRightRadius: 0, borderBottomRightRadius: 0 } : { borderRadius: "8px" },
+            ...isButtons && bStyles.cityInput ? bStyles.cityInput : {}
+          }, children: /* @__PURE__ */ jsx5(
+            "input",
+            {
+              className: "flopay-shared-input",
+              placeholder: "City",
+              autoComplete: "address-level2",
+              value: city,
+              onChange: (e) => {
+                cityRef.current = e.target.value;
+                setCity(e.target.value);
+              },
+              disabled: isSubmitting,
+              required: true,
+              "data-testid": "flopay-city",
+              style: inputFieldStyle()
+            }
+          ) }),
+          isAVSFieldVisible(avsConfig.state, cc) && /* @__PURE__ */ jsx5("div", { style: {
+            flex: 1,
+            backgroundColor: cardInputBg,
+            border: `1px solid ${resolvedBorder}`,
+            padding: "10px",
+            borderTopRightRadius: "8px",
+            borderBottomRightRadius: "8px",
+            ...isAVSFieldVisible(avsConfig.city, cc) ? { borderTopLeftRadius: 0, borderBottomLeftRadius: 0 } : { borderRadius: "8px" },
+            ...isButtons && bStyles.stateInput ? bStyles.stateInput : {}
+          }, children: stateOpts ? /* @__PURE__ */ jsxs3(
+            "select",
+            {
+              value: stateValue,
+              onChange: (e) => {
+                stateRef.current = e.target.value;
+                setStateValue(e.target.value);
+              },
+              disabled: isSubmitting,
+              autoComplete: "address-level1",
+              required: true,
+              "data-testid": "flopay-state",
+              style: { ...inputFieldStyle(), cursor: "pointer" },
+              children: [
+                /* @__PURE__ */ jsx5("option", { value: "", children: getStateLabel(cc) }),
+                stateOpts.map((s) => /* @__PURE__ */ jsx5("option", { value: s.code, children: s.name }, s.code))
+              ]
+            }
+          ) : /* @__PURE__ */ jsx5(
+            "input",
+            {
+              className: "flopay-shared-input",
+              placeholder: getStateLabel(cc),
+              autoComplete: "address-level1",
+              value: stateValue,
+              onChange: (e) => {
+                stateRef.current = e.target.value;
+                setStateValue(e.target.value);
+              },
+              disabled: isSubmitting,
+              required: true,
+              "data-testid": "flopay-state",
+              style: inputFieldStyle()
+            }
+          ) })
+        ] }),
+        (isAVSFieldVisible(avsConfig.country, cc) || isAVSFieldVisible(avsConfig.postal_code, cc)) && /* @__PURE__ */ jsxs3("div", { style: {
+          display: "flex",
+          flexDirection: avsLayoutProp === "column" ? "column" : "row",
+          gap: avsLayoutProp === "column" ? "0.5rem" : "0",
+          marginTop: "0.5rem"
+        }, children: [
+          isAVSFieldVisible(avsConfig.country, cc) && /* @__PURE__ */ jsx5("div", { style: {
+            flex: avsLayoutProp === "row" ? 1 : void 0,
+            backgroundColor: cardInputBg,
+            border: `1px solid ${resolvedBorder}`,
+            padding: "10px",
+            ...avsLayoutProp === "row" && isAVSFieldVisible(avsConfig.postal_code, cc) ? { borderRadius: "0", borderTopLeftRadius: "8px", borderBottomLeftRadius: "8px", borderRight: "none" } : { borderRadius: "8px" },
+            ...isButtons && bStyles.countrySelect ? bStyles.countrySelect : {}
+          }, children: /* @__PURE__ */ jsx5(
+            "select",
+            {
+              value: selectedCountry,
+              onChange: (e) => {
+                selectedCountryRef.current = e.target.value;
+                setSelectedCountry(e.target.value);
+                onCountryChange?.(e.target.value);
+                stateRef.current = "";
+                setStateValue("");
+              },
+              disabled: isSubmitting,
+              autoComplete: "country",
+              "data-testid": "flopay-country",
+              style: { ...inputFieldStyle(), cursor: "pointer" },
+              children: COUNTRY_OPTIONS.map((c) => /* @__PURE__ */ jsxs3("option", { value: c.code, children: [
+                c.flag,
+                " ",
+                c.name
+              ] }, c.code))
+            }
+          ) }),
+          isAVSFieldVisible(avsConfig.postal_code, cc) && /* @__PURE__ */ jsx5("div", { style: {
+            flex: avsLayoutProp === "row" ? 1 : void 0,
+            backgroundColor: cardInputBg,
+            border: `1px solid ${resolvedBorder}`,
+            padding: "10px",
+            ...avsLayoutProp === "row" && isAVSFieldVisible(avsConfig.country, cc) ? { borderRadius: "0", borderTopRightRadius: "8px", borderBottomRightRadius: "8px" } : { borderRadius: "8px" },
+            ...isButtons && bStyles.zipInput ? bStyles.zipInput : {}
+          }, children: /* @__PURE__ */ jsx5(
+            "input",
+            {
+              className: "flopay-shared-input",
+              placeholder: getPostalCodeLabel(selectedCountry),
+              autoComplete: "postal-code",
+              value: zipCode,
+              onChange: (e) => {
+                zipCodeRef.current = e.target.value;
+                setZipCode(e.target.value);
+                onZipChange?.(e.target.value);
+              },
+              disabled: isSubmitting,
+              required: true,
+              "data-testid": "flopay-zip",
+              style: inputFieldStyle()
+            }
+          ) })
+        ] })
+      ] });
+    })(),
     displayError && /* @__PURE__ */ jsxs3("div", { role: "alert", "data-testid": "flopay-error", style: {
       margin: "0.75rem 0",
       padding: "0.625rem 0.875rem",
@@ -2857,7 +3049,14 @@ function FloPayCheckout({
       }
     }
     if (!sid) {
-      realResult = await api.createAndFetchSession(params);
+      const paramsWithAnalytics = {
+        ...params,
+        avsCheck: !!enableAVS,
+        avsConfig: typeof enableAVS === "object" ? enableAVS : void 0,
+        checkoutType: "embedded_checkout",
+        checkoutLayout: children ? "custom_layout" : layout === "buttons" ? "buttons_layout" : "default_layout"
+      };
+      realResult = await api.createAndFetchSession(paramsWithAnalytics);
       sid = realResult.data.session?.id ?? "";
       if (sid && typeof window !== "undefined") {
         window.sessionStorage.setItem(cacheKey, sid);
@@ -3339,8 +3538,15 @@ function FloPayCheckout({
         enableAVS,
         avsLayout,
         country: session?.customer?.country,
+        city: session?.customer?.city,
+        state: session?.customer?.state,
+        addressLine1: session?.customer?.line1,
+        addressLine2: session?.customer?.line2,
         onCountryChange,
         onZipChange,
+        avsCheck: !!enableAVS,
+        checkoutType: createSessionParams ? "embedded_checkout" : "standard_checkout",
+        checkoutLayout: children ? "custom_layout" : layout === "buttons" ? "buttons_layout" : "default_layout",
         submitLabel,
         className
       }