Skip to content

[backport cloud/1.53] fix(billing): obtain a server quote before the team confirmation step - #16715

Merged
comfy-pr-bot merged 1 commit into
cloud/1.53from
backport-16647-to-cloud-1.53
Sep 2, 2026
Merged

comfy-pr-bot merged 1 commit into
cloud/1.53from
backport-16647-to-cloud-1.53

Conversation

@comfy-pr-bot

Copy link
Copy Markdown
Member

Backport of #16647 to cloud/1.53

Automatically created by backport workflow.

…#16647)

## Summary

With embedded checkout off, the Team confirmation step opened before any
quote was requested — so "Total due today" rendered with no amount, and
a plan change that could not be priced emptied the dialog entirely.

Found on staging during 1.52 QA (Denys), after #16517 fixed the same
symptom for Personal.

## Root cause

`handleSubscribeTeamClick`'s legacy branch set the step *before*
fetching, and then usually never fetched:

```ts
checkoutStep.value = 'preview'                              // step first
const needsPreview = payload.isChange || isSubscriptionCancelled()
if (!needsPreview || !payload.stop.id) return               // fresh subscribe: no request at all
```

`previewData` is reset to `null` immediately above this, so a fresh team
subscribe reached the confirmation with no quote.
`SubscriptionAddPaymentPreviewWorkspace` renders the total from
`previewData`, so the amount and the whole renewal line came out empty.
Everything else on that screen ($665, billing cycle, refill credits) is
derived from the `teamPlan` prop, which is why the screen looked
otherwise healthy.

Personal was never affected: `handleSubscribeClick` calls
`previewSubscribe` on both sides of the flag and only then advances the
step. So #16517 (legacy quote formatting) could not have fixed Team —
there was no preview to format.

The same early step change produced the empty modal on Team → Change
plan. `previewVariant` returns `'team-change'` from `checkoutType`
alone, and the two exits at `if (!payload.stop.id) return` and `if
(!isSubscriptionCancelled()) return` leave `previewData` null.
`SubscriptionTransitionPreviewWorkspace` declares `previewData:
PreviewSubscribeResponse` (required) and dereferences it during setup
(`previewData.promotion_code`), so setup throws and only the dialog
chrome renders. The `:preview-data="previewData!"` assertion at the call
site is what kept this off the type checker.

## Changes

- **What**: the legacy team path fetches and installs the preview first,
and advances to the confirmation only when `isUsableTeamPreview` accepts
it — otherwise it reports the failure and stays on pricing, matching the
personal and embedded paths. Removed the `previewData!` assertions so a
null preview can no longer reach a required prop. The total row is
omitted rather than rendered blank when nothing can price it (the
id-less OSS stop, the one case with no server quote available).
- **Breaking**: a preview failure now blocks a fresh team subscribe
instead of showing an unpriced confirmation. This matches what the
flag-on path already does.

## Review Focus

`isUsableTeamPreview` keeps the three acceptance rules that were
previously inline and adds the new-subscription case, which had no rule
because it never fetched: cancelled needs a reactivation-capable
preview, a change needs an existing-plan transition, a new subscribe
needs any allowed preview.

Worth knowing for the release call: `embeddedCheckoutEnabled` appears
exactly once in `useSubscriptionCheckout.test.ts` — as the `setup()`
default of `true`. Every one of the 131 existing tests ran the flag-on
branch, so the entire legacy branch shipped uncovered. That is the
actual reason this reached staging, and the four new tests are scoped to
it.

Amounts stay server-resolved throughout; nothing here derives a price
from `teamPlan`.

- Fixes FE-1974

## Screenshots (if applicable)

Captured against a cloud-distribution dev server with embedded checkout
off, driving the real flow: Settings → Plan & Credits → Change plan →
pick a different Team credit stop → Change plan.

### AS IS — `main`

