@startsimpli/billing 0.4.26 → 0.4.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startsimpli/billing",
-  "version": "0.4.26",
+  "version": "0.4.27",
   "description": "Universal billing integration for StartSimpli Next.js apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/components/BillingStates.review.test.tsx

@@ -0,0 +1,146 @@
+/**
+ * Billing page states from the crochet design review (2026-10-18):
+ * - a plan ending at period end has one status, "Ends <date>", and the free
+ *   plan it falls back to reads "Starts <date>", disabled (crochet_patterns-3bzni);
+ *   a cancelled paid plan keeps Manage Billing for its invoices (-pes38)
+ * - a trial says when the first charge is and how much (-iwl0f), shows its end
+ *   date once (-rjg2e), and counts day one of a 7-day trial as 7 days (-lm7nu)
+ * - a failed payment is not dated with the period end (-lb8u3)
+ * - back from a trial checkout: "Your Pro trial has started" (-reg6a)
+ * - the clicked plan button says "Opening checkout…" while it opens (-jnkso)
+ * - a complimentary plan on a tier marks that tier's card current (-lgqp2)
+ */
+import { describe, it, expect, vi } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import React from "react";
+import { BillingProvider } from "../hooks/BillingProvider";
+import { CurrentPlanCard } from "./CurrentPlanCard";
+import { SubscriptionManager } from "./SubscriptionManager";
+import type { BillingProduct, ProductOffer, SubscriptionInfo } from "../types";
+
+const base: Omit<ProductOffer, "id" | "name" | "slug" | "unitPrice" | "isFree" | "sortOrder"> = {
+  currency: "USD",
+  pricingModel: "flat",
+  intervalUnit: "month",
+  intervalCount: 1,
+  intervalDisplay: "per month",
+  isRecurring: true,
+  features: [],
+  isActive: true,
+  isFeatured: false,
+  trialDays: 0,
+  ctaText: "",
+};
+const FREE: ProductOffer = { ...base, id: "o-free", name: "Free", slug: "crochet-free", unitPrice: "0.00", isFree: true, sortOrder: 0, tier: "free" };
+const LITE: ProductOffer = { ...base, id: "o-lite", name: "Lite", slug: "crochet-lite", unitPrice: "2.99", isFree: false, sortOrder: 1, tier: "lite", ctaText: "Get Lite" };
+const PRO: ProductOffer = { ...base, id: "o-pro", name: "Pro", slug: "crochet-pro", unitPrice: "9.00", isFree: false, sortOrder: 2, tier: "pro", trialDays: 7, isFeatured: true, ctaText: "Start Free Trial" };
+const COMP: ProductOffer = { ...base, id: "o-comp", name: "Pro (complimentary)", slug: "crochet-pro-comp", unitPrice: "0.00", isFree: true, sortOrder: 2, tier: "pro", isActive: false };
+const PRODUCT: BillingProduct = { id: "p", slug: "crochet-patterns", name: "Crochet", description: "", offers: [FREE, LITE, PRO] };
+
+const sub = (offer: ProductOffer, over: Partial<SubscriptionInfo> = {}): SubscriptionInfo => ({
+  id: "s1",
+  offer,
+  status: "active",
+  currentPeriodStart: "2026-10-17T00:00:00Z",
+  currentPeriodEnd: "2099-11-17T00:00:00Z",
+  cancelAtPeriodEnd: false,
+  trialEnd: null,
+  viewerIsOwner: true,
+  ...over,
+});
+
+function renderManager(subscription: SubscriptionInfo | null, props: Partial<React.ComponentProps<typeof SubscriptionManager>> = {}) {
+  const fetcher = vi.fn((url: string) => {
+    if (url.includes("/billing/subscription/current/")) {
+      return Promise.resolve(subscription
+        ? { ok: true, json: () => Promise.resolve(subscription) }
+        : { ok: false, status: 404, json: () => Promise.resolve({}) });
+    }
+    if (url.includes("/billing/products/")) return Promise.resolve({ ok: true, json: () => Promise.resolve(PRODUCT) });
+    if (url.includes("/billing/success-sync/")) return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+    if (url.includes("/billing/usage/")) return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+    return Promise.resolve({ ok: false, status: 404, json: () => Promise.resolve({}) });
+  }) as unknown as typeof fetch;
+  return render(
+    <BillingProvider apiBaseUrl="https://api.test/api/v1" fetcher={fetcher}>
+      <SubscriptionManager productId="crochet-patterns" returnUrl="https://x/settings/billing" {...props} />
+    </BillingProvider>,
+  );
+}
+
+describe("CurrentPlanCard states", () => {
+  it("a plan cancelled at period end reads 'Ends <date>', not Active", () => {
+    render(<CurrentPlanCard subscription={sub(PRO, { cancelAtPeriodEnd: true, currentPeriodEnd: "2099-11-17T00:00:00Z" })} usage={{}} />);
+    expect(screen.getByTestId("plan-status").textContent).toBe("Ends Nov 17, 2099");
+  });
+
+  it("a cancelled plan reads the same as one cancelled at period end", () => {
+    render(<CurrentPlanCard subscription={sub(PRO, { status: "cancelled", currentPeriodEnd: "2099-11-17T00:00:00Z" })} usage={{}} />);
+    expect(screen.getByTestId("plan-status").textContent).toBe("Ends Nov 17, 2099");
+  });
+
+  it("a trial says the first charge and its amount, with the end date shown once", () => {
+    const trialEnd = "2099-10-24T00:00:00Z";
+    render(<CurrentPlanCard subscription={sub(PRO, { status: "trialing", trialEnd, currentPeriodEnd: trialEnd })} usage={{}} onPortalClick={() => {}} />);
+    expect(screen.getByTestId("first-charge").textContent).toBe("First charge $9 on Oct 24, 2099");
+    expect(screen.queryByText(/billing period/i)).toBeNull();
+    expect(screen.getByTestId("plan-status").textContent).toBe("Trialing");
+  });
+
+  it("day one of a 7-day trial reads 7 days", () => {
+    const trialEnd = new Date(Date.now() + 7 * 86_400_000 - 60_000).toISOString();
+    render(<CurrentPlanCard subscription={sub(PRO, { status: "trialing", trialEnd })} usage={{}} onPortalClick={() => {}} />);
+    expect(screen.getByTestId("banner-trialing").textContent).toMatch(/ends in 7 days/);
+  });
+
+  it("a failed payment is not dated with the period end", () => {
+    render(<CurrentPlanCard subscription={sub(PRO, { status: "past_due", currentPeriodEnd: "2099-11-17T00:00:00Z" })} usage={{}} onPortalClick={() => {}} />);
+    const banner = screen.getByTestId("banner-past-due");
+    expect(banner.textContent).toMatch(/your last payment failed/i);
+    expect(banner.textContent).not.toMatch(/2099/);
+  });
+
+  it("the next billing date uses the same date format as the banners", () => {
+    render(<CurrentPlanCard subscription={sub(PRO)} usage={{}} />);
+    expect(screen.getByTestId("next-billing-date").textContent).toBe("Next billing date: Nov 17, 2099");
+  });
+});
+
+describe("SubscriptionManager states", () => {
+  it("while Pro ends at period end, the Free card reads 'Starts <date>' and is disabled", async () => {
+    renderManager(sub(PRO, { cancelAtPeriodEnd: true }));
+    const btn = await screen.findByTestId("upgrade-cta-crochet-free");
+    expect(btn.textContent).toBe("Starts Nov 17, 2099");
+    expect((btn as HTMLButtonElement).disabled).toBe(true);
+  });
+
+  it("a cancelled paid plan keeps Manage Billing for its invoices", async () => {
+    renderManager(sub(PRO, { status: "cancelled" }));
+    expect(await screen.findByTestId("portal-button")).toBeTruthy();
+  });
+
+  it("back from a trial checkout says the trial has started", async () => {
+    renderManager(sub(PRO, { status: "trialing", trialEnd: "2099-10-24T00:00:00Z" }), { statusMessage: "success" });
+    expect((await screen.findByTestId("status-banner-success", {}, { timeout: 4000 })).textContent).toContain("Your Pro trial has started.");
+  });
+
+  it("the clicked plan button says 'Opening checkout…' and is disabled while checkout opens", async () => {
+    const onPlanChange = vi.fn(() => new Promise(() => {}));
+    renderManager(null, { onPlanChange });
+    const lite = await screen.findByTestId("upgrade-cta-crochet-lite");
+    await userEvent.click(lite);
+    await waitFor(() => expect(lite.textContent).toBe("Opening checkout…"));
+    expect((lite as HTMLButtonElement).disabled).toBe(true);
+    expect((screen.getByTestId("upgrade-cta-crochet-pro") as HTMLButtonElement).disabled).toBe(true);
+  });
+
+  it("a complimentary plan on the Pro tier marks the Pro card current, with no trial offered", async () => {
+    renderManager(sub(COMP, { currentPeriodEnd: null }));
+    const pro = await screen.findByTestId("upgrade-cta-crochet-pro");
+    expect(pro.textContent).toBe("Current plan");
+    expect((pro as HTMLButtonElement).disabled).toBe(true);
+    expect(screen.getByTestId("upgrade-cta-crochet-lite").textContent).toBe("Downgrade to Lite");
+    expect(screen.queryByText(/start free trial/i)).toBeNull();
+  });
+});

