@carrierllc/mcp 0.13.21 → 0.13.24

package/templates/storefront/pnpm-workspace.yaml

@@ -4,4 +4,11 @@ allowBuilds:
   unrs-resolver: true
   workerd: true
 overrides:
+  brace-expansion@1: 1.1.21
+  brace-expansion@2: 2.1.7
+  brace-expansion@5: 5.0.12
+  js-yaml: ^4.3.2
+  nanoid: ^3.3.18
+  postcss: ^8.5.23
+  sharp: ^0.35.4
   esbuild: ^0.28.1

package/templates/storefront/src/app/api/checkout/guest/route.ts

@@ -27,8 +27,10 @@
  * "Visit — Calm" at EUR 4.99 when no such product exists is a real payment
  * against nothing, and no webhook downstream can fulfil it.
  */
+import { auth, clerkClient } from "@clerk/nextjs/server";
 import { NextRequest, NextResponse } from "next/server";
-import { fetchTemplateCatalog } from "@/vendor/carrier/client";
+import { orderPurchaserEmail, userOwnsOrder } from "@/lib/checkout-order-claim";
+import { fetchOrder, fetchTopUpOptions, fetchTemplateCatalog } from "@/vendor/carrier/client";
 import { decideGuestCheckout, normalizeChannel } from "@/vendor/carrier/catalog-guard";
 
 interface GuestCheckoutBody {
@@ -44,6 +46,15 @@ interface GuestCheckoutBody {
 }
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
+  // Resolve server identity for every request, independent of client input.
+  // First purchases may remain anonymous; only top-ups require this identity.
+  let userId: string | null;
+  try {
+    ({ userId } = await auth());
+  } catch {
+    return NextResponse.json({ error: "Checkout service unavailable" }, { status: 503 });
+  }
+
   let body: GuestCheckoutBody;
   try {
     body = (await req.json()) as GuestCheckoutBody;
@@ -51,135 +62,184 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
     return NextResponse.json({ error: "Invalid request body" }, { status: 400 });
   }
 
+  if (!body || typeof body !== "object" || Array.isArray(body)) {
+    return NextResponse.json({ error: "Invalid request body" }, { status: 400 });
+  }
+  const providedTopUp = Object.prototype.hasOwnProperty.call(body, "topUpForOrderId");
+  if (providedTopUp && (typeof body.topUpForOrderId !== "string" || !/^[A-Za-z0-9_-]{1,256}$/.test(body.topUpForOrderId))) {
+    return NextResponse.json({ error: "Invalid top-up order reference" }, { status: 400 });
+  }
+  const topUpForOrderId = providedTopUp ? body.topUpForOrderId! : null;
   const { templateId } = body;
   if (!templateId) {
     return NextResponse.json({ error: "templateId is required" }, { status: 400 });
   }
 
-  const channel = normalizeChannel(body.channel);
-  const stripeKey = process.env.STRIPE_SECRET_KEY;
-  const catalog = await fetchTemplateCatalog();
-
-  const decision = decideGuestCheckout({
-    catalog,
-    templateId,
-    stripeConfigured: Boolean(stripeKey),
-  });
-  if (!decision.ok) {
-    if (decision.code === "catalog_degraded") {
-      // Loud on the server, calm to the customer. This is the state where a
-      // storefront is live, taking traffic, and cannot tell what it sells.
-      console.error(
-        `[checkout] refusing to sell from a sample catalog (reason=${catalog.reason ?? "unknown"}) — ` +
-          "NEXT_PUBLIC_CARRIER_API_URL is unset or the catalog request failed",
-      );
+  try {
+    let buyerEmail: string | null = null;
+    if (topUpForOrderId) {
+      if (!userId) return NextResponse.json({ error: "Sign in to top up" }, { status: 401 });
+      if (!process.env.STRIPE_SECRET_KEY || !process.env.CARRIER_API_KEY || !process.env.NEXT_PUBLIC_CARRIER_API_URL) {
+        return NextResponse.json({ error: "Top-up service unavailable" }, { status: 503 });
+      }
+      if (!(await userOwnsOrder(userId, topUpForOrderId))) {
+        return NextResponse.json({ error: "This order is linked to another account" }, { status: 403 });
+      }
+      buyerEmail = await orderPurchaserEmail(topUpForOrderId);
+      const client = await clerkClient();
+      const user = await client.users.getUser(userId);
+      if (!buyerEmail || !user.emailAddresses.some((address) =>
+        address.emailAddress.toLowerCase() === buyerEmail!.toLowerCase() && address.verification?.status === "verified")) {
+        return NextResponse.json({ error: "Verify the email that bought this order" }, { status: 403 });
+      }
     }
-    return NextResponse.json({ error: decision.error, code: decision.code }, { status: decision.status });
-  }
-
-  const plan = decision.plan;
+    if (topUpForOrderId) {
+      const lookup = await fetchOrder(topUpForOrderId);
+      if (!lookup.ok) return NextResponse.json({ error: "Order unavailable" }, { status: lookup.reason === "not-found" ? 404 : 503 });
+      if (lookup.order.orderId !== topUpForOrderId || lookup.order.status !== "ready" || lookup.order.cancelledAt || !/^89[0-9]{16,20}$/.test(lookup.order.iccid ?? "")) {
+        return NextResponse.json({ error: "This order cannot be topped up" }, { status: 409 });
+      }
+    }
+    const channel = normalizeChannel(body.channel);
+    const stripeKey = process.env.STRIPE_SECRET_KEY;
+    const catalog = await fetchTemplateCatalog();
 
-  if (!stripeKey) {
-    // No Stripe configured — return a mock URL so the storefront still builds
-    // and renders without credentials. No money moves on this path.
-    const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? "";
-    const successUrl = `${appUrl}/checkout/success?templateId=${encodeURIComponent(templateId)}&session_id=mock`;
-    return NextResponse.json({ url: successUrl });
-  }
+    const decision = decideGuestCheckout({
+      catalog,
+      templateId,
+      stripeConfigured: Boolean(stripeKey),
+    });
+    if (!decision.ok) {
+      if (decision.code === "catalog_degraded") {
+        // Loud on the server, calm to the customer. This is the state where a
+        // storefront is live, taking traffic, and cannot tell what it sells.
+        console.error(
+          `[checkout] refusing to sell from a sample catalog (reason=${catalog.reason ?? "unknown"}) — ` +
+            "NEXT_PUBLIC_CARRIER_API_URL is unset or the catalog request failed",
+        );
+      }
+      return NextResponse.json({ error: decision.error, code: decision.code }, { status: decision.status });
+    }
 
-  const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? "";
-  // success_url carries templateId so the success page knows which plan was purchased
-  const successUrl =
-    `${appUrl}/checkout/success?templateId=${encodeURIComponent(templateId)}&session_id={CHECKOUT_SESSION_ID}`;
-  const cancelUrl = `${appUrl}/shop`;
-  const embedded = body.uiMode === "embedded";
-  // Same charset gate the rest of the storefront applies to a Stripe session id.
-  const topUpForOrderId =
-    typeof body.topUpForOrderId === "string" && /^[A-Za-z0-9_-]{1,256}$/.test(body.topUpForOrderId)
-      ? body.topUpForOrderId
-      : null;
+    const plan = decision.plan;
+    if (topUpForOrderId) {
+      const eligible = await fetchTopUpOptions(topUpForOrderId);
+      if (!eligible.ok) return NextResponse.json({ error: "Top-up options unavailable" }, { status: 503 });
+      if (!eligible.options.some((option) => option?.id === templateId)) {
+        return NextResponse.json({ error: "This plan is not eligible for this eSIM" }, { status: 400 });
+      }
+    }
 
-  const formBody = new URLSearchParams({
-    mode: "payment",
-    "line_items[0][price_data][currency]": plan.currency.toLowerCase(),
-    "line_items[0][price_data][unit_amount]": String(plan.price_cents),
-    "line_items[0][price_data][product_data][name]": plan.name,
-    "line_items[0][price_data][product_data][description]": plan.description,
-    "line_items[0][quantity]": "1",
-    // Embedded sessions take `return_url` and reject `success_url` /
-    // `cancel_url`: there is no hosted page to come back from, and cancelling
-    // is just closing the form.
-    ...(embedded
-      ? {
-          ui_mode: "embedded",
-          redirect_on_completion: "if_required",
-          return_url: successUrl,
-        }
-      : { success_url: successUrl, cancel_url: cancelUrl }),
-    // Store templateId in BOTH session and payment_intent metadata so the
-    // provisioning webhook can read it. The `checkout.session.completed` event
-    // exposes `session.metadata` (NOT `payment_intent.metadata`), so the
-    // session-level copy is what fulfilment keys off to provision the eSIM —
-    // without it the plan is lost and the order is stuck "activating".
-    "metadata[templateId]": templateId,
-    "payment_intent_data[metadata][templateId]": templateId,
-    // Where the sale came from. Written alongside templateId and by the same
-    // reasoning: attribution recovered later from Stripe reports is guesswork,
-    // and the session is the only record that survives the redirect.
-    "metadata[channel]": channel,
-    "payment_intent_data[metadata][channel]": channel,
-    // Allow guest checkout (no Stripe account required)
-    "payment_method_collection": "always",
-    // Session-level and payment-intent-level, for the same reason templateId
-    // is: `checkout.session.completed` only exposes session metadata, and a
-    // top-up that loses its target order provisions a brand-new eSIM.
-    ...(topUpForOrderId
-      ? {
-          "metadata[topUpForOrderId]": topUpForOrderId,
-          "payment_intent_data[metadata][topUpForOrderId]": topUpForOrderId,
-        }
-      : {}),
-  });
+    if (!stripeKey) {
+      // No Stripe configured — return a mock URL so the storefront still builds
+      // and renders without credentials. No money moves on this path.
+      const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? "";
+      const successUrl = `${appUrl}/checkout/success?templateId=${encodeURIComponent(templateId)}&session_id=mock`;
+      return NextResponse.json({ url: successUrl });
+    }
 
-  const resp = await fetch("https://api.stripe.com/v1/checkout/sessions", {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${stripeKey}`,
-      "Content-Type": "application/x-www-form-urlencoded",
-    },
-    body: formBody.toString(),
-  });
+    const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? "";
+    // success_url carries templateId so the success page knows which plan was purchased
+    const topUpQuery = topUpForOrderId ? `&topUpForOrderId=${encodeURIComponent(topUpForOrderId)}` : "";
+    const successUrl =
+      `${appUrl}/checkout/success?templateId=${encodeURIComponent(templateId)}&session_id={CHECKOUT_SESSION_ID}${topUpQuery}`;
+    const cancelUrl = topUpForOrderId
+      ? `${appUrl}/shop?topUpForOrderId=${encodeURIComponent(topUpForOrderId)}`
+      : `${appUrl}/shop`;
+    const embedded = body.uiMode === "embedded";
 
-  if (!resp.ok) {
-    // Stripe's message names our parameters and our account. It goes to the
-    // log, not to the customer.
-    const err = (await resp.json().catch(() => ({}))) as { error?: { message?: string } };
-    console.error(`[checkout] Stripe session creation failed: ${err.error?.message ?? resp.status}`);
-    return NextResponse.json(
-      { error: "We could not start checkout. Please try again in a moment.", code: "stripe_error" },
-      { status: 502 },
-    );
-  }
+    if (topUpForOrderId) {
+      const fresh = await fetchOrder(topUpForOrderId);
+      if (!fresh.ok) return NextResponse.json({ error: "Order unavailable" }, { status: 503 });
+      if (fresh.order.orderId !== topUpForOrderId || fresh.order.status !== "ready" || fresh.order.cancelledAt || !/^89[0-9]{16,20}$/.test(fresh.order.iccid ?? "")) {
+        return NextResponse.json({ error: "This order cannot be topped up" }, { status: 409 });
+      }
+    }
+    const formBody = new URLSearchParams({
+      mode: "payment",
+      ...(buyerEmail ? { customer_email: buyerEmail } : {}),
+      "line_items[0][price_data][currency]": plan.currency.toLowerCase(),
+      "line_items[0][price_data][unit_amount]": String(plan.price_cents),
+      "line_items[0][price_data][product_data][name]": plan.name,
+      "line_items[0][price_data][product_data][description]": plan.description,
+      "line_items[0][quantity]": "1",
+      // Embedded sessions take `return_url` and reject `success_url` /
+      // `cancel_url`: there is no hosted page to come back from, and cancelling
+      // is just closing the form.
+      ...(embedded
+        ? {
+            ui_mode: "embedded",
+            redirect_on_completion: "if_required",
+            return_url: successUrl,
+          }
+        : { success_url: successUrl, cancel_url: cancelUrl }),
+      // Store templateId in BOTH session and payment_intent metadata so the
+      // provisioning webhook can read it. The `checkout.session.completed` event
+      // exposes `session.metadata` (NOT `payment_intent.metadata`), so the
+      // session-level copy is what fulfilment keys off to provision the eSIM —
+      // without it the plan is lost and the order is stuck "activating".
+      "metadata[templateId]": templateId,
+      "payment_intent_data[metadata][templateId]": templateId,
+      // Where the sale came from. Written alongside templateId and by the same
+      // reasoning: attribution recovered later from Stripe reports is guesswork,
+      // and the session is the only record that survives the redirect.
+      "metadata[channel]": channel,
+      "payment_intent_data[metadata][channel]": channel,
+      // Allow guest checkout (no Stripe account required)
+      "payment_method_collection": "always",
+      // Session-level and payment-intent-level, for the same reason templateId
+      // is: `checkout.session.completed` only exposes session metadata, and a
+      // top-up that loses its target order provisions a brand-new eSIM.
+      ...(topUpForOrderId
+        ? {
+            "metadata[topUpForOrderId]": topUpForOrderId,
+            "payment_intent_data[metadata][topUpForOrderId]": topUpForOrderId,
+          }
+        : {}),
+    });
 
-  const session = (await resp.json()) as {
-    id?: string;
-    url?: string;
-    client_secret?: string;
-  };
+    const resp = await fetch("https://api.stripe.com/v1/checkout/sessions", {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${stripeKey}`,
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: formBody.toString(),
+    });
 
-  if (embedded) {
-    if (!session.client_secret || !session.id) {
-      // Stripe accepted the session but did not return what an embedded form
-      // needs. Say so rather than shipping an empty iframe — the client falls
-      // back to the hosted page on this code.
-      console.error("[checkout] embedded session has no client_secret");
+    if (!resp.ok) {
+      // Stripe's message names our parameters and our account. It goes to the
+      // log, not to the customer.
+      const err = (await resp.json().catch(() => ({}))) as { error?: { message?: string } };
+      console.error(`[checkout] Stripe session creation failed: ${err.error?.message ?? resp.status}`);
       return NextResponse.json(
-        { error: "We could not start checkout. Please try again in a moment.", code: "embed_unavailable" },
+        { error: "We could not start checkout. Please try again in a moment.", code: "stripe_error" },
         { status: 502 },
       );
     }
-    return NextResponse.json({ clientSecret: session.client_secret, sessionId: session.id });
-  }
 
-  return NextResponse.json({ url: session.url });
+    const session = (await resp.json()) as {
+      id?: string;
+      url?: string;
+      client_secret?: string;
+    };
+
+    if (embedded) {
+      if (!session.client_secret || !session.id) {
+        // Stripe accepted the session but did not return what an embedded form
+        // needs. Say so rather than shipping an empty iframe — the client falls
+        // back to the hosted page on this code.
+        console.error("[checkout] embedded session has no client_secret");
+        return NextResponse.json(
+          { error: "We could not start checkout. Please try again in a moment.", code: "embed_unavailable" },
+          { status: 502 },
+        );
+      }
+      return NextResponse.json({ clientSecret: session.client_secret, sessionId: session.id });
+    }
+
+    return NextResponse.json({ url: session.url });
+  } catch {
+    return NextResponse.json({ error: "Checkout service unavailable" }, { status: 503 });
+  }
 }

package/templates/storefront/src/app/api/orders/[orderId]/cancel/route.ts

@@ -9,8 +9,8 @@
  * history all survive a cancellation and the customer can still read them.
  */
 import { NextResponse } from "next/server";
-import { fulfilmentFailureResponse, guardOrderRoute } from "@/lib/order-route-guard";
-import { cancelOrder } from "@/vendor/carrier/client";
+import { fulfilmentFailureResponse, guardOrderRoute, orderActionCall } from "@/lib/order-route-guard";
+
 
 export const dynamic = "force-dynamic";
 
@@ -22,11 +22,16 @@ export async function POST(_req: Request, ctx: Context): Promise<NextResponse> {
   const guard = await guardOrderRoute(ctx.params);
   if (!guard.ok) return guard.response;
 
-  const result = await cancelOrder(guard.orderId);
+  const result = await orderActionCall<{ cancelledAt?: string }>(guard.orderId, "cancel");
   if (result.ok) {
-    return NextResponse.json({
-      cancelledAt: result.cancelledAt ?? new Date().toISOString(),
-    });
+    const cancelledAt = result.data?.cancelledAt;
+    if (typeof cancelledAt !== "string" || !Number.isFinite(Date.parse(cancelledAt))) {
+      return NextResponse.json(
+        { error: "Cancellation was not confirmed. Reload before trying again." },
+        { status: 502 },
+      );
+    }
+    return NextResponse.json({ cancelledAt });
   }
 
   return fulfilmentFailureResponse(result.reason, "cancel this plan", guard.orderId);

package/templates/storefront/src/app/api/orders/[orderId]/top-up-options/route.ts

@@ -8,8 +8,8 @@
  * dashboard says so rather than showing a button that refuses on tap.
  */
 import { NextResponse } from "next/server";
-import { fulfilmentFailureResponse, guardOrderRoute } from "@/lib/order-route-guard";
-import { fetchTopUpOptions } from "@/vendor/carrier/client";
+import { fulfilmentFailureResponse, guardOrderRoute, orderActionCall } from "@/lib/order-route-guard";
+import type { TopUpOption } from "@/vendor/carrier/types";
 
 export const dynamic = "force-dynamic";
 
@@ -21,8 +21,11 @@ export async function GET(_req: Request, ctx: Context): Promise<NextResponse> {
   const guard = await guardOrderRoute(ctx.params);
   if (!guard.ok) return guard.response;
 
-  const lookup = await fetchTopUpOptions(guard.orderId);
-  if (lookup.ok) return NextResponse.json({ options: lookup.options });
+  const lookup = await orderActionCall<TopUpOption[]>(guard.orderId, "top-up-options");
+  if (lookup.ok && !Array.isArray(lookup.data)) {
+    return fulfilmentFailureResponse("upstream-error", "load top-up options", guard.orderId);
+  }
+  if (lookup.ok) return NextResponse.json({ options: lookup.data });
 
   return fulfilmentFailureResponse(lookup.reason, "load top-up options", guard.orderId);
 }

package/templates/storefront/src/app/api/orders/[orderId]/usage/route.ts

@@ -5,8 +5,8 @@
  * they have already claimed.
  */
 import { NextResponse } from "next/server";
-import { fulfilmentFailureResponse, guardOrderRoute } from "@/lib/order-route-guard";
-import { fetchUsage } from "@/vendor/carrier/client";
+import { fulfilmentFailureResponse, guardOrderRoute, orderActionCall } from "@/lib/order-route-guard";
+import type { EsimUsage } from "@/vendor/carrier/types";
 
 export const dynamic = "force-dynamic";
 
@@ -18,8 +18,11 @@ export async function GET(_req: Request, ctx: Context): Promise<NextResponse> {
   const guard = await guardOrderRoute(ctx.params);
   if (!guard.ok) return guard.response;
 
-  const lookup = await fetchUsage(guard.orderId);
-  if (lookup.ok) return NextResponse.json({ usage: lookup.usage });
+  const lookup = await orderActionCall<EsimUsage>(guard.orderId, "usage");
+  if (lookup.ok && typeof lookup.data?.usedBytes !== "number") {
+    return fulfilmentFailureResponse("upstream-error", "read your usage", guard.orderId);
+  }
+  if (lookup.ok) return NextResponse.json({ usage: lookup.data });
 
   return fulfilmentFailureResponse(lookup.reason, "read your usage", guard.orderId);
 }

package/templates/storefront/src/app/checkout/success/CheckoutSuccessClient.tsx

@@ -40,7 +40,10 @@ export function CheckoutSuccessClient({
 
   const activateUrl = `/activate/${encodeURIComponent(orderId)}`;
   const [mode, setMode] = useState<AuthMode>("signup");
-  const [step, setStep] = useState<FlowStep>("idle");
+  const [flowStep, setStep] = useState<FlowStep>("idle");
+  const step = flowStep === "idle" && authLoaded
+    ? (isSignedIn ? "redirecting" : "credentials")
+    : flowStep;
   const [email, setEmail] = useState(purchaserEmail ?? "");
   const [password, setPassword] = useState("");
   const [code, setCode] = useState("");
@@ -48,10 +51,7 @@ export function CheckoutSuccessClient({
   const [loading, setLoading] = useState(false);
   const emailLocked = Boolean(purchaserEmail);
 
-  const claimOrderAndRedirect = useCallback(async (afterAuth = false) => {
-    setStep("redirecting");
-    setError(null);
-    try {
+  const claimOrderAndRedirect = useCallback(async () => {
       const res = await fetch("/api/checkout/claim", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -62,21 +62,26 @@ export function CheckoutSuccessClient({
         throw new Error(err.error ?? "Failed to link your purchase to this account");
       }
       router.replace(activateUrl);
-    } catch (err) {
-      setStep(afterAuth || isSignedIn ? "claim-error" : "credentials");
-      setError(err instanceof Error ? err.message : "Failed to link your purchase to this account");
-    }
-  }, [activateUrl, isSignedIn, router, sessionId, templateId]);
+  }, [activateUrl, router, sessionId, templateId]);
+
+  const handleClaimError = useCallback((err: unknown) => {
+    setStep("claim-error");
+    setError(err instanceof Error ? err.message : "Failed to link your purchase to this account");
+  }, []);
+
+  async function startClaimAndRedirect() {
+    setStep("redirecting");
+    setError(null);
+    await claimOrderAndRedirect().catch(handleClaimError);
+  }
 
   // If already signed in, claim the paid order before activating.
   useEffect(() => {
     if (!authLoaded) return;
     if (isSignedIn) {
-      void claimOrderAndRedirect(true);
-    } else {
-      setStep("credentials");
+      void claimOrderAndRedirect().catch(handleClaimError);
     }
-  }, [authLoaded, isSignedIn, claimOrderAndRedirect]);
+  }, [authLoaded, isSignedIn, claimOrderAndRedirect, handleClaimError]);
 
   function clerkErrMsg(err: unknown): string {
     const e = err as { errors?: Array<{ longMessage?: string; message?: string }> };
@@ -119,7 +124,7 @@ export function CheckoutSuccessClient({
       const completion = await completeEmailSignUpAfterVerify(signUp, result);
       if (completion.status === "complete") {
         await setActive({ session: completion.sessionId });
-        await claimOrderAndRedirect(true);
+        await startClaimAndRedirect();
       } else {
         setError(completion.message);
       }
@@ -148,7 +153,7 @@ export function CheckoutSuccessClient({
       });
       if (result.status === "complete" && result.createdSessionId) {
         await setActive({ session: result.createdSessionId });
-        await claimOrderAndRedirect(true);
+        await startClaimAndRedirect();
       } else {
         setError("Sign-in incomplete. Please try again.");
       }
@@ -190,7 +195,7 @@ export function CheckoutSuccessClient({
             )}
             <button
               type="button"
-              onClick={() => void claimOrderAndRedirect(true)}
+              onClick={() => void startClaimAndRedirect()}
               className="w-full rounded-lg bg-[var(--brand-accent)] py-2 text-sm font-semibold text-white transition-opacity hover:opacity-90"
             >
               Try again

package/templates/storefront/src/app/contact/page.tsx

@@ -1,6 +1,6 @@
 import Link from "next/link";
 import brand from "@/brand.config";
-import { buildSupportLink } from "@/vendor/ui/brand";
+import { BRAND, buildSupportLink } from "@/vendor/ui/brand";
 
 export const metadata = { title: "Contact" };
 
@@ -11,7 +11,7 @@ export default function ContactPage() {
         Get in touch
       </h1>
       <p className="mt-2 mb-10 text-sand-600 dark:text-sand-400">
-        Real humans. 24/7. Pick the channel you already have open.
+        Pick the channel you already have open.
       </p>
       <div className="space-y-3">
         <Link
@@ -21,7 +21,7 @@ export default function ContactPage() {
           className="flex items-center justify-between rounded-2xl border border-sand-200 bg-white px-5 py-4 text-sand-900 dark:border-sand-800 dark:bg-sand-900 dark:text-sand-50"
         >
           <span className="font-medium">WhatsApp</span>
-          <span className="text-sm text-sand-500">24/7</span>
+          <span className="text-sm text-sand-500">{BRAND.support.hoursLocal}</span>
         </Link>
         <Link
           href={buildSupportLink("sms")}

package/templates/storefront/src/app/dashboard/EsimControls.tsx

@@ -104,7 +104,7 @@ export function EsimControls({ orderId, cancelled: initiallyCancelled }: Props)
       });
       const payload = await readJson<{ url?: string }>(res);
       if (!res.ok || !payload.url) throw new Error(payload.error ?? GENERIC_ERROR);
-      window.location.href = payload.url;
+      window.location.assign(payload.url);
     } catch (err) {
       setBuying(null);
       setTopUps({
@@ -171,7 +171,7 @@ export function EsimControls({ orderId, cancelled: initiallyCancelled }: Props)
                         {option.name}
                       </p>
                       <p className="text-xs text-sand-500">
-                        {formatDataAllowance(option.dataGb)} · {formatValidity(option.validityDays)}
+                        {formatDataAllowance(option.dataGb, option.unlimited)} · {formatValidity(option.validityDays)}
                       </p>
                     </div>
                     <button
@@ -203,8 +203,8 @@ export function EsimControls({ orderId, cancelled: initiallyCancelled }: Props)
             ) : confirmingCancel ? (
               <div>
                 <p className="mb-3 text-sm text-sand-700 dark:text-sand-300">
-                  Cancel this plan? It stops renewing. Data already paid for stays on the eSIM
-                  until it expires, and this cannot be undone from here.
+                  Cancel this plan? This blocks future top-ups on this eSIM. It does not refund
+                  payment, delete the eSIM from your device, or release its network profile.
                 </p>
                 <div className="flex flex-wrap gap-3">
                   <button

package/templates/storefront/src/app/help/page.tsx

@@ -11,7 +11,7 @@ export default function HelpPage() {
           Help
         </h1>
         <p className="mt-2 text-sand-600 dark:text-sand-400">
-          Get connected in under five minutes. Humans on WhatsApp, 24/7.
+          Get connected in under five minutes.
         </p>
       </div>
       <HowItWorks />

package/templates/storefront/src/app/shop/ShopClient.tsx

@@ -103,7 +103,7 @@ export function ShopClient({ plans }: { plans: SkuTemplate[] }) {
           </h2>
           <p className="mt-1 text-sm text-sand-500">
             {selected
-              ? `${formatDataAllowance(selected.dataGb)} · ${formatValidity(selected.validityDays)}`
+              ? `${formatDataAllowance(selected.dataGb, selected.unlimited)} · ${formatValidity(selected.validityDays)}`
               : "Choose a plan on the left and the total appears here."}
           </p>
 

package/templates/storefront/src/app/sign-up/[[...sign-up]]/StorefrontSignUpClient.tsx

@@ -9,6 +9,7 @@
  *   useSignUp()  → { signUp, isLoaded }
  *   useClerk()   → { setActive }
  */
+import Link from "next/link";
 import { useState, FormEvent } from "react";
 import { useSignUp } from "@clerk/nextjs";
 import { useClerk } from "@clerk/nextjs";
@@ -134,9 +135,9 @@ export function StorefrontSignUpClient() {
           </form>
           <p className="mt-4 text-center text-xs text-sand-400">
             Already have an account?{" "}
-            <a href="/sign-in" className="text-[var(--brand-accent)] hover:underline">
+            <Link href="/sign-in" className="text-[var(--brand-accent)] hover:underline">
               Sign in
-            </a>
+            </Link>
           </p>
         </>
       )}

package/templates/storefront/src/app/sitemap.ts

@@ -9,6 +9,7 @@ export default function sitemap(): MetadataRoute.Sitemap {
     { url: `${base}/help`, lastModified: new Date(), changeFrequency: "monthly", priority: 0.5 },
     { url: `${base}/contact`, lastModified: new Date(), changeFrequency: "monthly", priority: 0.4 },
     { url: `${base}/legal/privacy`, lastModified: new Date(), changeFrequency: "yearly", priority: 0.2 },
+    { url: `${base}/legal/acceptable-use`, lastModified: new Date(), changeFrequency: "yearly", priority: 0.2 },
     { url: `${base}/legal/terms`, lastModified: new Date(), changeFrequency: "yearly", priority: 0.2 },
   ];
 }

package/templates/storefront/src/components/checkout/EmbeddedStripeCheckout.tsx

@@ -125,9 +125,11 @@ export function EmbeddedStripeCheckout({ clientSecret, onComplete, onUnavailable
   // passes inline closures does not re-run this effect and open a second
   // Checkout instance against one session.
   const onCompleteRef = useRef(onComplete);
-  onCompleteRef.current = onComplete;
   const onUnavailableRef = useRef(onUnavailable);
-  onUnavailableRef.current = onUnavailable;
+  useEffect(() => {
+    onCompleteRef.current = onComplete;
+    onUnavailableRef.current = onUnavailable;
+  }, [onComplete, onUnavailable]);
 
   useEffect(() => {
     if (!canEmbedStripeCheckout || !clientSecret) return;