Skip to content

The open alternative to Salesforce, designed for AI.

feat(billing): show what each seat includes and where workspace credits come from (#29202)

Etiennef1475bb69c4b
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
index 3eef08a2ffc..1baef33dca8 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
@@ -19,7 +19,7 @@ import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { styled } from '@linaria/react';
-import { plural, t } from '@lingui/core/macro';
+import { t } from '@lingui/core/macro';
import { DOCUMENTATION_PATHS } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
@@ -171,7 +171,6 @@ export const SettingsBillingCreditsSection = ({
workspaceCreditsTotalGranted,
workspaceCreditsExtraGranted,
workspaceCreditsGrantedForSeats,
- workspaceCreditsSeats,
} = getResourceCreditUsage();
const intervalLabel = getIntervalLabel(isMonthlyPlan);
@@ -222,10 +221,17 @@ export const SettingsBillingCreditsSection = ({
const seatCreditsDisplay = formatNumber(workspaceCreditsGrantedForSeats, {
decimals: 2,
});
- const seatCreditsLabel = plural(workspaceCreditsSeats, {
- one: `Includes ${seatCreditsDisplay} credits for # seat, reset each period`,
- other: `Includes ${seatCreditsDisplay} credits for # seats, reset each period`,
+ const packageCreditsDisplay = formatNumber(displayedPackageCredits, {
+ decimals: 2,
});
+ const seatCreditsLabel =
+ displayedPackageCredits > 0
+ ? isMonthlyPlan
+ ? t`${seatCreditsDisplay} from seats, reset each month · ${packageCreditsDisplay} from your credit pack, roll over`
+ : t`${seatCreditsDisplay} from seats, reset each year · ${packageCreditsDisplay} from your credit pack, roll over`
+ : isMonthlyPlan
+ ? t`${seatCreditsDisplay} from seats, reset each month`
+ : t`${seatCreditsDisplay} from seats, reset each year`;
const remainingCreditsPercentageDisplay = formatNumber(
clampedRemainingCreditsPercentage,
{ decimals: 0 },
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
index 144f72c72d0..7694ba3c292 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
@@ -5,6 +5,7 @@ import { SettingsBillingSubscriptionInfoCard } from '@/settings/billing/componen
import { SettingsBillingSubscriptionInfoCardHeaderActions } from '@/settings/billing/components/internal/SettingsBillingSubscriptionInfoCardHeaderActions';
import { SettingsBillingSubscriptionInfoModals } from '@/settings/billing/components/internal/SettingsBillingSubscriptionInfoModals';
import { BILLING_MODAL_IDS } from '@/settings/billing/constants/BillingModalIds';
+import { SETTINGS_BILLING_PERSONAL_AI_USAGE_COMPARISON_ROW } from '@/settings/billing/constants/SettingsBillingPersonalAiUsageComparisonRow';
import { useApplyBillingSubscriptionChange } from '@/settings/billing/hooks/useApplyBillingSubscriptionChange';
import { useApplyCurrentWorkspaceBillingUpdate } from '@/settings/billing/hooks/useApplyCurrentWorkspaceBillingUpdate';
import { useBillingSubscriptionChangeWording } from '@/settings/billing/hooks/useBillingSubscriptionChangeWording';
@@ -28,12 +29,18 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
+import { plural } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import { Section } from 'twenty-ui/components/layout';
-import { IconClockPlay, IconCoins, IconTag } from 'twenty-ui/icon';
+import {
+ IconClockPlay,
+ IconCoins,
+ IconSparkles,
+ IconTag,
+} from 'twenty-ui/icon';
import {
CancelSwitchResourceCreditPriceDocument,
PermissionFlagType,
@@ -59,7 +66,7 @@ export const SettingsBillingSubscriptionInfo = ({
onUpdatePayment: () => void;
isUpdatePaymentDisabled: boolean;
}) => {
- const { t } = useLingui();
+ const { i18n, t } = useLingui();
const { formatNumber } = useNumberFormat();
const { openDialog } = useDialog();
@@ -68,7 +75,11 @@ export const SettingsBillingSubscriptionInfo = ({
const { applyCurrentWorkspaceBillingUpdate } =
useApplyCurrentWorkspaceBillingUpdate();
- const { refetchResourceCreditUsage } = useGetResourceCreditUsage();
+ const {
+ refetchResourceCreditUsage,
+ isGetResourceCreditUsageQueryLoaded,
+ getResourceCreditUsage,
+ } = useGetResourceCreditUsage();
const { currentResourceCreditBillingPrice } = useCurrentResourceCredit();
@@ -251,8 +262,13 @@ export const SettingsBillingSubscriptionInfo = ({
const creditsSubtotalValue = isDefined(creditsSubtotalDisplay)
? `$${creditsSubtotalDisplay}`
: '-';
- const creditsSubtotalDetails = isDefined(currentCreditsByPeriod)
- ? t`(${formatNumber(currentCreditsByPeriod, { decimals: 2 })} credits)`
+ const currentCreditsByPeriodDisplay = isDefined(currentCreditsByPeriod)
+ ? formatNumber(currentCreditsByPeriod, { decimals: 2 })
+ : undefined;
+ const creditsSubtotalDetails = isDefined(currentCreditsByPeriodDisplay)
+ ? currentInterval === SubscriptionInterval.Month
+ ? t`(${currentCreditsByPeriodDisplay} credits/month)`
+ : t`(${currentCreditsByPeriodDisplay} credits/year)`
: undefined;
const totalValue = isDefined(totalDisplay) ? `$${totalDisplay}` : '-';
const totalIntervalSubtitle = isDefined(totalDisplay)
@@ -319,6 +335,52 @@ export const SettingsBillingSubscriptionInfo = ({
]
: []),
];
+
+ const personalAiUsageCell =
+ SETTINGS_BILLING_PERSONAL_AI_USAGE_COMPARISON_ROW.plans[
+ currentPlan.planKey
+ ];
+
+ const resourceCreditUsage = isGetResourceCreditUsageQueryLoaded
+ ? getResourceCreditUsage()
+ : undefined;
+ const workspaceCreditsPerSeatPerMonth =
+ isDefined(resourceCreditUsage) &&
+ resourceCreditUsage.workspaceCreditsSeats > 0
+ ? resourceCreditUsage.workspaceCreditsGrantedForSeats /
+ resourceCreditUsage.workspaceCreditsSeats /
+ (currentInterval === SubscriptionInterval.Year ? 12 : 1)
+ : 0;
+ const workspaceCreditsPerSeatPerMonthDisplay = formatNumber(
+ workspaceCreditsPerSeatPerMonth,
+ { decimals: 2 },
+ );
+
+ const includedPerSeatItems = [
+ ...(currentBillingSubscription.hasUserCredits &&
+ personalAiUsageCell.kind === 'text'
+ ? [
+ {
+ Icon: IconSparkles,
+ label: t`Personal AI usage`,
+ value: i18n._(personalAiUsageCell.text),
+ },
+ ]
+ : []),
+ ...(workspaceCreditsPerSeatPerMonth > 0
+ ? [
+ {
+ Icon: IconCoins,
+ label: t`Workspace credits`,
+ value: plural(workspaceCreditsPerSeatPerMonth, {
+ one: `${workspaceCreditsPerSeatPerMonthDisplay} credit/month`,
+ other: `${workspaceCreditsPerSeatPerMonthDisplay} credits/month`,
+ }),
+ },
+ ]
+ : []),
+ ];
+
const [isCancellingMeteredSwitch, setIsCancellingMeteredSwitch] =
useState(false);
@@ -430,6 +492,7 @@ export const SettingsBillingSubscriptionInfo = ({
shouldUpdatePayment={shouldUpdatePayment}
/>
}
+ includedPerSeatItems={includedPerSeatItems}
isSubscriptionActionDisabled={isSubscriptionActionDisabled}
onSwitchToMonthly={() =>
openDialog(BILLING_MODAL_IDS.switchBillingIntervalToMonthly)
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
index 26041766971..a871bb6854b 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
@@ -58,6 +58,11 @@ const StyledScheduledChangeItem = styled.div`
}
`;
+const StyledIncludedBillingItem = styled(StyledScheduledChangeItem)`
+ gap: ${themeCssVariables.spacing[3]};
+ grid-template-columns: max-content minmax(0, 1fr);
+`;
+
type BillingFieldRowProps = {
Icon: IconComponent;
label: string;
@@ -105,3 +110,23 @@ export const ScheduledBillingChangeField = ({
</StyledScheduledChangeItem>
);
};
+
+export type IncludedBillingFieldProps = ScheduledBillingChangeFieldProps;
+
+export const IncludedBillingField = ({
+ Icon,
+ label,
+ value,
+}: IncludedBillingFieldProps) => {
+ const theme = useTheme();
+
+ return (
+ <StyledIncludedBillingItem>
+ <StyledBillingFieldLabel>
+ <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
+ {label}
+ </StyledBillingFieldLabel>
+ <StyledBillingFieldValue>{value}</StyledBillingFieldValue>
+ </StyledIncludedBillingItem>
+ );
+};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCard.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCard.tsx
index 68dc9e5d3ce..ac67567cb9d 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCard.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCard.tsx
@@ -1,5 +1,7 @@
import {
BillingFieldRow,
+ IncludedBillingField,
+ type IncludedBillingFieldProps,
ScheduledBillingChangeField,
type ScheduledBillingChangeFieldProps,
} from '@/settings/billing/components/internal/SettingsBillingCardField';
@@ -184,6 +186,7 @@ type SettingsBillingSubscriptionInfoCardProps = {
currentIntervalLabel: string;
displayedSubscriptionDate?: string;
headerActions: ReactNode;
+ includedPerSeatItems: IncludedBillingFieldProps[];
isSubscriptionActionDisabled: boolean;
onSwitchToMonthly: () => void;
onSwitchToYearly: () => void;
@@ -214,6 +217,7 @@ export const SettingsBillingSubscriptionInfoCard = ({
currentIntervalLabel,
displayedSubscriptionDate,
headerActions,
+ includedPerSeatItems,
isSubscriptionActionDisabled,
onSwitchToMonthly,
onSwitchToYearly,
@@ -232,6 +236,7 @@ export const SettingsBillingSubscriptionInfoCard = ({
}: SettingsBillingSubscriptionInfoCardProps) => {
const { t } = useLingui();
const hasScheduledChange = scheduledChangeItems.length > 0;
+ const hasIncludedPerSeatItems = includedPerSeatItems.length > 0;
return (
<StyledSettingsBillingCard>
@@ -305,7 +310,7 @@ export const SettingsBillingSubscriptionInfoCard = ({
<StyledSecondaryText>{seatsSubtotalDetails}</StyledSecondaryText>
)}
</BillingFieldRow>
- <BillingFieldRow label={t`Credits`} Icon={IconCoins}>
+ <BillingFieldRow label={t`Credit pack`} Icon={IconCoins}>
{creditsSubtotalValue}
{creditsSubtotalDetails && (
<StyledSecondaryText>
@@ -321,6 +326,25 @@ export const SettingsBillingSubscriptionInfoCard = ({
</BillingFieldRow>
</StyledBillingFieldListWithDivider>
</StyledSettingsBillingCardGridBody>
+ {hasIncludedPerSeatItems && (
+ <>
+ <StyledScheduledChangeHeader>
+ <StyledScheduledChangeTitle>
+ {t`Included per seat`}
+ </StyledScheduledChangeTitle>
+ </StyledScheduledChangeHeader>
+ <StyledScheduledChangeGrid columns={includedPerSeatItems.length}>
+ {includedPerSeatItems.map((includedPerSeatItem) => (
+ <IncludedBillingField
+ Icon={includedPerSeatItem.Icon}
+ key={includedPerSeatItem.label}
+ label={includedPerSeatItem.label}
+ value={includedPerSeatItem.value}
+ />
+ ))}
+ </StyledScheduledChangeGrid>
+ </>
+ )}
{hasScheduledChange && (
<>
<StyledScheduledChangeHeader>
diff --git a/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPersonalAiUsageComparisonRow.ts b/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPersonalAiUsageComparisonRow.ts
new file mode 100644
index 00000000000..5ec7cb0111a
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPersonalAiUsageComparisonRow.ts
@@ -0,0 +1,24 @@
+import { msg } from '@lingui/core/macro';
+
+import { type SettingsBillingPlanComparisonFeatureRow } from '@/settings/billing/types/SettingsBillingPlanComparison';
+import { BillingPlanKey } from '~/generated-metadata/graphql';
+
+export const SETTINGS_BILLING_PERSONAL_AI_USAGE_COMPARISON_ROW: SettingsBillingPlanComparisonFeatureRow =
+ {
+ featureLabel: msg`Personal AI usage`,
+ plans: {
+ [BillingPlanKey.ENTERPRISE]: { kind: 'excluded' },
+ [BillingPlanKey.ORGANIZATION_V2]: {
+ detail: msg`per member`,
+ kind: 'text',
+ text: msg`≈ 500 AI tasks/week`,
+ },
+ [BillingPlanKey.PRO]: { kind: 'excluded' },
+ [BillingPlanKey.PRO_V2]: {
+ detail: msg`per member`,
+ kind: 'text',
+ text: msg`≈ 100 AI tasks/week`,
+ },
+ },
+ type: 'feature',
+ };
diff --git a/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPlanComparisonRows.ts b/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPlanComparisonRows.ts
index bf9cee83d24..cab781946e2 100644
--- a/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPlanComparisonRows.ts
+++ b/packages/twenty-front/src/modules/settings/billing/constants/SettingsBillingPlanComparisonRows.ts
@@ -1,28 +1,12 @@
import { msg } from '@lingui/core/macro';
+import { SETTINGS_BILLING_PERSONAL_AI_USAGE_COMPARISON_ROW } from '@/settings/billing/constants/SettingsBillingPersonalAiUsageComparisonRow';
import { type SettingsBillingPlanComparisonRow } from '@/settings/billing/types/SettingsBillingPlanComparison';
import { BillingPlanKey } from '~/generated-metadata/graphql';
export const SETTINGS_BILLING_PLAN_COMPARISON_ROWS = [
{ title: msg`Plan essentials`, type: 'category' },
- {
- featureLabel: msg`Personal AI usage`,
- plans: {
- [BillingPlanKey.ENTERPRISE]: { kind: 'excluded' },
- [BillingPlanKey.ORGANIZATION_V2]: {
- detail: msg`per member`,
- kind: 'text',
- text: msg`≈ 500 AI tasks/week`,
- },
- [BillingPlanKey.PRO]: { kind: 'excluded' },
- [BillingPlanKey.PRO_V2]: {
- detail: msg`per member`,
- kind: 'text',
- text: msg`≈ 100 AI tasks/week`,
- },
- },
- type: 'feature',
- },
+ SETTINGS_BILLING_PERSONAL_AI_USAGE_COMPARISON_ROW,
{
featureLabel: msg`Workspace credits`,
plans: {