![AS IS: the change-plan confirmation is an empty "Choose a Plan"
box](https://raw.githubusercontent.com/dante01yoon/ComfyUI_frontend/assets/pr-16647-screenshots/docs-assets/pr-16647/asis-change-plan-empty.png)

The step is entered with `previewData` still null.
`SubscriptionTransitionPreviewWorkspace` declares that prop required and
dereferences it during setup, so setup throws and the body renders
nothing — only the shell's own header is left. This is the same failure
QA hit on staging.

### TO BE — this PR

> This shot still shows a duplicated "Choose a Plan" header and a second
back arrow. That is a separate defect, fixed in #16648 — it is left
visible here so this PR's own contribution is legible on its own.

![TO BE: the confirmation renders with Total due today priced from the
server](https://raw.githubusercontent.com/dante01yoon/ComfyUI_frontend/assets/pr-16647-screenshots/docs-assets/pr-16647/tobe-change-plan-priced.png)

The preview is fetched and installed before the step is entered, so the
confirmation renders and `Total due today` is priced from the server's
legacy `cost_*` fields — $361.00 here, with the renewal line resolved
too.

### TO BE — with #16648 applied as well

![TO BE: a single header and one back action, with the amount
priced](https://raw.githubusercontent.com/dante01yoon/ComfyUI_frontend/assets/pr-16647-screenshots/docs-assets/pr-16647/tobe-both-prs.png)

How the step looks once both PRs are in. They are two halves of the same
report and ship together for 1.52.
@comfy-pr-bot comfy-pr-bot added the backport Backporting a PR onto a release candidate label Sep 2, 2026
@comfy-pr-bot
comfy-pr-bot enabled auto-merge (squash) September 2, 2026 23:37
@github-actions

github-actions Bot commented Sep 2, 2026 •

Copy link
Copy Markdown
Contributor

🎭 Playwright: ✅ 1893 passed, 0 failed

📊 Browser Reports
  • chromium: View Report (✅ 1872 / ❌ 0 / ⚠️ 0 / ⏭️ 4)
  • chromium-2x: View Report (✅ 2 / ❌ 0 / ⚠️ 0 / ⏭️ 0)
  • chromium-0.5x: View Report (✅ 1 / ❌ 0 / ⚠️ 0 / ⏭️ 0)
  • mobile-chrome: View Report (✅ 18 / ❌ 0 / ⚠️ 0 / ⏭️ 0)

🎨 Storybook: ✅ Built — View Storybook

Details

⏰ Completed at: 09/02/2026, 11:39:37 PM UTC

Links

@github-actions
github-actions Bot requested a review from DrJKL September 2, 2026 23:38
@dante01yoon dante01yoon self-assigned this Sep 2, 2026
@github-actions github-actions Bot added the risk:R3 PR risk grade (advisory shadow check; grader-owned) label Sep 2, 2026
@comfy-pr-bot
comfy-pr-bot merged commit 5ad0261 into cloud/1.53 Sep 2, 2026
103 checks passed
@comfy-pr-bot
comfy-pr-bot deleted the backport-16647-to-cloud-1.53 branch September 2, 2026 23:52
@codecov

codecov Bot commented Sep 2, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@              Coverage Diff              @@
##             cloud/1.53   #16715   +/-   ##
=============================================
  Coverage              ?   83.29%           
=============================================
  Files                 ?     2023           
  Lines                 ?   116996           
  Branches              ?    33032           
=============================================
  Hits                  ?    97456           
  Misses                ?    19194           
  Partials              ?      346           
Flag Coverage Δ
e2e 66.58% <ø> (?)
unit 76.55% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ponents/SubscriptionAddPaymentPreviewWorkspace.vue 90.47% <100.00%> (ø)
...nents/SubscriptionRequiredDialogContentUnified.vue 59.63% <100.00%> (ø)
...m/workspace/composables/useSubscriptionCheckout.ts 92.37% <100.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Backporting a PR onto a release candidate risk:R3 PR risk grade (advisory shadow check; grader-owned)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants