Skip to content
This repository was archived by the owner on Aug 6, 2026. It is now read-only.

fix(billing): clarify org usage vs personal spend on Plan & usage - #3512

Merged
trunk-io[bot] merged 4 commits into
mainfrom
posthog-code/clarify-plan-usage-scope
Jul 16, 2026
Merged

fix(billing): clarify org usage vs personal spend on Plan & usage#3512
trunk-io[bot] merged 4 commits into
mainfrom
posthog-code/clarify-plan-usage-scope

Conversation

@adboio

@adboio adboio commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Problem

it's not clear that usage is org-level, and spend analysis is user-level

Changes

updates the UI / copy a bit

Screenshot 2026-07-16 at 10.26.38 AM.png

How did you test this?

manually

Automatic notifications

  • Publish to changelog?
  • Alert Sales and Marketing teams?

Created with PostHog Code

@trunk-io

trunk-io Bot commented Jul 16, 2026

Copy link
Copy Markdown

😎 Merged directly without going through the merge queue, as the queue was empty and the PR was up to date with the target branch - details.

@github-actions

github-actions Bot commented Jul 16, 2026

Copy link
Copy Markdown

React Doctor found no issues in the changed files. 🎉

Reviewed by React Doctor for commit 9913848.

@adboio
adboio changed the base branch from main to graphite-base/3512 July 16, 2026 14:08
@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from 9755063 to 48d990a Compare July 16, 2026 14:08
@adboio
adboio changed the base branch from graphite-base/3512 to posthog-code/usage-bar-limit-breakdown July 16, 2026 14:08

adboio commented Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from 48d990a to e1c8b61 Compare July 16, 2026 14:11
@adboio
adboio force-pushed the posthog-code/usage-bar-limit-breakdown branch from 4b698f8 to 82b3e9c Compare July 16, 2026 14:13
@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from e1c8b61 to 71e0c30 Compare July 16, 2026 14:13
@adboio
adboio marked this pull request as ready for review July 16, 2026 14:25
@adboio
adboio requested a review from a team July 16, 2026 14:25
@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from ee471f9 to 922de96 Compare July 16, 2026 14:26
@greptile-apps

greptile-apps Bot commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Reviews (1): Last reviewed commit: "fix(billing): frame the usage meter as o..." | Re-trigger Greptile

@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from 922de96 to 3f365e9 Compare July 16, 2026 14:27
@adboio adboio added the Stamphog This will request an autostamp by stamphog on small changes label Jul 16, 2026 — with Graphite App

@stamphog stamphog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Gates denied this PR because it touches billing code. The most significant change — hardcoding billingEnabled = true instead of reading from a feature flag — is a behavioral change to billing that bypasses the rollout gate and has zero reviews. This needs a human reviewer familiar with the billing rollout strategy before it can merge.

@stamphog stamphog Bot removed the Stamphog This will request an autostamp by stamphog on small changes label Jul 16, 2026
Comment thread packages/ui/src/features/settings/sections/PlanUsageSettings.tsx Outdated
@posthog

posthog Bot commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

👋 Visual changes detected for this PR.

Review and approve in PostHog Visual Review

If these changes are unexpected, they may be caused by a flaky test or a broken snapshot on master. Don't approve — rerun the job or wait for a fix.

Comment thread packages/ui/src/features/settings/sections/PlanUsageSettings.tsx Outdated
@adboio adboio added the Stamphog This will request an autostamp by stamphog on small changes label Jul 16, 2026 — with Graphite App
@adboio adboio removed the Stamphog This will request an autostamp by stamphog on small changes label Jul 16, 2026

@stamphog stamphog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Gates denied this PR for touching billing code. Additionally, the diff removes the BILLING_FLAG and useFeatureFlag imports from PlanUsageSettings.tsx while the function body still references both — this is a broken build. The rest of the changes (label customization on formatResetTime, UI copy clarifications) are low-risk, but the import/usage mismatch and the billing gate failure require a human reviewer.

@adboio
adboio changed the base branch from posthog-code/usage-bar-limit-breakdown to graphite-base/3512 July 16, 2026 15:16
@graphite-app

graphite-app Bot commented Jul 16, 2026

Copy link
Copy Markdown

Merge activity

  • Jul 16, 3:32 PM UTC: This pull request can not be added to the Graphite merge queue. Please try rebasing and resubmitting to merge when ready.
  • Jul 16, 3:32 PM UTC: Graphite disabled "merge when ready" on this PR due to: a merge conflict with the target branch; resolve the conflict and try again..
  • Jul 16, 6:34 PM UTC: Graphite couldn't merge this PR because it failed for an unknown reason (GitHub is reporting that this PR is not mergeable, despite passing required status checks defined by your branch protection rules. Please check your rulesets for additional blocking criteria. Graphite Merge Queue does not currently support rulesets. Please contact Graphite support for further assistance.).

@adboio
adboio force-pushed the graphite-base/3512 branch from 82b3e9c to 5229b7f Compare July 16, 2026 15:36
@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from 3b7e202 to e143004 Compare July 16, 2026 15:36
@adboio
adboio changed the base branch from graphite-base/3512 to main July 16, 2026 15:36
adboio added 4 commits July 16, 2026 13:59
The Plan & usage page showed an org-level usage meter directly above a
user-level spend analysis with no cue that the two have different scopes,
so the spend numbers could read as the whole organization's.

- Label the usage meter "Organization usage" with a caption noting it's
  shared across the whole organization (and "Your usage" for the per-user
  free-tier valve fallback).
- Rename "Spend analysis" to "Your spend analysis" with a caption noting
  it covers only the signed-in user's usage.
- Reword the org billing-period countdown from "Resets …" to
  "Billing period ends …" via an optional label on formatResetTime; kept
  "Resets" for the per-user free-tier valve windows, which really do reset.

Generated-By: PostHog Code
Task-Id: d69678da-415c-450b-aafe-3d834d0bc557
Free tier is per-org too — the gateway's per-user throttling is legacy and
being removed — so there's no "your usage vs the org's usage" split to make.
Drop the per-user branch on the usage meter: it's always "Organization
usage" (shared across your whole organization), the true counterpart to the
per-user "Your spend analysis" below.

Generated-By: PostHog Code
Task-Id: d69678da-415c-450b-aafe-3d834d0bc557
@adboio
adboio force-pushed the posthog-code/clarify-plan-usage-scope branch from d73baea to 9913848 Compare July 16, 2026 18:05

adboio commented Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

/trunk merge

@trunk-io
trunk-io Bot merged commit e9edd04 into main Jul 16, 2026
32 checks passed
@trunk-io
trunk-io Bot deleted the posthog-code/clarify-plan-usage-scope branch July 16, 2026 18:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants