@getopenpay/openpay-js-react 0.1.6-alpha.720e7c5 → 0.1.7-alpha.19e8830

package/dist/index.js

@@ -1,4 +1,4 @@
-import rn, { createContext as on, useContext as sn, useRef as re, useCallback as Y, useEffect as q, useState as w, useMemo as Q } from "react";
+import rn, { createContext as on, useContext as sn, useRef as re, useCallback as Z, useEffect as q, useState as w, useMemo as Q } from "react";
 import { jsx as V } from "react/jsx-runtime";
 import { z as n } from "zod";
 import { v4 as st } from "uuid";
@@ -62,9 +62,9 @@ ${e.map((r) => `- ${r.path.join("/")}: ${r.message}`).join(`
   } catch {
     return;
   }
-}, P = n.string().trim().min(1, { message: "Cannot be blank" }), S = n.string().trim().optional(), de = (e) => n.nullable(e.optional());
-var F = /* @__PURE__ */ ((e) => (e.FIRST_NAME = "firstName", e.LAST_NAME = "lastName", e.EMAIL = "email", e.ZIP_CODE = "zipCode", e.CITY = "city", e.STATE = "state", e.COUNTRY = "country", e.ADDRESS = "address", e.PHONE = "phone", e.PROMOTION_CODE = "promotionCode", e))(F || {});
-const ct = n.nativeEnum(F);
+}, O = n.string().trim().min(1, { message: "Cannot be blank" }), v = n.string().trim().optional(), de = (e) => n.nullable(e.optional());
+var C = /* @__PURE__ */ ((e) => (e.FIRST_NAME = "firstName", e.LAST_NAME = "lastName", e.EMAIL = "email", e.ZIP_CODE = "zipCode", e.CITY = "city", e.STATE = "state", e.COUNTRY = "country", e.ADDRESS = "address", e.PHONE = "phone", e.PROMOTION_CODE = "promotionCode", e))(C || {});
+const ct = n.nativeEnum(C);
 var lt = /* @__PURE__ */ ((e) => (e.CARD_NUMBER = "cardNumber", e.CARD_EXPIRY = "cardExpiry", e.CARD_CVC = "cardCvc", e))(lt || {});
 const ut = n.nativeEnum(lt), dt = n.union([ct, ut]);
 var mt = /* @__PURE__ */ ((e) => (e.CARD = "card", e.CARD_NUMBER = "card-number", e.CARD_EXPIRY = "card-expiry", e.CARD_CVC = "card-cvc", e))(mt || {});
@@ -76,20 +76,20 @@ const gn = n.nativeEnum(mt), ye = n.object({
   id: n.string()
 });
 n.object({
-  cardNumber: S,
-  expiry: S,
-  cvc: S
+  cardNumber: v,
+  expiry: v,
+  cvc: v
 });
 n.object({
-  backgroundColor: S,
-  color: S,
-  fontFamily: S,
-  fontSize: S,
-  fontWeight: S,
-  margin: S,
-  padding: S,
-  letterSpacing: S,
-  lineHeight: S
+  backgroundColor: v,
+  color: v,
+  fontFamily: v,
+  fontSize: v,
+  fontWeight: v,
+  margin: v,
+  padding: v,
+  letterSpacing: v,
+  lineHeight: v
 });
 const f = n.enum([
   // Element -> Form
@@ -116,51 +116,51 @@ const f = n.enum([
   type: Cn,
   elementType: ut,
   errors: n.array(n.string()).optional()
-}), vn = f.extract(["LOAD_ERROR", "TOKENIZE_ERROR", "CHECKOUT_ERROR"]), Sn = n.object({
-  type: vn,
-  message: P,
+}), Sn = f.extract(["LOAD_ERROR", "TOKENIZE_ERROR", "CHECKOUT_ERROR"]), Pn = n.object({
+  type: Sn,
+  message: O,
   headers: n.record(n.string(), n.string()).optional()
-}), Pn = f.extract(["VALIDATION_ERROR"]), On = n.object({
-  type: Pn,
+}), vn = f.extract(["VALIDATION_ERROR"]), On = n.object({
+  type: vn,
   elementType: dt,
   errors: n.array(n.string())
 }), Rn = n.object({
   type: n.literal(f.enum.LAYOUT),
-  height: P
+  height: O
 }), kn = n.object({
   type: n.literal(f.enum.LOADED),
-  sessionId: P,
+  sessionId: O,
   totalAmountAtoms: n.number(),
-  currency: S,
+  currency: v,
   checkoutPaymentMethods: n.array(ye)
 }), Tn = n.object({
   type: n.literal(f.enum.PAYMENT_FLOW_STARTED),
   nextActionMetadata: n.record(n.string(), n.any()),
   paymentFlowMetadata: n.any().optional(),
   startPFMetadata: n.optional(n.record(n.string(), n.any()))
-}), In = n.object({
+}), An = n.object({
   type: n.literal(f.enum.SETUP_PAYMENT_METHOD_SUCCESS),
   paymentMethodId: n.string()
 }), oe = n.object({
-  firstName: P,
-  lastName: P,
-  email: P,
-  zipCode: P,
-  country: P,
-  promotionCode: S
-}), An = n.object({
-  email: P,
-  zipCode: P,
-  country: P,
-  promotionCode: S
+  firstName: O,
+  lastName: O,
+  email: O,
+  zipCode: O,
+  country: O,
+  promotionCode: v
+}), In = n.object({
+  email: O,
+  zipCode: O,
+  country: O,
+  promotionCode: v
 }), jn = f.extract(["TOKENIZE", "CHECKOUT", "START_PAYMENT_FLOW"]), ft = n.object({
   type: jn,
-  sessionId: P,
+  sessionId: O,
   checkoutPaymentMethod: ye,
   paymentFlowMetadata: n.any().optional(),
   doNotUseLegacyCCFlow: n.boolean().optional(),
-  existingCCPMId: S
-}).extend(oe.shape), Dn = n.object({
+  existingCCPMId: v
+}).extend(oe.shape), Mn = n.object({
   type: n.literal(f.enum.TOKENIZE_SUCCESS),
   isReadyForCheckout: n.boolean()
 }), Fn = n.object({
@@ -168,27 +168,27 @@ const f = n.enum([
   invoiceUrls: n.array(n.string()),
   subscriptionIds: n.array(n.string()),
   customerId: n.string()
-}), Mn = n.discriminatedUnion("type", [
+}), Dn = n.discriminatedUnion("type", [
   En,
   bn,
-  Sn,
+  Pn,
   On,
   Rn,
   kn,
   ft,
-  Dn,
+  Mn,
   Fn,
   Tn,
-  In
-]), xn = n.object({
-  payload: Mn,
-  nonce: P,
-  formId: P,
-  elementId: P
+  An
+]), Nn = n.object({
+  payload: Dn,
+  nonce: O,
+  formId: O,
+  elementId: O
 });
 n.object({
   amountAtom: n.number(),
-  currency: P
+  currency: O
 });
 n.object({
   secure_token: n.string(),
@@ -198,22 +198,22 @@ n.object({
   secure_token: n.string(),
   existing_cc_pm_id: de(n.string())
 });
-const Nn = n.object({
+const xn = n.object({
   payment_methods: n.array(hn)
-}), $n = n.object({
+}), Ln = n.object({
   elementType: n.string(),
   errors: n.array(n.string())
 });
 n.object({
   session_id: n.string()
 });
-const Ln = n.object({
+const $n = n.object({
   success: n.literal(!1),
   error_type: n.literal("validation_error"),
-  errors: n.array($n)
+  errors: n.array(Ln)
 }), Un = n.discriminatedUnion("success", [
   n.object({ success: n.literal(!0) }),
-  Ln
+  $n
 ]);
 n.object({
   session_id: n.string(),
@@ -263,8 +263,8 @@ const qn = n.object({
   brl: "brl"
 }, _e = async (e) => {
   for (let r = 0; r < 10; r++)
-    We() || await _t(500);
-  if (!We())
+    Be() || await _t(500);
+  if (!Be())
     throw new Error("Stripe JS not found.");
   return new Stripe(e);
 }, Kn = async (e, t, r, o, s) => {
@@ -284,7 +284,7 @@ const qn = n.object({
   });
 }, _t = (e) => new Promise((t) => {
   setTimeout(t, e);
-}), We = () => "Stripe" in window, Zn = async (e) => new Promise((t, r) => {
+}), Be = () => "Stripe" in window, Yn = async (e) => new Promise((t, r) => {
   try {
     e.on("paymentmethod", async (o) => {
       t(o);
@@ -294,7 +294,7 @@ const qn = n.object({
   } catch (o) {
     r(o);
   }
-}), Yn = async (e, t) => {
+}), Zn = async (e, t) => {
   const r = e.nextActionMetadata;
   if (!e.paymentFlowMetadata || !e.paymentFlowMetadata.stripePmId)
     throw new Error(`Invalid payment flow metadata format: ${JSON.stringify(e.paymentFlowMetadata)}`);
@@ -316,8 +316,8 @@ const qn = n.object({
   });
   if (o.error)
     throw t.complete("fail"), new Error(`Payment failed: ${o.error.message ?? "unknown"}`);
-  t.complete("success");
-}, Bn = async (e) => {
+  return t.complete("success"), o;
+}, Wn = async (e) => {
   const t = yt.parse(e.nextActionMetadata);
   await gt(t);
 }, gt = async (e) => {
@@ -328,30 +328,30 @@ const qn = n.object({
   if (o !== "succeeded") throw o === "canceled" ? new Error("Payment cancelled, please click Submit again to pay") : new Error(
     `${((i = r.error) == null ? void 0 : i.message) ?? ((c = (a = r.setupIntent) == null ? void 0 : a.last_setup_error) == null ? void 0 : c.message) ?? "Payment failed, please click submit again to pay."}`
   );
-}, Wn = (e) => JSON.stringify(e), De = (e, t) => Array.from(e.querySelectorAll("[data-opid]") ?? []).reduce((s, i) => {
+}, Bn = (e) => JSON.stringify(e), Me = (e, t) => Array.from(e.querySelectorAll("[data-opid]") ?? []).reduce((s, i) => {
   const a = i.getAttribute("data-opid");
   return a ? { ...s, [a]: i.value } : s;
 }, t ?? {}), Gn = (e, t, r, o, s, i, a) => {
-  const c = De(r, {
+  const c = Me(r, {
     type: e,
     sessionId: t,
     checkoutPaymentMethod: s,
     paymentFlowMetadata: a,
     doNotUseLegacyCCFlow: i
   });
-  (s.provider === "apple_pay" || s.provider === "google_pay" || s.provider === "stripe_link") && (c[F.ZIP_CODE] || (c[F.ZIP_CODE] = "00000"));
-  const d = ft.safeParse(c);
-  if (d.success)
-    return d.data;
+  (s.provider === "apple_pay" || s.provider === "google_pay" || s.provider === "stripe_link") && (c[C.ZIP_CODE] || (c[C.ZIP_CODE] = "00000"));
+  const l = ft.safeParse(c);
+  if (l.success)
+    return l.data;
   {
-    const l = d.error.format(), m = pt(l);
+    const d = l.error.format(), m = pt(d);
     for (const [E, g] of Object.entries(m))
       o(E, g, E);
     return null;
   }
 }, Qn = (e) => {
   try {
-    return xn.parse(e);
+    return Nn.parse(e);
   } catch (t) {
     throw t;
   }
@@ -383,7 +383,7 @@ async function tr(e) {
     throw new Error("Got invalid CDE connection object");
   return r;
 }
-const C = (e) => n.nullable(e.optional());
+const b = (e) => n.nullable(e.optional());
 n.string().trim().min(1, { message: "Cannot be blank" });
 const nr = n.object({
   cde_response_type: n.literal("error"),
@@ -393,36 +393,36 @@ const nr = n.object({
 n.enum(["usd", "brl"]);
 const ht = n.object({
   name: n.string(),
-  amount_atom_off: C(n.number()),
-  percent_off: C(n.number()),
-  currency: C(n.string()),
+  amount_atom_off: b(n.number()),
+  percent_off: b(n.number()),
+  currency: b(n.string()),
   duration: n.string(),
-  duration_in_months: C(n.number())
+  duration_in_months: b(n.number())
 }), wt = n.object({
   amount_subtotal_atom: n.number().int(),
   amount_total_atom: n.number().int(),
   currency: n.string(),
-  description: C(n.string()),
+  description: b(n.string()),
   price_id: n.string(),
-  billing_interval: C(n.string()),
-  billing_interval_count: C(n.number().int()),
+  billing_interval: b(n.string()),
+  billing_interval_count: b(n.number().int()),
   quantity: n.number().int()
 }), rr = n.record(n.string(), n.any()), or = n.object({
   name: n.string(),
-  settings: C(rr)
+  settings: b(rr)
 }), ge = n.object({
   provider: n.string(),
-  processor_name: C(n.string()),
-  metadata: C(n.record(n.string(), n.any()))
+  processor_name: b(n.string()),
+  metadata: b(n.record(n.string(), n.any()))
 }), sr = n.object({
   quantity: n.number()
 }), ir = n.object({
-  id: C(n.string()),
-  billing_interval: C(n.string()),
-  billing_interval_count: C(n.number().int()),
+  id: b(n.string()),
+  billing_interval: b(n.string()),
+  billing_interval_count: b(n.number().int()),
   subscription_items: n.array(sr),
-  trial_start: C(n.string()),
-  trial_end: C(n.string())
+  trial_start: b(n.string()),
+  trial_end: b(n.string())
 }), Et = n.object({
   amount_atom: n.number()
 }), ar = n.object({
@@ -436,7 +436,7 @@ const ht = n.object({
 }), lr = n.object({
   currency: n.string(),
   discounts: n.array(cr),
-  hosted_invoice_url: C(n.string()),
+  hosted_invoice_url: b(n.string()),
   lines: n.array(ar),
   remaining_amount_atom: n.number(),
   tax_amount_atom: n.number(),
@@ -447,17 +447,17 @@ const ht = n.object({
   invoices: n.array(lr)
 }), Ct = n.object({
   preview: Ge,
-  preview_post_trial: C(Ge),
+  preview_post_trial: b(Ge),
   coupons: n.array(ht)
 }), Qe = n.object({
   status: n.literal("open"),
   token: n.string(),
-  email: C(n.string()),
+  email: b(n.string()),
   line_items: n.array(wt),
   amount_subtotal_atom: n.number().int(),
   amount_total_atom: n.number().int(),
   brand: or,
-  subs_preview: C(Ct),
+  subs_preview: b(Ct),
   // Null in setup mode
   methods_available: n.array(ge)
 }), bt = n.discriminatedUnion("mode", [
@@ -481,7 +481,7 @@ n.object({
   primary_color: n.string(),
   secondary_color: n.string()
 });
-const vt = n.object({
+const St = n.object({
   invoice_urls: n.array(n.string()),
   subscription_ids: n.array(n.string()),
   customer_id: n.string()
@@ -518,7 +518,7 @@ const pr = n.object({
   required_user_actions: n.array(n.record(n.string(), n.any()))
 });
 n.object({
-  fields: An,
+  fields: In,
   checkoutPaymentMethod: ge
 });
 n.object({
@@ -572,7 +572,7 @@ var wr = /* @__PURE__ */ function() {
   }
   return t;
 }(Error);
-class St extends Er {
+class Pt extends Er {
   constructor(t) {
     const r = `[cde-client] Error querying CDE: ${t.message}`;
     super(r), this.response = t;
@@ -581,16 +581,16 @@ class St extends Er {
     return this.response.message;
   }
 }
-const N = async (e, t, r) => {
+const x = async (e, t, r) => {
   const o = await e.send(t);
   if (br(o))
-    throw new St(o);
+    throw new Pt(o);
   if (!Cr(o, r)) {
     const s = r.safeParse(o);
     throw s.success ? new Error("Invalid state") : s.error;
   }
   return o;
-}, Cr = (e, t) => t.safeParse(e).success, br = (e) => nr.safeParse(e).success, vr = async (e, t) => await N(e, { type: "get_checkout_preview", payload: t }, Ct), se = async (e) => await N(e, { type: "get_prefill", payload: {} }, bt), Sr = async (e, t) => await N(e, { type: "start_payment_flow_for_cc", payload: t }, yr), Pr = async (e, t) => await N(e, { type: "start_payment_flow_for_pr", payload: t }, pr), Ne = async (e, t) => await N(e, { type: "confirm_payment_flow", payload: t }, Nn), Or = async (e, t, r) => {
+}, Cr = (e, t) => t.safeParse(e).success, br = (e) => nr.safeParse(e).success, Sr = async (e, t) => await x(e, { type: "get_checkout_preview", payload: t }, Ct), se = async (e) => await x(e, { type: "get_prefill", payload: {} }, bt), Pr = async (e, t) => await x(e, { type: "start_payment_flow_for_cc", payload: t }, yr), vr = async (e, t) => await x(e, { type: "start_payment_flow_for_pr", payload: t }, pr), xe = async (e, t) => await x(e, { type: "confirm_payment_flow", payload: t }, xn), Or = async (e, t, r) => {
   const o = Date.now();
   for (r = r ?? 5e3; Date.now() - o < r; ) {
     const s = e.querySelector(`input[data-opid=${t}]`);
@@ -603,7 +603,7 @@ const N = async (e, t, r) => {
   }
   return null;
 }, Rr = async (e, t, r) => {
-  const o = await vr(e, {
+  const o = await Sr(e, {
     secure_token: t,
     promotion_code: r
   }), s = new Set(o.preview.invoices.map((c) => c.currency));
@@ -614,7 +614,7 @@ const N = async (e, t, r) => {
     currency: i,
     amountAtom: a
   };
-}, Pt = async (e, t, r, o) => {
+}, vt = async (e, t, r, o) => {
   if (r)
     return { amountAtom: 0, currency: "usd" };
   {
@@ -627,16 +627,16 @@ const N = async (e, t, r) => {
     throw new Error("No CDE connections found");
   return await Promise.all(
     Array.from(e.values()).map(
-      (o) => N(o, { type: "tokenize_card", payload: t }, Un)
+      (o) => x(o, { type: "tokenize_card", payload: t }, Un)
     )
   );
 }, Xe = async (e, t) => {
   try {
-    return await N(e, { type: "checkout_card_elements", payload: t }, vt);
+    return await x(e, { type: "checkout_card_elements", payload: t }, St);
   } catch (r) {
     throw r;
   }
-}, Tr = async (e, t) => await N(e, { type: "setup_payment_method", payload: t }, mr), Ir = async (e, t) => await N(e, { type: "checkout", payload: t }, vt), Ot = 1e3, Ar = async (e, t) => {
+}, Tr = async (e, t) => await x(e, { type: "setup_payment_method", payload: t }, mr), Ar = async (e, t) => await x(e, { type: "checkout", payload: t }, St), Ot = 1e3, Ir = async (e, t) => {
   const o = await it({
     iframe: e,
     debug: !0,
@@ -644,7 +644,7 @@ const N = async (e, t, r) => {
     childOrigin: "*"
     // TODO: use with proper childOrigin
   }).promise;
-  return (await N(o, { type: "ping-3ds-status" }, qn)).status;
+  return (await x(o, { type: "ping-3ds-status" }, qn)).status;
 }, jr = (e) => {
   if (typeof e != "string") return !1;
   try {
@@ -652,11 +652,11 @@ const N = async (e, t, r) => {
   } catch {
     return !1;
   }
-}, Dr = "@keyframes fadeIn{0%{opacity:0;transform:scale(.9)}to{opacity:1;transform:scale(1)}}.overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:2147483648!important;display:flex;justify-content:center;align-items:center;background-color:#00000080}.container{max-width:500px;max-height:600px;width:100%;height:100%;background-color:#fff;position:relative;animation:fadeIn .3s ease-out}.frame{max-width:500px;max-height:600px;width:100%;height:100%;border:none}.cancel-button{position:absolute;background:transparent;border:none;font-size:1rem;color:#fff;cursor:pointer;top:-1.5rem;padding:0;right:0}", Fr = (e) => {
+}, Mr = "@keyframes fadeIn{0%{opacity:0;transform:scale(.9)}to{opacity:1;transform:scale(1)}}.overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:2147483648!important;display:flex;justify-content:center;align-items:center;background-color:#00000080}.container{max-width:500px;max-height:600px;width:100%;height:100%;background-color:#fff;position:relative;animation:fadeIn .3s ease-out}.frame{max-width:500px;max-height:600px;width:100%;height:100%;border:none}.cancel-button{position:absolute;background:transparent;border:none;font-size:1rem;color:#fff;cursor:pointer;top:-1.5rem;padding:0;right:0}", Fr = (e) => {
   const t = document.createElement("template");
   t.innerHTML = `
     <style>
-      ${Dr}
+      ${Mr}
     </style>
     <div class="overlay">
       <div class="container">
@@ -670,10 +670,10 @@ const N = async (e, t, r) => {
   const s = o.querySelector("#three-ds-iframe"), i = o.querySelector(".cancel-button");
   return document.body.appendChild(r), { host: r, iframe: s, cancelButton: i };
 };
-function Mr(e, t, r) {
+function Dr(e, t, r) {
   const o = async () => {
     try {
-      const i = await Ar(e, r);
+      const i = await Ir(e, r);
       i && (clearInterval(s), t(i));
     } catch {
     }
@@ -682,7 +682,7 @@ function Mr(e, t, r) {
   const s = setInterval(o, Ot);
   return s;
 }
-function xr({
+function Nr({
   elements: e,
   pollingInterval: t,
   resolve: r
@@ -694,7 +694,7 @@ function xr({
     e.cancelButton.removeEventListener("click", o);
   };
 }
-async function Nr({
+async function xr({
   url: e,
   baseUrl: t
 }) {
@@ -704,7 +704,7 @@ async function Nr({
       setTimeout(() => {
         r.host.remove();
       }, 1e3), o(c), a == null || a();
-    }, i = Mr(r.iframe, s, new URL(t).origin), a = xr({
+    }, i = Dr(r.iframe, s, new URL(t).origin), a = Nr({
       elements: r,
       pollingInterval: i,
       resolve: o
@@ -728,7 +728,7 @@ const Rt = (e) => async (t) => {
   } catch (r) {
     throw t.flowCallbacks.onCheckoutError(pe(r)), r;
   }
-}, $r = (e) => async (t) => {
+}, Lr = (e) => async (t) => {
   try {
     return await e(t);
   } catch (r) {
@@ -747,7 +747,7 @@ const Rt = (e) => async (t) => {
     log__: t,
     err__: r
   };
-}, { log__: Lr, err__: kt } = J("common-cc"), Tt = (e, t) => {
+}, { log__: $r, err__: kt } = J("common-cc"), Tt = (e, t) => {
   const r = oe.safeParse(e);
   if (!r.success) {
     const o = r.error.format(), s = pt(o);
@@ -767,64 +767,64 @@ const Rt = (e) => async (t) => {
           const i = s.data;
           t(i, o.errors);
         }
-      }), Lr(`Error tokenizing card: got validation errors: ${JSON.stringify(r.errors)}`), new Error("Got validation errors while tokenizing card");
-}, { err__: Ie } = J("commmon"), It = (e) => {
+      }), $r(`Error tokenizing card: got validation errors: ${JSON.stringify(r.errors)}`), new Error("Got validation errors while tokenizing card");
+}, { err__: Ae } = J("commmon"), At = (e) => {
   if (e.payment_methods.length !== 1)
     throw new Error(`Expected exactly one payment method, got ${e.payment_methods.length}`);
   return { payment_method_id: e.payment_methods[0].id };
 }, qr = (e, t) => {
   const r = e.find((o) => t.safeParse(o).success);
   if (!r)
-    throw Ie(`No CPMs found for model ${t}`), Ie(e), Ie("zodModel"), new Error(`No CPMs found for model ${t}`);
+    throw Ae(`No CPMs found for model ${t}`), Ae(e), Ae("zodModel"), new Error(`No CPMs found for model ${t}`);
   return t.parse(r);
-}, { log__: v, err__: et } = J("common-cc"), { log__: tt } = J("stripe-cc"), zr = Rt(
+}, { log__: P, err__: et } = J("common-cc"), { log__: tt } = J("stripe-cc"), zr = Rt(
   async ({ context: e, checkoutPaymentMethod: t, nonCdeFormInputs: r, flowCallbacks: o }) => {
-    var l;
-    v("├ Running common CC flow...", { checkoutPaymentMethod: t });
+    var d;
+    P("├ Running common CC flow...", { checkoutPaymentMethod: t });
     const s = Array.from(e.cdeConnections.values())[0], i = await se(s);
-    v(`├ Validating non-CDE form fields [Mode: ${i.mode}]`);
+    P(`├ Validating non-CDE form fields [Mode: ${i.mode}]`);
     const a = Tt(r, o.onValidationError);
-    v(`├ Tokenizing card info in CDE [Session: ${e.elementsSessionId}]`);
+    P(`├ Tokenizing card info in CDE [Session: ${e.elementsSessionId}]`);
     const c = await kr(e.cdeConnections, {
       session_id: e.elementsSessionId
     });
     Ur(c, o.onValidationError);
-    const d = {
+    const l = {
       session_id: e.elementsSessionId,
       checkout_payment_method: t,
       non_cde_form_fields: a
     };
     try {
       if (i.mode === "setup") {
-        v(`├ Setting up payment method in CDE [Token: ${i.token}]`);
-        const m = await Tr(s, d);
-        return v(`╰ Setup completed successfully [PM ID: ${m.payment_method_id}]`), { mode: "setup", result: m };
+        P(`├ Setting up payment method in CDE [Token: ${i.token}]`);
+        const m = await Tr(s, l);
+        return P(`╰ Setup completed successfully [PM ID: ${m.payment_method_id}]`), { mode: "setup", result: m };
       } else {
-        v(`├ Initial checkout flow. Checking out card info in CDE [Session: ${e.elementsSessionId}]`);
-        const m = await Xe(s, d);
-        return v("╰ Checkout completed successfully."), { mode: "checkout", result: m };
+        P(`├ Initial checkout flow. Checking out card info in CDE [Session: ${e.elementsSessionId}]`);
+        const m = await Xe(s, l);
+        return P("╰ Checkout completed successfully."), { mode: "checkout", result: m };
       }
     } catch (m) {
-      if (m instanceof St && m.originalErrorMessage === "3DS_REQUIRED") {
-        v("├ Card requires 3DS, starting non-legacy payment flow");
-        const E = ((l = m.response.headers) == null ? void 0 : l["op-should-use-new-flow"]) === "true", g = await Sr(s, d);
-        if (v(`├ op-should-use-new-flow: ${E}`), v("├ Payment flow result:", g), E ? await Kr(g, e.baseUrl) : await Zr(g), i.mode === "setup") {
-          v(`├ Confirming payment flow [cc_pm_id: ${g.cc_pm_id}]`);
-          const _ = await Ne(s, {
+      if (m instanceof Pt && m.originalErrorMessage === "3DS_REQUIRED") {
+        P("├ Card requires 3DS, starting non-legacy payment flow");
+        const E = ((d = m.response.headers) == null ? void 0 : d["op-should-use-new-flow"]) === "true", g = await Pr(s, l);
+        if (P(`├ op-should-use-new-flow: ${E}`), P("├ Payment flow result:", g), E ? await Kr(g, e.baseUrl) : await Yr(g), i.mode === "setup") {
+          P(`├ Confirming payment flow [cc_pm_id: ${g.cc_pm_id}]`);
+          const _ = await xe(s, {
             secure_token: i.token,
             existing_cc_pm_id: g.cc_pm_id
           });
-          v("├ Confirm payment flow result received Result:", _);
-          const h = It(_);
-          return v(`╰ Setup completed successfully [PM ID: ${h.payment_method_id}]`), { mode: "setup", result: h };
+          P("├ Confirm payment flow result received Result:", _);
+          const h = At(_);
+          return P(`╰ Setup completed successfully [PM ID: ${h.payment_method_id}]`), { mode: "setup", result: h };
         } else {
-          v(`├ Checking out after 3DS flow [Flow: ${E ? "new" : "legacy"}]`);
+          P(`├ Checking out after 3DS flow [Flow: ${E ? "new" : "legacy"}]`);
           const _ = await Xe(s, {
-            ...d,
+            ...l,
             existing_cc_pm_id: g.cc_pm_id,
             do_not_use_legacy_cc_flow: !E
           });
-          return v("╰ Checkout completed successfully."), { mode: "checkout", result: _ };
+          return P("╰ Checkout completed successfully."), { mode: "checkout", result: _ };
         }
       }
       throw et("╰ Error checking out card info in CDE"), et(m), m;
@@ -842,29 +842,29 @@ const Rt = (e) => async (t) => {
   return zn.parse(t);
 }, Kr = async (e, t) => {
   const r = Vr(e);
-  v(`├ Using common 3DS flow [URL: ${r.redirect_url}]`);
-  const o = await Nr({ url: r.redirect_url, baseUrl: t });
-  if (v(`╰ 3DS verification completed [Status: ${o}]`), o === me.CANCELLED)
+  P(`├ Using common 3DS flow [URL: ${r.redirect_url}]`);
+  const o = await xr({ url: r.redirect_url, baseUrl: t });
+  if (P(`╰ 3DS verification completed [Status: ${o}]`), o === me.CANCELLED)
     throw new Error("3DS verification cancelled");
   if (o === me.FAILURE)
     throw new Error("3DS verification failed");
-}, Zr = async (e) => {
+}, Yr = async (e) => {
   const t = Hr(e);
   tt(`├ Using stripe 3DS flow [Client Secret: ${t.client_secret.substring(0, 8)}...]`), await gt(t), tt("╰ Stripe 3DS flow completed successfully");
-}, { log__: T, err__: Yr } = J("stripe-pr"), Jr = n.object({
+}, { log__: T, err__: Zr } = J("stripe-pr"), Jr = n.object({
   provider: n.union([n.literal("apple_pay"), n.literal("google_pay")]),
   processor_name: n.literal("stripe"),
   metadata: n.object({
     stripe_pk: n.string()
   })
-}), Br = $r(
+}), Wr = Lr(
   async ({ context: e }) => {
     T("Checking if there are any CPMs for Stripe PR...");
     const t = qr(e.checkoutPaymentMethods, Jr);
     T("Initializing Stripe PR flow...");
     const r = Array.from(e.cdeConnections.values())[0], o = await se(r), s = o.mode === "setup";
     T("Getting initial preview amount");
-    const i = await Pt(r, o.token, s, void 0), a = await Kn(
+    const i = await vt(r, o.token, s, void 0), a = await Kn(
       t.metadata.stripe_pk,
       i.amountAtom,
       i.currency,
@@ -872,7 +872,7 @@ const Rt = (e) => async (t) => {
     );
     T("Checking if can make payment");
     const c = await a.canMakePayment();
-    return c === null ? (Yr("canMakePayment returned null"), { isAvailable: !1, reason: "canMakePayment returned null" }) : (T("Stripe PR flow initialized successfully. Can make payment", c), {
+    return c === null ? (Zr("canMakePayment returned null"), { isAvailable: !1, reason: "canMakePayment returned null" }) : (T("Stripe PR flow initialized successfully. Can make payment", c), {
       isAvailable: !0,
       pr: a,
       availableProviders: {
@@ -881,7 +881,7 @@ const Rt = (e) => async (t) => {
       }
     });
   }
-), Wr = Rt(
+), Br = Rt(
   async ({
     context: e,
     checkoutPaymentMethod: t,
@@ -893,27 +893,27 @@ const Rt = (e) => async (t) => {
     if (T("Running Stripe PR flow..."), s.provider !== t.provider)
       throw new Error(`Provider mismatch. Expected ${s.provider}, got ${t.provider}`);
     const a = Array.from(e.cdeConnections.values())[0], c = i.pr;
-    T("Validating non-CDE form fields");
-    const d = Gr(r), l = Tt(d, o.onValidationError);
     if (s != null && s.overridePaymentRequest) {
       const h = s.overridePaymentRequest;
       T("Overriding PR amount with", h), Qr(c, h.amount, h.pending);
     }
     T("Showing PR dialog..."), c.show();
-    const m = await Zn(c);
+    const l = await Yn(c);
+    T("Stripe PM added event:", l), T("Merging PM fields with form fields...");
+    const d = Gr(r, l), m = Tt(d, o.onValidationError);
     T("PR dialog finished. Starting payment flow...");
-    const E = await Pr(a, {
-      fields: l,
+    const E = await vr(a, {
+      fields: m,
       checkoutPaymentMethod: t
     }), g = Xr(E);
-    T("Confirming PR with Stripe..."), await Jn(g, m);
+    T("Confirming PR with Stripe..."), await Jn(g, l);
     const _ = await se(a);
     if (_.mode === "setup") {
       T("Confirming payment flow for setup...");
-      const h = await Ne(a, {
+      const h = await xe(a, {
         secure_token: _.token
       });
-      return { mode: "setup", result: It(h) };
+      return { mode: "setup", result: At(h) };
     } else {
       T("Performing checkout...");
       const h = {
@@ -921,21 +921,22 @@ const Rt = (e) => async (t) => {
         payment_input: {
           provider_type: t.provider
         },
-        customer_email: l[F.EMAIL],
-        customer_zip_code: l[F.ZIP_CODE],
-        customer_country: l[F.COUNTRY],
-        promotion_code: l[F.PROMOTION_CODE],
+        customer_email: m[C.EMAIL],
+        customer_zip_code: m[C.ZIP_CODE],
+        customer_country: m[C.COUNTRY],
+        promotion_code: m[C.PROMOTION_CODE],
         line_items: _.line_items,
         total_amount_atom: _.amount_total_atom,
         cancel_at_end: !1,
         checkout_payment_method: t
       };
-      return { mode: "checkout", result: await Ir(a, h) };
+      return { mode: "checkout", result: await Ar(a, h) };
     }
   }
-), Gr = (e) => {
-  const t = { ...e };
-  return t[F.ZIP_CODE] || (T("Overriding empty zip code (only for google pay and apple pay)"), t[F.ZIP_CODE] = "00000"), t;
+), Gr = (e, t) => {
+  var a, c, l, d;
+  const r = { ...e }, [o, ...s] = ((c = (a = t.payerName) == null ? void 0 : a.trim()) == null ? void 0 : c.split(/\s+/)) ?? [], i = s.join(" ") || void 0;
+  return r[C.FIRST_NAME] = r[C.FIRST_NAME] || o || "_OP_UNKNOWN", r[C.LAST_NAME] = r[C.LAST_NAME] || i || "_OP_UNKNOWN", r[C.EMAIL] = r[C.EMAIL] || t.payerEmail || "op_unfilled@getopenpay.com", r[C.ZIP_CODE] = r[C.ZIP_CODE] || ((l = t.shippingAddress) == null ? void 0 : l.postalCode) || "00000", r[C.COUNTRY] = r[C.COUNTRY] || ((d = t.shippingAddress) == null ? void 0 : d.country) || "US", T("Final form inputs:", r), r;
 }, Qr = (e, t, r) => {
   e.update({
     total: {
@@ -964,13 +965,13 @@ Details: got ${e.required_user_actions.length} required user actions`);
     run: zr
   },
   stripePR: {
-    init: Br,
-    run: Wr
+    init: Wr,
+    run: Br
   }
   // 👉 Add more flows here
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 };
-function At(e) {
+function It(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
 }
 var he = {};
@@ -978,7 +979,7 @@ Object.defineProperty(he, "__esModule", {
   value: !0
 });
 he.Observable = void 0;
-const jt = (e) => !!Symbol[e], $e = (e) => jt(e) ? Symbol[e] : "@@" + e, eo = $e("iterator"), Me = $e("observable"), Dt = $e("species");
+const jt = (e) => !!Symbol[e], Le = (e) => jt(e) ? Symbol[e] : "@@" + e, eo = Le("iterator"), De = Le("observable"), Mt = Le("species");
 function fe(e, t) {
   let r = e[t];
   if (r != null) {
@@ -988,7 +989,7 @@ function fe(e, t) {
 }
 function ne(e) {
   let t = e.constructor;
-  return t !== void 0 && (t = t[Dt], t === null && (t = void 0)), t !== void 0 ? t : we;
+  return t !== void 0 && (t = t[Mt], t === null && (t = void 0)), t !== void 0 ? t : we;
 }
 function to(e) {
   return e instanceof we;
@@ -1021,18 +1022,18 @@ function Ft(e) {
       X(r);
     }
 }
-function xe(e) {
+function Ne(e) {
   e._observer = void 0, e._queue = void 0, e._state = "closed";
 }
 function no(e) {
   let t = e._queue;
   if (t) {
     e._queue = void 0, e._state = "ready";
-    for (let r = 0; r < t.length && (Mt(e, t[r].type, t[r].value), e._state !== "closed"); ++r)
+    for (let r = 0; r < t.length && (Dt(e, t[r].type, t[r].value), e._state !== "closed"); ++r)
       ;
   }
 }
-function Mt(e, t, r) {
+function Dt(e, t, r) {
   e._state = "running";
   let o = e._observer;
   try {
@@ -1042,11 +1043,11 @@ function Mt(e, t, r) {
         s && s.call(o, r);
         break;
       case "error":
-        if (xe(e), s) s.call(o, r);
+        if (Ne(e), s) s.call(o, r);
         else throw r;
         break;
       case "complete":
-        xe(e), s && s.call(o);
+        Ne(e), s && s.call(o);
         break;
     }
   } catch (s) {
@@ -1054,7 +1055,7 @@ function Mt(e, t, r) {
   }
   e._state === "closed" ? Ft(e) : e._state === "running" && (e._state = "ready");
 }
-function Ae(e, t, r) {
+function Ie(e, t, r) {
   if (e._state !== "closed") {
     if (e._state === "buffering") {
       e._queue.push({
@@ -1070,7 +1071,7 @@ function Ae(e, t, r) {
       }], le(() => no(e));
       return;
     }
-    Mt(e, t, r);
+    Dt(e, t, r);
   }
 }
 class ro {
@@ -1081,13 +1082,13 @@ class ro {
         return o._state === "closed";
       },
       next(i) {
-        Ae(o, "next", i);
+        Ie(o, "next", i);
       },
       error(i) {
-        Ae(o, "error", i);
+        Ie(o, "error", i);
       },
       complete() {
-        Ae(o, "complete");
+        Ie(o, "complete");
       }
     };
     try {
@@ -1101,7 +1102,7 @@ class ro {
     return this._state === "closed";
   }
   unsubscribe() {
-    this._state !== "closed" && (xe(this), Ft(this));
+    this._state !== "closed" && (Ne(this), Ft(this));
   }
 }
 let we = class ue {
@@ -1183,19 +1184,19 @@ let we = class ue {
     if (typeof t != "function") throw new TypeError(t + " is not a function");
     let r = ne(this), o = arguments.length > 1, s = !1, a = arguments[1];
     return new r((c) => this.subscribe({
-      next(d) {
-        let l = !s;
-        if (s = !0, !l || o)
+      next(l) {
+        let d = !s;
+        if (s = !0, !d || o)
           try {
-            a = t(a, d);
+            a = t(a, l);
           } catch (m) {
             return c.error(m);
           }
         else
-          a = d;
+          a = l;
       },
-      error(d) {
-        c.error(d);
+      error(l) {
+        c.error(l);
       },
       complete() {
         if (!s && !o) return c.error(new TypeError("Cannot reduce an empty sequence"));
@@ -1213,11 +1214,11 @@ let we = class ue {
       let s, i = 0;
       function a(c) {
         s = c.subscribe({
-          next(d) {
-            o.next(d);
+          next(l) {
+            o.next(l);
           },
-          error(d) {
-            o.error(d);
+          error(l) {
+            o.error(l);
           },
           complete() {
             i === t.length ? (s = void 0, o.complete()) : a(r.from(t[i++]));
@@ -1238,22 +1239,22 @@ let we = class ue {
           if (t)
             try {
               c = t(c);
-            } catch (l) {
-              return o.error(l);
+            } catch (d) {
+              return o.error(d);
             }
-          let d = r.from(c).subscribe({
-            next(l) {
-              o.next(l);
+          let l = r.from(c).subscribe({
+            next(d) {
+              o.next(d);
             },
-            error(l) {
-              o.error(l);
+            error(d) {
+              o.error(d);
             },
             complete() {
-              let l = s.indexOf(d);
-              l >= 0 && s.splice(l, 1), a();
+              let d = s.indexOf(l);
+              d >= 0 && s.splice(d, 1), a();
             }
           });
-          s.push(d);
+          s.push(l);
         },
         error(c) {
           o.error(c);
@@ -1270,13 +1271,13 @@ let we = class ue {
       };
     });
   }
-  [Me]() {
+  [De]() {
     return this;
   }
   static from(t) {
     let r = typeof this == "function" ? this : ue;
     if (t == null) throw new TypeError(t + " is not an object");
-    let o = fe(t, Me);
+    let o = fe(t, De);
     if (o) {
       let s = o.call(t);
       if (Object(s) !== s) throw new TypeError(s + " is not an object");
@@ -1316,20 +1317,20 @@ let we = class ue {
       });
     });
   }
-  static get [Dt]() {
+  static get [Mt]() {
     return this;
   }
 };
 he.Observable = we;
 Object.defineProperty(we, Symbol("extensions"), {
   value: {
-    symbol: Me,
+    symbol: De,
     hostReportError: X
   },
   configurable: !0
 });
 var oo = he.Observable;
-const so = /* @__PURE__ */ At(oo), { log__: io, err__: ao } = J("init-flows"), co = (e) => ({
+const so = /* @__PURE__ */ It(oo), { log__: io, err__: ao } = J("init-flows"), co = (e) => ({
   // Stripe PR
   stripePR: lo("stripePR", Fe.stripePR.init({ context: e }))
   // 👉 Add initialization flows here
@@ -1361,8 +1362,8 @@ ${JSON.stringify(o)}`), o;
   startFlow: async () => {
   }
 };
-var Le = { exports: {} }, uo = rn;
-function xt(e, t, r) {
+var $e = { exports: {} }, uo = rn;
+function Nt(e, t, r) {
   var o = typeof t == "function";
   uo.useEffect(function() {
     var s, i = !0, a = e(function() {
@@ -1375,16 +1376,16 @@ function xt(e, t, r) {
     };
   }, o ? r : t);
 }
-Le.exports = xt;
-Le.exports.useAsyncEffect = xt;
-var mo = Le.exports;
-const ot = /* @__PURE__ */ At(mo);
+$e.exports = Nt;
+$e.exports.useAsyncEffect = Nt;
+var mo = $e.exports;
+const ot = /* @__PURE__ */ It(mo);
 function fo(e, t = 0) {
-  const r = re(!1), o = re(), s = re(e), i = Y(() => r.current, []), a = Y(() => {
+  const r = re(!1), o = re(), s = re(e), i = Z(() => r.current, []), a = Z(() => {
     r.current = !1, o.current && clearTimeout(o.current), o.current = setTimeout(() => {
       r.current = !0, s.current();
     }, t);
-  }, [t]), c = Y(() => {
+  }, [t]), c = Z(() => {
     r.current = null, o.current && clearTimeout(o.current);
   }, []);
   return q(() => {
@@ -1396,11 +1397,11 @@ function po(e, t = 0, r = []) {
   return q(i, r), [o, s];
 }
 const yo = (e, t, r, o) => {
-  const [s, i] = w(""), [a, c] = w(""), [d, l] = w(null), [m, E] = w(!1), [g, _] = w(null);
+  const [s, i] = w(""), [a, c] = w(""), [l, d] = w(null), [m, E] = w(!1), [g, _] = w(null);
   return ot(async () => {
     if (!o || !e)
       return;
-    const h = await Or(o, F.PROMOTION_CODE);
+    const h = await Or(o, C.PROMOTION_CODE);
     h == null || h.addEventListener("input", () => {
       E(!0), _(null), i(h.value);
     });
@@ -1415,8 +1416,8 @@ const yo = (e, t, r, o) => {
       try {
         if (!t || !r || !e)
           return;
-        const $ = (await se(t)).mode === "setup", Ce = await Pt(t, r, $, a);
-        h() && (_(null), l(Ce));
+        const L = (await se(t)).mode === "setup", Ce = await vt(t, r, L, a);
+        h() && (_(null), d(Ce));
       } catch (I) {
         h() && _(pe(I));
       } finally {
@@ -1425,11 +1426,11 @@ const yo = (e, t, r, o) => {
     },
     [!t, !r, a, e]
   ), {
-    amount: d,
+    amount: l,
     isLoading: m,
     error: g
   };
-}, Nt = (e = {}) => {
+}, xt = (e = {}) => {
   const [t, r] = w(e), o = Q(
     () => ({
       set: (i, a) => {
@@ -1443,8 +1444,8 @@ const yo = (e, t, r, o) => {
       },
       remove: (i) => {
         r((a) => {
-          const { [i]: c, ...d } = a;
-          return d;
+          const { [i]: c, ...l } = a;
+          return l;
         });
       },
       reset: () => r(e)
@@ -1452,12 +1453,12 @@ const yo = (e, t, r, o) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [r]
   ), s = {
-    get: Y((i) => t[i], [t]),
+    get: Z((i) => t[i], [t]),
     ...o
   };
   return [t, s];
 }, _o = () => {
-  const [e, t] = Nt({
+  const [e, t] = xt({
     card: void 0,
     "card-cvc": void 0,
     "card-expiry": void 0,
@@ -1477,7 +1478,7 @@ const yo = (e, t, r, o) => {
       `Invalid element id: ${e}, it needs to be in the format "ojs-{elementType}-element" (e.g. "ojs-card-number-element")`
     );
   return r.data;
-}, So = (e) => {
+}, Po = (e) => {
   const {
     children: t,
     checkoutSecureToken: r,
@@ -1486,134 +1487,134 @@ const yo = (e, t, r, o) => {
     onBlur: i,
     onChange: a,
     onLoad: c,
-    onLoadError: d,
-    onValidationError: l,
+    onLoadError: l,
+    onValidationError: d,
     onCheckoutStarted: m,
     onCheckoutSuccess: E,
     onCheckoutError: g,
     onSetupPaymentMethodSuccess: _,
     baseUrl: h,
     enableDynamicPreviews: I
-  } = e, $ = h ?? cn, [Ce, $t] = w(void 0), [Ue, Lt] = w([]), [Ut, qt] = w("1px"), [be, zt] = w(!1), [M, ve] = w(void 0), [qe, K] = w(!1), [Z, Ht] = w([]), [ee, Vt] = w({}), [ze, ie] = w(0), [He, z] = w(!1), [L, Kt] = w(void 0), [Ve, Zt] = w(void 0), [Ke, Yt] = w(void 0), [U, Jt] = w(void 0), [Se] = w(void 0), B = Q(() => `opjs-form-${st()}`, []), A = re(null), { cdeConns: Ze, anyCdeConn: W, connectToCdeIframe: Bt } = _o(), [Wt, Gt] = w(null), [Ye, G] = Nt({
+  } = e, L = h ?? cn, [Ce, Lt] = w(void 0), [Ue, $t] = w([]), [Ut, qt] = w("1px"), [be, zt] = w(!1), [D, Se] = w(void 0), [qe, K] = w(!1), [Y, Ht] = w([]), [ee, Vt] = w({}), [ze, ie] = w(0), [He, z] = w(!1), [$, Kt] = w(void 0), [Ve, Yt] = w(void 0), [Ke, Zt] = w(void 0), [U, Jt] = w(void 0), [Pe] = w(void 0), W = Q(() => `opjs-form-${st()}`, []), j = re(null), { cdeConns: Ye, anyCdeConn: B, connectToCdeIframe: Wt } = _o(), [Bt, Gt] = w(null), [Ze, G] = xt({
     apple_pay: ce,
     google_pay: ce
   });
   q(() => {
-    const u = { version: "0.1.6", release_version: "0.1.6-alpha.720e7c5" };
+    const u = { version: "0.1.7", release_version: "0.1.7-alpha.19e8830" };
     window.ojs_version = u;
   }, []);
   const Qt = yo(
     I ?? !1,
-    W,
+    B,
     r,
-    A.current
-  ), Pe = Y(
+    j.current
+  ), ve = Z(
     (u) => {
-      if (u.origin !== $ || !u.source) return;
-      const j = u.source;
+      if (u.origin !== L || !u.source) return;
+      const M = u.source;
       if (!jr(u.data))
         return;
-      const k = JSON.parse(u.data), p = Qn(k), H = p.elementId;
-      if (p.formId !== B || !H || p.nonce in Ue)
+      const A = JSON.parse(u.data), p = Qn(A), H = p.elementId;
+      if (p.formId !== W || !H || p.nonce in Ue)
         return;
-      Lt((R) => [...R, p.nonce]);
-      const y = p.payload, O = y.type;
-      if (O === f.enum.LAYOUT) {
-        const R = y.height ? `${y.height}px` : "100%";
-        qt(R);
-      } else if (O === f.enum.FOCUS && s)
+      $t((k) => [...k, p.nonce]);
+      const y = p.payload, R = y.type;
+      if (R === f.enum.LAYOUT) {
+        const k = y.height ? `${y.height}px` : "100%";
+        qt(k);
+      } else if (R === f.enum.FOCUS && s)
         s(p.elementId);
-      else if (O === f.enum.BLUR && i)
+      else if (R === f.enum.BLUR && i)
         i(p.elementId);
-      else if (O === f.enum.CHANGE && a)
+      else if (R === f.enum.CHANGE && a)
         a(p.elementId);
-      else if (O === f.enum.LOADED) {
-        const R = Z.find((b) => b.contentWindow === j);
-        if (K(!1), !R)
+      else if (R === f.enum.LOADED) {
+        const k = Y.find((S) => S.contentWindow === M);
+        if (K(!1), !k)
           return;
-        Vt((b) => ({ ...b, [H]: j })), Yt(y.totalAmountAtoms), Zt(y.currency), Jt(y.checkoutPaymentMethods), L || Kt(y.sessionId);
-      } else if (O === f.enum.TOKENIZE_STARTED)
+        Vt((S) => ({ ...S, [H]: M })), Zt(y.totalAmountAtoms), Yt(y.currency), Jt(y.checkoutPaymentMethods), $ || Kt(y.sessionId);
+      } else if (R === f.enum.TOKENIZE_STARTED)
         K(!0);
-      else if (O === f.enum.CHECKOUT_STARTED)
+      else if (R === f.enum.CHECKOUT_STARTED)
         m && m();
-      else if (O === f.enum.PAYMENT_FLOW_STARTED) {
-        if (!M)
+      else if (R === f.enum.PAYMENT_FLOW_STARTED) {
+        if (!D)
           throw new Error("extraData not populated");
-        if (!W)
+        if (!B)
           throw new Error("Not connected to CDE");
         (async () => {
-          const b = y.nextActionMetadata.type;
-          if (b !== void 0) if (b === "stripe_3ds")
-            await Bn(y);
-          else if (b === "stripe_payment_request") {
-            if (!Se)
+          const S = y.nextActionMetadata.type;
+          if (S !== void 0) if (S === "stripe_3ds")
+            await Wn(y);
+          else if (S === "stripe_payment_request") {
+            if (!Pe)
               throw new Error("Stripe PM not set");
-            await Yn(y, Se);
+            await Zn(y, Pe);
           } else
-            throw new Error(`Unknown next action type: ${b}`);
-          const D = await se(W);
-          if (D.mode === "setup") {
-            const { payment_methods: x } = await Ne(W, {
-              secure_token: D.token,
-              existing_cc_pm_id: M.existingCCPMId
+            throw new Error(`Unknown next action type: ${S}`);
+          const F = await se(B);
+          if (F.mode === "setup") {
+            const { payment_methods: N } = await xe(B, {
+              secure_token: F.token,
+              existing_cc_pm_id: D.existingCCPMId
             });
-            if (x.length !== 1)
-              throw new Error(`Expected exactly one payment method, got ${x.length}`);
-            return K(!1), ie(0), z(!1), _ && _(x[0].id), {
+            if (N.length !== 1)
+              throw new Error(`Expected exactly one payment method, got ${N.length}`);
+            return K(!1), ie(0), z(!1), _ && _(N[0].id), {
               proceedToCheckout: !1
             };
           } else
             return {
               proceedToCheckout: !0
             };
-        })().then(({ proceedToCheckout: b }) => {
-          var x;
-          if (!b)
+        })().then(({ proceedToCheckout: S }) => {
+          var N;
+          if (!S)
             return;
-          let D;
-          if (M.checkoutPaymentMethod.provider === "credit_card" && (D = (x = y.startPFMetadata) == null ? void 0 : x.cc_pm_id, !D))
+          let F;
+          if (D.checkoutPaymentMethod.provider === "credit_card" && (F = (N = y.startPFMetadata) == null ? void 0 : N.cc_pm_id, !F))
             throw new Error("CC PM ID not found");
           Te(
-            j,
-            B,
+            M,
+            W,
             H,
-            { ...M, type: "CHECKOUT", doNotUseLegacyCCFlow: !0, existingCCPMId: D },
-            $
-          ), z(!0), ve(void 0), m && m();
-        }).catch((b) => {
-          const D = pe(b);
-          K(!1), z(!1), g && g(D);
+            { ...D, type: "CHECKOUT", doNotUseLegacyCCFlow: !0, existingCCPMId: F },
+            L
+          ), z(!0), Se(void 0), m && m();
+        }).catch((S) => {
+          const F = pe(S);
+          K(!1), z(!1), g && g(F);
         });
-      } else if (O === f.enum.TOKENIZE_SUCCESS && M) {
-        const R = ze + 1, b = R === Object.keys(ee).length;
-        !He && (b || y.isReadyForCheckout) ? (Te(j, B, H, M, $), z(!0), ve(void 0)) : ie(R);
-      } else if (O === f.enum.CHECKOUT_SUCCESS)
+      } else if (R === f.enum.TOKENIZE_SUCCESS && D) {
+        const k = ze + 1, S = k === Object.keys(ee).length;
+        !He && (S || y.isReadyForCheckout) ? (Te(M, W, H, D, L), z(!0), Se(void 0)) : ie(k);
+      } else if (R === f.enum.CHECKOUT_SUCCESS)
         K(!1), ie(0), z(!1), E && E(y.invoiceUrls, y.subscriptionIds, y.customerId);
-      else if (O === f.enum.SETUP_PAYMENT_METHOD_SUCCESS)
+      else if (R === f.enum.SETUP_PAYMENT_METHOD_SUCCESS)
         K(!1), ie(0), z(!1), _ && _(y.paymentMethodId);
-      else if (O === f.enum.LOAD_ERROR)
-        d && d(y.message);
-      else if (O === f.enum.VALIDATION_ERROR) {
-        const R = M == null ? void 0 : M.checkoutPaymentMethod.provider;
-        (R === "credit_card" || R === void 0) && l && l(y.elementType, y.errors, H);
-      } else if (O === f.enum.TOKENIZE_ERROR || O === f.enum.CHECKOUT_ERROR)
+      else if (R === f.enum.LOAD_ERROR)
+        l && l(y.message);
+      else if (R === f.enum.VALIDATION_ERROR) {
+        const k = D == null ? void 0 : D.checkoutPaymentMethod.provider;
+        (k === "credit_card" || k === void 0) && d && d(y.elementType, y.errors, H);
+      } else if (R === f.enum.TOKENIZE_ERROR || R === f.enum.CHECKOUT_ERROR)
         if (y.message === "3DS_REQUIRED") {
-          const R = U == null ? void 0 : U.find((b) => b.provider === "credit_card");
-          if (!L || !A.current || !l || !R) return;
-          for (const [b, D] of Object.entries(ee)) {
-            if (!D) continue;
-            const x = Gn(
+          const k = U == null ? void 0 : U.find((S) => S.provider === "credit_card");
+          if (!$ || !j.current || !d || !k) return;
+          for (const [S, F] of Object.entries(ee)) {
+            if (!F) continue;
+            const N = Gn(
               f.enum.START_PAYMENT_FLOW,
-              L,
-              A.current,
-              l,
+              $,
+              j.current,
+              d,
               // Only stripe supports frontend 3DS right now,
               // so we pass processor_name: 'stripe' to tell delegator to only use stripe
-              { ...R, processor_name: "stripe" },
+              { ...k, processor_name: "stripe" },
               !1
             );
-            if (x) {
-              z(!0), ve(x), Te(D, B, b, x, $);
+            if (N) {
+              z(!0), Se(N), Te(F, W, S, N, L);
               break;
             }
           }
@@ -1621,27 +1622,27 @@ const yo = (e, t, r, o) => {
           K(!1), z(!1), g && g(y.message);
     },
     [
-      B,
-      L,
+      W,
+      $,
       Ue,
-      M,
-      Z,
+      D,
+      Y,
       ee,
       ze,
       He,
       i,
       a,
       s,
-      d,
+      l,
       m,
       E,
       _,
       g,
-      l,
-      $,
-      Se,
+      d,
+      L,
+      Pe,
       U,
-      W
+      B
     ]
   ), Je = Q(() => {
     const u = () => {
@@ -1651,100 +1652,100 @@ const yo = (e, t, r, o) => {
       onCheckoutStarted: te("onCheckoutStarted", m ?? u),
       onCheckoutSuccess: te("onCheckoutSuccess", E ?? u),
       onSetupPaymentMethodSuccess: te("onSetupPaymentMethodSuccess", _ ?? u),
-      onValidationError: te("onValidationError", l ?? u)
+      onValidationError: te("onValidationError", d ?? u)
     };
-  }, [g, m, E, _, l]), Oe = () => {
-    if (!A.current || !L || !U) return null;
+  }, [g, m, E, _, d]), Oe = () => {
+    if (!j.current || !$ || !U) return null;
     const u = /* @__PURE__ */ new Map();
-    return Object.entries(Ze).forEach(([k, p]) => {
-      p && u.set(k, p);
+    return Object.entries(Ye).forEach(([A, p]) => {
+      p && u.set(A, p);
     }), u.size === 0 ? null : {
-      formDiv: A.current,
-      elementsSessionId: L,
+      formDiv: j.current,
+      elementsSessionId: $,
       checkoutPaymentMethods: U,
       cdeConnections: u,
-      baseUrl: new URL($).origin
+      baseUrl: new URL(L).origin
     };
-  }, Be = (u, j, k) => {
+  }, We = (u, M, A) => {
     const p = Oe();
-    if (!(!p || !A.current))
+    if (!(!p || !j.current))
       return Fe.stripePR.run({
         context: p,
         checkoutPaymentMethod: nt(p.checkoutPaymentMethods, u),
-        nonCdeFormInputs: De(A.current),
+        nonCdeFormInputs: Me(j.current),
         flowCallbacks: Je,
-        customParams: { provider: u, overridePaymentRequest: k == null ? void 0 : k.overridePaymentRequest },
-        initResult: j
+        customParams: { provider: u, overridePaymentRequest: A == null ? void 0 : A.overridePaymentRequest },
+        initResult: M
       });
   };
   q(() => {
-    if (Wt !== null) return;
+    if (Bt !== null) return;
     const u = Oe();
     if (!u) return;
-    const j = co(u);
-    Gt(j), j.stripePR.subscribe((k) => {
-      if (k.status === "loading")
+    const M = co(u);
+    Gt(M), M.stripePR.subscribe((A) => {
+      if (A.status === "loading")
         G.set("apple_pay", ce), G.set("google_pay", ce);
-      else if (k.status === "error")
+      else if (A.status === "error")
         G.set("apple_pay", rt), G.set("google_pay", rt);
-      else if (k.status === "loaded") {
-        const p = k.result, H = p.isAvailable && p.availableProviders.applePay, ke = p.isAvailable && p.availableProviders.googlePay;
+      else if (A.status === "loaded") {
+        const p = A.result, H = p.isAvailable && p.availableProviders.applePay, ke = p.isAvailable && p.availableProviders.googlePay;
         G.set("apple_pay", {
           isLoading: !1,
           isAvailable: H,
-          startFlow: async (y) => H ? Be("apple_pay", p, y) : void 0
+          startFlow: async (y) => H ? We("apple_pay", p, y) : void 0
         }), G.set("google_pay", {
           isLoading: !1,
           isAvailable: ke,
-          startFlow: async (y) => ke ? Be("google_pay", p, y) : void 0
+          startFlow: async (y) => ke ? We("google_pay", p, y) : void 0
         });
       }
     });
-  }, [A.current, L, U, Object.keys(Ze).length]);
+  }, [j.current, $, U, Object.keys(Ye).length]);
   const Xt = () => {
     const u = Oe();
-    !A.current || !L || !W || !U || !u || Fe.commonCC.run({
+    !j.current || !$ || !B || !U || !u || Fe.commonCC.run({
       context: u,
       checkoutPaymentMethod: nt(U, "credit_card"),
-      nonCdeFormInputs: De(A.current),
+      nonCdeFormInputs: Me(j.current),
       flowCallbacks: Je,
       customParams: void 0,
       // This flow requires no custom params
       initResult: void 0
       // This flow requires no initialization
     });
-  }, Re = Y(
+  }, Re = Z(
     (u) => {
       qe && u.preventDefault();
     },
     [qe]
   );
   q(() => {
-    if (be || !A.current) return;
-    Z.length > 0 && Z.length === Object.keys(ee).length && (zt(!0), c && c(Ke, Ve));
-  }, [Z, ee, be, c, Ke, Ve]), q(() => ($t(window.location.origin), window.addEventListener("message", Pe), window.addEventListener("beforeunload", Re), () => {
-    window.removeEventListener("beforeunload", Re), window.removeEventListener("message", Pe);
-  }), [L, Pe, Re]);
-  const en = Y(
+    if (be || !j.current) return;
+    Y.length > 0 && Y.length === Object.keys(ee).length && (zt(!0), c && c(Ke, Ve));
+  }, [Y, ee, be, c, Ke, Ve]), q(() => (Lt(window.location.origin), window.addEventListener("message", ve), window.addEventListener("beforeunload", Re), () => {
+    window.removeEventListener("beforeunload", Re), window.removeEventListener("message", ve);
+  }), [$, ve, Re]);
+  const en = Z(
     async (u) => {
-      if (Z.find((p) => p.contentWindow === u.contentWindow)) return;
+      if (Y.find((p) => p.contentWindow === u.contentWindow)) return;
       Ht((p) => [...p, u]);
-      const k = go(u.id);
-      await Bt(k, u);
+      const A = go(u.id);
+      await Wt(A, u);
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [Z]
+    [Y]
   ), tn = {
-    formId: B,
+    formId: W,
     formHeight: Ut,
     referer: Ce,
     checkoutSecureToken: r,
     registerIframe: en,
-    baseUrl: $
+    baseUrl: L
   }, nn = {
     submit: Xt,
-    applePay: Ye.apple_pay,
-    googlePay: Ye.google_pay,
+    applePay: Ze.apple_pay,
+    googlePay: Ze.google_pay,
     // stripeLink: {
     // TODO: uncomment if we need stripe elements later.
     // Better if we can make stripe link work in prod without elements.
@@ -1755,9 +1756,9 @@ const yo = (e, t, r, o) => {
     loaded: be,
     preview: Qt
   };
-  return /* @__PURE__ */ V(at.Provider, { value: tn, children: /* @__PURE__ */ V("div", { className: o, ref: A, children: t(nn) }) });
+  return /* @__PURE__ */ V(at.Provider, { value: tn, children: /* @__PURE__ */ V("div", { className: o, ref: j, children: t(nn) }) });
 }, Ee = (e) => {
-  const { subPath: t, styles: r } = e, { formId: o, referer: s, formHeight: i, checkoutSecureToken: a, registerIframe: c, baseUrl: d } = an(), [l, m] = w(!1), E = re(null), g = Q(() => r ? Wn(r) : "", [r]), _ = Q(() => ({
+  const { subPath: t, styles: r } = e, { formId: o, referer: s, formHeight: i, checkoutSecureToken: a, registerIframe: c, baseUrl: l } = an(), [d, m] = w(!1), E = re(null), g = Q(() => r ? Bn(r) : "", [r]), _ = Q(() => ({
     border: "none",
     width: "100%",
     height: i
@@ -1767,25 +1768,25 @@ const yo = (e, t, r, o) => {
     return I.append("referer", s), I.append("styles", g), I.append("formId", o), I.append("secureToken", a), I.toString();
   }, [g, o, s, a]);
   return q(() => m(!0), []), q(() => {
-    !E.current || !l || c(E.current);
-  }, [l]), a ? /* @__PURE__ */ V(
+    !E.current || !d || c(E.current);
+  }, [d]), a ? /* @__PURE__ */ V(
     "iframe",
     {
       id: `ojs-${t}-element`,
       name: `${t}-element`,
       className: "ojs-iframe",
-      src: `${d}/app/v1/${t}-element/?${h}`,
+      src: `${l}/app/v1/${t}-element/?${h}`,
       style: _,
       ref: E
     }
   ) : /* @__PURE__ */ V("div", {});
-}, Po = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-cvc" }), Oo = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card" }), Ro = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-expiry" }), ko = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-number" });
+}, vo = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-cvc" }), Oo = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card" }), Ro = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-expiry" }), ko = ({ styles: e }) => /* @__PURE__ */ V(Ee, { styles: e, subPath: "card-number" });
 export {
-  Po as CardCvcElement,
+  vo as CardCvcElement,
   Oo as CardElement,
   Ro as CardExpiryElement,
   ko as CardNumberElement,
-  So as ElementsForm,
-  F as FieldName,
+  Po as ElementsForm,
+  C as FieldName,
   an as useOpenPayElements
 };