Skip to content

fix(billing): DES review polish on workspace billing UI#12917

Merged
dante01yoon merged 2 commits into
mainfrom
jaewon/billing-ui-des-review-polish
Jun 17, 2026
Merged

fix(billing): DES review polish on workspace billing UI#12917
dante01yoon merged 2 commits into
mainfrom
jaewon/billing-ui-des-review-polish

Conversation

@dante01yoon

@dante01yoon dante01yoon commented Jun 17, 2026

Copy link
Copy Markdown
Collaborator

before

https://www.figma.com/board/R9eN9DHmDgX3qEJXsRKiRr?node-id=410-297#1803836299
Screenshot 2026-06-17 at 9 52 50 PM

after

Screenshot 2026-06-17 at 9 53 40 PM

Design-review polish on the team-workspace billing UI (3 of the items from the Figma 'Team Plan - Workspaces' review). All three components are on main.

1. Remove dead 'Upgrade' badge in account popover

CurrentUserPopoverWorkspace.vue — the white badge beside 'Plans & pricing' was gated on canUpgrade, which is hardcoded false (PRO is the only tier), so it never rendered. Removed the badge markup and the dead computed. (Figma node 2797-724189.)

2. Subscribe-to-Run button height

SubscribeToRun.vue — used size="sm", which didn't match the sibling run/queue button (an h-8 button group it swaps with in the same slot via CloudRunButtonWrapper). Switched to size="unset" + h-8 rounded-lg gap-1.5 px-4 to match.

3. Duplicate border/radius on member 'subscription inactive' dialog

useSubscriptionDialog.ts — the layout dialog already zeroes the content border (border-none shadow-none), but the root pt kept only bg-transparent, so the dialog frame's default border+radius doubled with the card's own rounded-2xl border. Added border-none rounded-none shadow-none to root so only the card's single border/radius shows. (Figma node 3253-19473.)

Surfaced during Billing V1 design review (team workspaces).

- Remove the dead 'Upgrade' badge beside Plans & pricing in the account popover (canUpgrade was hardcoded false, so it never rendered)
- Match the Subscribe-to-Run button height to its sibling run button (h-8 rounded-lg)
- Drop the duplicate outer border/radius on the member 'subscription inactive' dialog: the layout-dialog frame already zeroes content border, but root kept its default border+radius, doubling the card's
@dante01yoon dante01yoon requested a review from a team June 17, 2026 09:51
@dosubot dosubot Bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Jun 17, 2026
@github-actions

github-actions Bot commented Jun 17, 2026

Copy link
Copy Markdown

🎭 Playwright: ✅ 1680 passed, 0 failed

📊 Browser Reports
  • chromium: View Report (✅ 1659 / ❌ 0 / ⚠️ 0 / ⏭️ 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 commented Jun 17, 2026

Copy link
Copy Markdown

🎨 Storybook: ✅ Built — View Storybook

Details

⏰ Completed at: 06/17/2026, 09:58:20 AM UTC

Links

@codecov

codecov Bot commented Jun 17, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@             Coverage Diff             @@
##             main   #12917       +/-   ##
===========================================
- Coverage   76.60%   62.13%   -14.47%     
===========================================
  Files        1568     1456      -112     
  Lines      104249    75060    -29189     
  Branches    31075    19519    -11556     
===========================================
- Hits        79862    46641    -33221     
- Misses      23533    28075     +4542     
+ Partials      854      344      -510     
Flag Coverage Δ
e2e ?
unit 62.13% <ø> (+<0.01%) ⬆️

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

Files with missing lines Coverage Δ
...m/cloud/subscription/components/SubscribeToRun.vue 95.23% <ø> (+7.73%) ⬆️
.../subscription/composables/useSubscriptionDialog.ts 68.33% <ø> (+28.16%) ⬆️
...rkspace/components/CurrentUserPopoverWorkspace.vue 68.18% <ø> (+1.81%) ⬆️

... and 1170 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.

@jtydhr88 jtydhr88 assigned dante01yoon and unassigned jtydhr88 Jun 17, 2026
@dante01yoon dante01yoon added this pull request to the merge queue Jun 17, 2026
Merged via the queue into main with commit 543a39a Jun 17, 2026
49 checks passed
@dante01yoon dante01yoon deleted the jaewon/billing-ui-des-review-polish branch June 17, 2026 13:34
@dante01yoon dante01yoon added cloud/1.46 Backport PRs for cloud 1.46 needs-backport Fix/change that needs to be cherry-picked to the current feature freeze branch labels Jun 19, 2026
@github-actions

Copy link
Copy Markdown

⚠️ Backport to cloud/1.46 failed

Reason: Merge conflicts detected during cherry-pick of 543a39a

📄 Conflicting files
src/platform/cloud/subscription/composables/useSubscriptionDialog.ts
🤖 Prompt for AI Agents
Backport PR #12917 (https://github.com/Comfy-Org/ComfyUI_frontend/pull/12917) to cloud/1.46.
Cherry-pick merge commit 543a39a6b05dd11cc10b1ac3adc2ab28a898dc31 onto new branch
backport-12917-to-cloud-1.46 from origin/cloud/1.46.
Resolve conflicts in: src/platform/cloud/subscription/composables/useSubscriptionDialog.ts .
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.46] <original title>" with label "backport".
See .github/workflows/pr-backport.yaml for workflow details.

