@economist/web-apple-pay 0.1.3-beta.6 → 0.1.3-beta.8

package/dist/index.js

@@ -78,6 +78,62 @@ function ensureApplePayLogoSymbol() {
 // src/templates/apple-pay-modal.template.html
 var apple_pay_modal_template_default = '<style>\n  .apm-overlay {\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    z-index: 97;\n    background: rgba(13, 13, 13, 0.7);\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    padding: var(--wall-gutter, 2rem);\n    box-sizing: border-box;\n  }\n\n  .apm {\n    position: relative;\n    background: #fff;\n    border-radius: 0.5rem 0.5rem 0 0;\n    border: 0.0625rem solid #d9d9d9;\n    padding: var(--mb-spacing-lg, 1.5rem);\n    width: 25rem;\n    max-width: 25rem;\n    box-sizing: border-box;\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    box-shadow: 0 0.25rem 1rem 0 rgba(13, 13, 13, 0.15);\n  }\n\n  .apm__close {\n    position: absolute;\n    top: 1.5rem;\n    right: 1.3125rem;\n    background: none;\n    border: none;\n    cursor: pointer;\n    padding: 0;\n    display: flex;\n    align-items: center;\n    justify-content: center;\n  }\n\n  .apm__close:focus {\n    outline: solid 0.125rem var(--focus-border-color, #121212);\n    border-radius: 0.25rem;\n  }\n\n  .apm__offer-name {\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: var(--mb-typestyle-title-3-size, 1.25rem);\n    font-weight: 500;\n    color: var(--mb-colour-greyscale-london-5, #0d0d0d);\n    line-height: var(--mb-typestyle-title-3-leading, 1.75rem);\n    font-style: normal;\n    margin: 0 1.5rem 0.5rem 0;\n  }\n\n  .apm__due-today {\n    color: #1a1a1a;\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: var(--mb-typestyle-label-2-size, 0.9375rem);\n    font-style: normal;\n    font-weight: 400;\n    line-height: var(--mb-typestyle-label-2-leading, 1.25rem);\n    margin: 0 0 0.75rem 0;\n  }\n\n  .apm__rule {\n    border: none;\n    border-top: 0.0625rem solid #d9d9d9;\n    margin: 0 0 1rem 0;\n  }\n\n  .apm__terms {\n    color: #1a1a1a;\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: var(--mb-typestyle-label-2-size, 0.9375rem);\n    font-style: normal;\n    font-weight: 400;\n    line-height: var(--mb-typestyle-label-2-leading, 1.25rem);\n    margin: 0 0 1rem 0;\n  }\n\n  .apm__terms-bullets {\n    list-style: disc outside;\n    padding-left: 1.25rem;\n    margin: 0 0 0.75rem 0;\n  }\n\n  .apm__terms-bullets li {\n    margin-bottom: 0.375rem;\n  }\n\n  .apm__terms-legal {\n    margin: 0;\n  }\n\n  .apm__passive-terms {\n    font-family: var(--wall-type-system-sans);\n    font-size: 0.9375rem;\n    color: #0d0d0d;\n    line-height: 1.4;\n    margin: 0 0 8px 0;\n  }\n\n  .apm__passive-terms a {\n    color: #1a1a1a;\n    font-weight: 700;\n    text-decoration: underline;\n  }\n\n  .apm__checkbox-label {\n    display: flex;\n    align-items: flex-start;\n    gap: var(--mb-spacing-sm, 0.5rem);\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: var(--mb-typestyle-label-2-size, 0.9375rem);\n    color: var(--mb-colour-greyscale-london-20, #1a1a1a);\n    line-height: var(--mb-typestyle-label-2-leading, 1.25rem);\n    cursor: pointer;\n    margin: 0 0 1.5rem 0;\n  }\n\n  .apm__checkbox-label--error {\n    margin-bottom: 0.25rem;\n  }\n\n  .apm__checkbox-wrapper {\n    position: relative;\n    flex-shrink: 0;\n    width: 1.25rem;\n    height: 1.25rem;\n    margin-top: 0.0625rem;\n  }\n\n  .apm__checkbox-input {\n    position: absolute;\n    opacity: 0;\n    width: 100%;\n    height: 100%;\n    cursor: pointer;\n    margin: 0;\n    z-index: 1;\n  }\n\n  .apm__checkbox-custom {\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: 1.25rem;\n    height: 1.25rem;\n    pointer-events: none;\n  }\n\n  .apm__checkbox-custom svg {\n    display: none;\n    width: 1.25rem;\n    height: 1.25rem;\n  }\n\n  .apm__checkbox-input:not(:checked) ~ .apm__checkbox-custom .svg-unchecked {\n    display: block;\n  }\n\n  .apm__checkbox-input:checked ~ .apm__checkbox-custom .svg-checked {\n    display: block;\n  }\n\n  .apm__checkbox-label--error\n    .apm__checkbox-input:not(:checked)\n    ~ .apm__checkbox-custom\n    .svg-unchecked {\n    display: none;\n  }\n\n  .apm__checkbox-label--error\n    .apm__checkbox-input:not(:checked)\n    ~ .apm__checkbox-custom\n    .svg-error {\n    display: block;\n  }\n\n  .apm__checkbox-input:focus-visible ~ .apm__checkbox-custom {\n    outline: solid 0.125rem #c91d42;\n    outline-offset: 0.125rem;\n    border-radius: 0.25rem;\n  }\n\n  .apm__checkbox-label a {\n    color: #1a1a1a;\n    font-weight: 700;\n    text-decoration: underline;\n  }\n\n  .apm__error {\n    display: none;\n    align-items: center;\n    gap: 0.75rem;\n    color: var(--mb-colour-greyscale-london-5, #0d0d0d);\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: 1.0625rem;\n    font-style: normal;\n    font-weight: 500;\n    line-height: 1.5rem;\n    margin-bottom: 1rem;\n  }\n\n  .apm__error--visible {\n    display: flex;\n  }\n\n  .apm__cta {\n    display: flex;\n    width: 100%;\n    height: 2.75rem;\n    padding: 0.375rem 1rem;\n    justify-content: center;\n    align-items: center;\n    gap: 0.375rem;\n    border-radius: 0.25rem;\n    background: #000;\n    border: none;\n    cursor: pointer;\n    color: #fff;\n    text-align: center;\n    font-family: var(\n      --mb-typeface-sans,\n      var(--wall-type-system-sans, system-ui, sans-serif)\n    );\n    font-size: 1.25rem;\n    font-style: normal;\n    font-weight: 500;\n    line-height: normal;\n  }\n\n  .apm__cta svg {\n    flex-shrink: 0;\n    display: block;\n  }\n\n  @media (min-width: 22.5rem) and (max-width: 37.5rem) {\n    .apm {\n      width: 24.375rem;\n      max-width: 24.375rem;\n    }\n  }\n\n  @media (min-width: 37.5625rem) {\n    .apm {\n      border-radius: 0.5rem;\n    }\n  }\n\n  @media (max-width: 22.4375rem) {\n    .apm {\n      width: 20rem;\n      max-width: 20rem;\n    }\n  }\n\n  @media (max-width: 26.1875rem) {\n    .apm__cta {\n      font-size: 1.125rem;\n    }\n  }\n</style>\n\n<div class="apm-overlay" id="apple-pay-modal-overlay">\n  <div\n    class="apm"\n    role="dialog"\n    aria-modal="true"\n    aria-labelledby="apple-pay-modal-offer-name"\n    id="apple-pay-modal"\n    tabindex="-1"\n  >\n    <button class="apm__close" id="apple-pay-modal-close" aria-label="Close">\n      <svg\n        aria-hidden="true"\n        xmlns="http://www.w3.org/2000/svg"\n        width="24"\n        height="24"\n        viewBox="0 0 24 24"\n        fill="none"\n      >\n        <g clip-path="url(#clip0_15712_93054)">\n          <rect width="24" height="24" fill="white" fill-opacity="0.01" />\n          <path\n            fill-rule="evenodd"\n            clip-rule="evenodd"\n            d="M0 0H24V24H0V0Z"\n            fill="white"\n            fill-opacity="0.01"\n          />\n          <path\n            fill-rule="evenodd"\n            clip-rule="evenodd"\n            d="M18.75 6.60964L17.3904 5.25L12 10.6404L6.60964 5.25L5.25 6.60964L10.6404 12L5.25 17.3904L6.60964 18.75L12 13.3596L17.3904 18.75L18.75 17.3904L13.3596 12L18.75 6.60964Z"\n            fill="#333333"\n          />\n        </g>\n        <defs>\n          <clipPath id="clip0_15712_93054">\n            <rect width="24" height="24" fill="white" />\n          </clipPath>\n        </defs>\n      </svg>\n    </button>\n    <p class="apm__offer-name" id="apple-pay-modal-offer-name"></p>\n    <p class="apm__due-today" id="apple-pay-modal-due-today"></p>\n    <hr class="apm__rule" />\n    <div class="apm__terms" id="apple-pay-modal-terms"></div>\n    <p class="apm__passive-terms" id="apple-pay-modal-passive-terms"></p>\n    <label\n      class="apm__checkbox-label"\n      id="apple-pay-modal-checkbox-label"\n      for="apple-pay-modal-checkbox"\n    >\n      <div class="apm__checkbox-wrapper">\n        <input\n          class="apm__checkbox-input"\n          type="checkbox"\n          id="apple-pay-modal-checkbox"\n        />\n        <span class="apm__checkbox-custom">\n          <svg\n            aria-hidden="true"\n            class="svg-unchecked"\n            width="24"\n            height="24"\n            viewBox="0 0 24 24"\n            fill="none"\n            xmlns="http://www.w3.org/2000/svg"\n          >\n            <path\n              d="M6 2.5H18C19.933 2.5 21.5 4.067 21.5 6V18C21.5 19.933 19.933 21.5 18 21.5H6C4.067 21.5 2.5 19.933 2.5 18V6C2.5 4.067 4.067 2.5 6 2.5Z"\n              fill="white"\n              stroke="#595959"\n            />\n          </svg>\n          <svg\n            aria-hidden="true"\n            class="svg-checked"\n            width="24"\n            height="24"\n            viewBox="0 0 24 24"\n            fill="none"\n            xmlns="http://www.w3.org/2000/svg"\n          >\n            <g clip-path="url(#clip0_20014_9555)">\n              <path\n                d="M2 6C2 3.79086 3.79086 2 6 2H18C20.2091 2 22 3.79086 22 6V18C22 20.2091 20.2091 22 18 22H6C3.79086 22 2 20.2091 2 18V6Z"\n                fill="#333333"\n              />\n              <path\n                d="M10.2857 17L6 12.6814L7.20857 11.4635L10.2857 14.5557L16.7914 8L18 9.22649L10.2857 17Z"\n                fill="white"\n              />\n            </g>\n            <defs>\n              <clipPath id="clip0_20014_9555">\n                <path\n                  d="M2 6C2 3.79086 3.79086 2 6 2H18C20.2091 2 22 3.79086 22 6V18C22 20.2091 20.2091 22 18 22H6C3.79086 22 2 20.2091 2 18V6Z"\n                  fill="white"\n                />\n              </clipPath>\n            </defs>\n          </svg>\n          <svg\n            aria-hidden="true"\n            class="svg-error"\n            width="24"\n            height="24"\n            viewBox="0 0 24 24"\n            fill="none"\n            xmlns="http://www.w3.org/2000/svg"\n          >\n            <path\n              d="M6 2.5H18C19.933 2.5 21.5 4.067 21.5 6V18C21.5 19.933 19.933 21.5 18 21.5H6C4.067 21.5 2.5 19.933 2.5 18V6C2.5 4.067 4.067 2.5 6 2.5Z"\n              fill="white"\n              stroke="#C91D42"\n              stroke-width="2"\n            />\n          </svg>\n        </span>\n      </div>\n      <span id="apple-pay-modal-checkbox-text"></span>\n    </label>\n    <div class="apm__error" id="apple-pay-modal-error" role="alert">\n      <svg\n        aria-hidden="true"\n        width="20"\n        height="20"\n        viewBox="0 0 20 20"\n        fill="none"\n        xmlns="http://www.w3.org/2000/svg"\n      >\n        <path\n          fill-rule="evenodd"\n          clip-rule="evenodd"\n          d="M10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2ZM0 10C0 4.47715 4.47715 0 10 0C15.5228 0 20 4.47715 20 10C20 15.5228 15.5228 20 10 20C4.47715 20 0 15.5228 0 10ZM11 13C11 13.5523 10.5523 14 10 14C9.44772 14 9 13.5523 9 13C9 12.4477 9.44772 12 10 12C10.5523 12 11 12.4477 11 13ZM10 6C10.5523 6 11 6.44772 11 7V10C11 10.5523 10.5523 11 10 11C9.44772 11 9 10.5523 9 10V7C9 6.44772 9.44772 6 10 6Z"\n          fill="#C91D42"\n        />\n      </svg>\n      Please accept the terms to continue\n    </div>\n    <button class="apm__cta" id="apple-pay-modal-cta">\n      Continue with\n      <svg width="51" height="22" aria-label="Apple Pay" role="img">\n        <use href="#apple-pay-logo" />\n      </svg>\n    </button>\n  </div>\n</div>\n\n';
 
+// src/clients/payment-checkout/config.ts
+var runtimeConfig = null;
+var configureApplePay = (config) => {
+  runtimeConfig = {
+    ...config
+  };
+};
+var getApplePayConfig = () => runtimeConfig;
+
+// src/utils/recaptcha.ts
+var loadRecaptchaScript = (siteKey) => {
+  return new Promise((resolve, reject) => {
+    if (typeof grecaptcha !== "undefined") return resolve();
+    const existingScript = document.querySelector(
+      'script[src*="recaptcha/api.js"]'
+    );
+    if (existingScript) {
+      existingScript.addEventListener("load", () => resolve());
+      existingScript.addEventListener(
+        "error",
+        () => reject(new Error("Failed to load existing reCAPTCHA script"))
+      );
+      return;
+    }
+    const script = document.createElement("script");
+    script.src = `https://www.google.com/recaptcha/api.js?render=${siteKey}`;
+    script.async = true;
+    script.defer = true;
+    script.onload = () => resolve();
+    script.onerror = () => reject(new Error("Failed to load reCAPTCHA script"));
+    document.head.appendChild(script);
+  });
+};
+var getRecaptchaToken = async (action) => {
+  const siteKey = getApplePayConfig()?.recaptchaSiteKey;
+  if (!siteKey) {
+    throw new Error(
+      "[web-apple-pay] Missing recaptchaSiteKey. Call configureApplePay({ recaptchaSiteKey, ... }) before initiating Apple Pay."
+    );
+  }
+  await loadRecaptchaScript(siteKey);
+  return new Promise((resolve, reject) => {
+    grecaptcha.ready(() => {
+      grecaptcha.execute(siteKey, { action }).then(resolve).catch(reject);
+    });
+  });
+};
+var getPurchaseRecaptchaTokens = async () => {
+  const [checkEligibility, newBasket, registerUser] = await Promise.all([
+    getRecaptchaToken("checkEligibility"),
+    getRecaptchaToken("newBasket"),
+    getRecaptchaToken("registerUser")
+  ]);
+  return { checkEligibility, newBasket, registerUser };
+};
+
 // src/apple-pay-modal.ts
 function getRenewalDateText(unit, duration) {
   const now = /* @__PURE__ */ new Date();
@@ -297,6 +353,8 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
   #country = "";
   #triggerElement = null;
   #keyHandler = null;
+  #recaptchaTokens = null;
+  #recaptchaTokensPromise = null;
   set offer(value) {
     this.#offer = value;
   }
@@ -317,7 +375,6 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     const offer = this.#offer;
     const country = this.#country;
     if (!offer) {
-      console.error("ApplePayModal: Missing or invalid offer data");
       this.remove();
       return;
     }
@@ -392,6 +449,23 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
         }
       });
     }
+    if (this.#recaptchaTokensPromise) {
+      if (cta) {
+        cta.setAttribute("disabled", "");
+        cta.setAttribute("aria-disabled", "true");
+        cta.setAttribute("aria-busy", "true");
+      }
+      this.#recaptchaTokensPromise.then((tokens) => {
+        this.#recaptchaTokens = tokens;
+        if (cta) {
+          cta.removeAttribute("disabled");
+          cta.removeAttribute("aria-disabled");
+          cta.removeAttribute("aria-busy");
+        }
+      }).catch(() => {
+        console.error("[web-apple-pay] apple-pay-modal: failed to pre-fetch reCAPTCHA tokens; CTA remains disabled");
+      });
+    }
     cta?.addEventListener("click", () => {
       if (isUS && checkbox && !checkbox.checked) {
         errorElement?.classList.add("apm__error--visible");
@@ -402,7 +476,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
         new CustomEvent("apple-pay-confirmed", {
           bubbles: true,
           composed: true,
-          detail: { skuId: offer.sku_id, country }
+          detail: { skuId: offer.sku_id, country, recaptchaTokens: this.#recaptchaTokens }
         })
       );
       this.close();
@@ -413,6 +487,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
+    this.#recaptchaTokensPromise = getPurchaseRecaptchaTokens();
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -439,16 +514,91 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
 };
 
 // src/templates/apple-pay-button.template.html
-var apple_pay_button_template_default = '<style>\n  /* Use CSS variables for layout so parent walls can easily override placement and sizing */\n  teg-apple-pay-button {\n    display: block;\n    margin: var(--apple-pay-margin, 0);\n    width: 100%;\n    height: 100%;\n  }\n\n  teg-apple-pay-button .apple-pay-container {\n    display: flex;\n    flex-direction: column;\n    align-items: stretch;\n    width: 100%;\n    height: 100%;\n  }\n\n  teg-apple-pay-button .apple-pay-btn {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    gap: 0.375rem;\n    width: 100%;\n    min-width: 0;\n    height: 100%;\n    min-height: var(--apple-pay-height, 2.75rem);\n    background-color: #000;\n    color: #fff;\n    border: none;\n    border-radius: var(--apple-pay-border-radius, 1.375rem);\n    cursor: pointer;\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: 1.0625rem;\n    font-weight: 500;\n  }\n\n  teg-apple-pay-button .apple-pay-btn svg {\n    flex-shrink: 0;\n    display: block;\n  }\n</style>\n\n<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">\n  <button\n    class="apple-pay-btn"\n    type="button"\n    aria-label="Pay with Apple Pay"\n    data-analytics="paywall:apple-pay-checkout"\n  >\n    <svg width="51" height="22" aria-label="Apple Pay" role="img">\n      <use href="#apple-pay-logo" />\n    </svg>\n  </button>\n</div>\n';
+var apple_pay_button_template_default = `<style>
+  /* Use CSS variables for layout so parent walls can easily override placement and sizing */
+  teg-apple-pay-button {
+    display: block;
+    margin: var(--apple-pay-margin, 0);
+    width: 100%;
+    height: 100%;
+  }
 
-// src/clients/payment-checkout/config.ts
-var runtimeConfig = null;
-var configureApplePay = (config) => {
-  runtimeConfig = {
-    ...config
-  };
-};
-var getApplePayConfig = () => runtimeConfig;
+  teg-apple-pay-button .apple-pay-container {
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    width: 100%;
+    height: 100%;
+  }
+
+  teg-apple-pay-button .apple-pay-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.375rem;
+    width: 100%;
+    min-width: 0;
+    height: 100%;
+    min-height: var(--apple-pay-height, 2.75rem);
+    background-color: #000;
+    color: #fff;
+    border: none;
+    border-radius: var(--apple-pay-border-radius, 1.375rem);
+    cursor: pointer;
+    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));
+    font-size: 1.0625rem;
+    font-weight: 500;
+  }
+
+  teg-apple-pay-button .apple-pay-btn svg {
+    flex-shrink: 0;
+    display: block;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading {
+    position: relative;
+    cursor: default;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading svg {
+    visibility: hidden;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading::after {
+    content: '';
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -0.625rem;
+    margin-top: -0.625rem;
+    width: 1.25rem;
+    height: 1.25rem;
+    border: 2px solid rgba(255, 255, 255, 0.2);
+    border-top-color: #fff;
+    border-radius: 50%;
+    animation: wap-button-spinner 0.8s linear infinite;
+  }
+
+  @keyframes wap-button-spinner {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+</style>
+
+<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">
+  <button
+    class="apple-pay-btn"
+    type="button"
+    aria-label="Pay with Apple Pay"
+    data-analytics="paywall:apple-pay-checkout"
+  >
+    <svg width="51" height="22" aria-label="Apple Pay" role="img">
+      <use href="#apple-pay-logo" />
+    </svg>
+  </button>
+</div>
+`;
 
 // src/clients/payment-checkout/detects.ts
 var isAppleDeviceOrSafari = () => {
@@ -459,20 +609,25 @@ var isAppleDeviceOrSafari = () => {
 var bypassApplePayChecks = () => new URLSearchParams(window.location.search).get("BYPASS_APPLE_PAY_CHECKS") !== null && getApplePayConfig()?.debugBypassEnabled === true;
 var isApplePayAvailable = async () => {
   if (bypassApplePayChecks()) {
+    console.debug("[web-apple-pay] isApplePayAvailable: bypass enabled, returning true");
     return true;
   }
   if (!isAppleDeviceOrSafari()) {
+    console.debug("[web-apple-pay] isApplePayAvailable: not an Apple device or Safari", { userAgent: navigator.userAgent });
     return false;
   }
   const applePaySession = window.ApplePaySession;
   if (!applePaySession) {
+    console.debug("[web-apple-pay] isApplePayAvailable: ApplePaySession not present on window");
     return false;
   }
   try {
     if (typeof applePaySession.canMakePayments !== "function") {
+      console.debug("[web-apple-pay] isApplePayAvailable: canMakePayments is not a function");
       return false;
     }
     if (!applePaySession.canMakePayments()) {
+      console.debug("[web-apple-pay] isApplePayAvailable: canMakePayments() returned false");
       return false;
     }
     const merchantId = getApplePayConfig()?.merchantId;
@@ -482,7 +637,9 @@ var isApplePayAvailable = async () => {
       );
       return false;
     }
-    return await applePaySession.canMakePaymentsWithActiveCard(merchantId);
+    const hasActiveCard = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
+    console.debug("[web-apple-pay] isApplePayAvailable: canMakePaymentsWithActiveCard =", hasActiveCard, { merchantId });
+    return hasActiveCard;
   } catch (error) {
     console.error("Error checking Apple Pay active card status:", error);
     return false;
@@ -612,53 +769,6 @@ var redirectToCheckoutFallback = (params) => {
   return url.pathname + url.search;
 };
 
-// src/utils/recaptcha.ts
-var loadRecaptchaScript = (siteKey) => {
-  return new Promise((resolve, reject) => {
-    if (typeof grecaptcha !== "undefined") return resolve();
-    const existingScript = document.querySelector(
-      'script[src*="recaptcha/api.js"]'
-    );
-    if (existingScript) {
-      existingScript.addEventListener("load", () => resolve());
-      existingScript.addEventListener(
-        "error",
-        () => reject(new Error("Failed to load existing reCAPTCHA script"))
-      );
-      return;
-    }
-    const script = document.createElement("script");
-    script.src = `https://www.google.com/recaptcha/api.js?render=${siteKey}`;
-    script.async = true;
-    script.defer = true;
-    script.onload = () => resolve();
-    script.onerror = () => reject(new Error("Failed to load reCAPTCHA script"));
-    document.head.appendChild(script);
-  });
-};
-var getRecaptchaToken = async (action) => {
-  const siteKey = getApplePayConfig()?.recaptchaSiteKey;
-  if (!siteKey) {
-    throw new Error(
-      "[web-apple-pay] Missing recaptchaSiteKey. Call configureApplePay({ recaptchaSiteKey, ... }) before initiating Apple Pay."
-    );
-  }
-  await loadRecaptchaScript(siteKey);
-  return new Promise((resolve, reject) => {
-    grecaptcha.ready(() => {
-      grecaptcha.execute(siteKey, { action }).then(resolve).catch(reject);
-    });
-  });
-};
-var getPurchaseRecaptchaTokens = async () => {
-  const [checkEligibility, newBasket, registerUser] = await Promise.all([
-    getRecaptchaToken("checkEligibility"),
-    getRecaptchaToken("newBasket"),
-    getRecaptchaToken("registerUser")
-  ]);
-  return { checkEligibility, newBasket, registerUser };
-};
-
 // src/utils/expressCheckoutTracking.ts
 var EXPRESS_CHECKOUT_EVENTS = {
   /** Wallet button displayed */
@@ -744,7 +854,52 @@ var MSG_EMAIL_COLLISION = "This email address is already linked to an account. P
 var MSG_CONTACT_VALIDATION_INTERNAL = "Could not validate Apple Pay contact";
 
 // src/clients/payment-checkout/apple-session.ts
+function redirectToFallbackCheckout(config) {
+  trackFallbackCheckout(config.skuId);
+  window.location.href = redirectToCheckoutFallback({
+    skuId: config.skuId,
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
+  });
+}
+async function handleMerchantValidation(event, session, config) {
+  console.debug("[web-apple-pay] onvalidatemerchant: validating", { validationURL: event.validationURL });
+  try {
+    const validationHost = new URL(event.validationURL).host;
+    if (!validationHost.endsWith("apple.com")) {
+      console.debug("[web-apple-pay] onvalidatemerchant: invalid host, aborting", { validationHost });
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    const recaptchaToken = await getRecaptchaToken("verifyMerchant");
+    const response = await validateAppleMerchant({
+      validationURL: event.validationURL,
+      recaptchaToken
+    });
+    if (!response?.merchantSession) {
+      console.debug("[web-apple-pay] onvalidatemerchant: no merchantSession in response, aborting");
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    console.debug("[web-apple-pay] onvalidatemerchant: merchant validated successfully");
+    session.completeMerchantValidation(response.merchantSession);
+  } catch (err) {
+    console.error("[web-apple-pay] onvalidatemerchant: error during validation", err);
+    session.abort();
+    redirectToFallbackCheckout(config);
+  }
+}
 function startApplePaySession(config) {
+  console.debug("[web-apple-pay] startApplePaySession: starting session", {
+    skuId: config.skuId,
+    countryCode: config.countryCode,
+    currencyCode: config.currencyCode,
+    supportedNetworks: config.supportedNetworks,
+    totalAmount: config.totalAmount,
+    userLoggedIn: config.userLoggedIn
+  });
   const paymentRequest = {
     countryCode: config.countryCode,
     currencyCode: config.currencyCode,
@@ -758,55 +913,27 @@ function startApplePaySession(config) {
     // Only request email from Apple Pay sheet if user is NOT logged in
     ...!config.userLoggedIn && { requiredShippingContactFields: ["email"] }
   };
-  const session = new ApplePaySession(3, paymentRequest);
-  session.onvalidatemerchant = async (event) => {
-    try {
-      const validationHost = new URL(event.validationURL).host;
-      if (!validationHost.endsWith("apple.com")) {
-        trackFallbackCheckout(config.skuId);
-        session.abort();
-        window.location.href = redirectToCheckoutFallback({
-          skuId: config.skuId,
-          returnUrl: config.returnUrl,
-          inlineError: MSG_PAYMENT_GENERIC_ERROR
-        });
-        return;
-      }
-      const recaptchaToken = await getRecaptchaToken("verifyMerchant");
-      const response = await validateAppleMerchant({
-        validationURL: event.validationURL,
-        recaptchaToken
-      });
-      if (!response?.merchantSession) {
-        trackFallbackCheckout(config.skuId);
-        session.abort();
-        window.location.href = redirectToCheckoutFallback({
-          skuId: config.skuId,
-          returnUrl: config.returnUrl,
-          inlineError: MSG_PAYMENT_GENERIC_ERROR
-        });
-        return;
-      }
-      session.completeMerchantValidation(response.merchantSession);
-    } catch {
-      trackFallbackCheckout(config.skuId);
-      session.abort();
-      window.location.href = redirectToCheckoutFallback({
-        skuId: config.skuId,
-        returnUrl: config.returnUrl,
-        inlineError: MSG_PAYMENT_GENERIC_ERROR
-      });
-    }
-  };
-  session.onpaymentauthorized = (event) => {
-    trackWalletPaymentAuthorised(config.skuId);
-    config.onPaymentAuthorized(event, session);
-  };
-  session.oncancel = () => {
-    config.onCancel?.();
-  };
-  trackWalletPaymentSheetOpen(config.skuId);
-  session.begin();
+  try {
+    const session = new ApplePaySession(3, paymentRequest);
+    session.onvalidatemerchant = async (event) => {
+      await handleMerchantValidation(event, session, config);
+    };
+    session.onpaymentauthorized = (event) => {
+      console.debug("[web-apple-pay] onpaymentauthorized: payment authorised");
+      trackWalletPaymentAuthorised(config.skuId);
+      config.onPaymentAuthorized(event, session);
+    };
+    session.oncancel = () => {
+      console.debug("[web-apple-pay] oncancel: user cancelled Apple Pay sheet");
+      config.onCancel?.();
+    };
+    console.debug("[web-apple-pay] startApplePaySession: session.begin()");
+    trackWalletPaymentSheetOpen(config.skuId);
+    session.begin();
+  } catch (err) {
+    console.error("[web-apple-pay] startApplePaySession: failed to create session", err);
+    redirectToFallbackCheckout(config);
+  }
 }
 
 // src/clients/payment-checkout/contact-validation.ts
@@ -1309,11 +1436,15 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    * Creates and configures an ApplePayButton if the feature flag is present.
    */
   static createIfEnabled(offer, country, entryPoint) {
-    if (!offer) return null;
-    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant))
+    if (!offer) {
+      return null;
+    }
+    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant)) {
       return null;
-    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT))
+    }
+    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT)) {
       return null;
+    }
     _ApplePayButton.define();
     const button = document.createElement(_ApplePayButton.tag);
     button.offer = offer;
@@ -1340,6 +1471,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #returnUrl = "";
   #supportedBillingCountries = [];
   #entryPoint = "";
+  #applePayConfirmedHandler = null;
   // ─── Public API ─────────────────────────────────────────────────────────────
   get offer() {
     return this.#offer;
@@ -1404,20 +1536,28 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     this.#paymentOptions = null;
     this.#returnUrl = "";
     this.#supportedBillingCountries = [];
+    if (this.#applePayConfirmedHandler) {
+      document.removeEventListener("apple-pay-confirmed", this.#applePayConfirmedHandler);
+      this.#applePayConfirmedHandler = null;
+    }
     this.querySelector(SEL_CONTAINER)?.remove();
   }
   // ─── Render pipeline ────────────────────────────────────────────────────────
   async #run() {
+    console.debug("[web-apple-pay] #run: start");
     try {
       if (await this.#checkAvailability()) return;
-      if (await this.#checkSession()) return;
       if (this.#checkOffer()) return;
+      this.#renderTemplate();
+      if (await this.#checkSession()) return;
       this.#captureReturnUrl();
       this.#computeBillingCountries();
       if (await this.#fetchAndCacheOptions()) return;
-      this.#renderTemplate();
-    } catch {
+      this.#finishLoading();
+    } catch (err) {
+      console.error("[web-apple-pay] #run: unexpected error, hiding button", err);
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
     } finally {
       this.#rendering = false;
     }
@@ -1426,9 +1566,11 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   async #checkAvailability() {
     const available = await isApplePayAvailable();
     if (!available) {
+      console.debug("[web-apple-pay] #checkAvailability: not available on this device/browser");
       this.style.display = "none";
       return true;
     }
+    console.debug("[web-apple-pay] #checkAvailability: ok");
     return false;
   }
   /**
@@ -1437,18 +1579,24 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    */
   async #checkSession() {
     this.#sessionData = await this.#fetchSession();
+    console.debug("[web-apple-pay] #checkSession: session data", { loggedIn: this.#sessionData?.loggedIn, userType: this.#sessionData?.userType });
     if (this.#sessionData?.loggedIn && (this.#sessionData.userType === "active-subscription" || this.#sessionData.userType === "b2b-user")) {
+      console.debug("[web-apple-pay] #checkSession: ineligible user, hiding button", { userType: this.#sessionData.userType });
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
+    console.debug("[web-apple-pay] #checkSession: ok");
     return false;
   }
   /** Returns `true` (hide) when no offer has been set before mount. */
   #checkOffer() {
     if (!this.#offer) {
+      console.debug("[web-apple-pay] #checkOffer: no offer set, hiding button");
       this.style.display = "none";
       return true;
     }
+    console.debug("[web-apple-pay] #checkOffer: ok", { skuId: this.#offer.sku_id });
     return false;
   }
   /** Captures the current page URL once at mount for reuse across the session lifetime. */
@@ -1472,32 +1620,51 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    */
   async #fetchAndCacheOptions() {
     this.#paymentOptions = await this.#fetchPaymentOptions();
-    if (!this.#paymentOptions?.apple_pay) {
+    console.debug("[web-apple-pay] #fetchAndCacheOptions: payment options", this.#paymentOptions);
+    if (!this.#paymentOptions?.options?.apple_pay) {
+      console.debug("[web-apple-pay] #fetchAndCacheOptions: apple_pay absent in options, hiding button");
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
+    console.debug("[web-apple-pay] #fetchAndCacheOptions: ok", this.#paymentOptions.options.apple_pay);
     return false;
   }
   /** Injects the button template and wires click and confirm event listeners. */
   #renderTemplate() {
+    console.debug("[web-apple-pay] #renderTemplate: injecting button template");
     this.style.removeProperty("display");
     ensureApplePayLogoSymbol();
     const template = document.createElement("template");
     template.innerHTML = apple_pay_button_template_default;
     this.appendChild(template.content.cloneNode(true));
-    this.#updateDisabledState();
-    trackExpressWalletImpression(this.#offer.sku_id, {
-      entryPoint: this.#entryPoint,
-      country: this.#country
-    });
     const button = this.querySelector(SEL_BUTTON);
+    button.classList.add("wap-loading");
+    button.setAttribute("disabled", "");
+    button.setAttribute("aria-disabled", "true");
+    button.setAttribute("aria-busy", "true");
     button.addEventListener("click", () => {
+      if (button.classList.contains("wap-loading")) return;
       this.#openModal();
     });
-    this.addEventListener("apple-pay-confirmed", (event) => {
-      const { skuId, country } = event.detail;
-      this.#initiateApplePay(skuId, country);
-    });
+    this.#applePayConfirmedHandler = (event) => {
+      const { skuId, country, recaptchaTokens } = event.detail;
+      this.#initiateApplePay(skuId, country, recaptchaTokens);
+      this.#applePayConfirmedHandler = null;
+    };
+    document.addEventListener("apple-pay-confirmed", this.#applePayConfirmedHandler, { once: true });
+  }
+  #finishLoading() {
+    console.debug("[web-apple-pay] #finishLoading: all checks passed, enabling button");
+    const button = this.querySelector(SEL_BUTTON);
+    if (button) {
+      button.classList.remove("wap-loading");
+      this.#updateDisabledState();
+      trackExpressWalletImpression(this.#offer.sku_id, {
+        entryPoint: this.#entryPoint,
+        country: this.#country
+      });
+    }
   }
   // ─── Private helpers ────────────────────────────────────────────────────────
   #updateDisabledState() {
@@ -1506,13 +1673,19 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     if (this.#offer) {
       button.removeAttribute("disabled");
       button.removeAttribute("aria-disabled");
+      button.removeAttribute("aria-busy");
       return;
     }
     button.setAttribute("disabled", "");
     button.setAttribute("aria-disabled", "true");
   }
   #openModal() {
-    if (!this.#offer || document.querySelector(ApplePayModal.tag)) return;
+    if (!this.#offer) {
+      return;
+    }
+    if (document.querySelector(ApplePayModal.tag)) {
+      return;
+    }
     trackExpressWalletClick(this.#offer.sku_id);
     ApplePayModal.define();
     const modal = document.createElement(ApplePayModal.tag);
@@ -1548,7 +1721,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     return {
       countryCode: country,
       currencyCode: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-      supportedNetworks: paymentOptions.apple_pay.settings.supported_networks,
+      supportedNetworks: paymentOptions.options.apple_pay.settings.supported_networks,
       totalAmount,
       totalLabel: TOTAL_LABEL,
       skuId,
@@ -1565,11 +1738,10 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       })
     };
   }
-  async #initiateApplePay(skuId, country) {
+  #initiateApplePay(skuId, country, recaptchaTokens) {
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
-      const recaptchaTokens = await getPurchaseRecaptchaTokens();
       startApplePaySession(
         this.#buildSessionParams(
           skuId,