Skip to content

Billing status fixes #177

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
AnthonyRonning merged 2 commits into from
Aug 5, 2025
Merged

Billing status fixes #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b040de
Revert "Merge pull request #175 from OpenSecretCloud/fix-model-select…
AnthonyRonning Aug 5, 2025
c5c1fb5
Revert "Merge pull request #170 from OpenSecretCloud/claude/issue-169…
AnthonyRonning Aug 5, 2025
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
15 changes: 3 additions & 12 deletions frontend/src/components/AccountMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,29 +79,20 @@ function ConfirmDeleteDialog() {
export function AccountMenu() {
const os = useOpenSecret();
const router = useRouter();
const { billingStatus } = useLocalState();
const [isPortalLoading, setIsPortalLoading] = useState(false);
const [isTeamDialogOpen, setIsTeamDialogOpen] = useState(false);

// Fetch billing status directly instead of relying on local state
const { data: billingStatus } = useQuery({
queryKey: ["billingStatus"],
queryFn: async () => {
const billingService = getBillingService();
return await billingService.getBillingStatus();
},
enabled: !!os.auth.user
});

const hasStripeAccount = billingStatus?.stripe_customer_id !== null;
const productName = billingStatus?.product_name || "";
const isPro = productName.toLowerCase().includes("pro");
const isMax = productName.toLowerCase().includes("max");
const isStarter = productName.toLowerCase().includes("starter");
const isTeamPlan = productName.toLowerCase().includes("team") ?? false;
const isTeamPlan = productName.toLowerCase().includes("team");
const showUpgrade = !isMax && !isTeamPlan;
const showManage = (isPro || isMax || isStarter || isTeamPlan) && hasStripeAccount;

// Fetch team status only if user has team plan
// Fetch team status if user has team plan
const { data: teamStatus } = useQuery<TeamStatus>({
queryKey: ["teamStatus"],
queryFn: async () => {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/BillingStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ export function BillingStatus() {
const status = await billingService.getBillingStatus();
setBillingStatus(status);
return status;
},
enabled: !!os.auth.user
}
});

// Check if user has team plan
const isTeamPlan = billingStatus?.product_name?.toLowerCase().includes("team") ?? false;
const isTeamPlan = billingStatus?.product_name?.toLowerCase().includes("team");

// Fetch team status only if user has team plan
// Fetch team status if user has team plan
const { data: teamStatus } = useQuery<TeamStatus>({
queryKey: ["teamStatus"],
queryFn: async () => {
Expand Down
17 changes: 1 addition & 16 deletions frontend/src/components/ModelSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import { useLocalState } from "@/state/useLocalState";
import { useOpenSecret } from "@opensecret/react";
import { useEffect, useRef } from "react";
import { useNavigate } from "@tanstack/react-router";
import { useQuery } from "@tanstack/react-query";
import { getBillingService } from "@/billing/billingService";
import type { Model } from "openai/resources/models.js";

// Model configuration for display names, badges, and token limits
Expand Down Expand Up @@ -91,26 +89,13 @@ export function ModelSelector({
messages?: ChatMessage[];
draftImages?: File[];
}) {
const { model, setModel, availableModels, setAvailableModels, setBillingStatus } =
useLocalState();
const { model, setModel, availableModels, setAvailableModels, billingStatus } = useLocalState();
const os = useOpenSecret();
const navigate = useNavigate();
const isFetching = useRef(false);
const hasFetched = useRef(false);
const availableModelsRef = useRef(availableModels);

// Fetch billing status directly instead of relying on local state
const { data: billingStatus } = useQuery({
queryKey: ["billingStatus"],
queryFn: async () => {
const billingService = getBillingService();
const status = await billingService.getBillingStatus();
setBillingStatus(status);
return status;
},
enabled: !!os.auth.user
});

// Check if chat contains any images or if there are draft images
const chatHasImages =
draftImages.length > 0 ||
Expand Down
18 changes: 2 additions & 16 deletions frontend/src/routes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { TeamManagementDialog } from "@/components/team/TeamManagementDialog";
import { useQuery } from "@tanstack/react-query";
import { getBillingService } from "@/billing/billingService";
import type { TeamStatus } from "@/types/team";
import type { BillingStatus as BillingStatusType } from "@/billing/billingApi";

const homeVariants = cva("grid h-full w-full overflow-hidden", {
variants: {
Expand Down Expand Up @@ -70,27 +69,14 @@ function Index() {
const [isSidebarOpen, setIsSidebarOpen] = useState(false);
const [teamDialogOpen, setTeamDialogOpen] = useState(false);

// Fetch billing status first to check if user has team plan
const { data: billingStatus } = useQuery<BillingStatusType>({
queryKey: ["billingStatus"],
queryFn: async () => {
const billingService = getBillingService();
return await billingService.getBillingStatus();
},
enabled: !!os.auth.user
});

// Check if user has team plan
const isTeamPlan = billingStatus?.product_name?.toLowerCase().includes("team") ?? false;

// Fetch team status only if user has team plan
// Fetch team status for the dialog
const { data: teamStatus } = useQuery<TeamStatus>({
queryKey: ["teamStatus"],
queryFn: async () => {
const billingService = getBillingService();
return await billingService.getTeamStatus();
},
enabled: isTeamPlan && !!os.auth.user && !!billingStatus
enabled: !!os.auth.user

@greptile-apps greptile-apps Bot Aug 5, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

style: This now fetches team status for all authenticated users, not just team plan users. Consider adding a condition to only fetch when needed to avoid unnecessary API calls.

});

// Auto-open team dialog if team_setup is true
Expand Down
Loading