cc @dante01yoon

@dante01yoon dante01yoon added cloud/1.45 Backport PRs for cloud 1.45 and removed cloud/1.46 Backport PRs for cloud 1.46 labels Jun 25, 2026
@github-actions

Copy link
Copy Markdown

⚠️ Backport to cloud/1.45 failed

Reason: Merge conflicts detected during cherry-pick of 543a39a

📄 Conflicting files
src/platform/cloud/subscription/composables/useSubscriptionDialog.ts
🤖 Prompt for AI Agents
Backport PR #12917 (https://github.com/Comfy-Org/ComfyUI_frontend/pull/12917) to cloud/1.45.
Cherry-pick merge commit 543a39a6b05dd11cc10b1ac3adc2ab28a898dc31 onto new branch
backport-12917-to-cloud-1.45 from origin/cloud/1.45.
Resolve conflicts in: src/platform/cloud/subscription/composables/useSubscriptionDialog.ts .
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.45] <original title>" with label "backport".
See .github/workflows/pr-backport.yaml for workflow details.

cc @dante01yoon

christian-byrne pushed a commit that referenced this pull request Jun 27, 2026
…lling UI (#12917) (#13195)

Backport of #12917 to `cloud/1.45`.

Cherry-picked squash commit `543a39a6b05dd11cc10b1ac3adc2ab28a898dc31`.
Original authorship preserved.

Applies 2 of the 3 polish items, which are independent of the
facade/run-lock stack:
- **Remove dead 'Upgrade' badge** in `CurrentUserPopoverWorkspace.vue`
- **Subscribe-to-Run button height** (`SubscribeToRun.vue`, `size=unset`
+ `h-8`)

**Deferred (1 item):** the member 'subscription inactive' dialog border
polish in `useSubscriptionDialog.ts` targets the
`SubscriptionInactiveMemberDialog` block from **FE-978 (#12786)**, which
is not yet on `cloud/1.45`. Resolved the conflict by keeping
cloud/1.45's version (the block doesn't exist here yet). Re-apply that
one-line `root` pt polish (`border-none rounded-none shadow-none`) when
#12786's backport lands.

Co-authored-by: GitHub Action <action@github.com>
@comfy-pr-bot comfy-pr-bot added the released:cloud PR has been released to cloud label Jun 30, 2026
@comfy-pr-bot

Copy link
Copy Markdown
Member

@dante01yoon Successfully backported to #13319

@github-actions github-actions Bot removed the needs-backport Fix/change that needs to be cherry-picked to the current feature freeze branch label Jun 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cloud/1.45 Backport PRs for cloud 1.45 released:cloud PR has been released to cloud 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