@economist/web-apple-pay 0.1.3-beta.0 → 0.1.3-beta.1

package/dist/index.js

@@ -307,9 +307,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     this.#country = value;
   }
   connectedCallback() {
-    console.log("[web-apple-pay] ApplePayModal connectedCallback");
     if (this.querySelector(".apm-overlay")) {
-      console.log("[web-apple-pay] ApplePayModal connectedCallback: already rendered, skipping");
       return;
     }
     ensureApplePayLogoSymbol();
@@ -323,7 +321,6 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
       this.remove();
       return;
     }
-    console.log("[web-apple-pay] ApplePayModal: rendering for offer", { skuId: offer.sku_id, country });
     const offerNameElement = this.querySelector(
       "#apple-pay-modal-offer-name"
     );
@@ -396,14 +393,11 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
       });
     }
     cta?.addEventListener("click", () => {
-      console.log("[web-apple-pay] ApplePayModal: CTA clicked", { skuId: offer.sku_id, country, isUS });
       if (isUS && checkbox && !checkbox.checked) {
-        console.log("[web-apple-pay] ApplePayModal: T&C checkbox not accepted, showing error");
         errorElement?.classList.add("apm__error--visible");
         checkboxLabel?.classList.add("apm__checkbox-label--error");
         return;
       }
-      console.log("[web-apple-pay] ApplePayModal: dispatching apple-pay-confirmed", { skuId: offer.sku_id, country });
       this.dispatchEvent(
         new CustomEvent("apple-pay-confirmed", {
           bubbles: true,
@@ -411,7 +405,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
           detail: { skuId: offer.sku_id, country }
         })
       );
-      console.log("[web-apple-pay] ApplePayModal: dispatching apple-pay-confirmed-final", { skuId: offer.sku_id, country });
+      this.close();
     });
     this.querySelector("#apple-pay-modal-close")?.addEventListener(
       "click",
@@ -419,7 +413,6 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
-    console.log("[web-apple-pay] ApplePayModal: open()");
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -434,7 +427,6 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     this.querySelector("#apple-pay-modal")?.focus();
   }
   close() {
-    console.log("[web-apple-pay] ApplePayModal: close()");
     if (this.#keyHandler) {
       document.removeEventListener("keydown", this.#keyHandler, {
         capture: true
@@ -447,17 +439,95 @@ 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%;
+  }
+
+  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/config.ts
 var runtimeConfig = null;
 var configureApplePay = (config) => {
-  console.log("[web-apple-pay] configureApplePay called", {
-    merchantId: config.merchantId,
-    walletApiBaseUrl: config.walletApiBaseUrl,
-    debugBypassEnabled: config.debugBypassEnabled,
-    recaptchaSiteKey: config.recaptchaSiteKey ? "***" : void 0
-  });
   runtimeConfig = {
     ...config
   };
@@ -472,27 +542,21 @@ var isAppleDeviceOrSafari = () => {
 };
 var bypassApplePayChecks = () => new URLSearchParams(window.location.search).get("BYPASS_APPLE_PAY_CHECKS") !== null && getApplePayConfig()?.debugBypassEnabled === true;
 var isApplePayAvailable = async () => {
-  console.log("[web-apple-pay] isApplePayAvailable: checking availability");
   if (bypassApplePayChecks()) {
-    console.log("[web-apple-pay] isApplePayAvailable: bypass active \u2192 true");
     return true;
   }
   if (!isAppleDeviceOrSafari()) {
-    console.log("[web-apple-pay] isApplePayAvailable: not Apple device or Safari \u2192 false");
     return false;
   }
   const applePaySession = window.ApplePaySession;
   if (!applePaySession) {
-    console.log("[web-apple-pay] isApplePayAvailable: ApplePaySession not found on window \u2192 false");
     return false;
   }
   try {
     if (typeof applePaySession.canMakePayments !== "function") {
-      console.log("[web-apple-pay] isApplePayAvailable: canMakePayments is not a function \u2192 false");
       return false;
     }
     if (!applePaySession.canMakePayments()) {
-      console.log("[web-apple-pay] isApplePayAvailable: canMakePayments() returned false \u2192 false");
       return false;
     }
     const merchantId = getApplePayConfig()?.merchantId;
@@ -502,10 +566,7 @@ var isApplePayAvailable = async () => {
       );
       return false;
     }
-    console.log("[web-apple-pay] isApplePayAvailable : calling canMakePaymentsWithActiveCard", { merchantId });
-    const result = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
-    console.log("[web-apple-pay] isApplePayAvailable: canMakePaymentsWithActiveCard \u2192", result);
-    return result;
+    return await applePaySession.canMakePaymentsWithActiveCard(merchantId);
   } catch (error) {
     console.error("Error checking Apple Pay active card status:", error);
     return false;
@@ -767,13 +828,6 @@ var MSG_CONTACT_VALIDATION_INTERNAL = "Could not validate Apple Pay contact";
 
 // src/clients/payment-checkout/apple-session.ts
 function startApplePaySession(config) {
-  console.log("[web-apple-pay] startApplePaySession", {
-    skuId: config.skuId,
-    countryCode: config.countryCode,
-    currencyCode: config.currencyCode,
-    totalAmount: config.totalAmount,
-    userLoggedIn: config.userLoggedIn
-  });
   const paymentRequest = {
     countryCode: config.countryCode,
     currencyCode: config.currencyCode,
@@ -787,45 +841,26 @@ function startApplePaySession(config) {
     // Only request email from Apple Pay sheet if user is NOT logged in
     ...!config.userLoggedIn && { requiredShippingContactFields: ["email"] }
   };
-  try {
-    const session = new ApplePaySession(3, paymentRequest);
-    console.log("[web-apple-pay] startApplePaySession: ApplePaySession created");
-    session.onvalidatemerchant = async (event) => {
-      console.log("[web-apple-pay] onvalidatemerchant: received", { validationURL: event.validationURL });
-      try {
-        const validationHost = new URL(event.validationURL).host;
-        if (!validationHost.endsWith("apple.com")) {
-          console.warn("[web-apple-pay] onvalidatemerchant: invalid host, aborting", { validationHost });
-          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");
-        console.log("[web-apple-pay] onvalidatemerchant: calling validateAppleMerchant");
-        const response = await validateAppleMerchant({
-          validationURL: event.validationURL,
-          recaptchaToken
+  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
         });
-        if (!response?.merchantSession) {
-          console.warn("[web-apple-pay] onvalidatemerchant: no merchantSession in response, aborting");
-          trackFallbackCheckout(config.skuId);
-          session.abort();
-          window.location.href = redirectToCheckoutFallback({
-            skuId: config.skuId,
-            returnUrl: config.returnUrl,
-            inlineError: MSG_PAYMENT_GENERIC_ERROR
-          });
-          return;
-        }
-        console.log("[web-apple-pay] onvalidatemerchant: merchant validated successfully");
-        session.completeMerchantValidation(response.merchantSession);
-      } catch (err) {
-        console.error("[web-apple-pay] onvalidatemerchant: error during validation", err);
+        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({
@@ -833,29 +868,28 @@ function startApplePaySession(config) {
           returnUrl: config.returnUrl,
           inlineError: MSG_PAYMENT_GENERIC_ERROR
         });
+        return;
       }
-    };
-    session.onpaymentauthorized = (event) => {
-      console.log("[web-apple-pay] onpaymentauthorized: payment authorized by user", { skuId: config.skuId });
-      trackWalletPaymentAuthorised(config.skuId);
-      config.onPaymentAuthorized(event, session);
-    };
-    session.oncancel = () => {
-      console.log("[web-apple-pay] oncancel: payment sheet cancelled by user", { skuId: config.skuId });
-      config.onCancel?.();
-    };
-    console.log("[web-apple-pay] startApplePaySession: beginning session");
-    trackWalletPaymentSheetOpen(config.skuId);
-    session.begin();
-  } catch (err) {
-    console.error("[web-apple-pay] startApplePaySession: failed to create or begin ApplePaySession", err);
-    trackFallbackCheckout(config.skuId);
-    window.location.href = redirectToCheckoutFallback({
-      skuId: config.skuId,
-      returnUrl: config.returnUrl,
-      inlineError: MSG_PAYMENT_GENERIC_ERROR
-    });
-  }
+      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();
 }
 
 // src/clients/payment-checkout/contact-validation.ts
@@ -1032,16 +1066,12 @@ function handleStructuredError(ctx) {
 async function handlePaymentAuthorized(event, session, sessionData, config) {
   const { skuId, returnUrl, queryString } = config;
   let validatedEmail;
-  console.log("[web-apple-pay] handlePaymentAuthorized: starting", { skuId, userLoggedIn: sessionData.loggedIn });
   try {
-    console.log("[web-apple-pay] handlePaymentAuthorized: step 1 \u2014 validating contacts");
     validatedEmail = validateContacts(
       event,
       sessionData,
       config.supportedBillingCountries
     );
-    console.log("[web-apple-pay] handlePaymentAuthorized: contacts valid", { validatedEmail });
-    console.log("[web-apple-pay] handlePaymentAuthorized: step 2 \u2014 calling performPurchase", { skuId });
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
@@ -1051,8 +1081,6 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       },
       recaptchaTokens: config.recaptchaTokens
     });
-    console.log("[web-apple-pay] handlePaymentAuthorized: performPurchase succeeded", { basketId: result.basketId });
-    console.log("[web-apple-pay] handlePaymentAuthorized: step 3 \u2014 completing payment and redirecting");
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
     const userStatus = sessionData.loggedIn ? "lex" : "nex";
@@ -1065,25 +1093,17 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
-      console.warn("[web-apple-pay] handlePaymentAuthorized: contact validation failed", err.errors);
       failApplePaySession(session, err.errors);
       return;
     }
     console.error("[web-apple-pay] onpaymentauthorized error", { skuId, err });
     const walletError = parseWalletApiError(err);
-    console.error("[web-apple-pay] handlePaymentAuthorized: BFF/network error", {
-      skuId,
-      errorType: walletError?.errorType ?? "UNKNOWN",
-      message: walletError?.message
-    });
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
-      console.warn("[web-apple-pay] handlePaymentAuthorized: unstructured error, using generic fallback");
       redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
-    console.log("[web-apple-pay] handlePaymentAuthorized: dispatching structured error handler", { errorType: walletError.errorType });
     handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
   }
 }
@@ -1370,19 +1390,11 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    * Creates and configures an ApplePayButton if the feature flag is present.
    */
   static createIfEnabled(offer, country, entryPoint) {
-    if (!offer) {
-      console.log("[web-apple-pay] createIfEnabled: no offer provided \u2192 null");
+    if (!offer) return null;
+    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant))
       return null;
-    }
-    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant)) {
-      console.log("[web-apple-pay] createIfEnabled: excluded variant \u2192 null", { variant: offer.product?.variant });
+    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT))
       return null;
