Skip to content

feat(Billing): Reintroduce the Scale-Up plan#7216

Merged
emyller merged 8 commits intomainfrom
feat/hello-again-scaleup
Apr 13, 2026
Merged

feat(Billing): Reintroduce the Scale-Up plan#7216
emyller merged 8 commits intomainfrom
feat/hello-again-scaleup

Conversation

@emyller
Copy link
Copy Markdown
Contributor

@emyller emyller commented Apr 10, 2026 •
edited
Loading

  • I have read the Contributing Guide.
  • I have added information to docs/ if required so people know about the feature.
  • I have filled in the "Changes" section below.
  • I have filled in the "How did you test this code" section below.

Changes

Contributes to https://github.com/Flagsmith/flagsmith-private/issues/107

Restores the Scale-Up plan in the in-app organisation billing page.

Also includes a fix to make "Startup" the first upgrade plan from free.

How did you test this code?

image image image image

emyller and others added 3 commits April 10, 2026 17:03
@emyller @claude
Offer the Scale-Up plan to self-serve customers
9339bc3 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@emyller @claude
Direct free-plan users to Startup as the first paid upgrade
96e0cea 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@emyller @claude
Reflect the current $60/seat cost in the auto-seat-upgrade message
2fb0804 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@emyller emyller self-assigned this Apr 10, 2026
@emyller emyller requested a review from a team as a code owner April 10, 2026 20:08
@emyller emyller requested review from talissoncosta and removed request for a team April 10, 2026 20:08
claude[bot]
claude bot reviewed Apr 10, 2026
View reviewed changes
Copy link
Copy Markdown

@claude claude bot left a comment

Choose a reason for hiding this comment

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

⚠️ Code review skipped — your organization's overage spend limit has been reached.

Code review is billed via overage credits. To resume reviews, an organization admin can raise the monthly limit at claude.ai/admin-settings/claude-code.

Once credits are available, reopen this pull request to trigger a review.

@vercel
Copy link
Copy Markdown

vercel bot commented Apr 10, 2026 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
flagsmith-frontend-preview Ready Ready Preview, Comment Apr 13, 2026 8:43pm
flagsmith-frontend-staging Ready Ready Preview, Comment Apr 13, 2026 8:43pm
1 Skipped Deployment
Project Deployment Actions Updated (UTC)
docs Ignored Ignored Preview Apr 13, 2026 8:43pm

Request Review

@github-actions github-actions bot added front-end Issue related to the React Front End Dashboard feature New feature or request labels Apr 10, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026 •
edited
Loading

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-api-test:pr-7216 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-api:pr-7216 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith:pr-7216 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith-private-cloud:pr-7216 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith-e2e:pr-7216 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-frontend:pr-7216 Finished ✅ Results ✅

emyller
emyller commented Apr 10, 2026
View reviewed changes
emyller
emyller commented Apr 10, 2026
View reviewed changes
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026 •
edited
Loading

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  24.2 seconds
commit  2fb0804
info  🔄 Run: #15984 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  51.7 seconds
commit  2fb0804
info  🔄 Run: #15984 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  47.7 seconds
commit  2fb0804
info  🔄 Run: #15984 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  1 minute, 2 seconds
commit  2fb0804
info  🔄 Run: #15984 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  24.3 seconds
commit  55970f3
info  🔄 Run: #15986 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  50.3 seconds
commit  55970f3
info  🔄 Run: #15986 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  17 passed

Details

stats  17 tests across 14 suites
duration  57.5 seconds
commit  55970f3
info  🔄 Run: #15986 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  46.9 seconds
commit  55970f3
info  🔄 Run: #15986 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  52.2 seconds
commit  3507498
info  🔄 Run: #15987 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  17 passed

Details

stats  17 tests across 14 suites
duration  51.9 seconds
commit  3507498
info  🔄 Run: #15987 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  13.5 seconds
commit  3507498
info  🔄 Run: #15987 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  58.9 seconds
commit  3507498
info  🔄 Run: #15987 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  25.4 seconds
commit  b1b2297
info  🔄 Run: #16011 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  29.1 seconds
commit  b1b2297
info  🔄 Run: #16011 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  1 minute, 23 seconds
commit  b1b2297
info  🔄 Run: #16011 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  55.6 seconds
commit  b1b2297
info  🔄 Run: #16011 (attempt 1)

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026 •
edited
Loading

Visual Regression

16 screenshots compared. See report for details.
View full report

@emyller @claude
Communicate the 20-seat limit on the Scale-Up pricing tile
55970f3 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Apr 10, 2026
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Apr 10, 2026
talissoncosta
talissoncosta requested changes Apr 13, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@talissoncosta talissoncosta left a comment

Choose a reason for hiding this comment

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

Just some minor comments regarding the imports... Otherwise looks good.

Have you tested the upgrade flow end-to-end with rtk_payment_modal_migration both on and off?

The new payment modal is behind the flag, but the getNextPlan() change in utils.tsx isn't — it affects the upgrade chips across the app for everyone. Users on the legacy modal would see "Upgrade to Scale-Up" chips but land on a modal that doesn't have a Scale-Up plan.

The flag has been on for internal testing for a while — could be a good opportunity to enable it for everyone alongside this. Otherwise we should gate getNextPlan() behind the flag to keep the old behaviour for legacy modal users.

talissoncosta
talissoncosta reviewed Apr 13, 2026
View reviewed changes
talissoncosta
talissoncosta reviewed Apr 13, 2026
View reviewed changes
talissoncosta
talissoncosta reviewed Apr 13, 2026
View reviewed changes
@emyller emyller marked this pull request as draft April 13, 2026 19:23
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Apr 13, 2026
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Apr 13, 2026
@emyller emyller marked this pull request as ready for review April 13, 2026 20:49
claude[bot]
claude bot reviewed Apr 13, 2026
View reviewed changes
Copy link
Copy Markdown

@claude claude bot left a comment

Choose a reason for hiding this comment

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

⚠️ Code review skipped — your organization's overage spend limit has been reached.

Code review is billed via overage credits. To resume reviews, an organization admin can raise the monthly limit at claude.ai/admin-settings/claude-code.

Once credits are available, reopen this pull request to trigger a review.

@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Apr 13, 2026
talissoncosta
talissoncosta approved these changes Apr 13, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@talissoncosta talissoncosta left a comment

Choose a reason for hiding this comment

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

All good! Thanks for handling that!

@emyller
Copy link
Copy Markdown
Contributor Author

emyller commented Apr 13, 2026

@talissoncosta Thanks for the great review here. I've started from scratch, aiming to support both old and new UIs. I've tested both, but haven't gone through activating a trial — I trust the billing masters above us know what they're doing. 👀 I'll give it a go once live.

@emyller emyller merged commit 556b114 into main Apr 13, 2026
44 checks passed
@emyller emyller deleted the feat/hello-again-scaleup branch April 13, 2026 21:20
@flagsmithdev flagsmithdev mentioned this pull request Apr 13, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@claude claude[bot] claude[bot] left review comments

@talissoncosta talissoncosta talissoncosta approved these changes

Assignees

@emyller emyller

Labels

feature New feature or request front-end Issue related to the React Front End Dashboard

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@emyller @talissoncosta