package/src/components/CurrentPlanCard.tsx

@@ -45,7 +45,25 @@ function featureLabel(f: OfferFeature): string | null {
   return formatFeatureLabel(f);
 }
 
-function StatusBadge({ status, trialEnd }: { status: string; trialEnd: string | null }) {
+/**
+ * The card's one status pill. A plan that is ending (cancelled, or cancelled
+ * at period end) reads "Ends <date>": it used to say "Active" beside a
+ * "your plan is cancelled" banner (crochet_patterns-3bzni, -pes38). A trial
+ * reads "Trialing" only; its end date is in the banner (crochet_patterns-rjg2e).
+ */
+function StatusBadge({ status, endsOn }: { status: string; endsOn: string | null }) {
+  if (endsOn) {
+    return (
+      <span
+        data-testid="plan-status"
+        role="status"
+        aria-label={`Subscription status: ends ${prettyDate(endsOn)}`}
+        className="inline-block text-xs font-semibold px-3 py-1 rounded-full bg-gray-100 text-gray-600"
+      >
+        {`Ends ${prettyDate(endsOn)}`}
+      </span>
+    );
+  }
   let cls = "inline-block text-xs font-semibold px-3 py-1 rounded-full ";
   switch (status) {
     case "active":            cls += "bg-green-50 text-green-700"; break;
@@ -75,16 +93,10 @@ function StatusBadge({ status, trialEnd }: { status: string; trialEnd: string |
       className={cls}
     >
       {readable}
-      {status === "trialing" && trialEnd && (
-        <span className="ml-1">until {formatDate(trialEnd)}</span>
-      )}
     </span>
   );
 }
 
-function formatDate(iso: string): string {
-  return new Date(iso).toISOString().slice(0, 10);
-}
 
 function ProgressBar({ used, limit }: { used: number; limit: number }) {
   // Cap at 100% so a hard-overage display can't blow out the layout.
@@ -126,10 +138,11 @@ function FeatureRow({ feature, used }: { feature: OfferFeature; used: number | n
   );
 }
 
-/** Days until ISO date, rounded down; negative if past. */
+/** Calendar days (UTC, as the dates are shown) from today to the ISO date;
+ * negative if past. Day one of a 7-day trial is 7, not 6 (crochet_patterns-lm7nu). */
 function daysUntil(iso: string): number {
-  const ms = new Date(iso).getTime() - Date.now();
-  return Math.floor(ms / 86_400_000);
+  const day = (d: Date) => Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
+  return Math.round((day(new Date(iso)) - day(new Date())) / 86_400_000);
 }
 
 /** Pretty "Jun 27, 2026" style — easier to scan than ISO yyyy-mm-dd in banners. */
@@ -179,6 +192,8 @@ function StateBanner({ testId, variant, message, action }: BannerProps) {
 export function CurrentPlanCard({ subscription, usage, upgradeCta, onPortalClick }: CurrentPlanCardProps) {
   const offer = subscription.offer;
   const features = offer.features ?? [];
+  const ending = subscription.status === "cancelled" || subscription.cancelAtPeriodEnd;
+  const endsOn = ending ? subscription.currentPeriodEnd : null;
 
   // State-driven banner choice — at most one banner at the top of the card.
   // Precedence: past_due > cancelled-in-period > trialing > none.
@@ -191,8 +206,8 @@ export function CurrentPlanCard({ subscription, usage, upgradeCta, onPortalClick
         variant="danger"
         message={
           <>
-            Payment failed{subscription.currentPeriodEnd ? ` on ${prettyDate(subscription.currentPeriodEnd)}` : ""}.
-            {" "}Update your card to keep your subscription active.
+            {/* Not dated: the period end is not when the payment failed (crochet_patterns-lb8u3). */}
+            Your last payment failed. Update your card to keep your subscription active.
           </>
         }
         action={{ label: "Update card", onClick: onPortalClick }}
@@ -260,7 +275,7 @@ export function CurrentPlanCard({ subscription, usage, upgradeCta, onPortalClick
       {stateBanner}
       <div className="flex items-center justify-between mb-4">
         <h2 className="text-xl font-bold text-gray-900">{offer.name}</h2>
-        <StatusBadge status={subscription.status} trialEnd={subscription.trialEnd} />
+        <StatusBadge status={subscription.status} endsOn={endsOn} />
       </div>
 
       <div className="mb-4">
@@ -280,14 +295,21 @@ export function CurrentPlanCard({ subscription, usage, upgradeCta, onPortalClick
       {/* Active paid subs surface "Next billing date" prominently — that's
           what users actually want to know. Free + cancelled + no-period subs
           fall back to the period range / nothing. startsim-7j4. */}
-      {subscription.currentPeriodEnd && !offer.isFree && subscription.status === "active" && !subscription.cancelAtPeriodEnd ? (
+      {/* A trial says when it first charges and how much, in place of a
+          billing period that only repeats the trial end (crochet_patterns-iwl0f).
+          One date format on the card, the banners' (crochet_patterns-rjg2e). */}
+      {subscription.status === "trialing" && subscription.trialEnd && !offer.isFree && !ending ? (
+        <p data-testid="first-charge" className="text-sm text-gray-600 mb-6">
+          {`First charge ${priceLabel(offer)} on ${prettyDate(subscription.trialEnd)}`}
+        </p>
+      ) : subscription.currentPeriodEnd && !offer.isFree && subscription.status === "active" && !subscription.cancelAtPeriodEnd ? (
         <p data-testid="next-billing-date" className="text-sm text-gray-600 mb-6">
-          Next billing date: {formatDate(subscription.currentPeriodEnd)}
+          Next billing date: {prettyDate(subscription.currentPeriodEnd)}
         </p>
-      ) : subscription.currentPeriodStart && subscription.currentPeriodEnd ? (
+      ) : subscription.currentPeriodStart && subscription.currentPeriodEnd && !ending ? (
         <p className="text-sm text-gray-500 mb-6">
-          Billing period: {formatDate(subscription.currentPeriodStart)} to{" "}
-          {formatDate(subscription.currentPeriodEnd)}
+          Billing period: {prettyDate(subscription.currentPeriodStart)} to{" "}
+          {prettyDate(subscription.currentPeriodEnd)}
         </p>
       ) : null}
 

package/src/components/SubscriptionManager.test.tsx

@@ -290,8 +290,8 @@ describe("SubscriptionManager", () => {
     // Check trialing status
     expect(screen.getByText(/trialing/i)).toBeDefined();
 
-    // Check trial end date is displayed
-    expect(screen.getByText(/2026-01-15/)).toBeDefined();
+    // The trial end is shown in the banner's format (crochet_patterns-rjg2e).
+    expect(screen.getByTestId("first-charge").textContent).toMatch(/Jan 15, 2026/);
   });
 
   it("shows billing period dates", async () => {
@@ -319,7 +319,7 @@ describe("SubscriptionManager", () => {
     // or free states after startsim-7j4. Both dates are still in the DOM via
     // the grid card's renderings, so target the current-plan card specifically.
     const currentPlan = screen.getByTestId("current-plan");
-    expect(currentPlan.textContent).toMatch(/2026-02-01/);
+    expect(currentPlan.textContent).toMatch(/Feb 1, 2026/);
   });
 
   it("shows ALL offers in the Change Plan grid (current marked, not hidden) — startsim-1f1", async () => {
@@ -934,7 +934,7 @@ describe("SubscriptionManager", () => {
 
     const nextBilling = screen.getByTestId("next-billing-date");
     expect(nextBilling.textContent).toMatch(/next billing date/i);
-    expect(nextBilling.textContent).toMatch(/2026-02-01/);
+    expect(nextBilling.textContent).toMatch(/Feb 1, 2026/);
     // The verbose "Billing period:" line is hidden on active paid subs.
     expect(screen.queryByText(/^Billing period:/i)).toBeNull();
   });

package/src/components/SubscriptionManager.tsx

@@ -311,8 +311,27 @@ export function SubscriptionManager({
   // startsim-21f, crochet_patterns-anw61.
   const paying = isPayingSubscription(usableSubscription);
   const onUnlistedPlan = !!product && isUnlistedOffer(product.offers, usableSubscription?.offer);
+  // A complimentary plan on a listed tier ("Pro (complimentary)", tier pro)
+  // IS that tier: its card reads "Current plan" and nothing sells the viewer a
+  // trial of what they have (crochet_patterns-lgqp2).
+  const ownTierKey = onUnlistedPlan && usableSubscription?.offer.tier ? `tier:${usableSubscription.offer.tier}` : null;
+  const ownTier = ownTierKey ? entries.find(({ tier }) => tier.key === ownTierKey) ?? null : null;
+  const rankOffer = ownTier?.offer ?? currentOffer;
   const directionFor = (cardOffer: ProductOffer): PlanDirection =>
-    planDirection(cardOffer, currentOffer, tierKeyOf);
+    ownTier && tierKeyOf(cardOffer.id) === ownTier.tier.key
+      ? "current"
+      : planDirection(cardOffer, rankOffer, tierKeyOf);
+
+  // A paid plan that is ending falls back to the free plan on its end date, so
+  // the free card says when instead of offering a second downgrade
+  // (crochet_patterns-3bzni, -pes38).
+  const endingOn =
+    usableSubscription && !usableSubscription.offer.isFree &&
+    (usableSubscription.status === "cancelled" || usableSubscription.cancelAtPeriodEnd) &&
+    usableSubscription.currentPeriodEnd &&
+    new Date(usableSubscription.currentPeriodEnd).getTime() > Date.now()
+      ? usableSubscription.currentPeriodEnd
+      : null;
 
   const handleOfferClick = (offer: ProductOffer) => {
     // Non-owner viewers can SEE the plans but can't change them — startsim-wo9.
@@ -329,8 +348,8 @@ export function SubscriptionManager({
   // only apps), so the Upgrade CTA simply doesn't render — startsim-ft2.
   const featuredPaidOffer: ProductOffer | null = (() => {
     if (!product) return null;
-    if (currentOffer) {
-      const above = product.offers.filter((o) => !o.isFree && o.sortOrder > currentOffer.sortOrder);
+    if (rankOffer) {
+      const above = product.offers.filter((o) => !o.isFree && o.sortOrder > rankOffer.sortOrder);
       return above.find((o) => o.isFeatured) ?? above[0] ?? null;
     }
     return (
@@ -356,7 +375,12 @@ export function SubscriptionManager({
           <svg className="w-5 h-5 text-green-600 shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
             <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
           </svg>
-          <p className="text-sm font-medium text-green-800">Subscription activated successfully!</p>
+          <p className="text-sm font-medium text-green-800">
+            {/* A trial is not yet a paid plan (crochet_patterns-reg6a). */}
+            {usableSubscription?.status === "trialing"
+              ? `Your ${usableSubscription.offer.name} trial has started.`
+              : "Subscription activated successfully!"}
+          </p>
         </div>
       )}
 
@@ -497,7 +521,13 @@ export function SubscriptionManager({
               const direction = directionFor(offer);
               const isCurrent = direction === "current";
               const isDowngrade = direction === "downgrade" || direction === "switch";
-              const ctaLabel = planCtaLabel(offer, direction, paying);
+              const fallsBackHere = !!endingOn && offer.isFree;
+              // Straight to checkout: say so until the page goes (crochet_patterns-jnkso).
+              const opening = planChange.busy && planChange.choosing?.id === offer.id && !planChange.pending && !offer.isFree && !paying;
+              const ctaLabel = fallsBackHere
+                ? `Starts ${new Date(endingOn).toLocaleDateString("en-US", { year: "numeric", month: "short", day: "numeric", timeZone: "UTC" })}`
+                : opening ? "Opening checkout\u2026"
+                : planCtaLabel(offer, direction, paying);
               const showTrial = trialApplies(offer, direction, paying);
 
               // Border: current = solid ring; featured upgrade = blue; else gray.
@@ -522,7 +552,7 @@ export function SubscriptionManager({
                   data-testid={`plan-card-${offer.slug}`}
                   data-direction={direction}
                   data-current={isCurrent || undefined}
-                  className={`relative rounded-xl p-6 transition-colors ${cardBorder}`}
+                  className={`relative flex flex-col rounded-xl p-6 transition-colors ${cardBorder}`}
                 >
                   <h4 className="text-lg font-bold text-gray-900 mb-2">{tier.name}</h4>
                   <div className="mb-3">
@@ -540,12 +570,12 @@ export function SubscriptionManager({
                   <PlanFeatureList features={offer.features} showTrialNote={showTrial || !(offer.trialDays > 0)} />
                   <button
                     data-testid={`upgrade-cta-${offer.slug}`}
-                    onClick={() => !isCurrent && !isViewerNonOwner && !planChange.busy && handleOfferClick(offer)}
-                    disabled={isCurrent || isViewerNonOwner || planChange.busy}
-                    aria-disabled={isCurrent || isViewerNonOwner || planChange.busy || undefined}
-                    aria-busy={planChange.busy && planChange.pending?.offer.id === offer.id ? true : undefined}
+                    onClick={() => !isCurrent && !fallsBackHere && !isViewerNonOwner && !planChange.busy && handleOfferClick(offer)}
+                    disabled={isCurrent || fallsBackHere || isViewerNonOwner || planChange.busy}
+                    aria-disabled={isCurrent || fallsBackHere || isViewerNonOwner || planChange.busy || undefined}
+                    aria-busy={planChange.busy && planChange.choosing?.id === offer.id ? true : undefined}
                     title={isViewerNonOwner ? "Only the team owner can change the plan" : undefined}
-                    className={`w-full py-2.5 px-4 text-sm font-bold rounded-xl transition-colors ${ctaClass} ${isViewerNonOwner ? "opacity-60 cursor-not-allowed" : ""}`}
+                    className={`mt-auto w-full py-2.5 px-4 text-sm font-bold rounded-xl transition-colors ${fallsBackHere ? "bg-gray-100 text-gray-500 cursor-not-allowed" : ctaClass} ${isViewerNonOwner ? "opacity-60 cursor-not-allowed" : ""}`}
                   >
                     {ctaLabel}
                   </button>
@@ -561,7 +591,8 @@ export function SubscriptionManager({
           Free-tier users (provider='none') have no Stripe customer, so the
           portal call would 404 — they get the Upgrade CTA on the current-plan
           card instead. startsim-b1z. */}
-      {usableSubscription && usableSubscription.status !== "cancelled" && !usableSubscription.offer.isFree && usableSubscription.viewerIsOwner !== false && (
+      {/* A cancelled paid plan keeps it too: its invoices are there (crochet_patterns-pes38). */}
+      {usableSubscription && !usableSubscription.offer.isFree && usableSubscription.viewerIsOwner !== false && (
         <div className="pt-4 border-t border-gray-100">
           <button
             data-testid="portal-button"

package/src/hooks/usePlanChange.ts

@@ -48,6 +48,8 @@ export interface UsePlanChangeResult {
   /** Open when the viewer must confirm. */
   pending: PlanChangeConfirmState | null;
   busy: boolean;
+  /** The offer being chosen while `busy`, so its button can say what is happening. */
+  choosing: ProductOffer | null;
   /** The confirm step itself is running. */
   confirming: boolean;
   error: string | null;
@@ -57,7 +59,12 @@ export interface UsePlanChangeResult {
 export function usePlanChange(proceed: PlanChangeProceed): UsePlanChangeResult {
   const { client } = useBillingContext();
   const [pending, setPending] = useState<PlanChangeConfirmState | null>(null);
-  const [busy, setBusy] = useState(false);
+  const [busy, setBusyState] = useState(false);
+  const [choosing, setChoosing] = useState<ProductOffer | null>(null);
+  const setBusy = useCallback((value: boolean, offer: ProductOffer | null = null) => {
+    setBusyState(value);
+    setChoosing(value ? offer : null);
+  }, []);
   const [confirming, setConfirming] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const inFlight = useRef(false);
@@ -78,14 +85,14 @@ export function usePlanChange(proceed: PlanChangeProceed): UsePlanChangeResult {
         return false;
       }
     },
-    [proceed],
+    [proceed, setBusy],
   );
 
   const choose = useCallback(
     async (offer: ProductOffer, context: PlanChangeContext) => {
       if (inFlight.current) return;
       inFlight.current = true;
-      setBusy(true);
+      setBusy(true, offer);
       setError(null);
 
       const leavingUnlisted = !!context.leavingUnlisted;
@@ -118,7 +125,7 @@ export function usePlanChange(proceed: PlanChangeProceed): UsePlanChangeResult {
         leavingUnlisted: preview?.currentOffer ? !preview.currentOffer.isListed : leavingUnlisted,
       });
     },
-    [client, run],
+    [client, run, setBusy],
   );
 
   const confirm = useCallback(async () => {
@@ -136,9 +143,9 @@ export function usePlanChange(proceed: PlanChangeProceed): UsePlanChangeResult {
     setError(null);
     inFlight.current = false;
     setBusy(false);
-  }, [confirming]);
+  }, [confirming, setBusy]);
 
   const clearError = useCallback(() => setError(null), []);
 
-  return { choose, confirm, cancel, pending, busy, confirming, error, clearError };
+  return { choose, confirm, cancel, pending, busy, choosing, confirming, error, clearError };
 }