@easypayment/medusa-payment-paypal 0.9.21 → 0.9.22

package/.medusa/server/src/admin/index.mjs

@@ -133,22 +133,20 @@ async function adminFetch(path, opts = {}) {
   }
 }
 const DEFAULT_FORM$1 = {
-  enabled: true,
-  title: "Credit or Debit Card",
-  threeDS: "when_required"
+  paymentAction: "capture",
+  brandName: "PayPal",
+  landingPage: "no_preference",
+  requireInstantPayment: false,
+  sendItemDetails: true,
+  invoicePrefix: "PP-",
+  creditCardStatementName: "PayPal"
 };
 function mergeWithDefaults$1(saved) {
   if (!saved) return { ...DEFAULT_FORM$1 };
   const entries = Object.entries(saved).filter(([, value]) => value !== void 0);
   return { ...DEFAULT_FORM$1, ...Object.fromEntries(entries) };
 }
-const THREE_DS_OPTIONS = [
-  { value: "when_required", label: "3D Secure when required", hint: "Triggers 3DS only when the card / issuer requires it." },
-  { value: "sli", label: "3D Secure (SCA) / liability shift (recommended)", hint: "Attempts to optimize for liability shift while remaining compliant." },
-  { value: "always", label: "Always request 3D Secure", hint: "Forces 3DS challenge whenever possible (may reduce conversion)." }
-];
-function AdvancedCardPaymentsTab() {
-  var _a, _b;
+function AdditionalSettingsTab() {
   const [form, setForm] = useState(() => ({ ...DEFAULT_FORM$1 }));
   const [loading, setLoading] = useState(false);
   const [saving, setSaving] = useState(false);
@@ -163,7 +161,7 @@ function AdvancedCardPaymentsTab() {
         setLoading(true);
         const json = await adminFetch("/admin/paypal/settings");
         const payload = (json == null ? void 0 : json.data) ?? json;
-        const saved = payload == null ? void 0 : payload.advanced_card_payments;
+        const saved = payload == null ? void 0 : payload.additional_settings;
         if (saved && typeof saved === "object") setForm(mergeWithDefaults$1(saved));
       } catch {
       } finally {
@@ -174,16 +172,14 @@ function AdvancedCardPaymentsTab() {
   async function onSave() {
     try {
       setSaving(true);
-      const json = await adminFetch("/admin/paypal/settings", {
-        method: "POST",
-        body: { advanced_card_payments: form }
-      });
+      setToast(null);
+      const json = await adminFetch("/admin/paypal/settings", { method: "POST", body: { additional_settings: form } });
       const payload = (json == null ? void 0 : json.data) ?? json;
-      const saved = payload == null ? void 0 : payload.advanced_card_payments;
+      const saved = payload == null ? void 0 : payload.additional_settings;
       if (saved && typeof saved === "object") setForm(mergeWithDefaults$1(saved));
       setToast({ kind: "success", message: "Settings saved" });
     } catch (e) {
-      setToast({ kind: "error", message: (e instanceof Error ? e.message : "") || "Failed to save settings." });
+      setToast({ kind: "error", message: e instanceof Error ? e.message : "Failed to save settings" });
     } finally {
       setSaving(false);
     }
@@ -195,42 +191,55 @@ function AdvancedCardPaymentsTab() {
     /* @__PURE__ */ jsx(
       SectionCard,
       {
-        title: "Advanced Card Payments",
-        description: "Control card checkout settings and 3D Secure behavior.",
+        title: "Additional Settings",
+        description: "These settings control checkout behavior and PayPal experience.",
         right: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
           /* @__PURE__ */ jsx("button", { type: "button", onClick: onSave, disabled: saving || loading, className: "transition-fg relative inline-flex w-fit items-center justify-center overflow-hidden rounded-md outline-none shadow-buttons-neutral text-ui-fg-base bg-ui-button-neutral after:transition-fg after:absolute after:inset-0 after:content-[''] after:button-neutral-gradient hover:bg-ui-button-neutral-hover hover:after:button-neutral-hover-gradient active:bg-ui-button-neutral-pressed active:after:button-neutral-pressed-gradient focus-visible:shadow-buttons-neutral-focus disabled:bg-ui-bg-disabled disabled:border-ui-border-base disabled:text-ui-fg-disabled disabled:shadow-buttons-neutral disabled:after:hidden txt-compact-small-plus px-3 py-1.5", children: saving ? "Saving..." : "Save settings" }),
           loading ? /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-subtle", children: "Loading…" }) : null
         ] }),
         children: /* @__PURE__ */ jsxs("div", { className: "divide-y divide-ui-border-base", children: [
-          /* @__PURE__ */ jsx(FieldRow, { label: "Enable/Disable", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.enabled, onChange: (e) => setForm((p) => ({ ...p, enabled: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Enable Advanced Credit/Debit Card" })
+          /* @__PURE__ */ jsx(FieldRow, { label: "Payment action", htmlFor: "as-payment-action", children: /* @__PURE__ */ jsxs("select", { id: "as-payment-action", value: form.paymentAction, onChange: (e) => setForm((p) => ({ ...p, paymentAction: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: [
+            /* @__PURE__ */ jsx("option", { value: "capture", children: "Capture" }),
+            /* @__PURE__ */ jsx("option", { value: "authorize", children: "Authorize" })
           ] }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Title", htmlFor: "acp-title", children: /* @__PURE__ */ jsx("input", { id: "acp-title", value: form.title, onChange: (e) => setForm((p) => ({ ...p, title: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "Credit or Debit Card" }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Contingency for 3D Secure", hint: "Choose when 3D Secure should be triggered during card payments.", htmlFor: "acp-threeds", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
-            /* @__PURE__ */ jsx("select", { id: "acp-threeds", value: form.threeDS, onChange: (e) => setForm((p) => ({ ...p, threeDS: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: THREE_DS_OPTIONS.map((o) => /* @__PURE__ */ jsx("option", { value: o.value, children: o.label }, o.value)) }),
-            ((_a = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _a.hint) ? /* @__PURE__ */ jsx("div", { className: "text-xs text-ui-fg-subtle", children: (_b = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _b.hint }) : null
-          ] }) })
+          /* @__PURE__ */ jsx(FieldRow, { label: "Brand Name", htmlFor: "as-brand-name", children: /* @__PURE__ */ jsx("input", { id: "as-brand-name", value: form.brandName, onChange: (e) => setForm((p) => ({ ...p, brandName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Landing Page", htmlFor: "as-landing-page", children: /* @__PURE__ */ jsxs("select", { id: "as-landing-page", value: form.landingPage, onChange: (e) => setForm((p) => ({ ...p, landingPage: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: [
+            /* @__PURE__ */ jsx("option", { value: "no_preference", children: "No Preference" }),
+            /* @__PURE__ */ jsx("option", { value: "login", children: "Login" }),
+            /* @__PURE__ */ jsx("option", { value: "billing", children: "Billing" })
+          ] }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Instant Payments", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.requireInstantPayment, onChange: (e) => setForm((p) => ({ ...p, requireInstantPayment: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
+            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Require Instant Payment" })
+          ] }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Send Item Details", hint: "Include all line item details in the payment request to PayPal so that they can be seen from the PayPal transaction details page.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.sendItemDetails, onChange: (e) => setForm((p) => ({ ...p, sendItemDetails: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
+            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Send line item details to PayPal" })
+          ] }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Invoice prefix", htmlFor: "as-invoice-prefix", children: /* @__PURE__ */ jsx("input", { id: "as-invoice-prefix", value: form.invoicePrefix, onChange: (e) => setForm((p) => ({ ...p, invoicePrefix: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PP-" }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Credit Card Statement Name", htmlFor: "as-cc-statement", children: /* @__PURE__ */ jsx("input", { id: "as-cc-statement", value: form.creditCardStatementName, onChange: (e) => setForm((p) => ({ ...p, creditCardStatementName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) })
         ] })
       }
     )
   ] }) });
 }
 const DEFAULT_FORM = {
-  paymentAction: "capture",
-  brandName: "PayPal",
-  landingPage: "no_preference",
-  requireInstantPayment: false,
-  sendItemDetails: true,
-  invoicePrefix: "PP-",
-  creditCardStatementName: "PayPal"
+  enabled: true,
+  title: "Credit or Debit Card",
+  threeDS: "when_required"
 };
 function mergeWithDefaults(saved) {
   if (!saved) return { ...DEFAULT_FORM };
   const entries = Object.entries(saved).filter(([, value]) => value !== void 0);
   return { ...DEFAULT_FORM, ...Object.fromEntries(entries) };
 }
-function AdditionalSettingsTab() {
+const THREE_DS_OPTIONS = [
+  { value: "when_required", label: "3D Secure when required", hint: "Triggers 3DS only when the card / issuer requires it." },
+  { value: "sli", label: "3D Secure (SCA) / liability shift (recommended)", hint: "Attempts to optimize for liability shift while remaining compliant." },
+  { value: "always", label: "Always request 3D Secure", hint: "Forces 3DS challenge whenever possible (may reduce conversion)." }
+];
+function AdvancedCardPaymentsTab() {
+  var _a, _b;
   const [form, setForm] = useState(() => ({ ...DEFAULT_FORM }));
   const [loading, setLoading] = useState(false);
   const [saving, setSaving] = useState(false);
@@ -245,7 +254,7 @@ function AdditionalSettingsTab() {
         setLoading(true);
         const json = await adminFetch("/admin/paypal/settings");
         const payload = (json == null ? void 0 : json.data) ?? json;
-        const saved = payload == null ? void 0 : payload.additional_settings;
+        const saved = payload == null ? void 0 : payload.advanced_card_payments;
         if (saved && typeof saved === "object") setForm(mergeWithDefaults(saved));
       } catch {
       } finally {
@@ -256,14 +265,16 @@ function AdditionalSettingsTab() {
   async function onSave() {
     try {
       setSaving(true);
-      setToast(null);
-      const json = await adminFetch("/admin/paypal/settings", { method: "POST", body: { additional_settings: form } });
+      const json = await adminFetch("/admin/paypal/settings", {
+        method: "POST",
+        body: { advanced_card_payments: form }
+      });
       const payload = (json == null ? void 0 : json.data) ?? json;
-      const saved = payload == null ? void 0 : payload.additional_settings;
+      const saved = payload == null ? void 0 : payload.advanced_card_payments;
       if (saved && typeof saved === "object") setForm(mergeWithDefaults(saved));
       setToast({ kind: "success", message: "Settings saved" });
     } catch (e) {
-      setToast({ kind: "error", message: e instanceof Error ? e.message : "Failed to save settings" });
+      setToast({ kind: "error", message: (e instanceof Error ? e.message : "") || "Failed to save settings." });
     } finally {
       setSaving(false);
     }
@@ -275,33 +286,22 @@ function AdditionalSettingsTab() {
     /* @__PURE__ */ jsx(
       SectionCard,
       {
-        title: "Additional Settings",
-        description: "These settings control checkout behavior and PayPal experience.",
+        title: "Advanced Card Payments",
+        description: "Control card checkout settings and 3D Secure behavior.",
         right: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
           /* @__PURE__ */ jsx("button", { type: "button", onClick: onSave, disabled: saving || loading, className: "transition-fg relative inline-flex w-fit items-center justify-center overflow-hidden rounded-md outline-none shadow-buttons-neutral text-ui-fg-base bg-ui-button-neutral after:transition-fg after:absolute after:inset-0 after:content-[''] after:button-neutral-gradient hover:bg-ui-button-neutral-hover hover:after:button-neutral-hover-gradient active:bg-ui-button-neutral-pressed active:after:button-neutral-pressed-gradient focus-visible:shadow-buttons-neutral-focus disabled:bg-ui-bg-disabled disabled:border-ui-border-base disabled:text-ui-fg-disabled disabled:shadow-buttons-neutral disabled:after:hidden txt-compact-small-plus px-3 py-1.5", children: saving ? "Saving..." : "Save settings" }),
           loading ? /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-subtle", children: "Loading…" }) : null
         ] }),
         children: /* @__PURE__ */ jsxs("div", { className: "divide-y divide-ui-border-base", children: [
-          /* @__PURE__ */ jsx(FieldRow, { label: "Payment action", htmlFor: "as-payment-action", children: /* @__PURE__ */ jsxs("select", { id: "as-payment-action", value: form.paymentAction, onChange: (e) => setForm((p) => ({ ...p, paymentAction: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: [
-            /* @__PURE__ */ jsx("option", { value: "capture", children: "Capture" }),
-            /* @__PURE__ */ jsx("option", { value: "authorize", children: "Authorize" })
-          ] }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Brand Name", htmlFor: "as-brand-name", children: /* @__PURE__ */ jsx("input", { id: "as-brand-name", value: form.brandName, onChange: (e) => setForm((p) => ({ ...p, brandName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Landing Page", htmlFor: "as-landing-page", children: /* @__PURE__ */ jsxs("select", { id: "as-landing-page", value: form.landingPage, onChange: (e) => setForm((p) => ({ ...p, landingPage: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: [
-            /* @__PURE__ */ jsx("option", { value: "no_preference", children: "No Preference" }),
-            /* @__PURE__ */ jsx("option", { value: "login", children: "Login" }),
-            /* @__PURE__ */ jsx("option", { value: "billing", children: "Billing" })
-          ] }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Instant Payments", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.requireInstantPayment, onChange: (e) => setForm((p) => ({ ...p, requireInstantPayment: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Require Instant Payment" })
-          ] }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Send Item Details", hint: "Include all line item details in the payment request to PayPal so that they can be seen from the PayPal transaction details page.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.sendItemDetails, onChange: (e) => setForm((p) => ({ ...p, sendItemDetails: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Send line item details to PayPal" })
+          /* @__PURE__ */ jsx(FieldRow, { label: "Enable/Disable", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.enabled, onChange: (e) => setForm((p) => ({ ...p, enabled: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
+            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Enable Advanced Credit/Debit Card" })
           ] }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Invoice prefix", htmlFor: "as-invoice-prefix", children: /* @__PURE__ */ jsx("input", { id: "as-invoice-prefix", value: form.invoicePrefix, onChange: (e) => setForm((p) => ({ ...p, invoicePrefix: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PP-" }) }),
-          /* @__PURE__ */ jsx(FieldRow, { label: "Credit Card Statement Name", htmlFor: "as-cc-statement", children: /* @__PURE__ */ jsx("input", { id: "as-cc-statement", value: form.creditCardStatementName, onChange: (e) => setForm((p) => ({ ...p, creditCardStatementName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) })
+          /* @__PURE__ */ jsx(FieldRow, { label: "Title", htmlFor: "acp-title", children: /* @__PURE__ */ jsx("input", { id: "acp-title", value: form.title, onChange: (e) => setForm((p) => ({ ...p, title: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "Credit or Debit Card" }) }),
+          /* @__PURE__ */ jsx(FieldRow, { label: "Contingency for 3D Secure", hint: "Choose when 3D Secure should be triggered during card payments.", htmlFor: "acp-threeds", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
+            /* @__PURE__ */ jsx("select", { id: "acp-threeds", value: form.threeDS, onChange: (e) => setForm((p) => ({ ...p, threeDS: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: THREE_DS_OPTIONS.map((o) => /* @__PURE__ */ jsx("option", { value: o.value, children: o.label }, o.value)) }),
+            ((_a = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _a.hint) ? /* @__PURE__ */ jsx("div", { className: "text-xs text-ui-fg-subtle", children: (_b = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _b.hint }) : null
+          ] }) })
         ] })
       }
     )
@@ -323,7 +323,7 @@ const PARTNER_JS_URLS = {
 const SERVICE_URL = "/admin/paypal/onboarding-link";
 const POPUP_NAME = "PPFrame";
 const CACHE_PREFIX = "pp_onboard_cache";
-const CACHE_EXPIRY = 10 * 60 * 1e3;
+const CACHE_EXPIRY = 6 * 60 * 60 * 1e3;
 const ONBOARDING_COMPLETE_ENDPOINT = "/admin/paypal/onboard-complete";
 const STATUS_ENDPOINT = "/admin/paypal/status";
 const SAVE_CREDENTIALS_ENDPOINT = "/admin/paypal/save-credentials";
@@ -346,7 +346,9 @@ function readCachedUrl(env) {
 function writeCachedUrl(env, url) {
   try {
     localStorage.setItem(cacheKeyFor(env), JSON.stringify({ url, ts: Date.now() }));
+    return readCachedUrl(env) === url;
   } catch {
+    return false;
   }
 }
 function clearCachedUrl(env) {
@@ -360,58 +362,12 @@ function clearCachedUrl(env) {
   } catch {
   }
 }
-function isPayPalOrigin(origin) {
-  try {
-    const host = new URL(origin).hostname.toLowerCase();
-    return host === "www.paypal.com" || host === "www.sandbox.paypal.com" || host.endsWith(".paypal.com") || host.endsWith(".paypalobjects.com");
-  } catch {
-    return false;
-  }
-}
-function extractAuth(data) {
-  if (!data) return {};
-  if (typeof data === "object") {
-    const obj = data;
-    const authCode = obj.authCode ?? obj.auth_code ?? obj.authcode;
-    const sharedId = obj.sharedId ?? obj.shared_id ?? obj.sharedid;
-    if (authCode && sharedId) {
-      return { authCode: String(authCode), sharedId: String(sharedId) };
-    }
-    for (const key of ["data", "payload", "message", "detail", "body"]) {
-      if (obj[key] && typeof obj[key] === "object") {
-        const inner = extractAuth(obj[key]);
-        if (inner.authCode && inner.sharedId) return inner;
-      }
-    }
-    return {};
-  }
-  if (typeof data === "string") {
-    const s = data.trim();
-    if (!s) return {};
-    if (s.startsWith("{")) {
-      try {
-        return extractAuth(JSON.parse(s));
-      } catch {
-      }
-    }
-    if (/auth_?code/i.test(s) && /shared_?id/i.test(s)) {
-      try {
-        const sp = new URLSearchParams(s.replace(/^[?#]/, ""));
-        const authCode = sp.get("authCode") || sp.get("auth_code") || void 0;
-        const sharedId = sp.get("sharedId") || sp.get("shared_id") || void 0;
-        if (authCode && sharedId) return { authCode, sharedId };
-      } catch {
-      }
-    }
-  }
-  return {};
-}
 function PayPalConnectionPage() {
   const [env, setEnv] = useState("live");
   const [envReady, setEnvReady] = useState(false);
   const [connState, setConnState] = useState("loading");
+  const [partnerReady, setPartnerReady] = useState(false);
   const [error, setError] = useState(null);
-  const [popupBlocked, setPopupBlocked] = useState(false);
   const [finalUrl, setFinalUrl] = useState("");
   const [showManual, setShowManual] = useState(false);
   const [clientId, setClientId] = useState("");
@@ -419,20 +375,11 @@ function PayPalConnectionPage() {
   const [statusInfo, setStatusInfo] = useState(null);
   const [onboardingInProgress, setOnboardingInProgress] = useState(false);
   const initLoaderRef = useRef(null);
-  const paypalButtonRef = useRef(null);
   const errorLogRef = useRef(null);
   const runIdRef = useRef(0);
   const currentRunId = useRef(0);
-  const finalUrlRef = useRef(finalUrl);
-  finalUrlRef.current = finalUrl;
-  const connStateRef = useRef(connState);
-  connStateRef.current = connState;
-  const inProgressRef = useRef(onboardingInProgress);
-  inProgressRef.current = onboardingInProgress;
   const envRef = useRef(env);
   envRef.current = env;
-  const popupRef = useRef(null);
-  const popupPollRef = useRef(null);
   const completedRef = useRef(false);
   const ppBtnMeasureRef = useRef(null);
   const [ppBtnWidth, setPpBtnWidth] = useState(null);
@@ -443,131 +390,23 @@ function PayPalConnectionPage() {
     setConnState("error");
     setError(msg);
   }, []);
-  const stopPopupPoll = useCallback(() => {
-    if (popupPollRef.current) {
-      clearInterval(popupPollRef.current);
-      popupPollRef.current = null;
-    }
-  }, []);
-  const openOnboardingPopup = useCallback(
-    (url) => {
-      const w = 450;
-      const h = 600;
-      const baseLeft = typeof window.screenX === "number" ? window.screenX : window.screenLeft || 0;
-      const baseTop = typeof window.screenY === "number" ? window.screenY : window.screenTop || 0;
-      const outerW = window.outerWidth || document.documentElement.clientWidth || 1024;
-      const outerH = window.outerHeight || document.documentElement.clientHeight || 768;
-      const left = Math.round(baseLeft + Math.max(0, (outerW - w) / 2));
-      const top = Math.round(baseTop + Math.max(0, (outerH - h) / 2));
-      const features = `popup=yes,width=${w},height=${h},left=${left},top=${top},scrollbars=yes,resizable=yes`;
-      let popup = null;
-      try {
-        popup = window.open(url, POPUP_NAME, features);
-      } catch {
-        popup = null;
-      }
-      if (popup) {
-        popupRef.current = popup;
-        try {
-          popup.focus();
-        } catch {
+  const generateLinkAndReload = useCallback(
+    async (targetEnv, runId) => {
+      if (initLoaderRef.current) {
+        const loaderText = initLoaderRef.current.querySelector("#loader-text");
+        if (loaderText) {
+          loaderText.textContent = "Generating onboarding session...";
         }
-        stopPopupPoll();
-        popupPollRef.current = setInterval(() => {
-          if (!popupRef.current || popupRef.current.closed) {
-            stopPopupPoll();
-          }
-        }, 1e3);
       }
-      return popup;
-    },
-    [stopPopupPoll]
-  );
-  const completeOnboarding = useCallback(
-    async (authCode, sharedId) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
-      if (!authCode || !sharedId) return;
-      if (completedRef.current) return;
-      completedRef.current = true;
       try {
-        window.onbeforeunload = null;
-      } catch {
-      }
-      const activeEnv = envRef.current === "sandbox" ? "sandbox" : "live";
-      setOnboardingInProgress(true);
-      setConnState("loading");
-      setError(null);
-      setPopupBlocked(false);
-      try {
-        const res = await fetch(ONBOARDING_COMPLETE_ENDPOINT, {
+        const res = await fetch(SERVICE_URL, {
           method: "POST",
           headers: { "content-type": "application/json" },
           credentials: "include",
-          body: JSON.stringify({ authCode, sharedId, env: activeEnv })
+          body: JSON.stringify({ products: ["PPCP"], environment: targetEnv })
         });
-        if (!res.ok) {
-          const txt = await res.text().catch(() => "");
-          throw new Error(txt || `Onboarding exchange failed (${res.status})`);
-        }
-        try {
-          (_a = popupRef.current) == null ? void 0 : _a.close();
-        } catch {
-        }
-        stopPopupPoll();
-        try {
-          const close1 = (_e = (_d = (_c = (_b = window.PAYPAL) == null ? void 0 : _b.apps) == null ? void 0 : _c.Signup) == null ? void 0 : _d.MiniBrowser) == null ? void 0 : _e.closeFlow;
-          if (typeof close1 === "function") close1();
-        } catch {
-        }
-        try {
-          const close2 = ((_h = (_g = (_f = window.PAYPAL) == null ? void 0 : _f.apps) == null ? void 0 : _g.Signup) == null ? void 0 : _h.miniBrowser) && window.PAYPAL.apps.Signup.miniBrowser.closeFlow;
-          if (typeof close2 === "function") close2();
-        } catch {
-        }
-        clearCachedUrl(activeEnv);
-        try {
-          const statusRes = await fetch(
-            `${STATUS_ENDPOINT}?environment=${activeEnv}`,
-            { method: "GET", credentials: "include" }
-          );
-          const refreshedStatus = await statusRes.json().catch(() => ({}));
-          setStatusInfo(refreshedStatus || null);
-        } catch {
-        }
-        setConnState("connected");
-        setShowManual(false);
-      } catch (e) {
-        completedRef.current = false;
-        console.error(e);
-        setConnState("error");
-        setError((e == null ? void 0 : e.message) || "Exchange failed while saving credentials.");
-      } finally {
-        setOnboardingInProgress(false);
-      }
-    },
-    [stopPopupPoll]
-  );
-  const fetchFreshLink = useCallback(
-    (runId, targetEnv) => {
-      if (initLoaderRef.current) {
-        const loaderText = initLoaderRef.current.querySelector("#loader-text");
-        if (loaderText)
-          loaderText.textContent = "Generating onboarding session...";
-      }
-      fetch(SERVICE_URL, {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify({
-          products: ["PPCP"],
-          // Generate the link for the explicitly selected environment so it can
-          // never depend on a racing POST /environment having landed yet.
-          environment: targetEnv
-        })
-      }).then((r) => {
-        if (!r.ok) throw new Error(`Service returned ${r.status}`);
-        return r.json();
-      }).then((data) => {
+        if (!res.ok) throw new Error(`Service returned ${res.status}`);
+        const data = await res.json();
         if (runId !== currentRunId.current) return;
         const href = data == null ? void 0 : data.onboarding_url;
         if (!href) {
@@ -575,13 +414,17 @@ function PayPalConnectionPage() {
           return;
         }
         const url = href + (href.includes("?") ? "&" : "?") + "displayMode=minibrowser";
-        writeCachedUrl(targetEnv, url);
+        const persisted = writeCachedUrl(targetEnv, url);
+        if (persisted) {
+          window.location.reload();
+          return;
+        }
         setFinalUrl(url);
         setConnState("ready");
-      }).catch(() => {
+      } catch {
         if (runId !== currentRunId.current) return;
         showError("Unable to connect to service.");
-      });
+      }
     },
     [showError]
   );
@@ -598,12 +441,60 @@ function PayPalConnectionPage() {
       alive = false;
     };
   }, []);
+  useEffect(() => {
+    if (!envReady) return;
+    currentRunId.current = ++runIdRef.current;
+    const runId = currentRunId.current;
+    let cancelled = false;
+    completedRef.current = false;
+    const run = async () => {
+      setConnState("loading");
+      setError(null);
+      setFinalUrl("");
+      try {
+        const r = await fetch(`${STATUS_ENDPOINT}?environment=${env}`, {
+          method: "GET",
+          credentials: "include"
+        });
+        const st = await r.json().catch(() => ({}));
+        if (cancelled || runId !== currentRunId.current) return;
+        setStatusInfo(st);
+        const isConnected = (st == null ? void 0 : st.status) === "connected" && (st == null ? void 0 : st.seller_client_id_present) === true;
+        if (isConnected) {
+          setConnState("connected");
+          setShowManual(false);
+          return;
+        }
+      } catch (e) {
+        console.error(e);
+      }
+      if (cancelled || runId !== currentRunId.current) return;
+      const cached = readCachedUrl(env);
+      if (cached) {
+        setFinalUrl(cached);
+        setConnState("ready");
+        return;
+      }
+      await generateLinkAndReload(env, runId);
+    };
+    run();
+    return () => {
+      cancelled = true;
+    };
+  }, [env, envReady, generateLinkAndReload]);
   useEffect(() => {
     var _a, _b, _c;
     if (connState !== "ready" || !finalUrl) return;
     const scriptUrl = PARTNER_JS_URLS[env];
     let cancelled = false;
     let pollTimer;
+    setPartnerReady(false);
+    const readyFallback = setTimeout(() => {
+      if (!cancelled) setPartnerReady(true);
+    }, 6e3);
+    const markReady = () => {
+      if (!cancelled) setPartnerReady(true);
+    };
     const initPartner = (attempt = 0) => {
       var _a2, _b2;
       if (cancelled) return;
@@ -615,6 +506,7 @@ function PayPalConnectionPage() {
         } catch (e) {
           console.error("[paypal] partner.js init failed:", e);
         }
+        markReady();
         return;
       }
       if (typeof (signup == null ? void 0 : signup.render) === "function") {
@@ -623,6 +515,7 @@ function PayPalConnectionPage() {
         } catch (e) {
           console.error("[paypal] partner.js render failed:", e);
         }
+        markReady();
         return;
       }
       if (attempt < 40) {
@@ -633,6 +526,7 @@ function PayPalConnectionPage() {
         document.dispatchEvent(new Event("DOMContentLoaded"));
       } catch {
       }
+      markReady();
     };
     const existingScript = document.getElementById("paypal-partner-js");
     if (existingScript) {
@@ -649,9 +543,11 @@ function PayPalConnectionPage() {
     ppScript.src = scriptUrl;
     ppScript.async = true;
     ppScript.onload = () => initPartner();
+    ppScript.onerror = () => markReady();
     document.body.appendChild(ppScript);
     return () => {
       cancelled = true;
+      clearTimeout(readyFallback);
       if (pollTimer) {
         clearTimeout(pollTimer);
       }
@@ -660,59 +556,61 @@ function PayPalConnectionPage() {
       }
     };
   }, [connState, finalUrl, env]);
-  useEffect(() => {
-    const onMessage = (ev) => {
-      if (!isPayPalOrigin(ev.origin)) return;
-      const { authCode, sharedId } = extractAuth(ev.data);
-      if (authCode && sharedId) {
-        completeOnboarding(authCode, sharedId);
+  const completeOnboarding = useCallback(async (authCode, sharedId) => {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (!authCode || !sharedId) return;
+    if (completedRef.current) return;
+    completedRef.current = true;
+    try {
+      window.onbeforeunload = null;
+    } catch {
+    }
+    const activeEnv = envRef.current === "sandbox" ? "sandbox" : "live";
+    setOnboardingInProgress(true);
+    setConnState("loading");
+    setError(null);
+    try {
+      const res = await fetch(ONBOARDING_COMPLETE_ENDPOINT, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        credentials: "include",
+        body: JSON.stringify({ authCode, sharedId, env: activeEnv })
+      });
+      if (!res.ok) {
+        const txt = await res.text().catch(() => "");
+        throw new Error(txt || `Onboarding exchange failed (${res.status})`);
       }
-    };
-    window.addEventListener("message", onMessage);
-    return () => window.removeEventListener("message", onMessage);
-  }, [completeOnboarding]);
-  useEffect(() => {
-    if (!envReady) return;
-    currentRunId.current = ++runIdRef.current;
-    const runId = currentRunId.current;
-    let cancelled = false;
-    completedRef.current = false;
-    const run = async () => {
-      setConnState("loading");
-      setError(null);
-      setPopupBlocked(false);
-      setFinalUrl("");
       try {
-        const r = await fetch(`${STATUS_ENDPOINT}?environment=${env}`, {
+        const close1 = (_d = (_c = (_b = (_a = window.PAYPAL) == null ? void 0 : _a.apps) == null ? void 0 : _b.Signup) == null ? void 0 : _c.MiniBrowser) == null ? void 0 : _d.closeFlow;
+        if (typeof close1 === "function") close1();
+      } catch {
+      }
+      try {
+        const close2 = ((_g = (_f = (_e = window.PAYPAL) == null ? void 0 : _e.apps) == null ? void 0 : _f.Signup) == null ? void 0 : _g.miniBrowser) && window.PAYPAL.apps.Signup.miniBrowser.closeFlow;
+        if (typeof close2 === "function") close2();
+      } catch {
+      }
+      clearCachedUrl(activeEnv);
+      try {
+        const statusRes = await fetch(`${STATUS_ENDPOINT}?environment=${activeEnv}`, {
           method: "GET",
           credentials: "include"
         });
-        const st = await r.json().catch(() => ({}));
-        if (cancelled || runId !== currentRunId.current) return;
-        setStatusInfo(st);
-        const isConnected = (st == null ? void 0 : st.status) === "connected" && (st == null ? void 0 : st.seller_client_id_present) === true;
-        if (isConnected) {
-          setConnState("connected");
-          setShowManual(false);
-          return;
-        }
-      } catch (e) {
-        console.error(e);
-      }
-      if (cancelled || runId !== currentRunId.current) return;
-      const cached = readCachedUrl(env);
-      if (cached) {
-        setFinalUrl(cached);
-        setConnState("ready");
-      } else {
-        fetchFreshLink(runId, env);
+        const refreshedStatus = await statusRes.json().catch(() => ({}));
+        setStatusInfo(refreshedStatus || null);
+      } catch {
       }
-    };
-    run();
-    return () => {
-      cancelled = true;
-    };
-  }, [env, envReady, fetchFreshLink]);
+      setConnState("connected");
+      setShowManual(false);
+    } catch (e) {
+      completedRef.current = false;
+      console.error(e);
+      setConnState("error");
+      setError((e == null ? void 0 : e.message) || "Exchange failed while saving credentials.");
+    } finally {
+      setOnboardingInProgress(false);
+    }
+  }, []);
   useLayoutEffect(() => {
     window.onboardingCallback = (authCode, sharedId) => {
       completeOnboarding(authCode, sharedId);
@@ -721,11 +619,6 @@ function PayPalConnectionPage() {
       window.onboardingCallback = void 0;
     };
   }, [completeOnboarding]);
-  useEffect(() => {
-    return () => {
-      stopPopupPoll();
-    };
-  }, [stopPopupPoll]);
   useLayoutEffect(() => {
     const el = ppBtnMeasureRef.current;
     if (!el) return;
@@ -746,26 +639,6 @@ function PayPalConnectionPage() {
       else window.removeEventListener("resize", update);
     };
   }, [connState, env, finalUrl]);
-  useEffect(() => {
-    const onCaptureClick = (e) => {
-      const btn = paypalButtonRef.current;
-      if (!btn) return;
-      const target = e.target;
-      if (!target || !btn.contains(target)) return;
-      e.preventDefault();
-      if (connStateRef.current !== "ready" || !finalUrlRef.current || inProgressRef.current) {
-        return;
-      }
-      completedRef.current = false;
-      const popup = openOnboardingPopup(finalUrlRef.current);
-      setPopupBlocked(!popup);
-    };
-    document.addEventListener("click", onCaptureClick, true);
-    return () => document.removeEventListener("click", onCaptureClick, true);
-  }, [openOnboardingPopup]);
-  const handleConnectClick = (e) => {
-    e.preventDefault();
-  };
   const handleSaveManual = async () => {
     if (!canSaveManual || onboardingInProgress) return;
     setOnboardingInProgress(true);
@@ -826,8 +699,7 @@ function PayPalConnectionPage() {
       clearCachedUrl(env);
       completedRef.current = false;
       currentRunId.current = ++runIdRef.current;
-      const runId = currentRunId.current;
-      fetchFreshLink(runId, env);
+      await generateLinkAndReload(env, currentRunId.current);
     } catch (e) {
       console.error(e);
       setConnState("error");
@@ -838,10 +710,10 @@ function PayPalConnectionPage() {
   };
   const handleEnvChange = async (e) => {
     const next = e.target.value;
+    if (next === env || onboardingInProgress) return;
     completedRef.current = false;
-    setPopupBlocked(false);
     clearCachedUrl();
-    setEnv(next);
+    setConnState("loading");
     try {
       await fetch(ENVIRONMENT_ENDPOINT, {
         method: "POST",
@@ -851,6 +723,7 @@ function PayPalConnectionPage() {
       });
     } catch {
     }
+    setEnv(next);
   };
   return /* @__PURE__ */ jsxs("div", { className: "p-6", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-6", children: [
@@ -910,7 +783,6 @@ function PayPalConnectionPage() {
               "a",
               {
                 ref: (node) => {
-                  paypalButtonRef.current = node;
                   ppBtnMeasureRef.current = node;
                 },
                 id: "paypal-button",
@@ -918,17 +790,19 @@ function PayPalConnectionPage() {
                 "data-paypal-button": "true",
                 href: finalUrl || "#",
                 "data-paypal-onboard-complete": "onboardingCallback",
-                onClick: handleConnectClick,
+                "aria-disabled": onboardingInProgress || !partnerReady,
                 className: "transition-fg relative inline-flex w-fit items-center justify-center overflow-hidden rounded-md outline-none no-underline shadow-buttons-neutral text-ui-fg-base bg-ui-button-neutral after:transition-fg after:absolute after:inset-0 after:content-[''] after:button-neutral-gradient hover:bg-ui-button-neutral-hover hover:after:button-neutral-hover-gradient active:bg-ui-button-neutral-pressed active:after:button-neutral-pressed-gradient focus-visible:shadow-buttons-neutral-focus disabled:bg-ui-bg-disabled disabled:border-ui-border-base disabled:text-ui-fg-disabled disabled:shadow-buttons-neutral disabled:after:hidden txt-compact-small-plus px-3 py-1.5",
                 style: {
-                  cursor: onboardingInProgress ? "not-allowed" : "pointer",
-                  opacity: onboardingInProgress ? 0.6 : 1,
-                  pointerEvents: onboardingInProgress ? "none" : "auto"
+                  cursor: onboardingInProgress || !partnerReady ? "not-allowed" : "pointer",
+                  opacity: onboardingInProgress || !partnerReady ? 0.6 : 1,
+                  // Keep the anchor mounted (partner.js must find it to bind)
+                  // but un-clickable until partner.js has taken over the
+                  // click — so it can never open a tab via the native href.
+                  pointerEvents: onboardingInProgress || !partnerReady ? "none" : "auto"
                 },
-                children: "Connect to PayPal"
+                children: partnerReady || onboardingInProgress ? "Connect to PayPal" : "Preparing PayPal…"
               }
             ),
-            popupBlocked && /* @__PURE__ */ jsx("div", { className: "mt-3 text-left text-xs bg-amber-50 text-amber-700 p-3 border border-amber-200 rounded", children: "Your browser blocked the PayPal popup. Please allow popups for this site, then click “Connect to PayPal” again." }),
             /* @__PURE__ */ jsx(
               "div",
               {
@@ -1301,14 +1175,14 @@ const routeModule = {
       Component: PayPalSettingsIndexRoute,
       path: "/settings/paypal"
     },
-    {
-      Component: AdvancedCardPaymentsTab,
-      path: "/settings/paypal/advanced-card-payments"
-    },
     {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
+    {
+      Component: AdvancedCardPaymentsTab,
+      path: "/settings/paypal/advanced-card-payments"
+    },
     {
       Component: PayPalApplePayPage,
       path: "/settings/paypal/apple-pay"