@economist/web-apple-pay 0.1.3-beta.28 → 0.1.3-beta.29

package/dist/index.js

@@ -684,6 +684,8 @@ function renewalPeriodText(unit, duration) {
       return "";
   }
 }
+var LI_SEPARATOR = "LI_SEPARATOR";
+var P_SEPARATOR = "P_SEPARATOR";
 function buildTermsContext(offer, country) {
   const isUS = country === "US";
   const isCA = country === "CA";
@@ -720,19 +722,19 @@ function freeTrialTerms(offer, ctx) {
   const trialDuration = offer.subscription_options?.trial_period?.duration ?? 1;
   const trialDateStr = `on ${getRenewalDateText(trialUnit, trialDuration)}${ctx.verificationText}`;
   if (ctx.isUS) {
-    return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function nytTerms(ctx) {
   const nytAccessText = "Your complimentary access to The New York Times is for one year only and does not auto-renew. We will send your instructions on how to redeem access to The New York Times by email.";
   if (ctx.isUS) {
-    return `Your subscription to <em>The Economist</em> auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}{{pSeparator}}${nytAccessText}`;
+    return `Your subscription to <em>The Economist</em> auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}${P_SEPARATOR}${nytAccessText}`;
   }
   if (ctx.isCA) {
-    return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled.{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}{{pSeparator}}${nytAccessText}`;
+    return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled.${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}${P_SEPARATOR}${nytAccessText}`;
   }
-  return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime} ${nytAccessText}`;
+  return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime} ${nytAccessText}`;
 }
 function minTermContractTerms(offer, ctx) {
   const duePrice = formatPrice(offer.price.purchase, offer.price.currency_code);
@@ -742,28 +744,28 @@ function minTermContractTerms(offer, ctx) {
   const contractLength = mtDuration && mtUnit ? `${mtDuration} ${mtUnit}` : "";
   const initialContractText = contractLength ? `your initial ${contractLength} contract` : "your initial contract";
   const mtRenewalDateText = mtUnit && mtDuration ? getRenewalDateText(mtUnit, Number(mtDuration)) : ctx.renewalDateText;
-  return `You\u2019ll be charged ${duePrice} a month for the duration of ${initialContractText}{{liSeparator}}Your subscription auto-renews annually at ${ctx.renewalPriceText} a month on ${mtRenewalDateText} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}`;
+  return `You\u2019ll be charged ${duePrice} a month for the duration of ${initialContractText}${LI_SEPARATOR}Your subscription auto-renews annually at ${ctx.renewalPriceText} a month on ${mtRenewalDateText} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}`;
 }
 function paidTrialTerms(offer, ctx) {
   const trialUnit = offer.subscription_options?.trial_period?.unit ?? ctx.unit;
   const trialDuration = offer.subscription_options?.trial_period?.duration ?? ctx.duration;
   const trialDateText = getRenewalDateText(trialUnit, trialDuration);
   if (ctx.isUS) {
-    return `Your subscription auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} on ${trialDateText} when your paid trial ends{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} on ${trialDateText} when your paid trial ends${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} on ${trialDateText} when your paid trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} on ${trialDateText} when your paid trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function autoRenewalTerms(ctx) {
   if (ctx.isUS) {
-    return `Your subscription auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function noAutoRenewalTerms(ctx) {
   if (ctx.isUS || ctx.isCA) {
-    return `Your subscription does not renew automatically${ctx.taxFootnote}{{liSeparator}}`;
+    return `Your subscription does not renew automatically${ctx.taxFootnote}${LI_SEPARATOR}`;
   }
-  return `Your subscription does not renew automatically{{liSeparator}}`;
+  return `Your subscription does not renew automatically${LI_SEPARATOR}`;
 }
 function generateApplePayModalTerms(offer, country) {
   const ctx = buildTermsContext(offer, country);
@@ -786,9 +788,9 @@ function generateApplePayModalTerms(offer, country) {
   return noAutoRenewalTerms(ctx);
 }
 function renderTermsHtml(termsText) {
-  const renewalTextLists = termsText.split("{{liSeparator}}");
+  const renewalTextLists = termsText.split(LI_SEPARATOR);
   const lastPart = renewalTextLists.pop() || "";
-  const renewalTextParagraphs = lastPart.split("{{pSeparator}}");
+  const renewalTextParagraphs = lastPart.split(P_SEPARATOR);
   const ulHtml = `<ul class="apm__terms-bullets">${renewalTextLists.map((value) => `<li>${value}</li>`).join("")}</ul>`;
   const paragraphHtml = renewalTextParagraphs.filter(Boolean).map((value) => `<p class="apm__terms-legal">${value}</p>`).join("");
   return ulHtml + paragraphHtml;
@@ -1207,7 +1209,6 @@ var validateAppleMerchant = (data) => {
   });
 };
 var performPurchase = (data) => {
-  console.log("[web-apple-pay] /v1/wallet/purchase payload", JSON.stringify(data, null, 2));
   return apiFetch("/v1/wallet/purchase", {
     method: "POST",
     body: JSON.stringify(data),
@@ -1224,22 +1225,6 @@ var getExpressCheckoutSession = () => {
 };
 
 // src/utils/expressCheckoutRedirect.ts
-var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
-var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
-var writeCheckoutRedirect = (originUrl) => {
-  if (originUrl.startsWith("/")) {
-    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
-    return;
-  }
-  try {
-    const { hostname } = new URL(originUrl);
-    const isAllowed = hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
-    if (isAllowed) {
-      localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
-    }
-  } catch {
-  }
-};
 var captureOriginUrl = () => window.location.href;
 var buildQueryString = () => {
   const countryCode = new URLSearchParams(window.location.search).get(
@@ -1264,8 +1249,7 @@ var redirectToCheckoutComplete = (params) => {
   url.searchParams.set("lmo_offer", params.skuId);
   url.searchParams.set("status", params.status);
   url.searchParams.set("redirectToCheckout", "true");
-  if (params.email) url.searchParams.set("email", params.email);
-  if (params.country) url.searchParams.set("country", params.country);
+  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 var redirectToCheckoutFallback = (params) => {
@@ -1276,7 +1260,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);
-  if (params.country) url.searchParams.set("country", params.country);
+  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 
@@ -1360,16 +1344,17 @@ 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,
-    inlineError: MSG_PAYMENT_GENERIC_ERROR,
-    country: config.countryCode
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
   });
 }
 async function handleMerchantValidation(event, session, config) {
@@ -1548,6 +1533,8 @@ 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,
@@ -1556,15 +1543,9 @@ var failApplePaySession = (session, errors = []) => {
 };
 function parseWalletApiError(err) {
   const body = err instanceof ApiError ? err.body : err;
-  console.warn("[web-apple-pay] parseWalletApiError: raw error", {
-    isApiError: err instanceof ApiError,
-    body
-  });
   if (body && typeof body === "object" && "errorType" in body && "message" in body) {
-    console.warn("[web-apple-pay] parseWalletApiError: structured BFF error", body);
     return body;
   }
-  console.warn("[web-apple-pay] parseWalletApiError: unstructured error \u2014 no errorType found");
   return null;
 }
 function validateContacts(event, sessionData, supportedBillingCountries) {
@@ -1577,42 +1558,37 @@ function validateContacts(event, sessionData, supportedBillingCountries) {
   }
   return void 0;
 }
-function redirectFallback(skuId, returnUrl, country, options) {
-  writeCheckoutRedirect(returnUrl);
+function redirectFallback(skuId, returnUrl, options) {
   trackFallbackCheckout(skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId,
-    country,
+    returnUrl,
     ...options
   });
 }
 var ERROR_HANDLERS = {
-  // 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_COLLISION: ({ skuId, returnUrl, validatedEmail }) => redirectFallback(skuId, returnUrl, {
+    emailError: MSG_EMAIL_COLLISION,
     email: validatedEmail
   }),
-  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 })
+  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 })
 };
 function handleStructuredError(ctx) {
   const handler = ERROR_HANDLERS[ctx.walletError.errorType];
   if (handler) {
     handler(ctx);
   } else {
-    redirectFallback(ctx.skuId, ctx.returnUrl, ctx.country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+    redirectFallback(ctx.skuId, ctx.returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
   }
 }
 async function handlePaymentAuthorized(event, session, sessionData, config) {
-  const { skuId, returnUrl, queryString, country } = config;
+  const { skuId, returnUrl, queryString } = config;
   let validatedEmail;
   try {
     validatedEmail = validateContacts(
@@ -1620,32 +1596,25 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       sessionData,
       config.supportedBillingCountries
     );
-    const resolvedShippingContact = sessionData.loggedIn ? {
-      ...event.payment.shippingContact ?? {},
-      emailAddress: sessionData.emailAddress
-    } : event.payment.shippingContact;
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
       currency: config.currency,
       billingContact: event.payment.billingContact,
-      ...resolvedShippingContact && {
-        shippingContact: resolvedShippingContact
+      ...event.payment.shippingContact && {
+        shippingContact: event.payment.shippingContact
       },
       recaptchaTokens: config.recaptchaTokens
     });
     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),
-      queryString,
-      email: successEmail,
-      country
+      returnUrl,
+      queryString
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
@@ -1657,10 +1626,10 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
-      redirectFallback(skuId, returnUrl, country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+      redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
-    handleStructuredError({ skuId, returnUrl, country, validatedEmail, walletError });
+    handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
   }
 }
 

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

@@ -679,6 +679,8 @@ function renewalPeriodText(unit, duration) {
       return "";
   }
 }
+var LI_SEPARATOR = "LI_SEPARATOR";
+var P_SEPARATOR = "P_SEPARATOR";
 function buildTermsContext(offer, country) {
   const isUS = country === "US";
   const isCA = country === "CA";
@@ -715,19 +717,19 @@ function freeTrialTerms(offer, ctx) {
   const trialDuration = offer.subscription_options?.trial_period?.duration ?? 1;
   const trialDateStr = `on ${getRenewalDateText(trialUnit, trialDuration)}${ctx.verificationText}`;
   if (ctx.isUS) {
-    return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${trialDateStr} when your free trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function nytTerms(ctx) {
   const nytAccessText = "Your complimentary access to The New York Times is for one year only and does not auto-renew. We will send your instructions on how to redeem access to The New York Times by email.";
   if (ctx.isUS) {
-    return `Your subscription to <em>The Economist</em> auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}{{pSeparator}}${nytAccessText}`;
+    return `Your subscription to <em>The Economist</em> auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}${P_SEPARATOR}${nytAccessText}`;
   }
   if (ctx.isCA) {
-    return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled.{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}{{pSeparator}}${nytAccessText}`;
+    return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled.${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}${P_SEPARATOR}${nytAccessText}`;
   }
-  return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime} ${nytAccessText}`;
+  return `Your subscription to <em>The Economist</em> auto-renews at ${ctx.renewalPriceText} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime} ${nytAccessText}`;
 }
 function minTermContractTerms(offer, ctx) {
   const duePrice = formatPrice(offer.price.purchase, offer.price.currency_code);
@@ -737,28 +739,28 @@ function minTermContractTerms(offer, ctx) {
   const contractLength = mtDuration && mtUnit ? `${mtDuration} ${mtUnit}` : "";
   const initialContractText = contractLength ? `your initial ${contractLength} contract` : "your initial contract";
   const mtRenewalDateText = mtUnit && mtDuration ? getRenewalDateText(mtUnit, Number(mtDuration)) : ctx.renewalDateText;
-  return `You\u2019ll be charged ${duePrice} a month for the duration of ${initialContractText}{{liSeparator}}Your subscription auto-renews annually at ${ctx.renewalPriceText} a month on ${mtRenewalDateText} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}`;
+  return `You\u2019ll be charged ${duePrice} a month for the duration of ${initialContractText}${LI_SEPARATOR}Your subscription auto-renews annually at ${ctx.renewalPriceText} a month on ${mtRenewalDateText} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}`;
 }
 function paidTrialTerms(offer, ctx) {
   const trialUnit = offer.subscription_options?.trial_period?.unit ?? ctx.unit;
   const trialDuration = offer.subscription_options?.trial_period?.duration ?? ctx.duration;
   const trialDateText = getRenewalDateText(trialUnit, trialDuration);
   if (ctx.isUS) {
-    return `Your subscription auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} on ${trialDateText} when your paid trial ends{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} on ${trialDateText} when your paid trial ends${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} on ${trialDateText} when your paid trial ends, until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} on ${trialDateText} when your paid trial ends, until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function autoRenewalTerms(ctx) {
   if (ctx.isUS) {
-    return `Your subscription auto-renews ${ctx.periodText} until cancelled{{liSeparator}}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
+    return `Your subscription auto-renews ${ctx.periodText} until cancelled${LI_SEPARATOR}Your subscription renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.renewalDateStr}${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal until cancelled. ${ctx.usCancelNote}${ctx.taxFootnote}`;
   }
-  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled{{liSeparator}}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
+  return `Your subscription auto-renews at ${ctx.renewalPriceText}${ctx.taxSuffix} ${ctx.periodText} ${ctx.renewalDateStr} until cancelled${LI_SEPARATOR}You\u2019ll be charged the rate in effect at each renewal. ${ctx.cancelAnytime}${ctx.taxFootnote}`;
 }
 function noAutoRenewalTerms(ctx) {
   if (ctx.isUS || ctx.isCA) {
-    return `Your subscription does not renew automatically${ctx.taxFootnote}{{liSeparator}}`;
+    return `Your subscription does not renew automatically${ctx.taxFootnote}${LI_SEPARATOR}`;
   }
-  return `Your subscription does not renew automatically{{liSeparator}}`;
+  return `Your subscription does not renew automatically${LI_SEPARATOR}`;
 }
 function generateApplePayModalTerms(offer, country) {
   const ctx = buildTermsContext(offer, country);
@@ -781,9 +783,9 @@ function generateApplePayModalTerms(offer, country) {
   return noAutoRenewalTerms(ctx);
 }
 function renderTermsHtml(termsText) {
-  const renewalTextLists = termsText.split("{{liSeparator}}");
+  const renewalTextLists = termsText.split(LI_SEPARATOR);
   const lastPart = renewalTextLists.pop() || "";
-  const renewalTextParagraphs = lastPart.split("{{pSeparator}}");
+  const renewalTextParagraphs = lastPart.split(P_SEPARATOR);
   const ulHtml = `<ul class="apm__terms-bullets">${renewalTextLists.map((value) => `<li>${value}</li>`).join("")}</ul>`;
   const paragraphHtml = renewalTextParagraphs.filter(Boolean).map((value) => `<p class="apm__terms-legal">${value}</p>`).join("");
   return ulHtml + paragraphHtml;
@@ -1202,7 +1204,6 @@ var validateAppleMerchant = (data) => {
   });
 };
 var performPurchase = (data) => {
-  console.log("[web-apple-pay] /v1/wallet/purchase payload", JSON.stringify(data, null, 2));
   return apiFetch("/v1/wallet/purchase", {
     method: "POST",
     body: JSON.stringify(data),
@@ -1219,22 +1220,6 @@ var getExpressCheckoutSession = () => {
 };
 
 // src/utils/expressCheckoutRedirect.ts
-var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
-var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
-var writeCheckoutRedirect = (originUrl) => {
-  if (originUrl.startsWith("/")) {
-    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
-    return;
-  }
-  try {
-    const { hostname } = new URL(originUrl);
-    const isAllowed = hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
-    if (isAllowed) {
-      localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
-    }
-  } catch {
-  }
-};
 var captureOriginUrl = () => window.location.href;
 var buildQueryString = () => {
   const countryCode = new URLSearchParams(window.location.search).get(
@@ -1259,8 +1244,7 @@ var redirectToCheckoutComplete = (params) => {
   url.searchParams.set("lmo_offer", params.skuId);
   url.searchParams.set("status", params.status);
   url.searchParams.set("redirectToCheckout", "true");
-  if (params.email) url.searchParams.set("email", params.email);
-  if (params.country) url.searchParams.set("country", params.country);
+  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 var redirectToCheckoutFallback = (params) => {
@@ -1271,7 +1255,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);
-  if (params.country) url.searchParams.set("country", params.country);
+  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 
@@ -1355,16 +1339,17 @@ 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,
-    inlineError: MSG_PAYMENT_GENERIC_ERROR,
-    country: config.countryCode
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
   });
 }
 async function handleMerchantValidation(event, session, config) {
@@ -1543,6 +1528,8 @@ 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,
@@ -1551,15 +1538,9 @@ var failApplePaySession = (session, errors = []) => {
 };
 function parseWalletApiError(err) {
   const body = err instanceof ApiError ? err.body : err;
-  console.warn("[web-apple-pay] parseWalletApiError: raw error", {
-    isApiError: err instanceof ApiError,
-    body
-  });
   if (body && typeof body === "object" && "errorType" in body && "message" in body) {
-    console.warn("[web-apple-pay] parseWalletApiError: structured BFF error", body);
     return body;
   }
-  console.warn("[web-apple-pay] parseWalletApiError: unstructured error \u2014 no errorType found");
   return null;
 }
 function validateContacts(event, sessionData, supportedBillingCountries) {
@@ -1572,42 +1553,37 @@ function validateContacts(event, sessionData, supportedBillingCountries) {
   }
   return void 0;
 }
-function redirectFallback(skuId, returnUrl, country, options) {
-  writeCheckoutRedirect(returnUrl);
+function redirectFallback(skuId, returnUrl, options) {
   trackFallbackCheckout(skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId,
-    country,
+    returnUrl,
     ...options
   });
 }
 var ERROR_HANDLERS = {
-  // 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_COLLISION: ({ skuId, returnUrl, validatedEmail }) => redirectFallback(skuId, returnUrl, {
+    emailError: MSG_EMAIL_COLLISION,
     email: validatedEmail
   }),
-  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 })
+  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 })
 };
 function handleStructuredError(ctx) {
   const handler = ERROR_HANDLERS[ctx.walletError.errorType];
   if (handler) {
     handler(ctx);
   } else {
-    redirectFallback(ctx.skuId, ctx.returnUrl, ctx.country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+    redirectFallback(ctx.skuId, ctx.returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
   }
 }
 async function handlePaymentAuthorized(event, session, sessionData, config) {
-  const { skuId, returnUrl, queryString, country } = config;
+  const { skuId, returnUrl, queryString } = config;
   let validatedEmail;
   try {
     validatedEmail = validateContacts(
@@ -1615,32 +1591,25 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       sessionData,
       config.supportedBillingCountries
     );
-    const resolvedShippingContact = sessionData.loggedIn ? {
-      ...event.payment.shippingContact ?? {},
-      emailAddress: sessionData.emailAddress
-    } : event.payment.shippingContact;
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
       currency: config.currency,
       billingContact: event.payment.billingContact,
-      ...resolvedShippingContact && {
-        shippingContact: resolvedShippingContact
+      ...event.payment.shippingContact && {
+        shippingContact: event.payment.shippingContact
       },
       recaptchaTokens: config.recaptchaTokens
     });
     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),
-      queryString,
-      email: successEmail,
-      country
+      returnUrl,
+      queryString
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
@@ -1652,10 +1621,10 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
-      redirectFallback(skuId, returnUrl, country, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
+      redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
-    handleStructuredError({ skuId, returnUrl, country, validatedEmail, walletError });
+    handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
   }
 }