Skip to content

charge users after trial if paid during trial#2033

Merged
ignaciojimenezr merged 2 commits intomainfrom
after-trial
May 8, 2026
Merged

charge users after trial if paid during trial#2033
ignaciojimenezr merged 2 commits intomainfrom
after-trial

Conversation

@ignaciojimenezr
Copy link
Copy Markdown
Collaborator

@ignaciojimenezr ignaciojimenezr commented May 6, 2026

  • Show $0 today only when the backend confirms the user will not be charged today.
  • Show the first billing date on upgrade cards.
  • Show First charge ... for Stripe subscriptions that are still trialing.
  • Restore Team minimum-seat copy where pricing is shown ( removed a couple of days ago but should be re-evaluated)
  • Add tests for the new billing copy.

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@dosubot dosubot Bot added the size:M This PR changes 30-99 lines, ignoring generated files. label May 6, 2026
@chelojimenez
Copy link
Copy Markdown
Contributor

chelojimenez commented May 6, 2026

Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@dosubot dosubot Bot added the enhancement New feature or request label May 6, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 6, 2026

Internal preview

Preview URL: https://mcp-inspector-pr-2033.up.railway.app
Deployed commit: 1b4e295
PR head commit: 93e3753
Backend target: staging fallback.
Health: ❌ Convex unreachable — see upsert-preview job logs (staging may need convex deploy)
Access is employee-only in non-production environments.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 6, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 05e4e3fc-f5d8-45ad-b1f1-0852b5fd72e2

📥 Commits

Reviewing files that changed from the base of the PR and between 33a37af and 4e63f3c.

📒 Files selected for processing (6)
  • mcpjam-inspector/client/src/components/__tests__/ChatboxesTab.test.tsx
  • mcpjam-inspector/client/src/components/__tests__/OrganizationsTab.billing.test.tsx
  • mcpjam-inspector/client/src/components/organization/OrganizationBillingSection.tsx
  • mcpjam-inspector/client/src/components/organization/OrganizationCurrentPlanPanel.tsx
  • mcpjam-inspector/client/src/hooks/useOrganizationBilling.ts
  • mcpjam-inspector/client/src/lib/billing-upsell.ts

Walkthrough

This pull request introduces deferred trial billing messaging and updates trial-related UI text across the billing components. Changes include adding a new optional deferredTrialBillingStartsAt field to the OrganizationBillingStatus interface, implementing helper functions to format billing dates and generate deferred trial messaging, and conditionally rendering this messaging in the plan comparison UI. The renewal text for trialing subscriptions now displays "First charge" instead of "Renews," and per-seat pricing now includes seat minimum information. Test coverage expands with new assertions for trial messaging and deferred billing visibility conditions.

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@dosubot dosubot Bot added the lgtm This PR has been approved by a maintainer label May 7, 2026
@ignaciojimenezr ignaciojimenezr merged commit dc1ea96 into main May 8, 2026
11 checks passed
@ignaciojimenezr ignaciojimenezr deleted the after-trial branch May 8, 2026 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants