From f760a8ac26cfa4f1bc627a042685b8349a4184cd Mon Sep 17 00:00:00 2001 From: Lauris Skraucis Date: Thu, 20 Jun 2024 12:27:42 +0200 Subject: [PATCH] refactor: only check platform billing for platforms (#15507) --- .../settings/platform/hooks/useGetUserAttributes.ts | 3 ++- .../settings/platform/oauth-clients/usePersistOAuthClient.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/web/components/settings/platform/hooks/useGetUserAttributes.ts b/apps/web/components/settings/platform/hooks/useGetUserAttributes.ts index eac06df5f4..8e5d0e5c67 100644 --- a/apps/web/components/settings/platform/hooks/useGetUserAttributes.ts +++ b/apps/web/components/settings/platform/hooks/useGetUserAttributes.ts @@ -4,7 +4,8 @@ import { useCheckTeamBilling } from "@calcom/web/lib/hooks/settings/platform/oau export const useGetUserAttributes = () => { const { data: user, isLoading: isUserLoading } = useMeQuery(); const { data: userBillingData, isFetching: isUserBillingDataLoading } = useCheckTeamBilling( - user?.organizationId + user?.organizationId, + user?.organization.isPlatform ); const isPlatformUser = user?.organization.isPlatform; const isPaidUser = userBillingData?.valid; diff --git a/apps/web/lib/hooks/settings/platform/oauth-clients/usePersistOAuthClient.ts b/apps/web/lib/hooks/settings/platform/oauth-clients/usePersistOAuthClient.ts index 5e3d3afa52..9d28620110 100644 --- a/apps/web/lib/hooks/settings/platform/oauth-clients/usePersistOAuthClient.ts +++ b/apps/web/lib/hooks/settings/platform/oauth-clients/usePersistOAuthClient.ts @@ -119,7 +119,7 @@ export const useDeleteOAuthClient = ( return mutation; }; -export const useCheckTeamBilling = (teamId?: number | null) => { +export const useCheckTeamBilling = (teamId?: number | null, isPlatformTeam?: boolean | null) => { const QUERY_KEY = "check-team-billing"; const isTeamBilledAlready = useQuery({ queryKey: [QUERY_KEY, teamId], @@ -132,7 +132,7 @@ export const useCheckTeamBilling = (teamId?: number | null) => { return data.data; }, - enabled: !!teamId, + enabled: !!teamId && !!isPlatformTeam, }); return isTeamBilledAlready;