chore(clerk-js,types): Update PricingTable with trial info

.changeset/tender-planets-win.md

@@ -0,0 +1,7 @@
+---
+'@clerk/localizations': minor
+'@clerk/clerk-js': minor
+'@clerk/types': minor
+---
+
+Update PricingTable with trial info.

packages/clerk-js/src/core/resources/CommercePlan.ts

@@ -27,6 +27,8 @@ export class CommercePlan extends BaseResource implements CommercePlanResource {
   slug!: string;
   avatarUrl!: string;
   features!: CommerceFeature[];
+  freeTrialDays!: number | null;
+  freeTrialEnabled!: boolean;
 
   constructor(data: CommercePlanJSON) {
     super();
@@ -56,6 +58,8 @@ export class CommercePlan extends BaseResource implements CommercePlanResource {
     this.publiclyVisible = data.publicly_visible;
     this.slug = data.slug;
     this.avatarUrl = data.avatar_url;
+    this.freeTrialDays = this.withDefault(data.free_trial_days, null);
+    this.freeTrialEnabled = this.withDefault(data.free_trial_enabled, false);
     this.features = (data.features || []).map(feature => new CommerceFeature(feature));
 
     return this;

packages/clerk-js/src/core/resources/CommerceSubscription.ts

@@ -73,7 +73,7 @@ export class CommerceSubscriptionItem extends BaseResource implements CommerceSu
   credit?: {
     amount: CommerceMoney;
   };
-  isFreeTrial = false;
+  isFreeTrial!: boolean;
 
   constructor(data: CommerceSubscriptionItemJSON) {
     super();

packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx

@@ -147,6 +147,9 @@ function Card(props: CardProps) {
     } else if (planPeriod !== subscription.planPeriod && plan.annualMonthlyAmount > 0) {
       shouldShowFooter = true;
       shouldShowFooterNotice = false;
+    } else if (plan.freeTrialEnabled && subscription.isFreeTrial) {
+      shouldShowFooter = true;
+      shouldShowFooterNotice = true;
     } else {
       shouldShowFooter = false;
       shouldShowFooterNotice = false;
@@ -232,9 +235,13 @@ function Card(props: CardProps) {
               <Text
                 elementDescriptor={descriptors.pricingTableCardFooterNotice}
                 variant={isCompact ? 'buttonSmall' : 'buttonLarge'}
-                localizationKey={localizationKeys('badge__startsAt', {
-                  date: subscription?.periodStart,
-                })}
+                localizationKey={
+                  plan.freeTrialEnabled && subscription.isFreeTrial && subscription.periodEnd
+                    ? localizationKeys('badge__trialEndsAt', {
+                        date: subscription.periodEnd,
+                      })
+                    : localizationKeys('badge__startsAt', { date: subscription?.periodStart })
+                }
                 colorScheme='secondary'
                 sx={t => ({
                   paddingBlock: t.space.$1x5,

packages/clerk-js/src/ui/components/PricingTable/__tests__/PricingTable.test.tsx

@@ -0,0 +1,167 @@
+import { render, waitFor } from '../../../../testUtils';
+import { bindCreateFixtures } from '../../../utils/test/createFixtures';
+import { PricingTable } from '..';
+
+const { createFixtures } = bindCreateFixtures('PricingTable');
+
+describe('PricingTable - trial info', () => {
+  const trialPlan = {
+    id: 'plan_trial',
+    name: 'Pro',
+    amount: 2000,
+    amountFormatted: '20.00',
+    annualAmount: 20000,
+    annualAmountFormatted: '200.00',
+    annualMonthlyAmount: 1667,
+    annualMonthlyAmountFormatted: '16.67',
+    currencySymbol: '$',
+    description: 'Pro plan with trial',
+    hasBaseFee: true,
+    isRecurring: true,
+    currency: 'USD',
+    isDefault: false,
+    forPayerType: 'user',
+    publiclyVisible: true,
+    slug: 'pro',
+    avatarUrl: '',
+    features: [] as any[],
+    freeTrialEnabled: true,
+    freeTrialDays: 14,
+    __internal_toSnapshot: jest.fn(),
+    pathRoot: '',
+    reload: jest.fn(),
+  } as const;
+
+  it('shows footer notice with trial end date when active subscription is in free trial', async () => {
+    const { wrapper, fixtures, props } = await createFixtures(f => {
+      f.withUser({ email_addresses: ['[email protected]'] });
+    });
+
+    // Provide empty props to the PricingTable context
+    props.setProps({});
+
+    fixtures.clerk.billing.getPlans.mockResolvedValue({ data: [trialPlan as any], total_count: 1 });
+    fixtures.clerk.billing.getSubscription.mockResolvedValue({
+      id: 'sub_1',
+      status: 'active',
+      activeAt: new Date('2021-01-01'),
+      createdAt: new Date('2021-01-01'),
+      nextPayment: null,
+      pastDueAt: null,
+      updatedAt: null,
+      subscriptionItems: [
+        {
+          id: 'si_1',
+          plan: trialPlan,
+          createdAt: new Date('2021-01-01'),
+          paymentSourceId: 'src_1',
+          pastDueAt: null,
+          canceledAt: null,
+          periodStart: new Date('2021-01-01'),
+          periodEnd: new Date('2021-01-15'),
+          planPeriod: 'month' as const,
+          status: 'active' as const,
+          isFreeTrial: true,
+          cancel: jest.fn(),
+          pathRoot: '',
+          reload: jest.fn(),
+        },
+      ],
+      pathRoot: '',
+      reload: jest.fn(),
+    });
+
+    const { findByRole, getByText, userEvent } = render(<PricingTable />, { wrapper });
+
+    // Wait for the plan to appear
+    await findByRole('heading', { name: 'Pro' });
+
+    // Default period is annual in mounted mode; switch to monthly to match the subscription
+    const periodSwitch = await findByRole('switch', { name: /billed annually/i });
+    await userEvent.click(periodSwitch);
+
+    await waitFor(() => {
+      // Trial footer notice uses badge__trialEndsAt localization (short date format)
+      expect(getByText('Trial ends Jan 15, 2021')).toBeVisible();
+    });
+  });
+
+  it('shows CTA "Start N-day free trial" when eligible and plan has trial', async () => {
+    const { wrapper, fixtures, props } = await createFixtures(f => {
+      f.withUser({ email_addresses: ['[email protected]'] });
+    });
+
+    // Provide empty props to the PricingTable context
+    props.setProps({});
+
+    fixtures.clerk.billing.getPlans.mockResolvedValue({ data: [trialPlan as any], total_count: 1 });
+    fixtures.clerk.billing.getSubscription.mockResolvedValue({
+      id: 'sub_top',
+      status: 'active',
+      activeAt: new Date('2021-01-01'),
+      createdAt: new Date('2021-01-01'),
+      nextPayment: null,
+      pastDueAt: null,
+      updatedAt: null,
+      eligibleForFreeTrial: true,
+      // No subscription items for the trial plan yet
+      subscriptionItems: [],
+      pathRoot: '',
+      reload: jest.fn(),
+    });
+
+    const { getByRole, getByText } = render(<PricingTable />, { wrapper });
+
+    await waitFor(() => {
+      expect(getByRole('heading', { name: 'Pro' })).toBeVisible();
+      // Button text from Plans.buttonPropsForPlan via freeTrialOr
+      expect(getByText('Start 14-day free trial')).toBeVisible();
+    });
+  });
+
+  it('shows CTA "Start N-day free trial" when user is signed out and plan has trial', async () => {
+    const { wrapper, fixtures, props } = await createFixtures();
+
+    // Provide empty props to the PricingTable context
+    props.setProps({});
+
+    fixtures.clerk.billing.getPlans.mockResolvedValue({ data: [trialPlan as any], total_count: 1 });
+    // When signed out, getSubscription should throw or return empty response
+    fixtures.clerk.billing.getSubscription.mockRejectedValue(new Error('Unauthenticated'));
+
+    const { getByRole, getByText } = render(<PricingTable />, { wrapper });
+
+    await waitFor(() => {
+      expect(getByRole('heading', { name: 'Pro' })).toBeVisible();
+      // Signed out users should see free trial CTA when plan has trial enabled
+      expect(getByText('Start 14-day free trial')).toBeVisible();
+    });
+  });
+
+  it('shows CTA "Subscribe" when user is signed out and plan has no trial', async () => {
+    const { wrapper, fixtures, props } = await createFixtures();
+
+    const nonTrialPlan = {
+      ...trialPlan,
+      id: 'plan_no_trial',
+      name: 'Basic',
+      freeTrialEnabled: false,
+      freeTrialDays: 0,
+    };
+
+    // Provide empty props to the PricingTable context
+    props.setProps({});
+
+    fixtures.clerk.billing.getPlans.mockResolvedValue({ data: [nonTrialPlan as any], total_count: 1 });
+    // When signed out, getSubscription should throw or return empty response
+    fixtures.clerk.billing.getSubscription.mockRejectedValue(new Error('Unauthenticated'));
+
+    const { getByRole, getByText } = render(<PricingTable />, { wrapper });
+
+    await waitFor(() => {
+      expect(getByRole('heading', { name: 'Basic' })).toBeVisible();
+      // Signed out users should see regular "Subscribe" for non-trial plans
+      expect(getByText('Subscribe')).toBeVisible();
+    });
+  });
+});

packages/clerk-js/src/ui/contexts/components/Plans.tsx

@@ -108,7 +108,7 @@ export const usePlansContext = () => {
     return false;
   }, [clerk, subscriberType]);
 
-  const { subscriptionItems, revalidate: revalidateSubscriptions } = useSubscription();
+  const { subscriptionItems, revalidate: revalidateSubscriptions, data: topLevelSubscription } = useSubscription();
 
   // Invalidates cache but does not fetch immediately
   const { data: plans, revalidate: revalidatePlans } = usePlans({ mode: 'cache' });
@@ -187,6 +187,7 @@ export const usePlansContext = () => {
   const buttonPropsForPlan = useCallback(
     ({
       plan,
+      // TODO(@COMMERCE): This needs to be removed.
       subscription: sub,
       isCompact = false,
       selectedPlanPeriod = 'annual',
@@ -211,6 +212,19 @@ export const usePlansContext = () => {
 
       const isEligibleForSwitchToAnnual = (plan?.annualMonthlyAmount ?? 0) > 0;
 
+      const freeTrialOr = (localizationKey: LocalizationKey): LocalizationKey => {
+        if (plan?.freeTrialEnabled) {
+          // Show trial CTA if user is signed out OR if signed in and eligible for free trial
+          const isSignedOut = !session;
+          const isEligibleForTrial = topLevelSubscription?.eligibleForFreeTrial;
+
+          if (isSignedOut || isEligibleForTrial) {
+            return localizationKeys('commerce.startFreeTrial', { days: plan.freeTrialDays ?? 0 });
+          }
+        }
+        return localizationKey;
+      };
+
       const getLocalizationKey = () => {
         // Handle subscription cases
         if (subscription) {
@@ -246,20 +260,21 @@ export const usePlansContext = () => {
         // Handle non-subscription cases
         const hasNonDefaultSubscriptions =
           subscriptionItems.filter(subscription => !subscription.plan.isDefault).length > 0;
+
         return hasNonDefaultSubscriptions
           ? localizationKeys('commerce.switchPlan')
-          : localizationKeys('commerce.subscribe');
+          : freeTrialOr(localizationKeys('commerce.subscribe'));
       };
 
       return {
-        localizationKey: getLocalizationKey(),
+        localizationKey: freeTrialOr(getLocalizationKey()),
         variant: isCompact ? 'bordered' : 'solid',
         colorScheme: isCompact ? 'secondary' : 'primary',
         isDisabled: !canManageBilling,
         disabled: !canManageBilling,
       };
     },
-    [activeOrUpcomingSubscriptionWithPlanPeriod, canManageBilling, subscriptionItems],
+    [activeOrUpcomingSubscriptionWithPlanPeriod, canManageBilling, subscriptionItems, topLevelSubscription],
   );
 
   const captionForSubscription = useCallback((subscription: CommerceSubscriptionItemResource) => {

packages/localizations/src/ar-SA.ts

@@ -62,6 +62,7 @@ export const arSA: LocalizationResource = {
   badge__requiresAction: 'الإجراء المطلوب',
   badge__startsAt: undefined,
   badge__thisDevice: 'هذا الجهاز',
+  badge__trialEndsAt: undefined,
   badge__unverified: 'لم يتم التحقق منه',
   badge__upcomingPlan: undefined,
   badge__userDevice: 'جهاز المستخدم',
@@ -133,6 +134,7 @@ export const arSA: LocalizationResource = {
     },
     reSubscribe: undefined,
     seeAllFeatures: undefined,
+    startFreeTrial: undefined,
     subscribe: undefined,
     subscriptionDetails: {
       beginsOn: undefined,
@@ -786,6 +788,26 @@ export const arSA: LocalizationResource = {
   },
   socialButtonsBlockButton: 'للمتابعة مع {{provider|titleize}}',
   socialButtonsBlockButtonManyInView: '{{provider|titleize}}',
+  taskChooseOrganization: {
+    chooseOrganization: {
+      action__createOrganization: undefined,
+      action__invitationAccept: undefined,
+      action__suggestionsAccept: undefined,
+      subtitle: undefined,
+      suggestionsAcceptedLabel: undefined,
+      title: undefined,
+    },
+    createOrganization: {
+      formButtonReset: undefined,
+      formButtonSubmit: undefined,
+      subtitle: undefined,
+      title: undefined,
+    },
+    signOut: {
+      actionLink: undefined,
+      actionText: undefined,
+    },
+  },
   unstable__errors: {
     already_a_member_in_organization: undefined,
     captcha_invalid:

packages/localizations/src/be-BY.ts

@@ -62,6 +62,7 @@ export const beBY: LocalizationResource = {
   badge__requiresAction: 'Патрабуецца дзеянне',
   badge__startsAt: undefined,
   badge__thisDevice: 'Гэта прылада',
+  badge__trialEndsAt: undefined,
   badge__unverified: 'Не верыфікавана',
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Карыстальніцкая прылада',
@@ -133,6 +134,7 @@ export const beBY: LocalizationResource = {
     },
     reSubscribe: undefined,
     seeAllFeatures: undefined,
+    startFreeTrial: undefined,
     subscribe: undefined,
     subscriptionDetails: {
       beginsOn: undefined,
@@ -793,6 +795,26 @@ export const beBY: LocalizationResource = {
   },
   socialButtonsBlockButton: 'Працягнуць з дапамогай {{provider|titleize}}',
   socialButtonsBlockButtonManyInView: undefined,
+  taskChooseOrganization: {
+    chooseOrganization: {
+      action__createOrganization: undefined,
+      action__invitationAccept: undefined,
+      action__suggestionsAccept: undefined,
+      subtitle: undefined,
+      suggestionsAcceptedLabel: undefined,
+      title: undefined,
+    },
+    createOrganization: {
+      formButtonReset: undefined,
+      formButtonSubmit: undefined,
+      subtitle: undefined,
+      title: undefined,
+    },
+    signOut: {
+      actionLink: undefined,
+      actionText: undefined,
+    },
+  },
   unstable__errors: {
     already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
     captcha_invalid: