Skip to content

Conversation

@christian-byrne
Copy link
Contributor

@christian-byrne christian-byrne commented Oct 19, 2025

Summary

Backport of #6064 (subscription page) to the rh-test branch.

This PR manually cherry-picks commit 7e1e8e3 to the rh-test branch and resolves merge conflicts that prevented automatic backporting.

Conflicts Resolved

1. src/components/actionbar/ComfyActionbar.vue

  • Conflict: HEAD (rh-test) used <ComfyQueueButton /> while the subscription PR introduced <ComfyRunButton />
  • Resolution: Updated to use <ComfyRunButton /> to include the subscription functionality wrapper while maintaining the existing rh-test template structure

2. src/composables/auth/useFirebaseAuthActions.ts

  • Conflict: Simple ordering difference in the return statement
  • Resolution: Used the subscription PR's ordering: deleteAccount, accessError, reportError

Testing

The cherry-pick completed successfully and passed all pre-commit hooks:

  • ✅ ESLint
  • ✅ Prettier formatting
  • ⚠️ Note: 2 unused i18n keys detected (informational only, same as original PR)

Related

┆Issue is synchronized with this Notion page by Unito

Summary

Implements cloud subscription management UI and flow for ComfyUI Cloud
users.

  Core Features:
- Subscription Status Tracking: Global reactive state management for
subscription status across all components
  using shared subscriptionStatus ref
- Subscribe to Run Button: Replaces the Run button in the actionbar with
a "Subscribe to Run" button for users
  without active subscriptions
- Subscription Required Dialog: Modal dialog with subscription benefits,
pricing, and checkout flow with video
  background
- Subscription Settings Panel: New settings panel showing subscription
status, renewal date, and quick access to
  billing management
- Auto-detection & Polling: Automatically polls subscription status
after checkout completion and syncs state
  across the application

https://github.com/user-attachments/assets/f41b8e6a-5845-48a7-8169-3a6fc0d2e5c8

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6064-subscription-page-28d6d73d36508135a2a0fe7c94b40852)
by [Unito](https://www.unito.io)

---------

Co-authored-by: GitHub Action <[email protected]>
@dosubot dosubot bot added the size:XXL This PR changes 1000+ lines, ignoring generated files. label Oct 19, 2025
@christian-byrne christian-byrne changed the title [backport] subscription page to rh-test [backport rh-test] subscription page to rh-test Oct 19, 2025
@github-actions
Copy link

github-actions bot commented Oct 19, 2025

🎭 Playwright Test Results

🕵🏻 No test results found

⏰ Completed at: 10/19/2025, 07:11:57 AM UTC

📊 Test Reports by Browser

  • chromium: Deployment failed
  • chromium-2x: Deployment failed
  • chromium-0.5x: Deployment failed
  • mobile-chrome: Deployment failed

🎉 Click on the links above to view detailed test results for each browser configuration.

@christian-byrne christian-byrne changed the title [backport rh-test] subscription page to rh-test [backport rh-test] subscription panel Oct 19, 2025
@christian-byrne christian-byrne added the backport Backporting a PR onto a release candidate label Oct 19, 2025
@christian-byrne christian-byrne merged commit a9db25e into rh-test Oct 19, 2025
18 of 23 checks passed
@christian-byrne christian-byrne deleted the backport-6064-to-rh-test branch October 19, 2025 07:14
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 size:XXL This PR changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants