@easypayment/medusa-payment-paypal 0.9.25 → 0.9.27

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

@@ -308,21 +308,11 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
-function PayPalGooglePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 const config = adminSdk.defineRouteConfig({
   label: "PayPal Connection"
 });
-const PARTNER_JS_URLS = {
-  sandbox: "https://www.sandbox.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js",
-  live: "https://www.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js"
-};
+const PARTNER_JS_URL = "https://www.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js";
 const SERVICE_URL = "/admin/paypal/onboarding-link";
-const POPUP_NAME = "PPFrame";
 const CACHE_PREFIX = "pp_onboard_cache";
 const CACHE_EXPIRY = 6 * 60 * 60 * 1e3;
 const ONBOARDING_COMPLETE_ENDPOINT = "/admin/paypal/onboard-complete";
@@ -347,9 +337,7 @@ 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) {
@@ -363,62 +351,11 @@ 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 ?? obj.code;
-    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", "params"]) {
-      if (obj[key] && typeof obj[key] === "object") {
-        const inner = extractAuth(obj[key]);
-        if (inner.authCode && inner.sharedId) return inner;
-      }
-      if (typeof obj[key] === "string") {
-        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("{") || 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] = react.useState("live");
   const [envReady, setEnvReady] = react.useState(false);
   const [connState, setConnState] = react.useState("loading");
   const [error, setError] = react.useState(null);
-  const [popupBlocked, setPopupBlocked] = react.useState(false);
   const [finalUrl, setFinalUrl] = react.useState("");
   const [showManual, setShowManual] = react.useState(false);
   const [clientId, setClientId] = react.useState("");
@@ -430,17 +367,11 @@ function PayPalConnectionPage() {
   const errorLogRef = react.useRef(null);
   const runIdRef = react.useRef(0);
   const currentRunId = react.useRef(0);
+  const completedRef = react.useRef(false);
   const envRef = react.useRef(env);
   envRef.current = env;
-  const finalUrlRef = react.useRef(finalUrl);
-  finalUrlRef.current = finalUrl;
-  const connStateRef = react.useRef(connState);
-  connStateRef.current = connState;
-  const inProgressRef = react.useRef(onboardingInProgress);
-  inProgressRef.current = onboardingInProgress;
-  const popupRef = react.useRef(null);
-  const pollRef = react.useRef(null);
-  const completedRef = react.useRef(false);
+  const pollTimerRef = react.useRef(null);
+  const pollAttemptsRef = react.useRef(0);
   const ppBtnMeasureRef = react.useRef(null);
   const [ppBtnWidth, setPpBtnWidth] = react.useState(null);
   const canSaveManual = react.useMemo(() => {
@@ -450,44 +381,72 @@ function PayPalConnectionPage() {
     setConnState("error");
     setError(msg);
   }, []);
-  const stopPoll = react.useCallback(() => {
-    if (pollRef.current) {
-      clearInterval(pollRef.current);
-      pollRef.current = null;
+  const closeMiniBrowser = react.useCallback(() => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    try {
+      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 {
     }
-  }, []);
-  const openOnboardingPopup = react.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);
+      const close2 = (_h = (_g = (_f = (_e = window.PAYPAL) == null ? void 0 : _e.apps) == null ? void 0 : _f.Signup) == null ? void 0 : _g.miniBrowser) == null ? void 0 : _h.closeFlow;
+      if (typeof close2 === "function") close2();
     } catch {
-      popup = null;
     }
-    if (popup) {
-      popupRef.current = popup;
+  }, []);
+  const stopStatusPolling = react.useCallback(() => {
+    if (pollTimerRef.current) {
+      clearTimeout(pollTimerRef.current);
+      pollTimerRef.current = null;
+    }
+    pollAttemptsRef.current = 0;
+  }, []);
+  const refreshStatusAndMaybeConnect = react.useCallback(
+    async (activeEnv) => {
       try {
-        popup.focus();
+        const res = await fetch(`${STATUS_ENDPOINT}?environment=${activeEnv}`, {
+          method: "GET",
+          credentials: "include"
+        });
+        const st = await res.json().catch(() => ({}));
+        const connected = (st == null ? void 0 : st.status) === "connected" && (st == null ? void 0 : st.seller_client_id_present) === true;
+        if (connected) {
+          completedRef.current = true;
+          setStatusInfo(st);
+          setConnState("connected");
+          setShowManual(false);
+          setOnboardingInProgress(false);
+          clearCachedUrl(activeEnv);
+          closeMiniBrowser();
+          stopStatusPolling();
+        }
+        return connected;
       } catch {
+        return false;
       }
-    }
-    return popup;
-  }, []);
+    },
+    [closeMiniBrowser, stopStatusPolling]
+  );
+  const startStatusPolling = react.useCallback(() => {
+    stopStatusPolling();
+    const MAX_ATTEMPTS = 100;
+    const tick = async () => {
+      pollAttemptsRef.current += 1;
+      const connected = await refreshStatusAndMaybeConnect(envRef.current);
+      if (connected || completedRef.current) return;
+      if (pollAttemptsRef.current >= MAX_ATTEMPTS) {
+        stopStatusPolling();
+        return;
+      }
+      pollTimerRef.current = setTimeout(tick, 3e3);
+    };
+    pollTimerRef.current = setTimeout(tick, 3e3);
+  }, [refreshStatusAndMaybeConnect, stopStatusPolling]);
   const completeOnboarding = react.useCallback(
     async (authCode, sharedId) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
       if (!authCode || !sharedId) return;
       if (completedRef.current) return;
       completedRef.current = true;
-      stopPoll();
       try {
         window.onbeforeunload = null;
       } catch {
@@ -496,7 +455,6 @@ function PayPalConnectionPage() {
       setOnboardingInProgress(true);
       setConnState("loading");
       setError(null);
-      setPopupBlocked(false);
       try {
         const res = await fetch(ONBOARDING_COMPLETE_ENDPOINT, {
           method: "POST",
@@ -508,32 +466,20 @@ function PayPalConnectionPage() {
           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 {
-        }
-        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 {
-        }
+        closeMiniBrowser();
         clearCachedUrl(activeEnv);
         try {
-          const statusRes = await fetch(`${STATUS_ENDPOINT}?environment=${activeEnv}`, {
-            method: "GET",
-            credentials: "include"
-          });
+          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);
+        stopStatusPolling();
       } catch (e) {
         completedRef.current = false;
         console.error(e);
@@ -543,42 +489,72 @@ function PayPalConnectionPage() {
         setOnboardingInProgress(false);
       }
     },
-    [stopPoll]
+    [closeMiniBrowser, stopStatusPolling]
   );
-  const startStatusPoll = react.useCallback(() => {
-    stopPoll();
-    let ticks = 0;
-    pollRef.current = setInterval(async () => {
-      var _a;
-      ticks += 1;
-      if (completedRef.current || ticks > 150) {
-        stopPoll();
-        return;
-      }
+  const initPartner = react.useCallback(() => {
+    var _a, _b;
+    const signup = (_b = (_a = window.PAYPAL) == null ? void 0 : _a.apps) == null ? void 0 : _b.Signup;
+    const init = (signup == null ? void 0 : signup.miniBrowser) && signup.miniBrowser.init || (signup == null ? void 0 : signup.MiniBrowser) && signup.MiniBrowser.init;
+    if (typeof init === "function") {
       try {
-        const r = await fetch(`${STATUS_ENDPOINT}?environment=${envRef.current}`, {
-          method: "GET",
-          credentials: "include"
-        });
-        const st = await r.json().catch(() => ({}));
-        if ((st == null ? void 0 : st.status) === "connected" && (st == null ? void 0 : st.seller_client_id_present) === true) {
-          completedRef.current = true;
-          stopPoll();
-          try {
-            (_a = popupRef.current) == null ? void 0 : _a.close();
-          } catch {
-          }
-          clearCachedUrl(envRef.current);
-          setStatusInfo(st);
-          setConnState("connected");
-          setShowManual(false);
-          setOnboardingInProgress(false);
-        }
-      } catch {
+        init();
+      } catch (e) {
+        console.error("[paypal] partner.js init failed:", e);
+      }
+    }
+  }, []);
+  react.useEffect(() => {
+    const existingScript = document.getElementById("paypal-partner-js");
+    if (existingScript) return;
+    const preloadHref = PARTNER_JS_URL;
+    let preloadLink = null;
+    if (!document.head.querySelector(`link[rel="preload"][href="${preloadHref}"]`)) {
+      preloadLink = document.createElement("link");
+      preloadLink.rel = "preload";
+      preloadLink.href = preloadHref;
+      preloadLink.as = "script";
+      document.head.appendChild(preloadLink);
+    }
+    const ppScript = document.createElement("script");
+    ppScript.id = "paypal-partner-js";
+    ppScript.src = preloadHref;
+    ppScript.async = true;
+    document.head.appendChild(ppScript);
+    return () => {
+      if (preloadLink == null ? void 0 : preloadLink.parentNode) preloadLink.parentNode.removeChild(preloadLink);
+      if (ppScript.parentNode) ppScript.parentNode.removeChild(ppScript);
+    };
+  }, []);
+  const activatePayPal = react.useCallback(
+    (url, runId) => {
+      if (paypalButtonRef.current) {
+        paypalButtonRef.current.href = url;
       }
-    }, 2e3);
-  }, [stopPoll]);
-  const generateLinkAndReload = react.useCallback(
+      setFinalUrl(url);
+      let attempts = 0;
+      const MAX_ATTEMPTS = 200;
+      const tryInit = () => {
+        var _a, _b;
+        if (runId !== currentRunId.current) return;
+        if ((_b = (_a = window.PAYPAL) == null ? void 0 : _a.apps) == null ? void 0 : _b.Signup) {
+          initPartner();
+          setConnState("ready");
+          return;
+        }
+        attempts++;
+        if (attempts >= MAX_ATTEMPTS) {
+          showError(
+            "PayPal partner script failed to load. Please refresh and try again."
+          );
+          return;
+        }
+        setTimeout(tryInit, 50);
+      };
+      tryInit();
+    },
+    [initPartner, showError]
+  );
+  const fetchFreshLink = react.useCallback(
     async (targetEnv, runId) => {
       if (initLoaderRef.current) {
         const loaderText = initLoaderRef.current.querySelector("#loader-text");
@@ -600,19 +576,14 @@ function PayPalConnectionPage() {
           return;
         }
         const url = href + (href.includes("?") ? "&" : "?") + "displayMode=minibrowser";
-        const persisted = writeCachedUrl(targetEnv, url);
-        if (persisted) {
-          window.location.reload();
-          return;
-        }
-        setFinalUrl(url);
-        setConnState("ready");
+        writeCachedUrl(targetEnv, url);
+        activatePayPal(url, runId);
       } catch {
         if (runId !== currentRunId.current) return;
         showError("Unable to connect to service.");
       }
     },
-    [showError]
+    [activatePayPal, showError]
   );
   react.useEffect(() => {
     let alive = true;
@@ -636,7 +607,6 @@ function PayPalConnectionPage() {
     const run = async () => {
       setConnState("loading");
       setError(null);
-      setPopupBlocked(false);
       setFinalUrl("");
       try {
         const r = await fetch(`${STATUS_ENDPOINT}?environment=${env}`, {
@@ -658,149 +628,43 @@ function PayPalConnectionPage() {
       if (cancelled || runId !== currentRunId.current) return;
       const cached = readCachedUrl(env);
       if (cached) {
-        setFinalUrl(cached);
-        setConnState("ready");
+        activatePayPal(cached, runId);
         return;
       }
-      await generateLinkAndReload(env, runId);
+      await fetchFreshLink(env, runId);
     };
     run();
     return () => {
       cancelled = true;
     };
-  }, [env, envReady, generateLinkAndReload]);
-  react.useEffect(() => {
-    var _a, _b, _c;
-    if (connState !== "ready" || !finalUrl) return;
-    const scriptUrl = PARTNER_JS_URLS[env];
-    let cancelled = false;
-    let pollTimer;
-    const initPartner = (attempt = 0) => {
-      var _a2, _b2;
-      if (cancelled) return;
-      const signup = (_b2 = (_a2 = window.PAYPAL) == null ? void 0 : _a2.apps) == null ? void 0 : _b2.Signup;
-      const target = (signup == null ? void 0 : signup.miniBrowser) && typeof signup.miniBrowser.init === "function" ? signup.miniBrowser : (signup == null ? void 0 : signup.MiniBrowser) && typeof signup.MiniBrowser.init === "function" ? signup.MiniBrowser : null;
-      if (target == null ? void 0 : target.init) {
-        try {
-          target.init();
-        } catch (e) {
-          console.error("[paypal] partner.js init failed:", e);
-        }
-        return;
-      }
-      if (typeof (signup == null ? void 0 : signup.render) === "function") {
-        try {
-          signup.render();
-        } catch (e) {
-          console.error("[paypal] partner.js render failed:", e);
-        }
-        return;
-      }
-      if (attempt < 40) {
-        pollTimer = setTimeout(() => initPartner(attempt + 1), 50);
-        return;
-      }
-      try {
-        document.dispatchEvent(new Event("DOMContentLoaded"));
-      } catch {
-      }
-    };
-    const existingScript = document.getElementById("paypal-partner-js");
-    if (existingScript) {
-      (_a = existingScript.parentNode) == null ? void 0 : _a.removeChild(existingScript);
-    }
-    if ((_c = (_b = window.PAYPAL) == null ? void 0 : _b.apps) == null ? void 0 : _c.Signup) {
-      try {
-        delete window.PAYPAL.apps.Signup;
-      } catch {
-      }
-    }
-    const ppScript = document.createElement("script");
-    ppScript.id = "paypal-partner-js";
-    ppScript.src = scriptUrl;
-    ppScript.async = true;
-    ppScript.onload = () => initPartner();
-    document.body.appendChild(ppScript);
-    return () => {
-      cancelled = true;
-      if (pollTimer) clearTimeout(pollTimer);
-      if (ppScript.parentNode) ppScript.parentNode.removeChild(ppScript);
-    };
-  }, [connState, finalUrl, env]);
-  react.useEffect(() => {
-    const onMessage = (ev) => {
-      var _a;
-      let serialized = "";
-      try {
-        serialized = typeof ev.data === "string" ? ev.data : JSON.stringify(ev.data);
-      } catch {
-        serialized = String(ev.data);
-      }
-      const looksRelevant = isPayPalOrigin(ev.origin) || /auth_?code|shared_?id|onboard|merchantId/i.test(serialized || "");
-      if (looksRelevant) {
-        console.info(
-          "[PayPal onboarding] message from",
-          ev.origin,
-          "·",
-          (serialized || "").slice(0, 500)
-        );
-      }
-      const d = ev.data;
-      if (d && typeof d === "object" && d.source === "paypal-onboarding-return") {
-        try {
-          (_a = popupRef.current) == null ? void 0 : _a.close();
-        } catch {
-        }
-        const fromReturn = extractAuth(d.params);
-        if (fromReturn.authCode && fromReturn.sharedId) {
-          completeOnboarding(fromReturn.authCode, fromReturn.sharedId);
-        } else if (!completedRef.current) {
-          startStatusPoll();
-        }
-        return;
-      }
-      if (!isPayPalOrigin(ev.origin)) return;
-      const { authCode, sharedId } = extractAuth(ev.data);
-      if (authCode && sharedId) {
-        completeOnboarding(authCode, sharedId);
-      }
-    };
-    window.addEventListener("message", onMessage);
-    return () => window.removeEventListener("message", onMessage);
-  }, [completeOnboarding, startStatusPoll]);
+  }, [env, envReady, fetchFreshLink, activatePayPal]);
   react.useLayoutEffect(() => {
     window.onboardingCallback = (authCode, sharedId) => {
-      completeOnboarding(authCode, sharedId);
+      void completeOnboarding(authCode, sharedId);
     };
     return () => {
       window.onboardingCallback = void 0;
     };
   }, [completeOnboarding]);
   react.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);
-      if (!popup) {
-        setPopupBlocked(true);
-        return;
-      }
-      setPopupBlocked(false);
-      startStatusPoll();
+    const onMessage = (event) => {
+      const data = event == null ? void 0 : event.data;
+      if (!data || data.source !== "paypal-onboarding-return") return;
+      const params = data.params || {};
+      const authCode = params.authCode || params.auth_code;
+      const sharedId = params.sharedId || params.shared_id;
+      const activeEnv = envRef.current;
+      void (async () => {
+        const connected = await refreshStatusAndMaybeConnect(activeEnv);
+        if (!connected && authCode && sharedId) {
+          await completeOnboarding(authCode, sharedId);
+        }
+      })();
     };
-    document.addEventListener("click", onCaptureClick, true);
-    return () => document.removeEventListener("click", onCaptureClick, true);
-  }, [openOnboardingPopup, startStatusPoll]);
-  react.useEffect(() => {
-    return () => stopPoll();
-  }, [stopPoll]);
+    window.addEventListener("message", onMessage);
+    return () => window.removeEventListener("message", onMessage);
+  }, [completeOnboarding, refreshStatusAndMaybeConnect]);
+  react.useEffect(() => stopStatusPolling, [stopStatusPolling]);
   react.useLayoutEffect(() => {
     const el = ppBtnMeasureRef.current;
     if (!el) return;
@@ -822,7 +686,12 @@ function PayPalConnectionPage() {
     };
   }, [connState, env, finalUrl]);
   const handleConnectClick = (e) => {
-    e.preventDefault();
+    if (connState !== "ready" || !finalUrl || onboardingInProgress) {
+      e.preventDefault();
+      return;
+    }
+    completedRef.current = false;
+    startStatusPolling();
   };
   const handleSaveManual = async () => {
     if (!canSaveManual || onboardingInProgress) return;
@@ -864,6 +733,7 @@ function PayPalConnectionPage() {
   const handleDisconnect = async () => {
     if (onboardingInProgress) return;
     if (!window.confirm("Disconnect PayPal for this environment?")) return;
+    stopStatusPolling();
     setOnboardingInProgress(true);
     setConnState("loading");
     setError(null);
@@ -884,7 +754,7 @@ function PayPalConnectionPage() {
       clearCachedUrl(env);
       completedRef.current = false;
       currentRunId.current = ++runIdRef.current;
-      await generateLinkAndReload(env, currentRunId.current);
+      await fetchFreshLink(env, currentRunId.current);
     } catch (e) {
       console.error(e);
       setConnState("error");
@@ -896,9 +766,9 @@ function PayPalConnectionPage() {
   const handleEnvChange = async (e) => {
     const next = e.target.value;
     if (next === env || onboardingInProgress) return;
+    stopStatusPolling();
     completedRef.current = false;
     clearCachedUrl();
-    setPopupBlocked(false);
     setConnState("loading");
     try {
       await fetch(ENVIRONMENT_ENDPOINT, {
@@ -932,7 +802,19 @@ function PayPalConnectionPage() {
         ) }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-sm font-medium pt-2", children: env === "sandbox" ? "Connect to PayPal (Sandbox)" : "Connect to PayPal" }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "max-w-xl", children: connState === "connected" ? /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-sm text-green-600 bg-green-50 p-3 rounded border border-green-200", children: "✅ Successfully connected to PayPal!" }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-sm text-green-600 bg-green-50 p-3 rounded border border-green-200", children: [
+            "✅ Successfully connected to PayPal!",
+            /* @__PURE__ */ jsxRuntime.jsx(
+              "a",
+              {
+                "data-paypal-button": "true",
+                "data-paypal-onboard-complete": "onboardingCallback",
+                href: "#",
+                style: { display: "none" },
+                children: "PayPal"
+              }
+            )
+          ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-3 rounded-md border border-ui-border-base bg-ui-bg-subtle p-3 text-xs text-ui-fg-subtle", children: [
             /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-medium text-ui-fg-base", children: "Connected PayPal account" }),
             /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-1", children: [
@@ -973,7 +855,6 @@ function PayPalConnectionPage() {
                   ppBtnMeasureRef.current = node;
                 },
                 id: "paypal-button",
-                target: POPUP_NAME,
                 "data-paypal-button": "true",
                 href: finalUrl || "#",
                 "data-paypal-onboard-complete": "onboardingCallback",
@@ -987,7 +868,6 @@ function PayPalConnectionPage() {
                 children: "Connect to PayPal"
               }
             ),
-            popupBlocked && /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx(
               "div",
               {
@@ -1143,6 +1023,12 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
+function PayPalGooglePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 function PayPalPayLaterMessagingPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
@@ -1368,6 +1254,10 @@ const routeModule = {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
+    {
+      Component: PayPalConnectionPage,
+      path: "/settings/paypal/connection"
+    },
     {
       Component: PayPalApplePayPage,
       path: "/settings/paypal/apple-pay"
@@ -1376,10 +1266,6 @@ const routeModule = {
       Component: PayPalGooglePayPage,
       path: "/settings/paypal/google-pay"
     },
-    {
-      Component: PayPalConnectionPage,
-      path: "/settings/paypal/connection"
-    },
     {
       Component: PayPalPayLaterMessagingPage,
       path: "/settings/paypal/pay-later-messaging"