-    }
-    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT)) {
-      console.log("[web-apple-pay] createIfEnabled: feature flag absent \u2192 null");
-      return null;
-    }
-    console.log("[web-apple-pay] createIfEnabled: creating button", { skuId: offer.sku_id, country, entryPoint });
     _ApplePayButton.define();
     const button = document.createElement(_ApplePayButton.tag);
     button.offer = offer;
@@ -1409,7 +1421,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #returnUrl = "";
   #supportedBillingCountries = [];
   #entryPoint = "";
-  #recaptchaTokens = null;
   // ─── Public API ─────────────────────────────────────────────────────────────
   get offer() {
     return this.#offer;
@@ -1451,9 +1462,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   }
   // ─── Lifecycle ──────────────────────────────────────────────────────────────
   async connectedCallback() {
-    console.log("[web-apple-pay] connectedCallback: element connected");
     if (this.#rendering || this.querySelector(SEL_CONTAINER)) {
-      console.log("[web-apple-pay] connectedCallback: already rendering or rendered, skipping");
       return;
     }
     this.#rendering = true;
@@ -1470,7 +1479,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    * and eliminating the implicit reliance on the DOM as a render-state flag.
    */
   disconnectedCallback() {
-    console.log("[web-apple-pay] disconnectedCallback: element removed from DOM, resetting state");
     this.#rendering = false;
     this.#readyPromise = null;
     this.#sessionData = null;
@@ -1481,17 +1489,18 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   }
   // ─── Render pipeline ────────────────────────────────────────────────────────
   async #run() {
-    console.log("[web-apple-pay] #run: starting render pipeline");
     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();
+      this.#finishLoading();
     } catch {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
     } finally {
       this.#rendering = false;
     }
@@ -1500,11 +1509,9 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   async #checkAvailability() {
     const available = await isApplePayAvailable();
     if (!available) {
-      console.log("[web-apple-pay] #checkAvailability: Apple Pay unavailable \u2192 hiding");
       this.style.display = "none";
       return true;
     }
-    console.log("[web-apple-pay] #checkAvailability: Apple Pay available");
     return false;
   }
   /**
@@ -1513,10 +1520,9 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    */
   async #checkSession() {
     this.#sessionData = await this.#fetchSession();
-    console.log("[web-apple-pay] #checkSession: session fetched", { loggedIn: this.#sessionData?.loggedIn, userType: this.#sessionData?.userType });
     if (this.#sessionData?.loggedIn && (this.#sessionData.userType === "active-subscription" || this.#sessionData.userType === "b2b-user")) {
-      console.log("[web-apple-pay] #checkSession: ineligible user \u2192 hiding", { userType: this.#sessionData.userType });
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -1524,17 +1530,14 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   /** Returns `true` (hide) when no offer has been set before mount. */
   #checkOffer() {
     if (!this.#offer) {
-      console.log("[web-apple-pay] #checkOffer: no offer set \u2192 hiding");
       this.style.display = "none";
       return true;
     }
-    console.log("[web-apple-pay] #checkOffer: offer present", { skuId: this.#offer.sku_id });
     return false;
   }
   /** Captures the current page URL once at mount for reuse across the session lifetime. */
   #captureReturnUrl() {
     this.#returnUrl = captureOriginUrl();
-    console.log("[web-apple-pay] #captureReturnUrl:", this.#returnUrl);
   }
   /**
    * Computes supported billing countries once at mount.
@@ -1546,7 +1549,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       this.#country,
       this.#offer.product?.variant ?? ""
     );
-    console.log("[web-apple-pay] #computeBillingCountries:", this.#supportedBillingCountries);
   }
   /**
    * Returns `true` (hide) when the wallet BFF reports Apple Pay is unavailable
@@ -1554,36 +1556,44 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    */
   async #fetchAndCacheOptions() {
     this.#paymentOptions = await this.#fetchPaymentOptions();
-    console.log("[web-apple-pay] #fetchAndCacheOptions: fetched payment options", { paymentOptions: this.#paymentOptions });
-    if (!this.#paymentOptions?.options?.apple_pay) {
-      console.log("[web-apple-pay] #fetchAndCacheOptions: apple_pay not in options \u2192 hiding");
+    if (!this.#paymentOptions?.apple_pay) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
   }
   /** Injects the button template and wires click and confirm event listeners. */
   #renderTemplate() {
-    console.log("[web-apple-pay] #renderTemplate: rendering Apple Pay button", { skuId: this.#offer?.sku_id, country: this.#country });
     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();
     });
-    document.addEventListener("apple-pay-confirmed", (event) => {
+    this.addEventListener("apple-pay-confirmed", (event) => {
       const { skuId, country } = event.detail;
-      console.log("[web-apple-pay] apple-pay-confirmed received on document", { skuId, country });
       this.#initiateApplePay(skuId, country);
-    }, { once: true });
+    });
+  }
+  #finishLoading() {
+    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() {
@@ -1592,28 +1602,15 @@ 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() {
-    console.log("[web-apple-pay] #openModal: button clicked", { skuId: this.#offer?.sku_id });
-    if (!this.#offer) {
-      console.warn("[web-apple-pay] #openModal: no offer set, ignoring click");
-      return;
-    }
-    if (document.querySelector(ApplePayModal.tag)) {
-      console.warn("[web-apple-pay] #openModal: modal already open, ignoring click");
-      return;
-    }
+    if (!this.#offer || document.querySelector(ApplePayModal.tag)) return;
     trackExpressWalletClick(this.#offer.sku_id);
-    getPurchaseRecaptchaTokens().then((tokens) => {
-      console.log("[web-apple-pay] #openModal: reCAPTCHA tokens pre-fetched");
-      this.#recaptchaTokens = tokens;
-    }).catch((err) => {
-      console.warn("[web-apple-pay] #openModal: reCAPTCHA pre-fetch failed", err);
-    });
     ApplePayModal.define();
     const modal = document.createElement(ApplePayModal.tag);
     modal.offer = this.#offer;
@@ -1625,37 +1622,30 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   }
   async #fetchSession() {
     try {
-      const session = await getExpressCheckoutSession();
-      console.log("[web-apple-pay] #fetchSession: success", { loggedIn: session.loggedIn, userType: session.userType });
-      return session;
-    } catch (err) {
-      console.warn("[web-apple-pay] #fetchSession: failed, falling back to anonymous session", err);
+      return await getExpressCheckoutSession();
+    } catch {
       return null;
     }
   }
   async #fetchPaymentOptions() {
     try {
-      const options = await getPaymentOptions({
+      return await getPaymentOptions({
         sku: this.#offer.sku_id,
         countryCode: this.#country,
         currencyCode: this.#offer.price?.currency_code ?? DEFAULT_CURRENCY,
         checkoutUrl: this.#returnUrl
       });
-      console.log("[web-apple-pay] #fetchPaymentOptions: success", { hasApplePay: !!options?.options?.apple_pay });
-      return options;
-    } catch (err) {
-      console.warn("[web-apple-pay] #fetchPaymentOptions: failed", err);
+    } catch {
       return null;
     }
   }
   #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokens) {
-    console.log("[web-apple-pay] #buildSessionParams", { skuId, country, userLoggedIn: sessionData.loggedIn });
     const offer = this.#offer;
     const totalAmount = offer.price?.purchase ? `${offer.price.purchase}` : DEFAULT_TOTAL;
     return {
       countryCode: country,
       currencyCode: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-      supportedNetworks: paymentOptions.options.apple_pay.settings.supported_networks,
+      supportedNetworks: paymentOptions.apple_pay.settings.supported_networks,
       totalAmount,
       totalLabel: TOTAL_LABEL,
       skuId,
@@ -1672,12 +1662,10 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     };
   }
   async #initiateApplePay(skuId, country) {
-    console.log("[web-apple-pay] #initiateApplePay: starting", { skuId, country });
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
-      const recaptchaTokens = this.#recaptchaTokens ?? await getPurchaseRecaptchaTokens();
-      console.log("[web-apple-pay] #initiateApplePay: tokens ready, starting session", { prefetched: !!this.#recaptchaTokens });
+      const recaptchaTokens = await getPurchaseRecaptchaTokens();
       startApplePaySession(
         this.#buildSessionParams(
           skuId,