@solvapay/react 2.3.1 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @solvapay/react changelog
 
+## 2.4.0
+
+### Minor Changes
+
+- b16c1b6: MandateText now always names SolvaPay's Terms of Service and Privacy Policy, and adds the merchant's own pair only when set.
+
+  `MandateContext` gains `solvapay: { termsUrl, privacyUrl }`. Mandate link labels live on `copy.legal.{termsOfService, privacyPolicy}`; `copy.legalFooter` stays the short footer strip. Custom `copy.mandate` templates no longer receive SolvaPay URLs on `ctx.merchant.termsUrl` / `privacyUrl` when the merchant has none — those fields are now merchant-only.
+
 ## 2.3.1
 
 ### Patch Changes

package/dist/{UsageMeter-DWkwHgTP.d.cts → UsageMeter-DUeL64V4.d.cts}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { _ as UsageSnapshot } from './useUsage-8NCXS45R.cjs';
+import { _ as UsageSnapshot } from './useUsage-zYGsspbH.cjs';
 
 /**
  * `<UsageMeter>` compound primitive — renders the authenticated customer's

package/dist/{UsageMeter-DosUKnwg.d.ts → UsageMeter-iI9fukd0.d.ts}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { _ as UsageSnapshot } from './useUsage-C5_XnS_6.js';
+import { _ as UsageSnapshot } from './useUsage-B144Vck8.js';
 
 /**
  * `<UsageMeter>` compound primitive — renders the authenticated customer's

package/dist/{chunk-LXG7QDM3.js → chunk-BPF5NFWF.js}

@@ -52,7 +52,7 @@ import {
   validateAutoRechargeForm,
   withPaymentElementDefaults,
   writeAutoRechargeCache
-} from "./chunk-JXH36VLL.js";
+} from "./chunk-MMD6AOUR.js";
 
 // src/TopupForm.tsx
 import { jsx, jsxs } from "react/jsx-runtime";

package/dist/{chunk-JXH36VLL.js → chunk-MMD6AOUR.js}

@@ -354,14 +354,20 @@ function trialPhrase(ctx) {
   const trialDays = ctx.plan?.trialDays ?? ctx.trialDays;
   return trialDays ? ` after your ${trialDays}-day free trial` : "";
 }
-function termsSentence(ctx) {
-  const { termsUrl, privacyUrl } = ctx.merchant;
-  if (termsUrl && privacyUrl) {
-    return ` See ${termsUrl} and ${privacyUrl}.`;
+function joinLegalDocs(urls) {
+  if (urls.length === 2) return `${urls[0]} and ${urls[1]}`;
+  return urls[0] ?? "";
+}
+function legalSentence(ctx) {
+  const solvaClause = `SolvaPay's ${ctx.solvapay.termsUrl} and ${ctx.solvapay.privacyUrl}`;
+  const merchantDocs = [];
+  if (ctx.merchant.termsUrl) merchantDocs.push(ctx.merchant.termsUrl);
+  if (ctx.merchant.privacyUrl) merchantDocs.push(ctx.merchant.privacyUrl);
+  if (merchantDocs.length === 0) {
+    return ` You agree to ${solvaClause}.`;
   }
-  if (termsUrl) return ` See ${termsUrl}.`;
-  if (privacyUrl) return ` See ${privacyUrl}.`;
-  return "";
+  const brand = ctx.merchant.displayName || ctx.merchant.legalName;
+  return ` You agree to ${brand}'s ${joinLegalDocs(merchantDocs)}, and ${solvaClause}.`;
 }
 var enCopy = {
   mandate: {
@@ -369,27 +375,27 @@ var enCopy = {
       const period = intervalPhrase(ctx);
       const trial = trialPhrase(ctx);
       const every = period ? ` every ${period}` : "";
-      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     oneTime: (ctx) => {
       const product = ctx.product?.name ? ` for ${ctx.product.name}` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     topup: (ctx) => {
       const product = ctx.product?.name ? ` to add credits to your ${ctx.product.name} balance` : " to add credits to your balance";
       const savedCard = ctx.savesPaymentMethod ? ` You also authorize ${ctx.merchant.legalName} to save this card and charge it for future auto-recharges, which you can turn off any time.` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     usageMetered: (ctx) => {
       const measures = ctx.plan?.measures ?? "request";
       const cycle = ctx.plan?.billingCycle ?? "monthly";
       const product = ctx.product?.name ?? "the service";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     freeTier: (ctx) => {
       const product = ctx.product?.name ?? "this plan";
       const planPhrase = ctx.plan?.name ? ` on ${ctx.plan.name}` : "";
-      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     }
   },
   cta: {
@@ -663,6 +669,10 @@ var enCopy = {
       paymentPayg: "Confirm your card to add credits to your balance."
     }
   },
+  legal: {
+    termsOfService: "Terms of Service",
+    privacyPolicy: "Privacy Policy"
+  },
   legalFooter: {
     terms: "Terms",
     privacy: "Privacy",
@@ -3158,8 +3168,12 @@ var MandateText = forwardRef4(
           legalName: merchant?.legalName ?? merchant?.displayName ?? "",
           displayName: merchant?.displayName,
           supportEmail: merchant?.supportEmail,
-          termsUrl: merchant?.termsUrl ?? SOLVAPAY_TERMS_URL,
-          privacyUrl: merchant?.privacyUrl ?? SOLVAPAY_PRIVACY_URL
+          termsUrl: merchant?.termsUrl,
+          privacyUrl: merchant?.privacyUrl
+        },
+        solvapay: {
+          termsUrl: SOLVAPAY_TERMS_URL,
+          privacyUrl: SOLVAPAY_PRIVACY_URL
         },
         plan: plan ? {
           name: plan.name,
@@ -3187,16 +3201,26 @@ var MandateText = forwardRef4(
         "data-solvapay-mandate-text": "",
         "data-variant": resolvedVariant,
         ...rest,
-        children: children ?? linkifyMandateText(text, ctx.merchant, copy, handleExternalClick)
+        children: children ?? linkifyMandateText(text, ctx, copy, handleExternalClick)
       }
     );
   }
 );
-function linkifyMandateText(text, merchant, copy, onLinkClick) {
-  const entries = [
-    { url: merchant.termsUrl, label: copy.legalFooter.terms },
-    { url: merchant.privacyUrl, label: copy.legalFooter.privacy }
-  ].filter((entry) => Boolean(entry.url));
+function linkifyMandateText(text, ctx, copy, onLinkClick) {
+  const termsLabel = copy.legal.termsOfService;
+  const privacyLabel = copy.legal.privacyPolicy;
+  const seen = /* @__PURE__ */ new Set();
+  const entries = [];
+  for (const entry of [
+    { url: ctx.merchant.termsUrl, label: termsLabel },
+    { url: ctx.merchant.privacyUrl, label: privacyLabel },
+    { url: ctx.solvapay.termsUrl, label: termsLabel },
+    { url: ctx.solvapay.privacyUrl, label: privacyLabel }
+  ]) {
+    if (!entry.url || seen.has(entry.url)) continue;
+    seen.add(entry.url);
+    entries.push({ url: entry.url, label: entry.label });
+  }
   if (entries.length === 0) return [text];
   const pattern = new RegExp(`(${entries.map((e) => escapeRegExp(e.url)).join("|")})`, "g");
   return text.split(pattern).map((part, i) => {

package/dist/{chunk-QWK3LMGG.js → chunk-P4PPMKIK.js}

@@ -8,7 +8,7 @@ import {
   useOpenExternal,
   useSolvaPay,
   useTransport
-} from "./chunk-JXH36VLL.js";
+} from "./chunk-MMD6AOUR.js";
 
 // src/hooks/usePaymentMethod.ts
 import { useCallback, useEffect, useState } from "react";

package/dist/{index-CxGoNto4.d.ts → index-BTZxR-Le.d.cts}

@@ -1,4 +1,4 @@
-import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-C5_XnS_6.js';
+import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-zYGsspbH.cjs';
 import React from 'react';
 import { PaymentElement, CardElement } from '@stripe/react-stripe-js';
 import { TaxBreakdown } from '@solvapay/core';
@@ -168,14 +168,12 @@ declare function deriveVariant(plan: Plan | null | undefined, mode?: 'topup'): C
  * resolve through the localized copy bundle so integrators can override
  * text without forking the component.
  *
- * The copy templates embed the merchant's terms / privacy URLs verbatim
- * (e.g. "... See https://acme.com/terms and https://acme.com/privacy.").
- * `MandateText` post-processes the rendered string and swaps any
- * occurrence of `merchant.termsUrl` / `merchant.privacyUrl` for an
- * `<a target="_blank">` whose visible label comes from
- * `copy.legalFooter.{terms, privacy}` ("Terms" / "Privacy"). Keeps the
- * i18n template signature untouched while lifting the legal commitment
- * to the point of charge.
+ * The copy templates embed legal URLs verbatim (merchant terms/privacy
+ * when set, plus SolvaPay's own). `MandateText` post-processes the
+ * rendered string and swaps those URLs for `<a target="_blank">` whose
+ * visible label comes from `copy.legal.{termsOfService, privacyPolicy}`.
+ * Keeps the i18n template signature untouched while lifting the legal
+ * commitment to the point of charge.
  *
  * `savesPaymentMethod` marks a confirm that also stores the card for
  * later off-session charges (auto-recharge). The MCP payment surfaces
@@ -183,12 +181,10 @@ declare function deriveVariant(plan: Plan | null | undefined, mode?: 'topup'): C
  * place that discloses the storage — the topup template appends a
  * saved-card sentence when the flag is set.
  *
- * When the merchant record omits `termsUrl` / `privacyUrl`, we fall back
- * to SolvaPay's hosted legal pages so the mandate sentence always carries
- * working links. SolvaPay is the underlying processor on every charge, so
- * its terms always apply — using them as the universal fallback keeps the
- * SCA disclosure complete even for merchants who haven't published their
- * own pages yet.
+ * SolvaPay's Terms of Service and Privacy Policy are always named and
+ * linked. The merchant's own pair is added only when the merchant
+ * record publishes `termsUrl` / `privacyUrl` — they are never used as
+ * a substitute for SolvaPay's.
  */
 
 type MandateTextProps = {

package/dist/{index-fuaNfBE5.d.cts → index-BY4aA8T2.d.ts}

@@ -1,4 +1,4 @@
-import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-8NCXS45R.cjs';
+import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-B144Vck8.js';
 import React from 'react';
 import { PaymentElement, CardElement } from '@stripe/react-stripe-js';
 import { TaxBreakdown } from '@solvapay/core';
@@ -168,14 +168,12 @@ declare function deriveVariant(plan: Plan | null | undefined, mode?: 'topup'): C
  * resolve through the localized copy bundle so integrators can override
  * text without forking the component.
  *
- * The copy templates embed the merchant's terms / privacy URLs verbatim
- * (e.g. "... See https://acme.com/terms and https://acme.com/privacy.").
- * `MandateText` post-processes the rendered string and swaps any
- * occurrence of `merchant.termsUrl` / `merchant.privacyUrl` for an
- * `<a target="_blank">` whose visible label comes from
- * `copy.legalFooter.{terms, privacy}` ("Terms" / "Privacy"). Keeps the
- * i18n template signature untouched while lifting the legal commitment
- * to the point of charge.
+ * The copy templates embed legal URLs verbatim (merchant terms/privacy
+ * when set, plus SolvaPay's own). `MandateText` post-processes the
+ * rendered string and swaps those URLs for `<a target="_blank">` whose
+ * visible label comes from `copy.legal.{termsOfService, privacyPolicy}`.
+ * Keeps the i18n template signature untouched while lifting the legal
+ * commitment to the point of charge.
  *
  * `savesPaymentMethod` marks a confirm that also stores the card for
  * later off-session charges (auto-recharge). The MCP payment surfaces
@@ -183,12 +181,10 @@ declare function deriveVariant(plan: Plan | null | undefined, mode?: 'topup'): C
  * place that discloses the storage — the topup template appends a
  * saved-card sentence when the flag is set.
  *
- * When the merchant record omits `termsUrl` / `privacyUrl`, we fall back
- * to SolvaPay's hosted legal pages so the mandate sentence always carries
- * working links. SolvaPay is the underlying processor on every charge, so
- * its terms always apply — using them as the universal fallback keeps the
- * SCA disclosure complete even for merchants who haven't published their
- * own pages yet.
+ * SolvaPay's Terms of Service and Privacy Policy are always named and
+ * linked. The merchant's own pair is added only when the merchant
+ * record publishes `termsUrl` / `privacyUrl` — they are never used as
+ * a substitute for SolvaPay's.
  */
 
 type MandateTextProps = {

package/dist/index.cjs

@@ -601,14 +601,20 @@ function trialPhrase(ctx) {
   const trialDays = ctx.plan?.trialDays ?? ctx.trialDays;
   return trialDays ? ` after your ${trialDays}-day free trial` : "";
 }
-function termsSentence(ctx) {
-  const { termsUrl, privacyUrl } = ctx.merchant;
-  if (termsUrl && privacyUrl) {
-    return ` See ${termsUrl} and ${privacyUrl}.`;
+function joinLegalDocs(urls) {
+  if (urls.length === 2) return `${urls[0]} and ${urls[1]}`;
+  return urls[0] ?? "";
+}
+function legalSentence(ctx) {
+  const solvaClause = `SolvaPay's ${ctx.solvapay.termsUrl} and ${ctx.solvapay.privacyUrl}`;
+  const merchantDocs = [];
+  if (ctx.merchant.termsUrl) merchantDocs.push(ctx.merchant.termsUrl);
+  if (ctx.merchant.privacyUrl) merchantDocs.push(ctx.merchant.privacyUrl);
+  if (merchantDocs.length === 0) {
+    return ` You agree to ${solvaClause}.`;
   }
-  if (termsUrl) return ` See ${termsUrl}.`;
-  if (privacyUrl) return ` See ${privacyUrl}.`;
-  return "";
+  const brand = ctx.merchant.displayName || ctx.merchant.legalName;
+  return ` You agree to ${brand}'s ${joinLegalDocs(merchantDocs)}, and ${solvaClause}.`;
 }
 var enCopy = {
   mandate: {
@@ -616,27 +622,27 @@ var enCopy = {
       const period = intervalPhrase(ctx);
       const trial = trialPhrase(ctx);
       const every = period ? ` every ${period}` : "";
-      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     oneTime: (ctx) => {
       const product = ctx.product?.name ? ` for ${ctx.product.name}` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     topup: (ctx) => {
       const product = ctx.product?.name ? ` to add credits to your ${ctx.product.name} balance` : " to add credits to your balance";
       const savedCard = ctx.savesPaymentMethod ? ` You also authorize ${ctx.merchant.legalName} to save this card and charge it for future auto-recharges, which you can turn off any time.` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     usageMetered: (ctx) => {
       const measures = ctx.plan?.measures ?? "request";
       const cycle = ctx.plan?.billingCycle ?? "monthly";
       const product = ctx.product?.name ?? "the service";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     freeTier: (ctx) => {
       const product = ctx.product?.name ?? "this plan";
       const planPhrase = ctx.plan?.name ? ` on ${ctx.plan.name}` : "";
-      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     }
   },
   cta: {
@@ -910,6 +916,10 @@ var enCopy = {
       paymentPayg: "Confirm your card to add credits to your balance."
     }
   },
+  legal: {
+    termsOfService: "Terms of Service",
+    privacyPolicy: "Privacy Policy"
+  },
   legalFooter: {
     terms: "Terms",
     privacy: "Privacy",
@@ -3569,8 +3579,12 @@ var MandateText = (0, import_react18.forwardRef)(
           legalName: merchant?.legalName ?? merchant?.displayName ?? "",
           displayName: merchant?.displayName,
           supportEmail: merchant?.supportEmail,
-          termsUrl: merchant?.termsUrl ?? SOLVAPAY_TERMS_URL,
-          privacyUrl: merchant?.privacyUrl ?? SOLVAPAY_PRIVACY_URL
+          termsUrl: merchant?.termsUrl,
+          privacyUrl: merchant?.privacyUrl
+        },
+        solvapay: {
+          termsUrl: SOLVAPAY_TERMS_URL,
+          privacyUrl: SOLVAPAY_PRIVACY_URL
         },
         plan: plan ? {
           name: plan.name,
@@ -3598,16 +3612,26 @@ var MandateText = (0, import_react18.forwardRef)(
         "data-solvapay-mandate-text": "",
         "data-variant": resolvedVariant,
         ...rest,
-        children: children ?? linkifyMandateText(text, ctx.merchant, copy, handleExternalClick)
+        children: children ?? linkifyMandateText(text, ctx, copy, handleExternalClick)
       }
     );
   }
 );
-function linkifyMandateText(text, merchant, copy, onLinkClick) {
-  const entries = [
-    { url: merchant.termsUrl, label: copy.legalFooter.terms },
-    { url: merchant.privacyUrl, label: copy.legalFooter.privacy }
-  ].filter((entry) => Boolean(entry.url));
+function linkifyMandateText(text, ctx, copy, onLinkClick) {
+  const termsLabel = copy.legal.termsOfService;
+  const privacyLabel = copy.legal.privacyPolicy;
+  const seen = /* @__PURE__ */ new Set();
+  const entries = [];
+  for (const entry of [
+    { url: ctx.merchant.termsUrl, label: termsLabel },
+    { url: ctx.merchant.privacyUrl, label: privacyLabel },
+    { url: ctx.solvapay.termsUrl, label: termsLabel },
+    { url: ctx.solvapay.privacyUrl, label: privacyLabel }
+  ]) {
+    if (!entry.url || seen.has(entry.url)) continue;
+    seen.add(entry.url);
+    entries.push({ url: entry.url, label: entry.label });
+  }
   if (entries.length === 0) return [text];
   const pattern = new RegExp(`(${entries.map((e) => escapeRegExp(e.url)).join("|")})`, "g");
   return text.split(pattern).map((part, i) => {

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, B as BootstrapPlanLike, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, q as BalanceStatus, r as UseTopupAmountSelectorOptions, s as UseTopupAmountSelectorReturn, t as UsePaymentMethodReturn, u as AutoRechargeConfig, v as SaveAutoRechargeInput, w as SolvaPayTransport, x as PartialSolvaPayCopy, y as PurchaseInfo, z as Product, D as SolvaPayConfig } from './useUsage-8NCXS45R.cjs';
-export { E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError, _ as UsageSnapshot, $ as UseUsageReturn, a0 as useUsage } from './useUsage-8NCXS45R.cjs';
-import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-fuaNfBE5.cjs';
-export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UseCheckoutFlowOptions, x as UseCheckoutFlowReturn, y as configToAutoRechargeInput, z as deriveVariant, D as useCheckoutFlow, E as useCheckoutStepsContext } from './index-fuaNfBE5.cjs';
+import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, B as BootstrapPlanLike, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, q as BalanceStatus, r as UseTopupAmountSelectorOptions, s as UseTopupAmountSelectorReturn, t as UsePaymentMethodReturn, u as AutoRechargeConfig, v as SaveAutoRechargeInput, w as SolvaPayTransport, x as PartialSolvaPayCopy, y as PurchaseInfo, z as Product, D as SolvaPayConfig } from './useUsage-zYGsspbH.cjs';
+export { E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError, _ as UsageSnapshot, $ as UseUsageReturn, a0 as useUsage } from './useUsage-zYGsspbH.cjs';
+import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-BTZxR-Le.cjs';
+export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UseCheckoutFlowOptions, x as UseCheckoutFlowReturn, y as configToAutoRechargeInput, z as deriveVariant, D as useCheckoutFlow, E as useCheckoutStepsContext } from './index-BTZxR-Le.cjs';
 import { PaymentIntent, Stripe, StripeElements } from '@stripe/stripe-js';
 import { BusinessDetailsInput, TaxBreakdown } from '@solvapay/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
@@ -1090,8 +1090,8 @@ type CopyProviderProps = {
 declare const CopyProvider: React.FC<CopyProviderProps>;
 
 /**
- * Canonical English copy. Preserves the exact copy shipped before the i18n
- * refactor so no visible behavior changes for English consumers.
+ * Canonical English copy. Mandate variants keep their SCA lead-ins and
+ * close with the hosted-style legal consent tail (`legalSentence`).
  */
 declare const enCopy: SolvaPayCopy;
 

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, B as BootstrapPlanLike, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, q as BalanceStatus, r as UseTopupAmountSelectorOptions, s as UseTopupAmountSelectorReturn, t as UsePaymentMethodReturn, u as AutoRechargeConfig, v as SaveAutoRechargeInput, w as SolvaPayTransport, x as PartialSolvaPayCopy, y as PurchaseInfo, z as Product, D as SolvaPayConfig } from './useUsage-C5_XnS_6.js';
-export { E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError, _ as UsageSnapshot, $ as UseUsageReturn, a0 as useUsage } from './useUsage-C5_XnS_6.js';
-import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-CxGoNto4.js';
-export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UseCheckoutFlowOptions, x as UseCheckoutFlowReturn, y as configToAutoRechargeInput, z as deriveVariant, D as useCheckoutFlow, E as useCheckoutStepsContext } from './index-CxGoNto4.js';
+import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, B as BootstrapPlanLike, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, q as BalanceStatus, r as UseTopupAmountSelectorOptions, s as UseTopupAmountSelectorReturn, t as UsePaymentMethodReturn, u as AutoRechargeConfig, v as SaveAutoRechargeInput, w as SolvaPayTransport, x as PartialSolvaPayCopy, y as PurchaseInfo, z as Product, D as SolvaPayConfig } from './useUsage-B144Vck8.js';
+export { E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError, _ as UsageSnapshot, $ as UseUsageReturn, a0 as useUsage } from './useUsage-B144Vck8.js';
+import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-BY4aA8T2.js';
+export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UseCheckoutFlowOptions, x as UseCheckoutFlowReturn, y as configToAutoRechargeInput, z as deriveVariant, D as useCheckoutFlow, E as useCheckoutStepsContext } from './index-BY4aA8T2.js';
 import { PaymentIntent, Stripe, StripeElements } from '@stripe/stripe-js';
 import { BusinessDetailsInput, TaxBreakdown } from '@solvapay/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
@@ -1090,8 +1090,8 @@ type CopyProviderProps = {
 declare const CopyProvider: React.FC<CopyProviderProps>;
 
 /**
- * Canonical English copy. Preserves the exact copy shipped before the i18n
- * refactor so no visible behavior changes for English consumers.
+ * Canonical English copy. Mandate variants keep their SCA lead-ins and
+ * close with the hosted-style legal consent tail (`legalSentence`).
  */
 declare const enCopy: SolvaPayCopy;
 

package/dist/index.js

@@ -4,7 +4,7 @@ import {
 import {
   LaunchCustomerPortalButton,
   usePaymentMethod
-} from "./chunk-QWK3LMGG.js";
+} from "./chunk-P4PPMKIK.js";
 import {
   ActivationFlow,
   AutoRecharge,
@@ -20,7 +20,7 @@ import {
   useCheckoutSteps,
   useCreditGate,
   usePaywallResolver
-} from "./chunk-LXG7QDM3.js";
+} from "./chunk-BPF5NFWF.js";
 import {
   AmountPicker,
   BalanceBadge,
@@ -100,7 +100,7 @@ import {
   useTopupAmountSelector,
   useTransport,
   useUsage
-} from "./chunk-JXH36VLL.js";
+} from "./chunk-MMD6AOUR.js";
 import {
   createAnonymousAuthAdapter,
   defaultAuthAdapter,

package/dist/mcp/index.cjs

@@ -1223,14 +1223,20 @@ function trialPhrase(ctx) {
   const trialDays2 = ctx.plan?.trialDays ?? ctx.trialDays;
   return trialDays2 ? ` after your ${trialDays2}-day free trial` : "";
 }
-function termsSentence(ctx) {
-  const { termsUrl, privacyUrl } = ctx.merchant;
-  if (termsUrl && privacyUrl) {
-    return ` See ${termsUrl} and ${privacyUrl}.`;
+function joinLegalDocs(urls) {
+  if (urls.length === 2) return `${urls[0]} and ${urls[1]}`;
+  return urls[0] ?? "";
+}
+function legalSentence(ctx) {
+  const solvaClause = `SolvaPay's ${ctx.solvapay.termsUrl} and ${ctx.solvapay.privacyUrl}`;
+  const merchantDocs = [];
+  if (ctx.merchant.termsUrl) merchantDocs.push(ctx.merchant.termsUrl);
+  if (ctx.merchant.privacyUrl) merchantDocs.push(ctx.merchant.privacyUrl);
+  if (merchantDocs.length === 0) {
+    return ` You agree to ${solvaClause}.`;
   }
-  if (termsUrl) return ` See ${termsUrl}.`;
-  if (privacyUrl) return ` See ${privacyUrl}.`;
-  return "";
+  const brand = ctx.merchant.displayName || ctx.merchant.legalName;
+  return ` You agree to ${brand}'s ${joinLegalDocs(merchantDocs)}, and ${solvaClause}.`;
 }
 var enCopy = {
   mandate: {
@@ -1238,27 +1244,27 @@ var enCopy = {
       const period = intervalPhrase(ctx);
       const trial = trialPhrase(ctx);
       const every = period ? ` every ${period}` : "";
-      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     oneTime: (ctx) => {
       const product = ctx.product?.name ? ` for ${ctx.product.name}` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     topup: (ctx) => {
       const product = ctx.product?.name ? ` to add credits to your ${ctx.product.name} balance` : " to add credits to your balance";
       const savedCard = ctx.savesPaymentMethod ? ` You also authorize ${ctx.merchant.legalName} to save this card and charge it for future auto-recharges, which you can turn off any time.` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     usageMetered: (ctx) => {
       const measures = ctx.plan?.measures ?? "request";
       const cycle = ctx.plan?.billingCycle ?? "monthly";
       const product = ctx.product?.name ?? "the service";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     freeTier: (ctx) => {
       const product = ctx.product?.name ?? "this plan";
       const planPhrase = ctx.plan?.name ? ` on ${ctx.plan.name}` : "";
-      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     }
   },
   cta: {
@@ -1532,6 +1538,10 @@ var enCopy = {
       paymentPayg: "Confirm your card to add credits to your balance."
     }
   },
+  legal: {
+    termsOfService: "Terms of Service",
+    privacyPolicy: "Privacy Policy"
+  },
   legalFooter: {
     terms: "Terms",
     privacy: "Privacy",
@@ -7860,8 +7870,12 @@ var MandateText = (0, import_react37.forwardRef)(
           legalName: merchant?.legalName ?? merchant?.displayName ?? "",
           displayName: merchant?.displayName,
           supportEmail: merchant?.supportEmail,
-          termsUrl: merchant?.termsUrl ?? SOLVAPAY_TERMS_URL,
-          privacyUrl: merchant?.privacyUrl ?? SOLVAPAY_PRIVACY_URL
+          termsUrl: merchant?.termsUrl,
+          privacyUrl: merchant?.privacyUrl
+        },
+        solvapay: {
+          termsUrl: SOLVAPAY_TERMS_URL,
+          privacyUrl: SOLVAPAY_PRIVACY_URL
         },
         plan: plan ? {
           name: plan.name,
@@ -7889,16 +7903,26 @@ var MandateText = (0, import_react37.forwardRef)(
         "data-solvapay-mandate-text": "",
         "data-variant": resolvedVariant,
         ...rest,
-        children: children ?? linkifyMandateText(text, ctx.merchant, copy, handleExternalClick)
+        children: children ?? linkifyMandateText(text, ctx, copy, handleExternalClick)
       }
     );
   }
 );
-function linkifyMandateText(text, merchant, copy, onLinkClick) {
-  const entries = [
-    { url: merchant.termsUrl, label: copy.legalFooter.terms },
-    { url: merchant.privacyUrl, label: copy.legalFooter.privacy }
-  ].filter((entry) => Boolean(entry.url));
+function linkifyMandateText(text, ctx, copy, onLinkClick) {
+  const termsLabel = copy.legal.termsOfService;
+  const privacyLabel = copy.legal.privacyPolicy;
+  const seen = /* @__PURE__ */ new Set();
+  const entries = [];
+  for (const entry of [
+    { url: ctx.merchant.termsUrl, label: termsLabel },
+    { url: ctx.merchant.privacyUrl, label: privacyLabel },
+    { url: ctx.solvapay.termsUrl, label: termsLabel },
+    { url: ctx.solvapay.privacyUrl, label: privacyLabel }
+  ]) {
+    if (!entry.url || seen.has(entry.url)) continue;
+    seen.add(entry.url);
+    entries.push({ url: entry.url, label: entry.label });
+  }
   if (entries.length === 0) return [text];
   const pattern = new RegExp(`(${entries.map((e) => escapeRegExp(e.url)).join("|")})`, "g");
   return text.split(pattern).map((part, i) => {

package/dist/mcp/index.d.cts

@@ -1,10 +1,10 @@
-import { w as SolvaPayTransport, a1 as SolvaPayProviderInitial, D as SolvaPayConfig, B as BootstrapPlanLike, y as PurchaseInfo, a2 as CreditActivityType, a3 as CreditActivityEntry, H as Merchant } from '../useUsage-8NCXS45R.cjs';
+import { w as SolvaPayTransport, a1 as SolvaPayProviderInitial, D as SolvaPayConfig, B as BootstrapPlanLike, y as PurchaseInfo, a2 as CreditActivityType, a3 as CreditActivityEntry, H as Merchant } from '../useUsage-zYGsspbH.cjs';
 import { TOOL_FOR_VIEW, SolvaPayMcpViewKind, BootstrapMerchant, BootstrapProduct, BootstrapPlan, BootstrapCustomer } from '@solvapay/mcp-core';
 export { MCP_TOOL_NAMES, McpToolName } from '@solvapay/mcp-core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 import { PricingOptionLike, PricedLike, BalancePegLike } from '@solvapay/core';
-import { U as UsageMeterRootProps } from '../UsageMeter-DWkwHgTP.cjs';
+import { U as UsageMeterRootProps } from '../UsageMeter-DUeL64V4.cjs';
 import '@stripe/stripe-js';
 import '../adapters/auth.cjs';
 

package/dist/mcp/index.d.ts

@@ -1,10 +1,10 @@
-import { w as SolvaPayTransport, a1 as SolvaPayProviderInitial, D as SolvaPayConfig, B as BootstrapPlanLike, y as PurchaseInfo, a2 as CreditActivityType, a3 as CreditActivityEntry, H as Merchant } from '../useUsage-C5_XnS_6.js';
+import { w as SolvaPayTransport, a1 as SolvaPayProviderInitial, D as SolvaPayConfig, B as BootstrapPlanLike, y as PurchaseInfo, a2 as CreditActivityType, a3 as CreditActivityEntry, H as Merchant } from '../useUsage-B144Vck8.js';
 import { TOOL_FOR_VIEW, SolvaPayMcpViewKind, BootstrapMerchant, BootstrapProduct, BootstrapPlan, BootstrapCustomer } from '@solvapay/mcp-core';
 export { MCP_TOOL_NAMES, McpToolName } from '@solvapay/mcp-core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 import { PricingOptionLike, PricedLike, BalancePegLike } from '@solvapay/core';
-import { U as UsageMeterRootProps } from '../UsageMeter-DosUKnwg.js';
+import { U as UsageMeterRootProps } from '../UsageMeter-iI9fukd0.js';
 import '@stripe/stripe-js';
 import '../adapters/auth.js';
 

package/dist/mcp/index.js

@@ -2,7 +2,7 @@ import {
   ExternalLinkGlyph,
   LaunchCustomerPortalButton,
   paymentMethodCache
-} from "../chunk-QWK3LMGG.js";
+} from "../chunk-P4PPMKIK.js";
 import {
   AmountPicker,
   BalanceBadge,
@@ -57,7 +57,7 @@ import {
   useTransport,
   useUsage,
   validateAutoRechargeForm
-} from "../chunk-JXH36VLL.js";
+} from "../chunk-MMD6AOUR.js";
 import "../chunk-UMXOAUW7.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/primitives/index.cjs

@@ -719,14 +719,20 @@ function trialPhrase(ctx) {
   const trialDays = ctx.plan?.trialDays ?? ctx.trialDays;
   return trialDays ? ` after your ${trialDays}-day free trial` : "";
 }
-function termsSentence(ctx) {
-  const { termsUrl, privacyUrl } = ctx.merchant;
-  if (termsUrl && privacyUrl) {
-    return ` See ${termsUrl} and ${privacyUrl}.`;
+function joinLegalDocs(urls) {
+  if (urls.length === 2) return `${urls[0]} and ${urls[1]}`;
+  return urls[0] ?? "";
+}
+function legalSentence(ctx) {
+  const solvaClause = `SolvaPay's ${ctx.solvapay.termsUrl} and ${ctx.solvapay.privacyUrl}`;
+  const merchantDocs = [];
+  if (ctx.merchant.termsUrl) merchantDocs.push(ctx.merchant.termsUrl);
+  if (ctx.merchant.privacyUrl) merchantDocs.push(ctx.merchant.privacyUrl);
+  if (merchantDocs.length === 0) {
+    return ` You agree to ${solvaClause}.`;
   }
-  if (termsUrl) return ` See ${termsUrl}.`;
-  if (privacyUrl) return ` See ${privacyUrl}.`;
-  return "";
+  const brand = ctx.merchant.displayName || ctx.merchant.legalName;
+  return ` You agree to ${brand}'s ${joinLegalDocs(merchantDocs)}, and ${solvaClause}.`;
 }
 var enCopy = {
   mandate: {
@@ -734,27 +740,27 @@ var enCopy = {
       const period = intervalPhrase(ctx);
       const trial = trialPhrase(ctx);
       const every = period ? ` every ${period}` : "";
-      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By subscribing, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${every}${trial} until you cancel. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     oneTime: (ctx) => {
       const product = ctx.product?.name ? ` for ${ctx.product.name}` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge a one-time ${ctx.amountFormatted}${product}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     topup: (ctx) => {
       const product = ctx.product?.name ? ` to add credits to your ${ctx.product.name} balance` : " to add credits to your balance";
       const savedCard = ctx.savesPaymentMethod ? ` You also authorize ${ctx.merchant.legalName} to save this card and charge it for future auto-recharges, which you can turn off any time.` : "";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge ${ctx.amountFormatted}${product}. Credits are non-refundable once used.${savedCard} Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     usageMetered: (ctx) => {
       const measures = ctx.plan?.measures ?? "request";
       const cycle = ctx.plan?.billingCycle ?? "monthly";
       const product = ctx.product?.name ?? "the service";
-      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you authorize ${ctx.merchant.legalName} to charge your payment method for metered usage of ${product} at ${ctx.amountFormatted} per ${measures}, billed ${cycle}. You can cancel any time. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     },
     freeTier: (ctx) => {
       const product = ctx.product?.name ?? "this plan";
       const planPhrase = ctx.plan?.name ? ` on ${ctx.plan.name}` : "";
-      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${termsSentence(ctx)}`;
+      return `By confirming, you activate ${product}${planPhrase}. Payments are processed by SolvaPay.${legalSentence(ctx)}`;
     }
   },
   cta: {
@@ -1028,6 +1034,10 @@ var enCopy = {
       paymentPayg: "Confirm your card to add credits to your balance."
     }
   },
+  legal: {
+    termsOfService: "Terms of Service",
+    privacyPolicy: "Privacy Policy"
+  },
   legalFooter: {
     terms: "Terms",
     privacy: "Privacy",
@@ -3397,8 +3407,12 @@ var MandateText = (0, import_react19.forwardRef)(
           legalName: merchant?.legalName ?? merchant?.displayName ?? "",
           displayName: merchant?.displayName,
           supportEmail: merchant?.supportEmail,
-          termsUrl: merchant?.termsUrl ?? SOLVAPAY_TERMS_URL,
-          privacyUrl: merchant?.privacyUrl ?? SOLVAPAY_PRIVACY_URL
+          termsUrl: merchant?.termsUrl,
+          privacyUrl: merchant?.privacyUrl
+        },
+        solvapay: {
+          termsUrl: SOLVAPAY_TERMS_URL,
+          privacyUrl: SOLVAPAY_PRIVACY_URL
         },
         plan: plan ? {
           name: plan.name,
@@ -3426,16 +3440,26 @@ var MandateText = (0, import_react19.forwardRef)(
         "data-solvapay-mandate-text": "",
         "data-variant": resolvedVariant,
         ...rest,
-        children: children ?? linkifyMandateText(text, ctx.merchant, copy, handleExternalClick)
+        children: children ?? linkifyMandateText(text, ctx, copy, handleExternalClick)
       }
     );
   }
 );
-function linkifyMandateText(text, merchant, copy, onLinkClick) {
-  const entries = [
-    { url: merchant.termsUrl, label: copy.legalFooter.terms },
-    { url: merchant.privacyUrl, label: copy.legalFooter.privacy }
-  ].filter((entry) => Boolean(entry.url));
+function linkifyMandateText(text, ctx, copy, onLinkClick) {
+  const termsLabel = copy.legal.termsOfService;
+  const privacyLabel = copy.legal.privacyPolicy;
+  const seen = /* @__PURE__ */ new Set();
+  const entries = [];
+  for (const entry of [
+    { url: ctx.merchant.termsUrl, label: termsLabel },
+    { url: ctx.merchant.privacyUrl, label: privacyLabel },
+    { url: ctx.solvapay.termsUrl, label: termsLabel },
+    { url: ctx.solvapay.privacyUrl, label: privacyLabel }
+  ]) {
+    if (!entry.url || seen.has(entry.url)) continue;
+    seen.add(entry.url);
+    entries.push({ url: entry.url, label: entry.label });
+  }
   if (entries.length === 0) return [text];
   const pattern = new RegExp(`(${entries.map((e) => escapeRegExp(e.url)).join("|")})`, "g");
   return text.split(pattern).map((part, i) => {

package/dist/primitives/index.d.cts

@@ -1,13 +1,13 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React, { Ref } from 'react';
-import { b as Plan, z as Product, s as UseTopupAmountSelectorReturn, y as PurchaseInfo, T as TopupFormProps, c as SaveAutoRechargeResponse, u as AutoRechargeConfig } from '../useUsage-8NCXS45R.cjs';
-export { B as BootstrapPlanLike, E as CheckoutStep, O as SuccessMeta } from '../useUsage-8NCXS45R.cjs';
+import { b as Plan, z as Product, s as UseTopupAmountSelectorReturn, y as PurchaseInfo, T as TopupFormProps, c as SaveAutoRechargeResponse, u as AutoRechargeConfig } from '../useUsage-zYGsspbH.cjs';
+export { B as BootstrapPlanLike, E as CheckoutStep, O as SuccessMeta } from '../useUsage-zYGsspbH.cjs';
 import { TaxBreakdown, BusinessDetailsInput } from '@solvapay/core';
-import { A as AutoRechargeInputPayload, F as AmountInputUnit, G as AutoRechargeFormState, l as PaywallStructuredContent } from '../index-fuaNfBE5.cjs';
-export { H as ActivationFlow, I as ActivationFlowActivateButton, J as ActivationFlowActivated, K as ActivationFlowAmountPicker, L as ActivationFlowContinueButton, N as ActivationFlowError, O as ActivationFlowLoading, Q as ActivationFlowRetrying, R as ActivationFlowRoot, m as ActivationFlowStep, S as ActivationFlowSummary, B as BalanceBadge, n as CancelPlanButton, p as CheckoutStatus, q as CheckoutSteps, T as CheckoutStepsAmountContinueButton, V as CheckoutStepsAmountPicker, W as CheckoutStepsBackLink, X as CheckoutStepsIfStep, Y as CheckoutStepsPayment, Z as CheckoutStepsPlanContinueButton, _ as CheckoutStepsPlanGrid, $ as CheckoutStepsRoot, a0 as CheckoutStepsStepHeading, a1 as CheckoutStepsStepMessage, a2 as CheckoutStepsSuccess, M as MandateText, t as MandateTextProps, a3 as PaymentForm, j as PaymentFormBusinessDetails, c as PaymentFormCardElement, a as PaymentFormCustomerFields, h as PaymentFormError, i as PaymentFormLegalFooter, g as PaymentFormLoading, d as PaymentFormMandateText, b as PaymentFormPaymentElement, a4 as PaymentFormRoot, f as PaymentFormSubmitButton, P as PaymentFormSummary, k as PaymentFormTaxSummary, e as PaymentFormTermsCheckbox, u as PlanBadge, v as ProductBadge, w as PurchaseGate, a5 as PurchaseGateAllowed, a6 as PurchaseGateBlocked, a7 as PurchaseGateError, a8 as PurchaseGateLoading, a9 as PurchaseGateRoot, aa as useActivationFlow, E as useCheckoutStepsContext, ab as usePurchaseGate } from '../index-fuaNfBE5.cjs';
+import { A as AutoRechargeInputPayload, F as AmountInputUnit, G as AutoRechargeFormState, l as PaywallStructuredContent } from '../index-BTZxR-Le.cjs';
+export { H as ActivationFlow, I as ActivationFlowActivateButton, J as ActivationFlowActivated, K as ActivationFlowAmountPicker, L as ActivationFlowContinueButton, N as ActivationFlowError, O as ActivationFlowLoading, Q as ActivationFlowRetrying, R as ActivationFlowRoot, m as ActivationFlowStep, S as ActivationFlowSummary, B as BalanceBadge, n as CancelPlanButton, p as CheckoutStatus, q as CheckoutSteps, T as CheckoutStepsAmountContinueButton, V as CheckoutStepsAmountPicker, W as CheckoutStepsBackLink, X as CheckoutStepsIfStep, Y as CheckoutStepsPayment, Z as CheckoutStepsPlanContinueButton, _ as CheckoutStepsPlanGrid, $ as CheckoutStepsRoot, a0 as CheckoutStepsStepHeading, a1 as CheckoutStepsStepMessage, a2 as CheckoutStepsSuccess, M as MandateText, t as MandateTextProps, a3 as PaymentForm, j as PaymentFormBusinessDetails, c as PaymentFormCardElement, a as PaymentFormCustomerFields, h as PaymentFormError, i as PaymentFormLegalFooter, g as PaymentFormLoading, d as PaymentFormMandateText, b as PaymentFormPaymentElement, a4 as PaymentFormRoot, f as PaymentFormSubmitButton, P as PaymentFormSummary, k as PaymentFormTaxSummary, e as PaymentFormTermsCheckbox, u as PlanBadge, v as ProductBadge, w as PurchaseGate, a5 as PurchaseGateAllowed, a6 as PurchaseGateBlocked, a7 as PurchaseGateError, a8 as PurchaseGateLoading, a9 as PurchaseGateRoot, aa as useActivationFlow, E as useCheckoutStepsContext, ab as usePurchaseGate } from '../index-BTZxR-Le.cjs';
 import { PaymentElement } from '@stripe/react-stripe-js';
 import { Stripe, StripeElements } from '@stripe/stripe-js';
-export { a as UsageMeter, B as UsageMeterBar, b as UsageMeterClassNames, E as UsageMeterEmpty, L as UsageMeterLabel, c as UsageMeterLoading, P as UsageMeterPercentage, R as UsageMeterResetsIn, d as UsageMeterRoot, U as UsageMeterRootProps, u as useUsageMeter } from '../UsageMeter-DWkwHgTP.cjs';
+export { a as UsageMeter, B as UsageMeterBar, b as UsageMeterClassNames, E as UsageMeterEmpty, L as UsageMeterLabel, c as UsageMeterLoading, P as UsageMeterPercentage, R as UsageMeterResetsIn, d as UsageMeterRoot, U as UsageMeterRootProps, u as useUsageMeter } from '../UsageMeter-DUeL64V4.cjs';
 import '../adapters/auth.cjs';
 
 type PlanPricingOption = {
@@ -923,8 +923,9 @@ declare function useAutoRechargeForm(): AutoRechargeContextValue;
  * but dependency-free so it can ship inside `<PaymentForm>` / `<TopupForm>`
  * default trees and the MCP shell footer.
  *
- * Merchant terms/privacy URLs are *not* rendered here — those continue
- * to be woven into the mandate sentence by `<MandateText>`.
+ * Merchant terms/privacy URLs are *not* rendered here — those appear
+ * in the `<MandateText>` consent tail when the merchant has set them.
+ * This strip is always SolvaPay's own Terms · Privacy.
  */
 
 type LegalFooterProps = {

package/dist/primitives/index.d.ts

@@ -1,13 +1,13 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React, { Ref } from 'react';
-import { b as Plan, z as Product, s as UseTopupAmountSelectorReturn, y as PurchaseInfo, T as TopupFormProps, c as SaveAutoRechargeResponse, u as AutoRechargeConfig } from '../useUsage-C5_XnS_6.js';
-export { B as BootstrapPlanLike, E as CheckoutStep, O as SuccessMeta } from '../useUsage-C5_XnS_6.js';
+import { b as Plan, z as Product, s as UseTopupAmountSelectorReturn, y as PurchaseInfo, T as TopupFormProps, c as SaveAutoRechargeResponse, u as AutoRechargeConfig } from '../useUsage-B144Vck8.js';
+export { B as BootstrapPlanLike, E as CheckoutStep, O as SuccessMeta } from '../useUsage-B144Vck8.js';
 import { TaxBreakdown, BusinessDetailsInput } from '@solvapay/core';
-import { A as AutoRechargeInputPayload, F as AmountInputUnit, G as AutoRechargeFormState, l as PaywallStructuredContent } from '../index-CxGoNto4.js';
-export { H as ActivationFlow, I as ActivationFlowActivateButton, J as ActivationFlowActivated, K as ActivationFlowAmountPicker, L as ActivationFlowContinueButton, N as ActivationFlowError, O as ActivationFlowLoading, Q as ActivationFlowRetrying, R as ActivationFlowRoot, m as ActivationFlowStep, S as ActivationFlowSummary, B as BalanceBadge, n as CancelPlanButton, p as CheckoutStatus, q as CheckoutSteps, T as CheckoutStepsAmountContinueButton, V as CheckoutStepsAmountPicker, W as CheckoutStepsBackLink, X as CheckoutStepsIfStep, Y as CheckoutStepsPayment, Z as CheckoutStepsPlanContinueButton, _ as CheckoutStepsPlanGrid, $ as CheckoutStepsRoot, a0 as CheckoutStepsStepHeading, a1 as CheckoutStepsStepMessage, a2 as CheckoutStepsSuccess, M as MandateText, t as MandateTextProps, a3 as PaymentForm, j as PaymentFormBusinessDetails, c as PaymentFormCardElement, a as PaymentFormCustomerFields, h as PaymentFormError, i as PaymentFormLegalFooter, g as PaymentFormLoading, d as PaymentFormMandateText, b as PaymentFormPaymentElement, a4 as PaymentFormRoot, f as PaymentFormSubmitButton, P as PaymentFormSummary, k as PaymentFormTaxSummary, e as PaymentFormTermsCheckbox, u as PlanBadge, v as ProductBadge, w as PurchaseGate, a5 as PurchaseGateAllowed, a6 as PurchaseGateBlocked, a7 as PurchaseGateError, a8 as PurchaseGateLoading, a9 as PurchaseGateRoot, aa as useActivationFlow, E as useCheckoutStepsContext, ab as usePurchaseGate } from '../index-CxGoNto4.js';
+import { A as AutoRechargeInputPayload, F as AmountInputUnit, G as AutoRechargeFormState, l as PaywallStructuredContent } from '../index-BY4aA8T2.js';
+export { H as ActivationFlow, I as ActivationFlowActivateButton, J as ActivationFlowActivated, K as ActivationFlowAmountPicker, L as ActivationFlowContinueButton, N as ActivationFlowError, O as ActivationFlowLoading, Q as ActivationFlowRetrying, R as ActivationFlowRoot, m as ActivationFlowStep, S as ActivationFlowSummary, B as BalanceBadge, n as CancelPlanButton, p as CheckoutStatus, q as CheckoutSteps, T as CheckoutStepsAmountContinueButton, V as CheckoutStepsAmountPicker, W as CheckoutStepsBackLink, X as CheckoutStepsIfStep, Y as CheckoutStepsPayment, Z as CheckoutStepsPlanContinueButton, _ as CheckoutStepsPlanGrid, $ as CheckoutStepsRoot, a0 as CheckoutStepsStepHeading, a1 as CheckoutStepsStepMessage, a2 as CheckoutStepsSuccess, M as MandateText, t as MandateTextProps, a3 as PaymentForm, j as PaymentFormBusinessDetails, c as PaymentFormCardElement, a as PaymentFormCustomerFields, h as PaymentFormError, i as PaymentFormLegalFooter, g as PaymentFormLoading, d as PaymentFormMandateText, b as PaymentFormPaymentElement, a4 as PaymentFormRoot, f as PaymentFormSubmitButton, P as PaymentFormSummary, k as PaymentFormTaxSummary, e as PaymentFormTermsCheckbox, u as PlanBadge, v as ProductBadge, w as PurchaseGate, a5 as PurchaseGateAllowed, a6 as PurchaseGateBlocked, a7 as PurchaseGateError, a8 as PurchaseGateLoading, a9 as PurchaseGateRoot, aa as useActivationFlow, E as useCheckoutStepsContext, ab as usePurchaseGate } from '../index-BY4aA8T2.js';
 import { PaymentElement } from '@stripe/react-stripe-js';
 import { Stripe, StripeElements } from '@stripe/stripe-js';
-export { a as UsageMeter, B as UsageMeterBar, b as UsageMeterClassNames, E as UsageMeterEmpty, L as UsageMeterLabel, c as UsageMeterLoading, P as UsageMeterPercentage, R as UsageMeterResetsIn, d as UsageMeterRoot, U as UsageMeterRootProps, u as useUsageMeter } from '../UsageMeter-DosUKnwg.js';
+export { a as UsageMeter, B as UsageMeterBar, b as UsageMeterClassNames, E as UsageMeterEmpty, L as UsageMeterLabel, c as UsageMeterLoading, P as UsageMeterPercentage, R as UsageMeterResetsIn, d as UsageMeterRoot, U as UsageMeterRootProps, u as useUsageMeter } from '../UsageMeter-iI9fukd0.js';
 import '../adapters/auth.js';
 
 type PlanPricingOption = {
@@ -923,8 +923,9 @@ declare function useAutoRechargeForm(): AutoRechargeContextValue;
  * but dependency-free so it can ship inside `<PaymentForm>` / `<TopupForm>`
  * default trees and the MCP shell footer.
  *
- * Merchant terms/privacy URLs are *not* rendered here — those continue
- * to be woven into the mandate sentence by `<MandateText>`.
+ * Merchant terms/privacy URLs are *not* rendered here — those appear
+ * in the `<MandateText>` consent tail when the merchant has set them.
+ * This strip is always SolvaPay's own Terms · Privacy.
  */
 
 type LegalFooterProps = {

package/dist/primitives/index.js

@@ -89,7 +89,7 @@ import {
   useCreditGate,
   usePaywallNotice,
   usePurchaseGate
-} from "../chunk-LXG7QDM3.js";
+} from "../chunk-BPF5NFWF.js";
 import {
   AmountPicker,
   AmountPickerConfirm,
@@ -175,7 +175,7 @@ import {
   usePlanSelector,
   useTopupForm,
   useUsageMeter
-} from "../chunk-JXH36VLL.js";
+} from "../chunk-MMD6AOUR.js";
 import "../chunk-UMXOAUW7.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/{useUsage-C5_XnS_6.d.ts → useUsage-B144Vck8.d.ts}

@@ -4043,9 +4043,25 @@ type MandateContext = {
         legalName: string;
         displayName?: string;
         supportEmail?: string;
+        /**
+         * Merchant-published Terms of Service URL. Omitted when the merchant
+         * has not set one — never a SolvaPay fallback.
+         */
         termsUrl?: string;
+        /**
+         * Merchant-published Privacy Policy URL. Omitted when the merchant
+         * has not set one — never a SolvaPay fallback.
+         */
         privacyUrl?: string;
     };
+    /**
+     * SolvaPay's own legal pages. Always present — SolvaPay is the
+     * processor on every charge, so its terms always apply.
+     */
+    solvapay: {
+        termsUrl: string;
+        privacyUrl: string;
+    };
     plan?: {
         name?: string;
         interval?: string;
@@ -4448,6 +4464,16 @@ interface SolvaPayCopy {
             paymentPayg: string;
         };
     };
+    /**
+     * Full legal-document names used in the mandate consent tail
+     * ("Terms of Service" / "Privacy Policy"). Distinct from
+     * `legalFooter.terms` / `legalFooter.privacy`, which stay short
+     * for the footer strip.
+     */
+    legal: {
+        termsOfService: string;
+        privacyPolicy: string;
+    };
     legalFooter: {
         terms: string;
         privacy: string;
@@ -5038,14 +5064,12 @@ interface SolvaPayConfig {
          * @example
          * ```tsx
          * import { createSupabaseAuthAdapter } from '@solvapay/react-supabase';
+         * import { supabase } from './supabase'; // your existing client
          *
          * <SolvaPayProvider
          *   config={{
          *     auth: {
-         *       adapter: createSupabaseAuthAdapter({
-         *         supabaseUrl: process.env.NEXT_PUBLIC_SUPABASE_URL!,
-         *         supabaseAnonKey: process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
-         *       })
+         *       adapter: createSupabaseAuthAdapter({ client: supabase })
          *     }
          *   }}
          * >

package/dist/{useUsage-8NCXS45R.d.cts → useUsage-zYGsspbH.d.cts}

@@ -4043,9 +4043,25 @@ type MandateContext = {
         legalName: string;
         displayName?: string;
         supportEmail?: string;
+        /**
+         * Merchant-published Terms of Service URL. Omitted when the merchant
+         * has not set one — never a SolvaPay fallback.
+         */
         termsUrl?: string;
+        /**
+         * Merchant-published Privacy Policy URL. Omitted when the merchant
+         * has not set one — never a SolvaPay fallback.
+         */
         privacyUrl?: string;
     };
+    /**
+     * SolvaPay's own legal pages. Always present — SolvaPay is the
+     * processor on every charge, so its terms always apply.
+     */
+    solvapay: {
+        termsUrl: string;
+        privacyUrl: string;
+    };
     plan?: {
         name?: string;
         interval?: string;
@@ -4448,6 +4464,16 @@ interface SolvaPayCopy {
             paymentPayg: string;
         };
     };
+    /**
+     * Full legal-document names used in the mandate consent tail
+     * ("Terms of Service" / "Privacy Policy"). Distinct from
+     * `legalFooter.terms` / `legalFooter.privacy`, which stay short
+     * for the footer strip.
+     */
+    legal: {
+        termsOfService: string;
+        privacyPolicy: string;
+    };
     legalFooter: {
         terms: string;
         privacy: string;
@@ -5038,14 +5064,12 @@ interface SolvaPayConfig {
          * @example
          * ```tsx
          * import { createSupabaseAuthAdapter } from '@solvapay/react-supabase';
+         * import { supabase } from './supabase'; // your existing client
          *
          * <SolvaPayProvider
          *   config={{
          *     auth: {
-         *       adapter: createSupabaseAuthAdapter({
-         *         supabaseUrl: process.env.NEXT_PUBLIC_SUPABASE_URL!,
-         *         supabaseAnonKey: process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
-         *       })
+         *       adapter: createSupabaseAuthAdapter({ client: supabase })
          *     }
          *   }}
          * >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solvapay/react",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -85,7 +85,7 @@
     "react-dom": "^19.2.5",
     "typescript": "^5.9.3",
     "vitest": "^4.1.2",
-    "@solvapay/mcp-core": "0.4.4",
+    "@solvapay/mcp-core": "0.4.5",
     "@solvapay/server": "2.8.0",
     "@solvapay/test-utils": "0.0.0"
   },