Skip to content

FE-3021 fix(billing-web): Pay failure card, $0 explanation, yearly naming and endings copy - #19537

Merged
dante01yoon merged 1 commit into
mainfrom
jaewon/fe-3021-ux-pass-summary-copy
Sep 30, 2026
Merged

dante01yoon merged 1 commit into
mainfrom
jaewon/fe-3021-ux-pass-summary-copy

Conversation

@dante01yoon

@dante01yoon dante01yoon commented Sep 30, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Fixes seven items from Alex Tov's UX pass on the M3 full-page checkout (billing_web_checkout_ui): a refused Pay gets the processing-error card, a $0 total says why, yearly kept plans name their cadence, team keep-subscription copy follows a period change, and three endings (View plans, capabilities failure, missing Stripe key) behave per design.

Changes

  • Why (Alex's items)
    • 13: a coded Pay failure (e.g. a 500 → REQUEST_FAILED) rendered as a bare red <p role=alert> with no support path. Figma 314-10612 wants the "Payment couldn't be processed" card with Contact support.
    • 14: a $0 total with no explanation. An upgrade a code takes to $0, or a $0 new subscription the quote gives no renewal_at, got no zero-due line. Figma 294-8224.
    • 15: a yearly→yearly downgrade read "You'll keep Pro until…"; yearly plans must read "Pro Yearly". Figma 294-8445.
    • 17b: team monthly→yearly read "Changing your commitment…" instead of the switch-to-yearly line.
    • 16a: View plans opened the Team tab only for a missing stop; a retired team plan whose link carries team_credit_stop_id went to the default tab.
    • 16b: a failed capabilities read showed the quote body ("We couldn't load your quote. Nothing has been charged…"). Figma 421-5804.
    • 16c: a missing Stripe key ended the whole page. Figma 370-15519 fails inside the payment column.
  • Root cause
    • 13: payVerdictOf had a separate failure verdict that bypassed InlineOutcome, so the page threaded a plain failure string through the view, column and pay action beside the card.
    • 14: chargeNowTrailing gated the zero-due line on new_subscription and a renewal_at; the prorated family never had one.
    • 15: keptPlanLine passed cadenceChanges to namedPlan, which is false for yearly→yearly.
    • 17b: changeOf checked TEAM→TEAM before the duration change.
    • 16a: viewPlansLink read only the page's team_stop_missing reason, never the link.
    • 16b: capabilityStop emitted the quote's unavailable event.
    • 16c: quotedStop turned a missing key into an unavailable stop.
  • How
    • 13: a coded refusal is now InlineOutcome { kind: 'processing_error', code, serverMessage? }. payFailed always carries an outcome; the failure verdict, payFailure and the failure prop chain are deleted. The card body goes through useHostedCopy().refusal, so the "show server message" rule (status-only codes, 5xx included) holds inside the card. Support mail quotes Error code: <code>.
    • 14: one zeroDueLine for every $0 total in charge_now and prorated_change (not scheduled); dated → existing zeroDue, undated → new zeroDueUndated. Amounts are the quote's renewal_amount_cents ?? cost_next_period_cents.
    • 15: the kept plan names its cadence when it changes or when it is yearly.
    • 17b: TEAM→TEAM is commitment only when the duration is unchanged; otherwise to_yearly / to_yearly_undated / to_monthly.
    • 16a: Team tab when the link carries a stop, or the quote named a team plan without one.
    • 16b: new capabilitiesFailed event → unavailable { cause: 'capabilities' } with its own body that does not claim nothing was charged. Title, code and Try again unchanged.
    • 16c: the quoted event carries element: 'failed' when no key resolved, so the collect rail arrives failed. With no saved method that is column_error (Try again remounts the form, which picks up a key that arrived); beside saved methods, Saved stays payable. On-file plan changes never read the key.

Review Focus

  • 16c beside saved methods: the failure stays inside Add new rather than taking the column, per the existing rail rules (368-15319). Figma 370-15519 shows the no-saved-method case.
  • 13 body wording: REQUEST_FAILED with a server message shows that message; without one, billing-web's own copy for the code.

Screenshots (fixture build)

Taken from the Playwright e2e fixture build (mocked cloud, fake Stripe), not a real backend. AS IS is origin/main source, TO BE is this branch.

Item AS IS (fixture build) TO BE (fixture build)
13 Pay failure (500 with a server message) item13-asis item13-tobe
14 upgrade taken to $0 by a code item14-asis item14-tobe
15 yearly to yearly downgrade item15-asis item15-tobe
17b team monthly to yearly, plan set to end item17b-asis item17b-tobe
16b capabilities read failed item16b-asis item16b-tobe

16a is a URL change, covered by the e2e spec for a retired team plan whose link carries its commit stop. 16c has no fixture-build screenshot because the e2e build bakes a Stripe key; the component test 370-15519 covers it.

Plan position

PR Ticket Scope
#19374 FE-3019 summary discounts, kept team commitment, payment column layout
#19373 FE-3020 promo pricing on Pay, unreadable promo links, expired card on re-reads
#19376 FE-3021 ending screens, error-card buttons
#19379 FE-3022 payment authentication follow-ups
this PR FE-3021 Pay failure card, $0 explanation, yearly naming, endings copy (items 13-17b)
flowchart LR
  R[M3 design review] --> A[FE-3019 #19374]
  R --> B[FE-3020 #19373]
  R --> C[FE-3021 #19376]
  R --> D[FE-3022 #19379]
  R --> E[FE-3021 items 13-17b]
  style E fill:#f5c518,color:#000
Loading

Verification

  • Red first: 16 new or changed unit and component tests and 5 new e2e specs failed on origin/main source, pass here.
  • apps/billing-web: typecheck, lint (eslint + stylelint + oxlint), vitest 839/839, Playwright 95/95.
  • pnpm knip clean; fallow audit --changed-since origin/main: no new findings.

@dante01yoon
dante01yoon requested a review from a team September 30, 2026 02:01
@dante01yoon dante01yoon added needs-backport Fix/change that needs to be cherry-picked to the current feature freeze branch core/1.55 Backport PRs for core 1.55 cloud/1.55 Backport PRs for cloud 1.55 labels Sep 30, 2026
@coderabbitai

coderabbitai Bot commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 0a8e137b-7840-4fc8-abf5-031de955a4ed

📥 Commits

Reviewing files that changed from the base of the PR and between d129959 and e5468e4.

📒 Files selected for processing (18)
  • apps/billing-web/e2e/full-page-checkout.spec.ts
  • apps/billing-web/e2e/full-page-endings.spec.ts
  • apps/billing-web/e2e/full-page-summary.spec.ts
  • apps/billing-web/src/checkout/checkoutPage.test.ts
  • apps/billing-web/src/checkout/checkoutPage.ts
  • apps/billing-web/src/checkout/keepSubscription.test.ts
  • apps/billing-web/src/checkout/keepSubscription.ts
  • apps/billing-web/src/checkout/payVerdict.test.ts
  • apps/billing-web/src/checkout/payVerdict.ts
  • apps/billing-web/src/checkout/summaryLedger.test.ts
  • apps/billing-web/src/checkout/summaryLedger.ts
  • apps/billing-web/src/components/fullPage/CheckoutPayAction.vue
  • apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue
  • apps/billing-web/src/components/fullPage/InlineOutcomeCard.vue
  • apps/billing-web/src/composables/useFullPageCheckout.ts
  • apps/billing-web/src/locales/en/main.json
  • apps/billing-web/src/views/FullPageCheckoutView.test.ts
  • apps/billing-web/src/views/FullPageCheckoutView.vue
💤 Files with no reviewable changes (2)
  • apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue
  • apps/billing-web/src/views/FullPageCheckoutView.vue

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 4 remain after this review.


📝 Walkthrough

Walkthrough

The checkout updates how it handles capability-read failures, missing payment-provider keys, and coded payment refusals. It also updates team-plan navigation and subscription summary wording, with unit and end-to-end tests covering these behaviors.

Changes

Full-page checkout

Layer / File(s) Summary
Checkout loading and arrival states
apps/billing-web/src/checkout/checkoutPage.ts, apps/billing-web/src/composables/useFullPageCheckout.ts, apps/billing-web/src/locales/en/main.json, apps/billing-web/src/checkout/checkoutPage.test.ts, apps/billing-web/src/views/FullPageCheckoutView.test.ts, apps/billing-web/e2e/full-page-endings.spec.ts
Capability-read failures map to an unavailable checkout state. A missing Stripe key marks the collection element as failed. Team-plan arrivals route to Team pricing. Tests cover these states and retry behavior.
Payment refusal outcomes
apps/billing-web/src/checkout/checkoutPage.ts, apps/billing-web/src/checkout/payVerdict.ts, apps/billing-web/src/components/fullPage/*, apps/billing-web/src/composables/useFullPageCheckout.ts, apps/billing-web/src/views/FullPageCheckoutView.vue, apps/billing-web/src/views/FullPageCheckoutView.test.ts, apps/billing-web/src/checkout/payVerdict.test.ts, apps/billing-web/e2e/full-page-checkout.spec.ts
Coded refusals appear as processing-error outcomes, with server messages when provided. Support links include the error code. Tests cover the displayed message, enabled Pay action, and support link.
Subscription summary wording
apps/billing-web/src/checkout/summaryLedger.ts, apps/billing-web/src/checkout/summaryLedger.test.ts, apps/billing-web/src/checkout/keepSubscription.ts, apps/billing-web/src/checkout/keepSubscription.test.ts, apps/billing-web/src/locales/en/main.json, apps/billing-web/e2e/full-page-summary.spec.ts
Zero-due summaries state the recurring amount with or without a renewal date. Retained annual plans include their cadence. TEAM duration changes use duration-based classifications.

Priority: ➖ Normal

Estimated code review effort: 3 (Moderate) | ~25 minutes

Change: Bug fix

Sequence Diagram(s)

sequenceDiagram
  participant CheckoutView
  participant useFullPageCheckout
  participant checkoutPageReducer
  participant CapabilitiesRead
  CheckoutView->>useFullPageCheckout: Start checkout
  useFullPageCheckout->>CapabilitiesRead: Read capabilities
  CapabilitiesRead-->>useFullPageCheckout: Return 503 error
  useFullPageCheckout->>checkoutPageReducer: Dispatch capabilitiesFailed
  checkoutPageReducer-->>CheckoutView: Show unavailable checkout
  CheckoutView->>useFullPageCheckout: Try again
  useFullPageCheckout->>CapabilitiesRead: Read capabilities again
  CapabilitiesRead-->>useFullPageCheckout: Return capabilities
  useFullPageCheckout-->>CheckoutView: Open checkout
Loading

Suggested reviewers: drjkl

Merge Risk: ⚪ Minimal · up to e5468

This change improves checkout error handling and summary wording. Automated coverage is reported for the new behavior, and the review found no concrete merge-blocking issue.

Security Architecture Review

Security architecture risk: 🔵 Low · up to e5468

The changes primarily improve checkout errors and explanations. Eligibility, consent, and in-flight payment checks remain in place, and no introduced security flaw was established. Payment cleanup and server-side retry guarantees were not fully verified.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

  • inferred — The demonstrated propagation is through checkout event producers, the page reducer, and frontend rendering consumers. Exported-type classification alone does not demonstrate additional tenant reach or a new service entrypoint; consumers outside the available repository graph remain unverified.

Trust Boundaries and Controls

  • observed — The new refusal path can carry server-message text into the outcome card. Hosted copy selects that text for status-only codes, and the card renders it through text interpolation rather than an HTML sink. Support links use a fixed recipient and URL-encoded structured codes or operation identifiers.

Resilience and Maintainability Implications

  • observed — The frontend prevents another Pay while an attempt is sent or its outcome is reconciling. Operation updates retain waiting and unconfirmed states for unresolved payments and transition successful operations to terminal state. These controls do not independently prove backend atomicity or idempotency.
🚥 Pre-merge checks | ✅ 6 | ❓ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
End-To-End Regression Coverage For Fixes ❓ Inconclusive The title and commit subject contain fix, and the PR changes apps/billing-web/src/ files without changing browser_tests/. However, the PR description is explicitly truncated. The visible text do… Provide the complete PR description for review, or add a concrete explanation for why a Playwright regression test under browser_tests/ is not practical. Otherwise, add or update a Playwright regression test under browser_tests/.
✅ Passed checks (6 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Website End-To-End Regression Coverage ✅ Passed No files under apps/website/src/ or apps/website/public/ changed. The pull request changes apps/billing-web files only, so this website-specific check does not apply.
Adr Compliance For Entity/Litegraph Changes ✅ Passed PASS: The changed-file list contains only billing-web checkout, component, locale, view, and end-to-end test files. It contains no files under src/lib/litegraph/ or src/ecs/, and no files related …
Title check ✅ Passed The title clearly summarizes the main billing checkout changes, including the Pay failure card, $0 explanation, yearly naming, and endings copy.
Description check ✅ Passed The description is detailed and covers the summary, changes, root causes, implementation, review focus, screenshots, scope, and verification results. It does not use the template's exact "What" headin…
Full details: End-To-End Regression Coverage For Fixes

Explanation

The title and commit subject contain fix, and the PR changes apps/billing-web/src/ files without changing browser_tests/. However, the PR description is explicitly truncated. The visible text does not provide a concrete reason for not adding a test under browser_tests/, but the omitted text could contain that explanation.

✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the risk:xhigh PR risk grade (advisory shadow check; grader-owned) label Sep 30, 2026
@github-actions

github-actions Bot commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

🌾 Fallow: ✅ Passed

Fallow audits the diff for duplication, complexity and dead code. It gates on new findings only, so when the audit completes, a red is something this PR introduced or moved — never inherited backlog. A red can also mean the audit itself did not finish; the details below say which happened.

No new findings in the changed files.

Reproduce locally
# the base the gate compared against
npx fallow audit --root . --quiet --format json \
  --changed-since d1299599c7cb2af8d5cbfab6dd5071546eab596c

Full docs: ADR-DEVEX-LINT-0015

🧩 Custom Nodes Ecosystem Matrix: 🟡 Withheld — could not measure

Executes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight ecosystem-matrix shard checks are a harness self-test; the pack verdict is matrix-verdict.

This candidate changes nothing the matrix measures, so every expensive stage was skipped.

Reproduce locally
# build one shard's fixture, then run it
python3 scripts/registry-census/build_matrix.py --shard 1/4
MATRIX_RENDERER=vue MATRIX_VUE=1 \
  npx vitest run --config vitest.matrix.config.mts

Full docs: scripts/registry-census/README.md

@codecov

codecov Bot commented Sep 30, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@            Coverage Diff             @@
##             main   #19537      +/-   ##
==========================================
+ Coverage   84.31%   85.15%   +0.83%     
==========================================
  Files        3294     2412     -882     
  Lines      158986   136049   -22937     
  Branches    43239    36789    -6450     
==========================================
- Hits       134051   115846   -18205     
+ Misses      23060    19732    -3328     
+ Partials     1875      471    -1404     
Flag Coverage Δ
billing-web-unit 91.99% <100.00%> (+0.06%) ⬆️
website-unit ?

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

Files with missing lines Coverage Δ
apps/billing-web/src/checkout/checkoutPage.ts 99.39% <100.00%> (+<0.01%) ⬆️
apps/billing-web/src/checkout/keepSubscription.ts 100.00% <100.00%> (ø)
apps/billing-web/src/checkout/payVerdict.ts 97.82% <100.00%> (+0.09%) ⬆️
apps/billing-web/src/checkout/summaryLedger.ts 98.80% <100.00%> (+0.05%) ⬆️
...-web/src/components/fullPage/CheckoutPayAction.vue 100.00% <100.00%> (ø)
.../src/components/fullPage/CheckoutPaymentColumn.vue 96.61% <ø> (ø)
...-web/src/components/fullPage/InlineOutcomeCard.vue 100.00% <100.00%> (ø)
...billing-web/src/composables/useFullPageCheckout.ts 96.69% <100.00%> (+0.38%) ⬆️
...pps/billing-web/src/views/FullPageCheckoutView.vue 95.45% <ø> (-0.20%) ⬇️

... and 882 files with indirect coverage changes

🚀 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.

@christian-byrne christian-byrne left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved at e5468e4e5884658c0e1a9ab475ac69c54340a2b5.

  • Coded Pay refusals now use the standard outcome card and support path without weakening the server-message policy.
  • The zero-due, yearly-plan, Team cadence, capabilities-failure, plan-link, and missing-key branches match their stated contracts and remain workspace-local.
Full context for agent readers

I reviewed the production state transitions and their regression coverage at this exact head. The missing Stripe key stays inside the collection rail, on-file changes remain independent of it, and capability failures no longer borrow quote-specific copy. All executed exact-head checks are green and no review threads are open.

@dante01yoon
dante01yoon added this pull request to the merge queue Sep 30, 2026
Merged via the queue into main with commit ed558d0 Sep 30, 2026
118 of 121 checks passed
@dante01yoon
dante01yoon deleted the jaewon/fe-3021-ux-pass-summary-copy branch September 30, 2026 02:58
@comfy-pr-bot

Copy link
Copy Markdown
Member

⚠️ Backport to core/1.55 failed

Reason: Merge conflicts detected during cherry-pick of ed558d0

The auto-backport could not be completed automatically. Please backport
manually onto branch backport-19537-to-core-1.55 (from origin/core/1.55) and
open a PR to core/1.55.

This may be a stacking conflict rather than a real one. #19539, #19518, #19459 are still open against core/1.55. If this PR sits on top of any of them, the conflict will disappear once they merge — wait for that, then remove and re-add the needs-backport label to re-run this workflow.

📄 Conflicting files
apps/billing-web/e2e/full-page-checkout.spec.ts
apps/billing-web/e2e/full-page-endings.spec.ts
apps/billing-web/e2e/full-page-summary.spec.ts
apps/billing-web/src/checkout/checkoutPage.test.ts
apps/billing-web/src/checkout/checkoutPage.ts
apps/billing-web/src/checkout/keepSubscription.test.ts
apps/billing-web/src/checkout/keepSubscription.ts
apps/billing-web/src/checkout/payVerdict.test.ts
apps/billing-web/src/checkout/payVerdict.ts
apps/billing-web/src/checkout/summaryLedger.test.ts
apps/billing-web/src/checkout/summaryLedger.ts
apps/billing-web/src/components/fullPage/CheckoutPayAction.vue
apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue
apps/billing-web/src/components/fullPage/InlineOutcomeCard.vue
apps/billing-web/src/composables/useFullPageCheckout.ts
apps/billing-web/src/locales/en/main.json
apps/billing-web/src/views/FullPageCheckoutView.test.ts
apps/billing-web/src/views/FullPageCheckoutView.vue
🤖 Prompt for AI Agents
Backport PR #19537 (https://github.com/Comfy-Org/ComfyUI_frontend/pull/19537) to core/1.55.
Cherry-pick merge commit ed558d08fa73e9a14b8c343785b2b9b04c4b8808 onto new branch
backport-19537-to-core-1.55 from origin/core/1.55.
Resolve conflicts in: apps/billing-web/e2e/full-page-checkout.spec.ts apps/billing-web/e2e/full-page-endings.spec.ts apps/billing-web/e2e/full-page-summary.spec.ts apps/billing-web/src/checkout/checkoutPage.test.ts apps/billing-web/src/checkout/checkoutPage.ts apps/billing-web/src/checkout/keepSubscription.test.ts apps/billing-web/src/checkout/keepSubscription.ts apps/billing-web/src/checkout/payVerdict.test.ts apps/billing-web/src/checkout/payVerdict.ts apps/billing-web/src/checkout/summaryLedger.test.ts apps/billing-web/src/checkout/summaryLedger.ts apps/billing-web/src/components/fullPage/CheckoutPayAction.vue apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue apps/billing-web/src/components/fullPage/InlineOutcomeCard.vue apps/billing-web/src/composables/useFullPageCheckout.ts apps/billing-web/src/locales/en/main.json apps/billing-web/src/views/FullPageCheckoutView.test.ts apps/billing-web/src/views/FullPageCheckoutView.vue .

> **This may be a stacking conflict rather than a real one.** #19539, #19518, #19459 are still open against `core/1.55`. If this PR sits on top of any of them, the conflict will disappear once they merge — wait for that, then remove and re-add the `needs-backport` label to re-run this workflow.

For test snapshots (browser_tests/**/*-snapshots/), accept PR version if
changed in original PR, else keep target. For package.json versions, keep
target branch. For pnpm-lock.yaml, regenerate with pnpm install.
Ask user for non-obvious conflicts.
Create PR titled "[backport core/1.55] <original title>" with label "backport".
See .github/workflows/pr-backport.yaml for workflow details.

cc @dante01yoon

@comfy-pr-bot

Copy link
Copy Markdown
Member

⚠️ Backport to cloud/1.55 failed

Reason: Merge conflicts detected during cherry-pick of ed558d0

The auto-backport could not be completed automatically. Please backport
manually onto branch backport-19537-to-cloud-1.55 (from origin/cloud/1.55) and
open a PR to cloud/1.55.

This may be a stacking conflict rather than a real one. #19542, #19528, #19521, #19460 are still open against cloud/1.55. If this PR sits on top of any of them, the conflict will disappear once they merge — wait for that, then remove and re-add the needs-backport label to re-run this workflow.

📄 Conflicting files
apps/billing-web/e2e/full-page-checkout.spec.ts
apps/billing-web/e2e/full-page-endings.spec.ts
apps/billing-web/e2e/full-page-summary.spec.ts
apps/billing-web/src/checkout/checkoutPage.test.ts
apps/billing-web/src/checkout/checkoutPage.ts
apps/billing-web/src/checkout/keepSubscription.test.ts
apps/billing-web/src/checkout/keepSubscription.ts
apps/billing-web/src/checkout/payVerdict.test.ts
apps/billing-web/src/checkout/payVerdict.ts
apps/billing-web/src/checkout/summaryLedger.test.ts
apps/billing-web/src/checkout/summaryLedger.ts
apps/billing-web/src/components/fullPage/CheckoutPayAction.vue
apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue
apps/billing-web/src/components/fullPage/InlineOutcomeCard.vue
apps/billing-web/src/composables/useFullPageCheckout.ts
apps/billing-web/src/locales/en/main.json
apps/billing-web/src/views/FullPageCheckoutView.test.ts
apps/billing-web/src/views/FullPageCheckoutView.vue
🤖 Prompt for AI Agents
Backport PR #19537 (https://github.com/Comfy-Org/ComfyUI_frontend/pull/19537) to cloud/1.55.
Cherry-pick merge commit ed558d08fa73e9a14b8c343785b2b9b04c4b8808 onto new branch
backport-19537-to-cloud-1.55 from origin/cloud/1.55.
Resolve conflicts in: apps/billing-web/e2e/full-page-checkout.spec.ts apps/billing-web/e2e/full-page-endings.spec.ts apps/billing-web/e2e/full-page-summary.spec.ts apps/billing-web/src/checkout/checkoutPage.test.ts apps/billing-web/src/checkout/checkoutPage.ts apps/billing-web/src/checkout/keepSubscription.test.ts apps/billing-web/src/checkout/keepSubscription.ts apps/billing-web/src/checkout/payVerdict.test.ts apps/billing-web/src/checkout/payVerdict.ts apps/billing-web/src/checkout/summaryLedger.test.ts apps/billing-web/src/checkout/summaryLedger.ts apps/billing-web/src/components/fullPage/CheckoutPayAction.vue apps/billing-web/src/components/fullPage/CheckoutPaymentColumn.vue apps/billing-web/src/components/fullPage/InlineOutcomeCard.vue apps/billing-web/src/composables/useFullPageCheckout.ts apps/billing-web/src/locales/en/main.json apps/billing-web/src/views/FullPageCheckoutView.test.ts apps/billing-web/src/views/FullPageCheckoutView.vue .

> **This may be a stacking conflict rather than a real one.** #19542, #19528, #19521, #19460 are still open against `cloud/1.55`. If this PR sits on top of any of them, the conflict will disappear once they merge — wait for that, then remove and re-add the `needs-backport` label to re-run this workflow.

For test snapshots (browser_tests/**/*-snapshots/), accept PR version if
changed in original PR, else keep target. For package.json versions, keep
target branch. For pnpm-lock.yaml, regenerate with pnpm install.
Ask user for non-obvious conflicts.
Create PR titled "[backport cloud/1.55] <original title>" with label "backport".
See .github/workflows/pr-backport.yaml for workflow details.

cc @dante01yoon

zeus-onl pushed a commit to zeus-onl/ComfyUI_frontend that referenced this pull request Sep 30, 2026
…g table (Comfy-Org#19611)

## Summary

A checkout link with no `plan` now sends the customer to pick a plan
instead of to the `return_to` home.

## Changes

- **Why**: DES-1209 rule for a no-`plan` link is "bounce back to the
host's pricing table". Alex's answer (b) for Platform, which has no
pricing table: "go to return_to. If that's missing or bad, go to the
platform's billing page." Item 12 of the 2026-09-29 UX review.
- **Root cause**: Comfy-Org#19462 routed a planless link through the same
`sendToHost` as a `pricing` link, which resolves `return_to` to its
registered home (`router.ts` `hostReturnHref`). It never looked at the
pricing table.
- **How**:
- `router.ts` `planPickerHref` picks the destination. Any product but
`platform` gets `pricingTableUrl` (the URL View plans already uses), on
the Team tab when the link carries `team_credit_stop_id`. A `platform`
link gets its own `return_to` when billing may follow it, else
Platform's billing page.
- "May follow" is read from the raw link, because `withCheckoutReturn`
rewrites a missing or unregistered `return_to` to `comfyui_credits`
before parsing.
- `billing-contract` gains a `platform_billing` return target:
`https://platform.comfy.org/profile/billing` and
`https://stagingplatform.comfy.org/profile/billing`. That route is
`pages/profile/billing.vue` in Comfy-Org/platform. The registry had no
Platform billing URL, only the origin root (`platform_account`). Like
`platform_account`, it has no `test`-family destination, so there a
Platform link that needs the fallback is the existing "doesn't name a
place we can send you back to" entry error.
- **Flag off / M2**: this runs in the router before the session and the
`billing_web_checkout_ui` read, so it applies to M2 and M3 alike, as the
rule intends. The flag-off parity tests from Comfy-Org#19462 are unchanged except
the expected URL. Signed-out, pending, minting, failed-sign-in and
signed-in `embedded`/unreachable visitors still leave at once, with no
sign-in page, no workspace bind and no flag fetch. An already-signed-in
tab on `full_page` still gets Plan not available. The
superseded-navigation guard is untouched.

## Review Focus

- "Cloud host" is read as every product except `platform` (`comfyui`,
`workshop`, `models`). The pricing table only exists in cloud, and cloud
is already the checkout's fallback host.
- `platform_billing` is also a registered `return_to` that a product may
now send. It sits in the closed registry like the other targets.

## Screenshots (if applicable)

Fixture build (`VITE_BILLING_ENV=test`, mocked `testcloud.comfy.org`).
This is a URL-level change, so the evidence is where the tab lands, from
the e2e run before and after the fix:

| Link (`/v1/checkout?…`) | AS IS | TO BE |
| --- | --- | --- |
| `product=comfyui&return_to=comfyui_workspace&workspace=ws_team_e2e`,
signed out | `testcloud.comfy.org/?workspace=ws_team_e2e` |
`testcloud.comfy.org/?pricing=1&workspace=ws_team_e2e` |
| same, signed in, new tab | `testcloud.comfy.org/?workspace=ws_e2e` |
`testcloud.comfy.org/?pricing=1&workspace=ws_e2e` |
| `…&team_credit_stop_id=stop_700` |
`testcloud.comfy.org/?workspace=ws_team_e2e` |
`testcloud.comfy.org/?pricing=team&workspace=ws_team_e2e` |
| `product=platform&return_to=comfyui_workspace` |
`testcloud.comfy.org/?workspace=ws_e2e` | unchanged (a followable
`return_to`) |
| `product=platform&return_to=nowhere` |
`testcloud.comfy.org/?settings=plan-credits` | stays on billing, entry
error (no Platform page in `test`) |

The Platform billing page itself has no `test`-family destination, so
unit tests cover it with `VITE_BILLING_ENV` stubbed to staging and
production (`router.planless.test.ts`): unregistered `return_to` →
`https://stagingplatform.comfy.org/profile/billing?workspace=ws-1`,
missing `return_to` → `https://platform.comfy.org/profile/billing`,
`return_to=platform_account` →
`https://stagingplatform.comfy.org/?workspace=ws-1`.

The first commit holds only the tests. Against the old router they fail
with the AS IS URLs above (15 unit, 8 e2e).



## Where this PR sits in Milestone 3

| State | PR / ticket | Scope |
|---|---|---|
| Merged | Comfy-Org#19253 | M3 stack: FE-3018..3022 full page behind
billing_web_checkout_ui |
| Merged | Comfy-Org#19462 / Comfy-Org#19487 | Design review rounds 3-4 |
| Merged | Comfy-Org#19540 Comfy-Org#19538 Comfy-Org#19536 Comfy-Org#19537 | UX pass: money state,
lock/redirect, promo, summary/copy |
| Merged | Comfy-Org#19531 | Accept `payment_not_completed` (must ship before
cloud#11119) |
| Open | **Comfy-Org#19611** (this PR) | Planless link goes to the plan picker |
| Open | Comfy-Org#19612 | Visual pass: checkbox, dark dropdown, unbroken
dates/IDs, settled copy |
| Open | Comfy-Org#19613 | Restore a promo this page applied; discount rows in
server order |
| Blocked on BE | FE-3072 (BE-17842) | Top-up on the full page; op facts
for receipt/credits lines |
| Blocked on BE | BE-13104 / BE-17785 / BE-10064 | $0 due card, subtotal
+ list price + renewal_at, Phase-A cancel |
| Next | M3-9 / M3-10 | Rollout via the flag, then delete the M2 path
and the flag |

```mermaid
flowchart LR
  classDef done fill:#e3f5e1,stroke:#2e7d32
  classDef open fill:#dff0ff,stroke:#1f6feb
  classDef be fill:#fde2e2,stroke:#c0392b
  classDef me fill:#fff4cc,stroke:#b58900,stroke-width:3px
  S["PR 19253 M3 stack"]:::done --> R["PR 19462 / PR 19487 design rounds"]:::done
  R --> U["UX pass PR 19540 PR 19538 PR 19536 PR 19537"]:::done
  R --> PNC["PR 19531 payment_not_completed"]:::done
  U --> P611["PR 19611 planless destination"]:::open
  U --> P612["PR 19612 visual pass"]:::open
  U --> P613["PR 19613 promo restore + order"]:::open
  BE1["BE-17842 op facts + top-up quote"]:::be --> TU["FE-3072 top-up"]:::open
  BE2["BE-13104 / BE-17785 / BE-10064"]:::be -.-> FU["$0 card, subtotal, cancel"]:::open
  P611 --> RO["M3-9 rollout"]
  P612 --> RO
  P613 --> RO
  PNC --> BEDEP["cloud PR 11119 deploy after FE release"]:::be
  RO --> CL["M3-10 delete M2 path + flag"]
  class P611 me
```
zeus-onl pushed a commit to zeus-onl/ComfyUI_frontend that referenced this pull request Sep 30, 2026
…wn, unbroken dates and IDs, settled copy (Comfy-Org#19612)

## Summary

Alex Tov's visual pass on the M3 full-page checkout (Slack, 2026-09-29):
a checkbox outline that reads on its card, a saved-card list that opens
dark, dates and reference codes that wrap in one piece, and
settled-payment copy that names the workspace.

## Why

Five findings from the designer's pass over the fixture build. The
unticked box was near-invisible, the saved-card list opened white on a
dark page, dates split before the year on phones ("…refill monthly after
July 28, / 2026"), long UUID reference codes could split mid-segment,
and the settled-while-watched body didn't match Figma 717-14670.

## Root cause

- Checkbox: the unticked outline used `border-border-default`, which
sits too close to `bg-tertiary-background`.
- Dropdown: `dark-theme` lived on each view's wrapper, but Reka's
`SelectPortal` teleports the list to `<body>`, outside every wrapper, so
it resolved light tokens.
- Dates: each formatter produced ordinary spaces, and there were three
of them (`longDate`, the summary ledger's inline `Intl.DateTimeFormat`
pair, `useHostedCopy().date`).
- Code card: break opportunities were inserted only after underscores.
Op IDs are UUIDs with hyphens.

## Changes

- **What**:
- Keep-subscription checkbox: the unticked outline is
`border-muted-foreground`. Ticked and invalid states are unchanged.
- Saved-card dropdown: `dark-theme` now sits on `<html>` in
`apps/billing-web/index.html`. Every billing-web surface is dark, so
portalled UI now gets the dark tokens too, and the list's
`bg-base-background` matches the trigger.
- Dates: `longDate.ts` owns every date in billing-web copy and joins it
with non-breaking spaces (`unbrokenDate`). The summary ledger's
`date`/`monthDay` and `useHostedCopy().date` now go through it.
- Reference code card: splits on `/(?<=[_-])/`, adding a break
opportunity after each hyphen as well as each underscore (372-4951).
- Settled while watched (717-14670): "A payment for {workspace} went
through. Check your plan in settings for the details." `{workspace}` is
the session's workspace name, which the page already passes to every
ending. Without a session name it falls back to the existing
`ending.thisWorkspace` copy ("A payment for this workspace went
through.").

## How

TDD. Tests were changed first and confirmed red, then the fix turned
them green.

- Pure-string tests (`summaryLedger.test.ts`,
`keepSubscription.test.ts`) now spell dates with ` `. DOM tests using
`getByText`/`toHaveTextContent` normalise whitespace (NBSP included), so
they can't observe the change and stay as they were.
- `CheckoutEnding.test.ts` pins the code card's break opportunities for
a UUID and an underscore code, plus the new settled copy.
- New e2e in `full-page-checkout.spec.ts`: the open saved-card list's
computed background equals its trigger's. Before the fix it was
`rgb(255, 255, 255)` against `rgb(23, 23, 24)`.

## Review Focus

- `dark-theme` on `<html>` makes the per-view wrapper classes redundant.
I left those untouched to keep this diff off files other in-flight PRs
are editing. Removing them is a follow-up.
- Chromium already breaks after a hyphen before a digit, so the code
card looks the same in both builds there. The explicit `<wbr>` covers
engines that apply UAX Comfy-Org#14 LB25 (no break between a hyphen and a number)
and fall back to `wrap-anywhere` mid-segment.

## Screenshots (if applicable)

All images are from the **fixture build**: the billing-web Playwright
fixtures (mocked Cloud, fake Stripe.js), production `vite build`, dark
theme, 1512×982 unless the row says phone (390×844). AS IS is
`origin/main`, TO BE is this PR. None are from a real backend.

### AS IS / TO BE

| Item | AS IS (fixture build) | TO BE (fixture build) |
| --- | --- | --- |
| 1. Unticked keep-subscription box, close-up | <img width="384"
alt="checkbox close-up AS IS"
src="https://github.com/user-attachments/assets/87363a1f-b7c9-42a8-8c2c-257102f31abb"
/> | <img width="384" alt="checkbox close-up TO BE"
src="https://github.com/user-attachments/assets/f1d97bbe-f956-49e4-8902-cf5aacd822c1"
/> |
| 1. Unticked keep-subscription box, full page | <img width="420"
alt="checkbox AS IS"
src="https://github.com/user-attachments/assets/09d2695e-9169-4c3d-becf-27ad97db9ee9"
/> | <img width="420" alt="checkbox TO BE"
src="https://github.com/user-attachments/assets/1c636614-e243-4161-9a91-95467ba1818b"
/> |
| 2. Saved-card dropdown open | <img width="420" alt="dropdown AS IS"
src="https://github.com/user-attachments/assets/71a7474e-965f-4404-b7e3-e550476edf99"
/> | <img width="420" alt="dropdown TO BE"
src="https://github.com/user-attachments/assets/ecc37316-ed0d-480d-a9e2-4848946b9a52"
/> |
| 3. Scheduled downgrade summary, phone: "refill monthly after July 28,
2026" | <img width="220" alt="dates phone AS IS"
src="https://github.com/user-attachments/assets/edba88d1-5c17-4570-91f0-b76cccb34241"
/> | <img width="220" alt="dates phone TO BE"
src="https://github.com/user-attachments/assets/f749c264-1a0a-4455-80c0-b56bdcab28e3"
/> |
| 4. Payment in progress with a UUID reference, phone. Same render in
Chromium (see Review Focus) | <img width="220" alt="code phone AS IS"
src="https://github.com/user-attachments/assets/94605dba-b20d-4363-9d2c-1ff7552c581e"
/> | <img width="220" alt="code phone TO BE"
src="https://github.com/user-attachments/assets/def1eb20-e316-4701-bc2e-3a5937dd8e30"
/> |
| 5. Payment in progress settles while watched (717-14670); fixture
workspace is "Personal" | <img width="420" alt="settled AS IS"
src="https://github.com/user-attachments/assets/b2612aea-503e-4988-b04f-732cbbf7a3ae"
/> | <img width="420" alt="settled TO BE"
src="https://github.com/user-attachments/assets/9271831b-a733-493b-b2b9-c5d5b0a5f6b3"
/> |




## Where this PR sits in Milestone 3

| State | PR / ticket | Scope |
|---|---|---|
| Merged | Comfy-Org#19253 | M3 stack: FE-3018..3022 full page behind
billing_web_checkout_ui |
| Merged | Comfy-Org#19462 / Comfy-Org#19487 | Design review rounds 3-4 |
| Merged | Comfy-Org#19540 Comfy-Org#19538 Comfy-Org#19536 Comfy-Org#19537 | UX pass: money state,
lock/redirect, promo, summary/copy |
| Merged | Comfy-Org#19531 | Accept `payment_not_completed` (must ship before
cloud#11119) |
| Open | Comfy-Org#19611 | Planless link goes to the plan picker |
| Open | **Comfy-Org#19612** (this PR) | Visual pass: checkbox, dark dropdown,
unbroken dates/IDs, settled copy |
| Open | Comfy-Org#19613 | Restore a promo this page applied; discount rows in
server order |
| Blocked on BE | FE-3072 (BE-17842) | Top-up on the full page; op facts
for receipt/credits lines |
| Blocked on BE | BE-13104 / BE-17785 / BE-10064 | $0 due card, subtotal
+ list price + renewal_at, Phase-A cancel |
| Next | M3-9 / M3-10 | Rollout via the flag, then delete the M2 path
and the flag |

```mermaid
flowchart LR
  classDef done fill:#e3f5e1,stroke:#2e7d32
  classDef open fill:#dff0ff,stroke:#1f6feb
  classDef be fill:#fde2e2,stroke:#c0392b
  classDef me fill:#fff4cc,stroke:#b58900,stroke-width:3px
  S["PR 19253 M3 stack"]:::done --> R["PR 19462 / PR 19487 design rounds"]:::done
  R --> U["UX pass PR 19540 PR 19538 PR 19536 PR 19537"]:::done
  R --> PNC["PR 19531 payment_not_completed"]:::done
  U --> P611["PR 19611 planless destination"]:::open
  U --> P612["PR 19612 visual pass"]:::open
  U --> P613["PR 19613 promo restore + order"]:::open
  BE1["BE-17842 op facts + top-up quote"]:::be --> TU["FE-3072 top-up"]:::open
  BE2["BE-13104 / BE-17785 / BE-10064"]:::be -.-> FU["$0 card, subtotal, cancel"]:::open
  P611 --> RO["M3-9 rollout"]
  P612 --> RO
  P613 --> RO
  PNC --> BEDEP["cloud PR 11119 deploy after FE release"]:::be
  RO --> CL["M3-10 delete M2 path + flag"]
  class P612 me
```
zeus-onl pushed a commit to zeus-onl/ComfyUI_frontend that referenced this pull request Sep 30, 2026
… discount rows in server order (Comfy-Org#19613)

## Summary

Implements Alex Tov's decisions (a) and (c) from the M3 design review: a
promo code applied on the full-page checkout survives a reload or a
3DS/Alipay return, and the summary lists discount rows in the order the
server returns them.

## Changes

- **Why**:
- (a) A code applied on this page was lost after a reload or a provider
return, and the price rose with no explanation. The no-auto-apply rule
covers codes arriving from outside links; a code applied here must come
back.
- (c) The entered code rendered in its own slot after the held
discounts, whatever order the quote listed them in.
- **Root cause**:
- (a) The applied code lived only in the in-memory `PromoEntry` state.
The subscribe return URL carries only the link's own `promo`, so every
fresh mount started from the link, not from what the customer applied.
- (c) `summaryLedger.ts` split promotions into `adjustments` (held) and
a separate `promo` row (entered), and `CheckoutLedger.vue` rendered them
in two places.
- **How**:
- New `checkout/promoMemory.ts` keeps one `{ identity, code }` record in
`sessionStorage`. The identity is the checkout request (workspace,
product, plan, team credit stop), so another checkout reads nothing and
drops the stale record. Every storage access sits in try/catch; without
storage the page behaves as before. Nothing is written to the page URL
or the return URL.
- `initialPromoEntry` takes the recalled code and starts `applied`, so
the existing capture read (`requoteWithPromo`) re-prices it through the
normal quote. A server refusal lands on the existing "Your promo code
expired" card (Figma 476-14445).
- `useCheckoutPromo` writes the remembered code after each reducer
transition that changes it (pure `codeToRemember`), so Remove and an
expiry clear it. `useFullPageCheckout` clears it when the page reaches a
terminal state.
- `SummaryLedger.discounts` replaces `adjustments`, `promo` and
`subtotal`: every `promotion` discount becomes a row in server order,
labelled `name ?? "Promo code"`, at the server's amount. The removable
chip on the entered code is unchanged. `subtotal` was never populated
(the quote reports no pre-discount base) and had no position once the
entered-code slot went away, so it is removed with its i18n key.

## Review Focus

- Chips keep their existing order (held codes, then the entered code).
Only the money rows follow server order.
- A restored code outranks a link's `promo` prefill for the same
checkout identity.
- Tests: reducer seed cases, `promoMemory` (identity scoping, malformed
records, throwing storage), ledger server order, view-level
reload/refuse/remove/success/other-plan/return-URL cases, and four new
e2e specs (reload keeps the discount, refusal on reload shows the
expired card, a copied URL carries no applied code, entered code listed
first renders first).

## Screenshots (if applicable)

Fixture build (billing-web e2e mocks), dark, 1512×982.

| Case | AS IS | TO BE |
| --- | --- | --- |
| Apply LAUNCH20, reload | <img width="600" alt="AS IS reload"
src="https://github.com/user-attachments/assets/bf222d93-cdf2-49b3-88c0-c9d8a7ee2986"
/> | <img width="600" alt="TO BE reload"
src="https://github.com/user-attachments/assets/552839e4-240b-404a-9d09-351f9e7b5901"
/> |
| Apply, server refuses the code on reload | <img width="600" alt="AS IS
refused"
src="https://github.com/user-attachments/assets/f73a8a14-784a-4cb4-bc30-545dfefe558e"
/> | <img width="600" alt="TO BE refused"
src="https://github.com/user-attachments/assets/63d358de-0cb2-4e74-9ad6-451d88ae3525"
/> |
| Server lists the entered code first | <img width="600" alt="AS IS
order"
src="https://github.com/user-attachments/assets/26af2ea4-6d98-42f6-8b4d-8601310b49c9"
/> | <img width="600" alt="TO BE order"
src="https://github.com/user-attachments/assets/86a12997-06ca-4a12-baf1-4e169afb8ce5"
/> |



## Where this PR sits in Milestone 3

| State | PR / ticket | Scope |
|---|---|---|
| Merged | Comfy-Org#19253 | M3 stack: FE-3018..3022 full page behind
billing_web_checkout_ui |
| Merged | Comfy-Org#19462 / Comfy-Org#19487 | Design review rounds 3-4 |
| Merged | Comfy-Org#19540 Comfy-Org#19538 Comfy-Org#19536 Comfy-Org#19537 | UX pass: money state,
lock/redirect, promo, summary/copy |
| Merged | Comfy-Org#19531 | Accept `payment_not_completed` (must ship before
cloud#11119) |
| Open | Comfy-Org#19611 | Planless link goes to the plan picker |
| Open | Comfy-Org#19612 | Visual pass: checkbox, dark dropdown, unbroken
dates/IDs, settled copy |
| Open | **Comfy-Org#19613** (this PR) | Restore a promo this page applied;
discount rows in server order |
| Blocked on BE | FE-3072 (BE-17842) | Top-up on the full page; op facts
for receipt/credits lines |
| Blocked on BE | BE-13104 / BE-17785 / BE-10064 | $0 due card, subtotal
+ list price + renewal_at, Phase-A cancel |
| Next | M3-9 / M3-10 | Rollout via the flag, then delete the M2 path
and the flag |

```mermaid
flowchart LR
  classDef done fill:#e3f5e1,stroke:#2e7d32
  classDef open fill:#dff0ff,stroke:#1f6feb
  classDef be fill:#fde2e2,stroke:#c0392b
  classDef me fill:#fff4cc,stroke:#b58900,stroke-width:3px
  S["PR 19253 M3 stack"]:::done --> R["PR 19462 / PR 19487 design rounds"]:::done
  R --> U["UX pass PR 19540 PR 19538 PR 19536 PR 19537"]:::done
  R --> PNC["PR 19531 payment_not_completed"]:::done
  U --> P611["PR 19611 planless destination"]:::open
  U --> P612["PR 19612 visual pass"]:::open
  U --> P613["PR 19613 promo restore + order"]:::open
  BE1["BE-17842 op facts + top-up quote"]:::be --> TU["FE-3072 top-up"]:::open
  BE2["BE-13104 / BE-17785 / BE-10064"]:::be -.-> FU["$0 card, subtotal, cancel"]:::open
  P611 --> RO["M3-9 rollout"]
  P612 --> RO
  P613 --> RO
  PNC --> BEDEP["cloud PR 11119 deploy after FE release"]:::be
  RO --> CL["M3-10 delete M2 path + flag"]
  class P613 me
```
nomadoor pushed a commit to nomadoor/ComfyUI_frontend that referenced this pull request Oct 1, 2026
…e, discount duration, balance and receipts (Comfy-Org#19672)

## Summary

The full-page checkout now shows the numbers the backend started
reporting on 2026-09-30: the pre-discount subtotal, a discounted plan's
list price, each coupon's term, the account balance applied today, and
what a settled payment charged, added and bought.

## Changes

- **Why**: cloud Comfy-Org#11148 (BE-17785) added `subtotal_cents`,
`new_plan.list_price_cents` and `discounts[].duration` /
`duration_in_months` to the checkout quote; cloud Comfy-Org#11223 added
`balance_applied_cents`; cloud Comfy-Org#11199 (BE-17842) added
`amount_charged_cents`, `credits_added` and `plan` to a succeeded op
status. Alex's decisions in DES-1210 / DES-1211 / DES-1212 held these
slots until the backend reported them ("no Subtotal until the quote
reports one", "no discounted-rate strikethrough until the quote has a
list price", "Success credits line stays off until BE-17842"). All four
are on cloud main.
- **Root cause** (the monthly-to-yearly `renewal_at` gap): our e2e
fixture quoted that transition without `renewal_at`; the real backend
returns it, so the undated copy was never the backend's answer.
- **How**:
- `@comfyorg/ingest-types` regenerated from cloud@0dbfffb the way
cloud's push-ingest-types workflow does it (`openapi-project -fe`, `pnpm
generate`, `oxfmt`). account-core reads the new int64 amounts as safe
integers, like the existing cents (shared `wireCents`), and keeps the
generated Zod strict.
- account-core: a succeeded operation carries a `receipt` (amount
charged, credits added, plan), each absent while the server cannot say
it. `recover({ includeSettled: true })` re-reads a success whose credits
are still landing, the way it already re-reads a parked reconciliation.
- Summary (`summaryLedger.ts`, `CheckoutLedger.vue` split into
`LedgerRows` / `LedgerItem` / `LedgerDeduction`): a discounted plan rate
shows its list price struck through; a discount row states its term
("First year" / "First month" for `once`, "For N months" for
`repeating`, nothing for `forever` or an unknown term); "Account balance
−$X / Credit already on your account" is the last deduction (744-15697)
and keeps the prorated row it explains instead of dropping it; Subtotal
(re-added after Comfy-Org#19613 removed it) shows only where a discount follows
two or more money rows.
- Endings (`endingScreen.ts`, `CheckoutEnding.vue`): Success counts the
credits the op reports (77-4068). Already completed and You're all set
name the plan the receipt names, priced from the catalog (328-4444), in
place of the reference code. A top-up's Already completed lists Added
and Amount paid and no balance (410-5225). A charge whose credits are
still landing reads Payment received with Payment / Credits added
"Adding…" / Plan rows (390-4947), re-reads on the parked cadence, and
resolves to Success or Already completed once the credits land.
- Success card, paid today (Alex, FE-3021 "Added 2026-09-30", 758-15763
/ 765-15713; same bug as FE-2119 in the old flow): the card priced the
plan from `new_plan.price_cents`, so a promo showed the full rate. When
the server-reported charge differs from that rate, the card keeps the
rate, adds a divider, one row per reason, then "Paid today".
`successBreakdown.ts` decides the rows as a pure projection and reuses
the summary's discount and balance rows (`LedgerDeduction` /
`LedgerItem`). Paid today is `amount_charged_cents` from the succeeded
op when the page read one, else the quote's `amount_due_cents` for this
page's own Pay. Reasons: the entered code, a discount the subscription
already holds (with its term), and the account balance. A prorated
change reads only Paid today with "Prorated for the rest of this billing
period". A plan-level rate, a scheduled change, and a charge equal to
the rate get no rows.
- e2e fixtures: `switchToYearly` quotes a monthly-to-yearly switch the
way the real backend does, with `renewal_at`, `list_price_cents` and
`subtotal_cents`. The earlier "renewal_at BE gap" on this transition
came from our fixture, not the backend.
- **Breaking**: none. Every field is optional and each slot renders only
when the server reports its number.

**Rule 2.** Every amount and count on these screens is a number the
server reported: quote fields, op status fields, or the plan catalog.
The page adds, subtracts, divides and converts nothing; `centsToCredits`
is not used on any outcome screen.

## Review Focus

- **Needs a decision: per-month compare price.** Figma shows "$630
~~$700~~ /mo × 12 months, billed yearly". The quote reports
`price_cents` and `list_price_cents` per billing period, so a yearly
plan renders "$7,560 ~~$8,400~~ /yr, billed yearly". The per-month form
would need either a `/ 12` on the page (Rule 2) or per-month fields from
the backend.
- **Subtotal is not reachable yet.** Every family has at most one money
row today, so the ≥2-rows rule never fires. It fires once itemized
proration lands.
- **Itemized proration is left out.** cloud Comfy-Org#11252
(`proration_remaining_cents` / `proration_unused_cents`, plus
`renewal_at` without the embedded flag) is still open, so the prorated
row keeps its single stand-in subline.
- **Discount term for `once` on a monthly plan** reads "First month".
DES-1211 only specifies "first year" (on yearly).
- **Server gap on the Success breakdown.** After a payment-provider
return (3DS, Alipay) the page reads only the op status, so the card
shows "Paid today" (`amount_charged_cents`) against the catalog rate
with no reason rows: the op status reports no promo, discount, balance
or proration. It also cannot say a charge was prorated, so the subline
is absent there. Itemized reasons on that path need the op status to
report them.
- `settledPlanRead` now applies to any settled page this tab did not
price (receipt plan, else the status's plan for a returned payment); the
page's own Pay still names the plan from its quote.
- The generated `new_free_tier_subscriptions` field disappears from
`GetFeaturesResponse`. It was hand-added to the generated files in
Comfy-Org#12170 and is not in the cloud spec; `apps/website` extends the schema
with it and `RemoteConfig` declares it, so nothing reads it from
ingest-types.

## Screenshots (if applicable)

Fixture build (billing-web e2e mocks), dark, 1512×982.

| Case | AS IS | TO BE |
| --- | --- | --- |
| Monthly to yearly, list price, first-year promo | <img width="600"
alt="asis-summary-yearly"
src="https://github.com/user-attachments/assets/6164b359-33f5-4143-94df-3f852b45eb49"
/> | <img width="600" alt="tobe-summary-yearly"
src="https://github.com/user-attachments/assets/86eef478-c83f-4880-a7b0-d5d4963b32dc"
/> |
| Prorated upgrade over an account balance | <img width="600"
alt="asis-summary-balance"
src="https://github.com/user-attachments/assets/e2786a06-da16-41c0-b96b-f677172f2aab"
/> | <img width="600" alt="tobe-summary-balance"
src="https://github.com/user-attachments/assets/db103f1b-badb-4d65-8d52-b58ea542e6d7"
/> |
| Success with the credits the op reports | <img width="600"
alt="asis-ending-success"
src="https://github.com/user-attachments/assets/65d79420-51d4-415b-ad00-5b7b060cdf02"
/> | <img width="600" alt="tobe-ending-success"
src="https://github.com/user-attachments/assets/6e4b6f36-95e4-4b23-b57b-601401c60d7e"
/> |
| Charge whose credits are still landing | <img width="600"
alt="asis-ending-received"
src="https://github.com/user-attachments/assets/7902f4bc-39a2-4c29-b6ad-447d3d7bf28f"
/> | <img width="600" alt="tobe-ending-received"
src="https://github.com/user-attachments/assets/a6b4e9f2-aad7-4496-9592-311e8de8eaec"
/> |
| Reload once the credits landed | <img width="600"
alt="asis-ending-already"
src="https://github.com/user-attachments/assets/83e80707-2f11-4971-af86-6620e00d76d9"
/> | <img width="600" alt="tobe-ending-already"
src="https://github.com/user-attachments/assets/477429b2-7cc6-4dc2-a8e5-a8a08880be02"
/> |
| Success under a promo code | <img width="600"
alt="asis-success-discount"
src="https://github.com/user-attachments/assets/8bdf911e-f195-4968-a069-5790303e5ec3"
/> | <img width="600" alt="tobe-success-discount"
src="https://github.com/user-attachments/assets/c3d5f7ae-f466-4df8-bdf1-6dd22ec62951"
/> |
| Success after a prorated upgrade | <img width="600"
alt="asis-success-prorated"
src="https://github.com/user-attachments/assets/b1cd2088-a8d2-4afe-a7a0-3a5d43f2b06f"
/> | <img width="600" alt="tobe-success-prorated"
src="https://github.com/user-attachments/assets/b66e7c28-e2c6-4e1d-8e42-c82879553548"
/> |

## Where this PR sits in Milestone 3

| State | PR / ticket | Scope |
|---|---|---|
| Merged | Comfy-Org#19253 | M3 stack: FE-3018..3022 full page behind
`billing_web_checkout_ui` |
| Merged | Comfy-Org#19462 / Comfy-Org#19487 | Design review rounds 3-4 |
| Merged | Comfy-Org#19540 Comfy-Org#19538 Comfy-Org#19536 Comfy-Org#19537 | UX pass: money state,
lock/redirect, promo, summary/copy |
| Merged | Comfy-Org#19531 | Accept `payment_not_completed` |
| Merged | Comfy-Org#19611 Comfy-Org#19612 Comfy-Org#19613 | Follow-ups: planless link, visual
pass, promo restore + server order |
| Merged (BE) | cloud Comfy-Org#11148 Comfy-Org#11223 Comfy-Org#11188 Comfy-Org#11199 | Quote subtotal /
list price / discount term / balance, top-up quote, op receipt |
| Open (BE) | cloud Comfy-Org#11252 | `renewal_at` without the flag, itemized
proration |
| Open | **this PR** | Server-reported subtotal, list price, discount
term, balance and receipts |
| Open | Comfy-Org#19673 (stacked on this PR) | FE-3072 credit top-up on the full
page |
| Next | M3-9 / M3-10 | Rollout via the flag, then delete the M2 path
and the flag |

```mermaid
flowchart LR
  classDef done fill:#e3f5e1,stroke:#2e7d32
  classDef open fill:#dff0ff,stroke:#1f6feb
  classDef be fill:#fde2e2,stroke:#c0392b
  classDef me fill:#fff4cc,stroke:#b58900,stroke-width:3px
  S["PR 19253 M3 stack"]:::done --> R["PR 19462 / PR 19487 design rounds"]:::done
  R --> U["UX pass PR 19540 PR 19538 PR 19536 PR 19537"]:::done
  R --> PNC["PR 19531 payment_not_completed"]:::done
  U --> F["Follow-ups PR 19611 PR 19612 PR 19613"]:::done
  BE1["cloud 11148 / 11223 quote fields"]:::done --> ME["FE-3019 server-reported fields"]
  BE2["cloud 11199 op receipt"]:::done --> ME
  F --> ME
  BE3["cloud 11188 top-up quote"]:::done --> TU["FE-3072 top-up on the full page"]:::open
  ME --> TU
  BE4["cloud 11252 itemized proration"]:::be -.-> PR["Proration rows"]:::open
  TU --> RO["M3-9 rollout"]
  ME --> RO
  RO --> CL["M3-10 delete M2 path + flag"]
  class ME me
```
another-chi pushed a commit to another-chi/ComfyUI_frontend that referenced this pull request Oct 1, 2026
…omfy-Org#19673)

## Summary

A `/v1/top-up` link now opens a credit top-up on the full-page checkout:
the summary leads with the credits the server quotes for the link's
amount, Pay charges the method on file through the billing SDK's top-up
command, and the endings report what the operation added and cost.

Builds on Comfy-Org#19672 (merged).

## Changes

- **Why**: FE-3072 (Alex's M3 review, 2026-09-28): the full-page
checkout handles top-ups too. Figma 265-4362 (summary: credits first,
expiry from the server, no promo), 77-3783 (Success and Already
completed, op facts only), 394-4991 (receipt). cloud Comfy-Org#11188 (BE-17842)
added the read-only top-up quote this needs, and cloud Comfy-Org#11199 the op
receipt the endings read. Both are on cloud main.
- **Root cause** (why a top-up link failed before): the entry contract
had no top-up intent, so `/v1/top-up` was an unreadable link, and
billing-web had no quote or route for it.
- **How**:
- `@comfyorg/billing-contract`: a `top-up` intent with `amount_cents`,
the amount the product asks for in whole cents. The builder and the
parser refuse anything but a positive whole number of cents with
`INVALID_AMOUNT`. The amount is the customer's quantity, not a price.
- `@comfyorg/account-core`: `topup.quoteTopup({ amountCents })` reads
`POST /billing/topup/quote` (no idempotency key; nothing is charged). A
404 is `NOT_AVAILABLE`, a refused amount `INVALID_AMOUNT`, and the
credits and amount are read as safe integers.
- billing-web: `TopupRouteView` renders `FullPageTopupView` on the
`billing_web_checkout_ui` full-page flag. `useFullPageTopup` drives the
same `CheckoutPage` reducer as the subscription checkout: it reconciles
first, reads `can_top_up`, quotes the amount, and pays through
`useTopUp` (the SDK top-up command on the `billing_sdk_topup_enabled`
rail), on the method on file. `topupVerdictOf` maps the command's result
onto the existing Pay verdicts. `buildTopupLedger` leads with the quoted
credits and dates them "Expire {date}" from the quote's `expires_at`,
with no promo entry. Success reads "{N} credits added" with Added and
Amount paid; credits still landing read Payment received; a revisit is
Already completed.
- `useCheckoutExit` and `reconciledEvent` move out of
`useFullPageCheckout` so both checkouts share them.
  - Design review answers (Alex, 2026-09-30):
- A one-time code reads "This payment only" on a change to a monthly
plan. A new monthly subscription keeps "First month", and a yearly plan
keeps "First year" (DES-1211) for a new subscription and a change alike.
`discountTerm` picks the copy from the quote's `transition_type` and the
new plan's duration; no money logic changes.
- Top-up Success and Already completed put the credits icon
(`icon-[lucide--coins]`, as on the plan card and summary) on the Added
value (77-4102, 410-5225).
- Top-up Pay reads "Pay", and the terms line reads "…charge your payment
method once for this purchase." with Terms and Privacy Policy linked
through the shared `CheckoutTermsNote` (180-6679).
- A top-up link with no amount or an unreadable amount ends on "This
link isn't valid" with `CHECKOUT_LINK_INVALID`, Add credits to the
workspace's Plan & Credits settings, and Contact support (769-15773). It
is a new `amount_invalid` reason mapped to a `link_invalid` ending.
`App.vue` lets the top-up route explain an `INVALID_AMOUNT` link instead
of the generic entry error. Subscription links keep "This plan isn't
available".
- **Breaking**: none. `TopupCommand` gains `quoteTopup`, so its fakes
gain one too.

**Rule 2.** The credits, the expiry, the amount charged and the credits
added are the server's numbers. The page does not convert the amount
into credits, and it states no expiry policy of its own.

## Review Focus

- A revisit of a top-up this tab already saw succeed ends on Already
completed. A top-up link is always for sale, so without this the page
would offer a second form.
- Top-up Success leaves out the Previous balance and New balance rows
from 77-3783. They would need two balance reads around the charge, and
DES-1212 already keeps balance rows off Already completed because a
balance can be stale. Say if Success should show them.
- "This payment only" is limited to monthly plan changes, the case
Alex's answer named. A one-time code on a yearly plan still reads "First
year", on a switch to yearly too.
- A top-up link that is unreadable for any reason other than its amount
(an unknown product, say) still ends on the generic entry error page, as
before.
- Nothing in the host app builds a top-up link yet. This PR adds the
contract, the page and the quote.
- On the embedded variant of the flag the route shows the entry error.
There is no embedded top-up on billing-web.

## Screenshots (if applicable)

Fixture build (billing-web e2e mocks), dark, 1512×982.

| Case | AS IS | TO BE |
| --- | --- | --- |
| `/v1/top-up?amount_cents=2500` | <img width="600"
alt="asis-topup-summary"
src="https://github.com/user-attachments/assets/e54024c4-1c18-493a-9503-2150244a90a5"
/> | <img width="600" alt="tobe-topup-summary"
src="https://github.com/user-attachments/assets/3f964432-279e-4850-805b-89a36d2a1889"
/> |
| Pay goes through | n/a | <img width="600" alt="tobe-topup-success"
src="https://github.com/user-attachments/assets/af7607ee-9134-44be-bd03-388239133b70"
/> |
| Credits still landing | n/a | <img width="600"
alt="tobe-topup-received"
src="https://github.com/user-attachments/assets/88b5bf5b-3705-4d72-81da-b2066a46c1b4"
/> |
| Reload once they land | n/a | <img width="600"
alt="tobe-topup-already"
src="https://github.com/user-attachments/assets/5d91e64d-a2da-4ede-956e-41132bf5d9c0"
/> |

Design review answers, fixture build (billing-web e2e mocks), 1280×860.
AS IS is the previous head `a893946ddc`.

| Case | AS IS | TO BE |
| --- | --- | --- |
| Top-up Success, credits icon on Added (77-4102) | <img width="600"
alt="asis-topup-success"
src="https://github.com/user-attachments/assets/124b0226-3cbc-4ae2-a34e-28120cd8bc83"
/> | <img width="600" alt="tobe-topup-success"
src="https://github.com/user-attachments/assets/dc68d101-41a1-4251-a77f-6c949411e261"
/> |
| Top-up Pay button and terms (180-6679) | <img width="600"
alt="asis-topup-pay"
src="https://github.com/user-attachments/assets/bf977000-5be6-457c-8a90-187d401e1c14"
/> | <img width="600" alt="tobe-topup-pay"
src="https://github.com/user-attachments/assets/ec51cc45-39cd-4a27-9165-0e7e2e2af8c4"
/> |
| `/v1/top-up` with no amount (769-15773) | <img width="600"
alt="asis-topup-invalid"
src="https://github.com/user-attachments/assets/e9f8b70d-bd09-458a-9411-64f1ddc7da10"
/> | <img width="600" alt="tobe-topup-invalid"
src="https://github.com/user-attachments/assets/9bd1399c-11e7-48d4-8e5e-4d600de0ea3c"
/> |
| One-time code on a plan change | <img width="600"
alt="asis-change-once"
src="https://github.com/user-attachments/assets/a2d0b587-f42e-4f37-a584-f59044883496"
/> | <img width="600" alt="tobe-change-once"
src="https://github.com/user-attachments/assets/1153d17c-34a8-4c1c-8369-33f3cb616295"
/> |

## Where this PR sits in Milestone 3

| State | PR / ticket | Scope |
|---|---|---|
| Merged | Comfy-Org#19253 | M3 stack: FE-3018..3022 full page behind
`billing_web_checkout_ui` |
| Merged | Comfy-Org#19462 / Comfy-Org#19487 | Design review rounds 3-4 |
| Merged | Comfy-Org#19540 Comfy-Org#19538 Comfy-Org#19536 Comfy-Org#19537 | UX pass: money state,
lock/redirect, promo, summary/copy |
| Merged | Comfy-Org#19531 | Accept `payment_not_completed` |
| Merged | Comfy-Org#19611 Comfy-Org#19612 Comfy-Org#19613 | Follow-ups: planless link, visual
pass, promo restore + server order |
| Merged (BE) | cloud Comfy-Org#11148 Comfy-Org#11223 Comfy-Org#11188 Comfy-Org#11199 | Quote subtotal /
list price / discount term / balance, top-up quote, op receipt |
| Open (BE) | cloud Comfy-Org#11252 | `renewal_at` without the flag, itemized
proration |
| Merged | Comfy-Org#19672 | FE-3019 server-reported subtotal, list price,
discount term, balance and receipts |
| Open | **this PR** | FE-3072 credit top-up on the full page |
| Next | M3-9 / M3-10 | Rollout via the flag, then delete the M2 path
and the flag |

```mermaid
flowchart LR
  classDef done fill:#e3f5e1,stroke:#2e7d32
  classDef open fill:#dff0ff,stroke:#1f6feb
  classDef be fill:#fde2e2,stroke:#c0392b
  classDef me fill:#fff4cc,stroke:#b58900,stroke-width:3px
  S["PR 19253 M3 stack"]:::done --> R["PR 19462 / PR 19487 design rounds"]:::done
  R --> U["UX pass PR 19540 PR 19538 PR 19536 PR 19537"]:::done
  R --> PNC["PR 19531 payment_not_completed"]:::done
  U --> F["Follow-ups PR 19611 PR 19612 PR 19613"]:::done
  BE1["cloud 11148 / 11223 quote fields"]:::done --> SR["PR 19672 server-reported fields"]:::done
  BE2["cloud 11199 op receipt"]:::done --> SR
  F --> SR
  BE3["cloud 11188 top-up quote"]:::done --> ME["FE-3072 top-up on the full page"]
  SR --> ME
  BE4["cloud 11252 itemized proration"]:::be -.-> PR["Proration rows"]:::open
  ME --> RO["M3-9 rollout"]
  SR --> RO
  RO --> CL["M3-10 delete M2 path + flag"]
  class ME me
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk:xhigh PR risk grade (advisory shadow check; grader-owned)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants