Skip to content

[REV-1603 & REV-1606] Show billing V2 for solo free users #11434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IsaiahWitzke merged 6 commits into from
May 27, 2026
Merged

[REV-1603 & REV-1606] Show billing V2 for solo free users #11434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ade58b
[REV-1603] Show billing V2 for solo free users
IsaiahWitzke May 20, 2026
19599fd
[REV-1603] Refactor billing cycle usage section + own-usage rendering
IsaiahWitzke May 21, 2026
ecc8907
fix no pink bar for free team solo user
IsaiahWitzke May 21, 2026
76dceb3
address REV-1606
IsaiahWitzke May 22, 2026
0a00f63
Remove dead shows_team_section parameter; gate Team has_non_viewer_da…
IsaiahWitzke May 22, 2026
66922d8
Merge remote-tracking branch 'origin/master' into oz-agent/REV-1603-b…
IsaiahWitzke May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/settings_view/billing_and_usage/billing_cycle_usage_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ pub fn filter_legacy_buckets(entries: &[BillingCycleUsageEntry]) -> Vec<BillingC
/// "Is there any data in `entries` that's not my own?"
pub fn has_non_viewer_data(entries: &[BillingCycleUsageEntry], viewer_uid: Option<&str>) -> bool {
entries.iter().any(|e| match &e.subject_type {
AiCreditsUsageAndCostSubjectType::Team => true,
AiCreditsUsageAndCostSubjectType::Team => e.credits_used > 0,
Copy link
Copy Markdown
Contributor Author

@IsaiahWitzke IsaiahWitzke May 22, 2026

Choose a reason for hiding this comment

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

this addresses https://linear.app/warpdotdev/issue/REV-1606/hide-other-members-if-there-are-no-other-members

Copy link
Copy Markdown
Contributor

@tylerlam-warp tylerlam-warp May 24, 2026

Choose a reason for hiding this comment

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

nice

_ => match (e.subject_uid.as_deref(), viewer_uid) {
(Some(uid), Some(viewer)) => uid != viewer,
// Unknown subject — conservatively treat as non-viewer.
Expand Down
Loading
Loading