@economist/web-apple-pay 0.1.3-beta.30 → 0.1.3-beta.31

package/dist/index.js

@@ -956,6 +956,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
           cta.removeAttribute("aria-busy");
         }
       }).catch(() => {
+        console.error("[web-apple-pay] apple-pay-modal: failed to pre-fetch reCAPTCHA tokens; CTA remains disabled");
         if (cta) {
           cta.removeAttribute("aria-busy");
         }
@@ -1141,11 +1142,15 @@ var isApplePayAvailable = async () => {
     }
     const merchantId = getApplePayConfig()?.merchantId;
     if (!merchantId) {
+      console.warn(
+        "[web-apple-pay] Missing merchantId. Call configureApplePay({ merchantId, ... }) before rendering Apple Pay components."
+      );
       return false;
     }
     const hasActiveCard = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
     return hasActiveCard;
   } catch (error) {
+    console.error("Error checking Apple Pay active card status:", error);
     return false;
   }
 };
@@ -1233,13 +1238,25 @@ var getExpressCheckoutSession = () => {
 };
 
 // src/utils/expressCheckoutRedirect.ts
-var captureOriginUrl = () => window.location.href;
-var buildQueryString = () => {
-  const countryCode = new URLSearchParams(window.location.search).get(
-    "country"
-  );
-  return countryCode ? `&country=${encodeURIComponent(countryCode)}` : "";
+var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
+var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
+function isAllowedRedirectUrl(url) {
+  if (url.startsWith("/")) return !url.startsWith("//");
+  try {
+    const { hostname } = new URL(url);
+    return hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
+  } catch {
+    return false;
+  }
+}
+var writeCheckoutRedirect = (originUrl) => {
+  if (!isAllowedRedirectUrl(originUrl)) return;
+  try {
+    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+  } catch {
+  }
 };
+var captureOriginUrl = () => window.location.href;
 var decodeSku = (sku) => {
   try {
     return atob(sku.substring(sku.indexOf("-") + 1));
@@ -1250,14 +1267,11 @@ var decodeSku = (sku) => {
 var redirectToCheckoutComplete = (params) => {
   const url = new URL("/checkout/complete", window.location.origin);
   url.searchParams.set("basketId", params.basketId);
-  if (params.queryString) {
-    const qs = params.queryString.startsWith("?") ? params.queryString.slice(1) : params.queryString;
-    new URLSearchParams(qs).forEach((v, k) => url.searchParams.set(k, v));
-  }
   url.searchParams.set("lmo_offer", params.skuId);
   url.searchParams.set("status", params.status);
   url.searchParams.set("redirectToCheckout", "true");
-  url.searchParams.set("returnUrl", params.returnUrl);
+  if (params.email) url.searchParams.set("email", params.email);
+  if (params.country) url.searchParams.set("country", params.country);
   return url.pathname + url.search;
 };
 var redirectToCheckoutFallback = (params) => {
@@ -1268,7 +1282,7 @@ var redirectToCheckoutFallback = (params) => {
     url.searchParams.set("inlineError", params.inlineError);
   if (params.email) url.searchParams.set("email", params.email);
   if (params.emailError) url.searchParams.set("emailError", params.emailError);
-  url.searchParams.set("returnUrl", params.returnUrl);
+  if (params.country) url.searchParams.set("country", params.country);
   return url.pathname + url.search;
 };
 
@@ -1352,17 +1366,16 @@ var MSG_EMAIL_WRONG_FORMAT = "That email doesn\u2019t look right. Please enter a
 var MSG_EMAIL_TOO_LONG = "This field must be 80 characters or less.";
 var MSG_UNSUPPORTED_BILLING_COUNTRY = "Billing country does not match offer price zone";
 var MSG_PAYMENT_GENERIC_ERROR = "Something went wrong. Please check your payment and billing details and try again or contact us.";
-var MSG_RECAPTCHA_VALIDATION_FAILED = "Security check failed. Please try again.";
-var MSG_EMAIL_COLLISION = "This email address is already linked to an account. Please log in, or try a different email address.";
 var MSG_CONTACT_VALIDATION_INTERNAL = "Could not validate Apple Pay contact";
 
 // src/clients/payment-checkout/apple-session.ts
 function redirectToFallbackCheckout(config) {
+  writeCheckoutRedirect(config.returnUrl);
   trackFallbackCheckout(config.skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId: config.skuId,
-    returnUrl: config.returnUrl,
-    inlineError: MSG_PAYMENT_GENERIC_ERROR
+    inlineError: MSG_PAYMENT_GENERIC_ERROR,
+    country: config.countryCode
   });
 }
 async function handleMerchantValidation(event, session, config) {
@@ -1385,6 +1398,7 @@ async function handleMerchantValidation(event, session, config) {
     }
     session.completeMerchantValidation(response.merchantSession);
   } catch (err) {
+    console.error("[web-apple-pay] onvalidatemerchant: error during validation", err);
     session.abort();
     redirectToFallbackCheckout(config);
   }
@@ -1418,6 +1432,7 @@ function startApplePaySession(config) {
     trackWalletPaymentSheetOpen(config.skuId);
     session.begin();
   } catch (err) {
+    console.error("[web-apple-pay] startApplePaySession: failed to create session", err);
     redirectToFallbackCheckout(config);
   }
 }
@@ -1539,8 +1554,6 @@ var shippingContactDetails = (shippingContact) => {
 };
 
 // src/clients/payment-checkout/payment-handler.ts
-var MSG_ELIGIBILITY = "Something went wrong, please try again";
-var MSG_REGISTRATION = "We couldn't create your account. Please enter your email or try a different login method.";
 var failApplePaySession = (session, errors = []) => {
   session.completePayment({
     status: ApplePaySession.STATUS_FAILURE,
@@ -1564,37 +1577,42 @@ function validateContacts(event, sessionData, supportedBillingCountries) {
   }
   return void 0;
 }
-function redirectFallback(skuId, returnUrl, options) {
+function redirectFallback(skuId, returnUrl, country, options) {
+  writeCheckoutRedirect(returnUrl);
   trackFallbackCheckout(skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId,
-    returnUrl,
+    country,
     ...options
   });
 }
 var ERROR_HANDLERS = {
-  EMAIL_COLLISION: ({ skuId, returnUrl, validatedEmail }) => redirectFallback(skuId, returnUrl, {
-    emailError: MSG_EMAIL_COLLISION,
+  // emailError flows as an inline field error on the email input.
+  // email pre-populates the input so the user doesn't have to retype it.
+  EMAIL_COLLISION: ({ skuId, returnUrl, country, validatedEmail, walletError }) => redirectFallback(skuId, returnUrl, country, {
+    emailError: walletError.message,
+    email: validatedEmail
+  }),
+  PAYMENT_DECLINED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  ELIGIBILITY_REJECTED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  REGISTRATION_FAILED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  ACCOUNT_CREATION_FAILED: ({ skuId, returnUrl, country, validatedEmail, walletError }) => redirectFallback(skuId, returnUrl, country, {
+    emailError: walletError.message,
     email: validatedEmail
   }),
-  PAYMENT_DECLINED: ({ skuId, returnUrl }) => (
-    // Matches sma-checkout catch-all: always redirect with generic inlineError.
-    redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR })
-  ),
-  ELIGIBILITY_REJECTED: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_ELIGIBILITY }),
-  REGISTRATION_FAILED: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_REGISTRATION }),
-  VALIDATION_ERROR: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_RECAPTCHA_VALIDATION_FAILED })
+  VALIDATION_ERROR: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  RECAPTCHA_FAILED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message })
 };
 function handleStructuredError(ctx) {
   const handler = ERROR_HANDLERS[ctx.walletError.errorType];
   if (handler) {
     handler(ctx);
   } else {
-    redirectFallback(ctx.skuId, ctx.returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+    redirectFallback(ctx.skuId, ctx.returnUrl, ctx.country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
   }
 }
 async function handlePaymentAuthorized(event, session, sessionData, config) {
-  const { skuId, returnUrl, queryString } = config;
+  const { skuId, returnUrl, country } = config;
   let validatedEmail;
   try {
     validatedEmail = validateContacts(
@@ -1614,27 +1632,30 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
+    const successEmail = sessionData.loggedIn ? sessionData.emailAddress : validatedEmail;
     const userStatus = sessionData.loggedIn ? "lex" : "nex";
+    writeCheckoutRedirect(returnUrl);
     window.location.href = redirectToCheckoutComplete({
       basketId: result.basketId,
       status: userStatus,
       skuId: decodeSku(skuId),
-      returnUrl,
-      queryString
+      email: successEmail,
+      country
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
       failApplePaySession(session, err.errors);
       return;
     }
+    console.error("[web-apple-pay] onpaymentauthorized error", { skuId, err });
     const walletError = parseWalletApiError(err);
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
-      redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+      redirectFallback(skuId, returnUrl, country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
-    handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
+    handleStructuredError({ skuId, returnUrl, country, validatedEmail, walletError });
   }
 }
 
@@ -1904,6 +1925,7 @@ var FEATURE_APPLE_PAY_EXPRESS_CHECKOUT = "FEATURE_APPLE_PAY_EXPRESS_CHECKOUT";
 var TOTAL_LABEL = "The Economist";
 var DEFAULT_CURRENCY = "USD";
 var DEFAULT_TOTAL = "0.00";
+var ERROR_INITIATE = "Failed to initiate Apple Pay session:";
 var SEL_CONTAINER = ".apple-pay-container";
 var SEL_BUTTON = ".apple-pay-btn";
 var APPLE_PAY_EXCLUDED_VARIANTS = [
@@ -2027,15 +2049,16 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   // ─── Render pipeline ────────────────────────────────────────────────────────
   async #run() {
     try {
+      this.#renderTemplate();
       if (await this.#checkAvailability()) return;
       if (this.#checkOffer()) return;
-      this.#renderTemplate();
       if (await this.#checkSession()) return;
       this.#captureReturnUrl();
       this.#computeBillingCountries();
       if (await this.#fetchAndCacheOptions()) return;
       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 {
@@ -2047,6 +2070,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     const available = await isApplePayAvailable();
     if (!available) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -2068,6 +2092,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #checkOffer() {
     if (!this.#offer) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -2175,6 +2200,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #scheduleRecaptchaTokens() {
     const attempt = getPurchaseRecaptchaTokens();
     attempt.catch((err) => {
+      console.error("[web-apple-pay] reCAPTCHA token pre-fetch failed; will retry on modal open", err);
       if (this.#recaptchaTokensPromise === attempt) {
         this.#recaptchaTokensPromise = null;
       }
@@ -2217,7 +2243,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
         country,
         currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
         returnUrl: this.#returnUrl,
-        queryString: buildQueryString(),
         supportedBillingCountries: this.#supportedBillingCountries,
         recaptchaTokens
       })
@@ -2237,6 +2262,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
         )
       );
     } catch (error) {
+      console.error(ERROR_INITIATE, error);
     }
   }
 };
@@ -2245,7 +2271,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
 var ApplePayEntryPoint = /* @__PURE__ */ ((ApplePayEntryPoint2) => {
   ApplePayEntryPoint2["PAYWALL"] = "article_paywall";
   ApplePayEntryPoint2["REGWALL"] = "article_regwall";
-  ApplePayEntryPoint2["DUAL_OFFER_BANNER"] = "dual_offer_banner";
   return ApplePayEntryPoint2;
 })(ApplePayEntryPoint || {});
 

package/dist/src/apple-pay-button.js

@@ -951,6 +951,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
           cta.removeAttribute("aria-busy");
         }
       }).catch(() => {
+        console.error("[web-apple-pay] apple-pay-modal: failed to pre-fetch reCAPTCHA tokens; CTA remains disabled");
         if (cta) {
           cta.removeAttribute("aria-busy");
         }
@@ -1136,11 +1137,15 @@ var isApplePayAvailable = async () => {
     }
     const merchantId = getApplePayConfig()?.merchantId;
     if (!merchantId) {
+      console.warn(
+        "[web-apple-pay] Missing merchantId. Call configureApplePay({ merchantId, ... }) before rendering Apple Pay components."
+      );
       return false;
     }
     const hasActiveCard = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
     return hasActiveCard;
   } catch (error) {
+    console.error("Error checking Apple Pay active card status:", error);
     return false;
   }
 };
@@ -1228,13 +1233,25 @@ var getExpressCheckoutSession = () => {
 };
 
 // src/utils/expressCheckoutRedirect.ts
-var captureOriginUrl = () => window.location.href;
-var buildQueryString = () => {
-  const countryCode = new URLSearchParams(window.location.search).get(
-    "country"
-  );
-  return countryCode ? `&country=${encodeURIComponent(countryCode)}` : "";
+var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
+var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
+function isAllowedRedirectUrl(url) {
+  if (url.startsWith("/")) return !url.startsWith("//");
+  try {
+    const { hostname } = new URL(url);
+    return hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
+  } catch {
+    return false;
+  }
+}
+var writeCheckoutRedirect = (originUrl) => {
+  if (!isAllowedRedirectUrl(originUrl)) return;
+  try {
+    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+  } catch {
+  }
 };
+var captureOriginUrl = () => window.location.href;
 var decodeSku = (sku) => {
   try {
     return atob(sku.substring(sku.indexOf("-") + 1));
@@ -1245,14 +1262,11 @@ var decodeSku = (sku) => {
 var redirectToCheckoutComplete = (params) => {
   const url = new URL("/checkout/complete", window.location.origin);
   url.searchParams.set("basketId", params.basketId);
-  if (params.queryString) {
-    const qs = params.queryString.startsWith("?") ? params.queryString.slice(1) : params.queryString;
-    new URLSearchParams(qs).forEach((v, k) => url.searchParams.set(k, v));
-  }
   url.searchParams.set("lmo_offer", params.skuId);
   url.searchParams.set("status", params.status);
   url.searchParams.set("redirectToCheckout", "true");
-  url.searchParams.set("returnUrl", params.returnUrl);
+  if (params.email) url.searchParams.set("email", params.email);
+  if (params.country) url.searchParams.set("country", params.country);
   return url.pathname + url.search;
 };
 var redirectToCheckoutFallback = (params) => {
@@ -1263,7 +1277,7 @@ var redirectToCheckoutFallback = (params) => {
     url.searchParams.set("inlineError", params.inlineError);
   if (params.email) url.searchParams.set("email", params.email);
   if (params.emailError) url.searchParams.set("emailError", params.emailError);
-  url.searchParams.set("returnUrl", params.returnUrl);
+  if (params.country) url.searchParams.set("country", params.country);
   return url.pathname + url.search;
 };
 
@@ -1347,17 +1361,16 @@ var MSG_EMAIL_WRONG_FORMAT = "That email doesn\u2019t look right. Please enter a
 var MSG_EMAIL_TOO_LONG = "This field must be 80 characters or less.";
 var MSG_UNSUPPORTED_BILLING_COUNTRY = "Billing country does not match offer price zone";
 var MSG_PAYMENT_GENERIC_ERROR = "Something went wrong. Please check your payment and billing details and try again or contact us.";
-var MSG_RECAPTCHA_VALIDATION_FAILED = "Security check failed. Please try again.";
-var MSG_EMAIL_COLLISION = "This email address is already linked to an account. Please log in, or try a different email address.";
 var MSG_CONTACT_VALIDATION_INTERNAL = "Could not validate Apple Pay contact";
 
 // src/clients/payment-checkout/apple-session.ts
 function redirectToFallbackCheckout(config) {
+  writeCheckoutRedirect(config.returnUrl);
   trackFallbackCheckout(config.skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId: config.skuId,
-    returnUrl: config.returnUrl,
-    inlineError: MSG_PAYMENT_GENERIC_ERROR
+    inlineError: MSG_PAYMENT_GENERIC_ERROR,
+    country: config.countryCode
   });
 }
 async function handleMerchantValidation(event, session, config) {
@@ -1380,6 +1393,7 @@ async function handleMerchantValidation(event, session, config) {
     }
     session.completeMerchantValidation(response.merchantSession);
   } catch (err) {
+    console.error("[web-apple-pay] onvalidatemerchant: error during validation", err);
     session.abort();
     redirectToFallbackCheckout(config);
   }
@@ -1413,6 +1427,7 @@ function startApplePaySession(config) {
     trackWalletPaymentSheetOpen(config.skuId);
     session.begin();
   } catch (err) {
+    console.error("[web-apple-pay] startApplePaySession: failed to create session", err);
     redirectToFallbackCheckout(config);
   }
 }
@@ -1534,8 +1549,6 @@ var shippingContactDetails = (shippingContact) => {
 };
 
 // src/clients/payment-checkout/payment-handler.ts
-var MSG_ELIGIBILITY = "Something went wrong, please try again";
-var MSG_REGISTRATION = "We couldn't create your account. Please enter your email or try a different login method.";
 var failApplePaySession = (session, errors = []) => {
   session.completePayment({
     status: ApplePaySession.STATUS_FAILURE,
@@ -1559,37 +1572,42 @@ function validateContacts(event, sessionData, supportedBillingCountries) {
   }
   return void 0;
 }
-function redirectFallback(skuId, returnUrl, options) {
+function redirectFallback(skuId, returnUrl, country, options) {
+  writeCheckoutRedirect(returnUrl);
   trackFallbackCheckout(skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId,
-    returnUrl,
+    country,
     ...options
   });
 }
 var ERROR_HANDLERS = {
-  EMAIL_COLLISION: ({ skuId, returnUrl, validatedEmail }) => redirectFallback(skuId, returnUrl, {
-    emailError: MSG_EMAIL_COLLISION,
+  // emailError flows as an inline field error on the email input.
+  // email pre-populates the input so the user doesn't have to retype it.
+  EMAIL_COLLISION: ({ skuId, returnUrl, country, validatedEmail, walletError }) => redirectFallback(skuId, returnUrl, country, {
+    emailError: walletError.message,
+    email: validatedEmail
+  }),
+  PAYMENT_DECLINED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  ELIGIBILITY_REJECTED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  REGISTRATION_FAILED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  ACCOUNT_CREATION_FAILED: ({ skuId, returnUrl, country, validatedEmail, walletError }) => redirectFallback(skuId, returnUrl, country, {
+    emailError: walletError.message,
     email: validatedEmail
   }),
-  PAYMENT_DECLINED: ({ skuId, returnUrl }) => (
-    // Matches sma-checkout catch-all: always redirect with generic inlineError.
-    redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR })
-  ),
-  ELIGIBILITY_REJECTED: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_ELIGIBILITY }),
-  REGISTRATION_FAILED: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_REGISTRATION }),
-  VALIDATION_ERROR: ({ skuId, returnUrl }) => redirectFallback(skuId, returnUrl, { inlineError: MSG_RECAPTCHA_VALIDATION_FAILED })
+  VALIDATION_ERROR: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message }),
+  RECAPTCHA_FAILED: ({ skuId, returnUrl, country, walletError }) => redirectFallback(skuId, returnUrl, country, { inlineError: walletError.message })
 };
 function handleStructuredError(ctx) {
   const handler = ERROR_HANDLERS[ctx.walletError.errorType];
   if (handler) {
     handler(ctx);
   } else {
-    redirectFallback(ctx.skuId, ctx.returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+    redirectFallback(ctx.skuId, ctx.returnUrl, ctx.country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
   }
 }
 async function handlePaymentAuthorized(event, session, sessionData, config) {
-  const { skuId, returnUrl, queryString } = config;
+  const { skuId, returnUrl, country } = config;
   let validatedEmail;
   try {
     validatedEmail = validateContacts(
@@ -1609,27 +1627,30 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
+    const successEmail = sessionData.loggedIn ? sessionData.emailAddress : validatedEmail;
     const userStatus = sessionData.loggedIn ? "lex" : "nex";
+    writeCheckoutRedirect(returnUrl);
     window.location.href = redirectToCheckoutComplete({
       basketId: result.basketId,
       status: userStatus,
       skuId: decodeSku(skuId),
-      returnUrl,
-      queryString
+      email: successEmail,
+      country
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
       failApplePaySession(session, err.errors);
       return;
     }
+    console.error("[web-apple-pay] onpaymentauthorized error", { skuId, err });
     const walletError = parseWalletApiError(err);
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
-      redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+      redirectFallback(skuId, returnUrl, country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
-    handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
+    handleStructuredError({ skuId, returnUrl, country, validatedEmail, walletError });
   }
 }
 
@@ -1899,6 +1920,7 @@ var FEATURE_APPLE_PAY_EXPRESS_CHECKOUT = "FEATURE_APPLE_PAY_EXPRESS_CHECKOUT";
 var TOTAL_LABEL = "The Economist";
 var DEFAULT_CURRENCY = "USD";
 var DEFAULT_TOTAL = "0.00";
+var ERROR_INITIATE = "Failed to initiate Apple Pay session:";
 var SEL_CONTAINER = ".apple-pay-container";
 var SEL_BUTTON = ".apple-pay-btn";
 var APPLE_PAY_EXCLUDED_VARIANTS = [
@@ -2022,15 +2044,16 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   // ─── Render pipeline ────────────────────────────────────────────────────────
   async #run() {
     try {
+      this.#renderTemplate();
       if (await this.#checkAvailability()) return;
       if (this.#checkOffer()) return;
-      this.#renderTemplate();
       if (await this.#checkSession()) return;
       this.#captureReturnUrl();
       this.#computeBillingCountries();
       if (await this.#fetchAndCacheOptions()) return;
       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 {
@@ -2042,6 +2065,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     const available = await isApplePayAvailable();
     if (!available) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -2063,6 +2087,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #checkOffer() {
     if (!this.#offer) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -2170,6 +2195,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #scheduleRecaptchaTokens() {
     const attempt = getPurchaseRecaptchaTokens();
     attempt.catch((err) => {
+      console.error("[web-apple-pay] reCAPTCHA token pre-fetch failed; will retry on modal open", err);
       if (this.#recaptchaTokensPromise === attempt) {
         this.#recaptchaTokensPromise = null;
       }
@@ -2212,7 +2238,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
         country,
         currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
         returnUrl: this.#returnUrl,
-        queryString: buildQueryString(),
         supportedBillingCountries: this.#supportedBillingCountries,
         recaptchaTokens
       })
@@ -2232,6 +2257,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
         )
       );
     } catch (error) {
+      console.error(ERROR_INITIATE, error);
     }
   }
 };