Skip to content

[backport cloud/1.51] Fix local billing routes to open Plan & Credits - #15796

Merged
comfy-pr-bot merged 1 commit into
cloud/1.51from
backport-15793-to-cloud-1.51
Aug 24, 2026
Merged

comfy-pr-bot merged 1 commit into
cloud/1.51from
backport-15793-to-cloud-1.51

Conversation

@comfy-pr-bot

Copy link
Copy Markdown
Member

Backport of #15793 to cloud/1.51

Automatically created by backport workflow.

## Summary

Route Local billing entry points to the V1 **Plan & Credits** panel
instead of the hidden legacy Credits panel.

Root cause: #15239 added the V1 `workspace` / Plan & Credits destination
for Local, but three existing workspace-aware call sites still selected
the legacy `credits` panel on non-Cloud builds. As a result, the profile
**Plans and credits** action and completed top-ups opened the old
combined Credits + Activity screen. Cloud already selected `workspace`
and was unaffected.

Reported in
[Slack](https://comfy-organization.slack.com/archives/C0932CGKT5K/p1787569379861219?thread_ts=1787034725.224329&cid=C0932CGKT5K).

## Changes

- **What**: Open `workspace` from the Local profile action and from both
immediate and polled workspace top-up completion paths.
- **Regression coverage**: Assert the Local profile action opens
`workspace`; preserve direct tests for immediate and polled top-up
completion; update the Local browser user story to require the `Credits`
and `Activity` tabs before testing Add credits.

## Review Focus

The hidden legacy `credits` panel and `CurrentUserPopoverLegacy` remain
unchanged for pre-workspace/legacy flows. This PR only changes call
sites that already run with workspace billing context.

## Validation

- `pnpm test:unit ...` — 112 tests passed across profile routing,
immediate/polled top-up completion, and Local/Cloud Plan & Credits
rendering
- `pnpm typecheck`
- `pnpm typecheck:browser`
- `pnpm exec eslint ...`
- `pnpm exec oxfmt --check ...`
- `pnpm knip`
- Local real-app browser flow: profile **Plans and credits** opens
tabbed Plan & Credits and Add credits remains available
- Cloud browser coverage: V1 workspace navigation and unified credits
tile pass unchanged

## Screenshots

### AS IS — Local opens the legacy combined Credits + Activity page

![AS IS — legacy Local Credits
page](https://ampcode.com/user-content/artifacts/ac9a166d32bfb27893e030609676f1d766bac946ebe230fab433a345e644a2a3-file.png)

### TO BE — Local opens the tabbed Plan & Credits page

![TO BE — tabbed Local Plan and Credits
page](https://ampcode.com/user-content/artifacts/2cd756894e7c93336f9827949b3d0f580ebaaa280f14b8cfb83eb5971bee6fa4-file.png)

Co-authored-by: Amp <amp@ampcode.com>
@comfy-pr-bot comfy-pr-bot added the backport Backporting a PR onto a release candidate label Aug 24, 2026
@comfy-pr-bot
comfy-pr-bot enabled auto-merge (squash) August 24, 2026 15:09
@dosubot dosubot Bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Aug 24, 2026
@github-actions

github-actions Bot commented Aug 24, 2026 •

Copy link
Copy Markdown
Contributor

🎨 Storybook: ✅ Built — View Storybook

Details

⏰ Completed at: 08/24/2026, 03:11:01 PM UTC

Links

🎭 Playwright: ✅ 1819 passed, 0 failed · 5 flaky

📊 Browser Reports
  • chromium: View Report (✅ 1798 / ❌ 0 / ⚠️ 5 / ⏭️ 5)
  • 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)

@github-actions github-actions Bot added the risk:R3 PR risk grade (advisory shadow check; grader-owned) label Aug 24, 2026
@github-actions
github-actions Bot requested a review from AustinMroz August 24, 2026 15:09
@codecov

codecov Bot commented Aug 24, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@              Coverage Diff              @@
##             cloud/1.51   #15796   +/-   ##
=============================================
  Coverage              ?   81.55%           
=============================================
  Files                 ?     1884           
  Lines                 ?   117711           
  Branches              ?    36773           
=============================================
  Hits                  ?    95997           
  Misses                ?    21242           
  Partials              ?      472           
Flag Coverage Δ
unit 73.14% <100.00%> (?)

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

Files with missing lines Coverage Δ
...rkspace/components/CurrentUserPopoverWorkspace.vue 83.68% <100.00%> (ø)
.../components/TopUpCreditsDialogContentWorkspace.vue 84.69% <100.00%> (ø)
...platform/workspace/stores/billingOperationStore.ts 95.75% <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.

@comfy-pr-bot
comfy-pr-bot merged commit 61513c4 into cloud/1.51 Aug 24, 2026
87 of 89 checks passed
@comfy-pr-bot
comfy-pr-bot deleted the backport-15793-to-cloud-1.51 branch August 24, 2026 15:23
@huang47 huang47 added the risk:xhigh PR risk grade (advisory shadow check; grader-owned) label Sep 2, 2026 — with ChatGPT Codex Connector
@huang47 huang47 removed the risk:R3 PR risk grade (advisory shadow check; grader-owned) label Sep 2, 2026
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:xhigh PR risk grade (advisory shadow check; grader-owned) size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants