The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[Onboarding 8/10] Redesign plan step (#26783)
Thomas des Francs6ecdbde5f064
diff --git a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.tsdeleted file mode 100644index c38450c65cf..00000000000--- a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.ts+++ /dev/null@@ -1,9 +0,0 @@-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme';--export const StyledOnboardingStepTagsRow = styled.div`- display: flex;- flex-wrap: wrap;- gap: ${themeCssVariables.spacing[1]};- padding-top: ${themeCssVariables.spacing[1]};-`;diff --git a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsChange.tsx b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsChange.tsxindex e6e265b7985..85dae7e50cb 100644--- a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsChange.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsChange.tsx@@ -7,16 +7,22 @@ const StyledChange = styled(motion.span)`color: ${themeCssVariables.color.green9};font-size: ${themeCssVariables.font.size.md};font-weight: ${themeCssVariables.font.weight.medium};++ &[data-lost] {+ color: ${themeCssVariables.font.color.tertiary};+ }`;type OnboardingFreeCreditsChangeProps = {label: string;+ isLost?: boolean;delay: number;onDisplayed: () => void;};export const OnboardingFreeCreditsChange = ({label,+ isLost = false,delay,onDisplayed,}: OnboardingFreeCreditsChangeProps) => {@@ -25,18 +31,21 @@ export const OnboardingFreeCreditsChange = ({const fadeInDuration = theme.animation.duration.normal;const fadeOutDuration = theme.animation.duration.fast;- const displayDuration =- ONBOARDING_NEWLY_EARNED_CREDITS_DISPLAY_DURATION_S + fadeOutDuration;+ const visibleDuration = isLost+ ? theme.animation.duration.slow+ : ONBOARDING_NEWLY_EARNED_CREDITS_DISPLAY_DURATION_S;+ const displayDuration = visibleDuration + fadeOutDuration;const fadeTimes = [0,fadeInDuration / displayDuration,- ONBOARDING_NEWLY_EARNED_CREDITS_DISPLAY_DURATION_S / displayDuration,+ visibleDuration / displayDuration,1,];const slideOffset = shouldReduceMotion ? 0 : theme.spacingMultiplicator * 2;return (<StyledChange+ data-lost={isLost || undefined}variants={{hidden: {opacity: 0,diff --git a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsxindex 84552e3902d..73ba6266b78 100644--- a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx@@ -7,11 +7,13 @@ import { StyledOnboardingFreeCreditsLabel } from '@/onboarding/components/free-cimport { StyledOnboardingFreeCreditsText } from '@/onboarding/components/free-credits/StyledOnboardingFreeCreditsText';import { useOnboardingFreeCreditsTooltipContent } from '@/onboarding/hooks/useOnboardingFreeCreditsTooltipContent';import { useMarkOnboardingFreeCreditsAsSeen } from '@/onboarding/hooks/useMarkOnboardingFreeCreditsAsSeen';+import { onboardingUpgradeTrialLostCreditsState } from '@/onboarding/states/onboardingUpgradeTrialLostCreditsState';import { type OnboardingCreditsProgress } from '@/onboarding/types/OnboardingCreditsProgress';import { formatOnboardingCredits } from '@/onboarding/utils/formatOnboardingCredits';import { currentFocusedItemSelector } from '@/ui/utilities/focus/states/currentFocusedItemSelector';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { styled } from '@linaria/react';import { plural } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';@@ -140,9 +142,13 @@ export const OnboardingFreeCreditsPill = ({currentStepCredits,seenCredits,newlyEarnedCredits,+ lostCredits,isFirstCreditsGain,} = progress;const markCreditsAsSeen = useMarkOnboardingFreeCreditsAsSeen();+ const setOnboardingUpgradeTrialLostCredits = useSetAtomState(+ onboardingUpgradeTrialLostCreditsState,+ );const tooltipContent = useOnboardingFreeCreditsTooltipContent({currentStep,newlyEarnedCredits,@@ -159,6 +165,10 @@ export const OnboardingFreeCreditsPill = ({numberFormat,);+ const creditsChangeDelay = hasTrackGrown+ ? theme.animation.duration.normal+ : theme.animation.duration.normal * 2;+const tooltipSlideOffset = shouldReduceMotion? 0: theme.spacingMultiplicator;@@ -170,15 +180,22 @@ export const OnboardingFreeCreditsPill = ({<OnboardingFreeCreditsChangekey={newlyEarnedCredits}label={`+${formatOnboardingCredits(newlyEarnedCredits, numberFormat)}`}- delay={- hasTrackGrown- ? theme.animation.duration.normal- : theme.animation.duration.normal * 2- }+ delay={creditsChangeDelay}onDisplayed={markCreditsAsSeen}/>)}</AnimatePresence>+ <AnimatePresence>+ {lostCredits > 0 && (+ <OnboardingFreeCreditsChange+ key={`lost-${lostCredits}`}+ label={`−${formatOnboardingCredits(lostCredits, numberFormat)}`}+ isLost+ delay={creditsChangeDelay}+ onDisplayed={() => setOnboardingUpgradeTrialLostCredits(0)}+ />+ )}+ </AnimatePresence><StyledPillAnchor ref={pillRef}><Popover.RootonOpenChange={(open) => {diff --git a/packages/twenty-front/src/modules/onboarding/components/free-credits/__stories__/OnboardingHeaderFreeCredits.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/free-credits/__stories__/OnboardingHeaderFreeCredits.stories.tsxindex 950164b64e4..0517e14d5a9 100644--- a/packages/twenty-front/src/modules/onboarding/components/free-credits/__stories__/OnboardingHeaderFreeCredits.stories.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/free-credits/__stories__/OnboardingHeaderFreeCredits.stories.tsx@@ -14,6 +14,7 @@ import { workspaceMemberFormatPreferencesState } from '@/localization/states/worimport { OnboardingHeaderFreeCredits } from '@/onboarding/components/free-credits/OnboardingHeaderFreeCredits';import { ONBOARDING_FREE_CREDITS_DEFAULT_VALUE } from '@/onboarding/constants/OnboardingFreeCreditsDefaultValue';import { onboardingFreeCreditsFamilyState } from '@/onboarding/states/onboardingFreeCreditsFamilyState';+import { onboardingUpgradeTrialLostCreditsState } from '@/onboarding/states/onboardingUpgradeTrialLostCreditsState';import { type OnboardingFreeCredits } from '@/onboarding/types/OnboardingFreeCredits';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { OnboardingStatus } from '~/generated-metadata/graphql';@@ -57,6 +58,7 @@ const seedOnboardingFreeCredits = ({...onboardingFreeCredits,},);+ jotaiStore.set(onboardingUpgradeTrialLostCreditsState.atom, 0);};const findVisibleTooltip = async (canvasElement: HTMLElement, text: string) => {@@ -196,6 +198,38 @@ export const NewlyEarned: Story = {},};+export const LostUpgradeCredits: Story = {+ beforeEach: () => {+ seedOnboardingFreeCredits({+ onboardingStatus: OnboardingStatus.PLAN_REQUIRED,+ onboardingFreeCredits: {+ importContacts: 1,+ upgradeTrial: 2,+ seenCredits: 3,+ },+ });+ },+ play: async ({ canvasElement }) => {+ await within(canvasElement).findByRole('button', {+ name: /free credits/,+ });++ jotaiStore.set(+ onboardingFreeCreditsFamilyState.atomFamily(mockCurrentWorkspace.id),+ (onboardingFreeCredits) => ({+ ...onboardingFreeCredits,+ upgradeTrial: 0,+ seenCredits: 1,+ }),+ );+ jotaiStore.set(onboardingUpgradeTrialLostCreditsState.atom, 2);++ await expect(+ await within(canvasElement).findByText('−2'),+ ).toBeInTheDocument();+ },+};+export const CreditsWorth: Story = {beforeEach: () => {seedOnboardingFreeCredits({diff --git a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanCard.tsx b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanCard.tsxindex 5ab610a20c0..bee530bbf65 100644--- a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanCard.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanCard.tsx@@ -1,4 +1,5 @@import { styled } from '@linaria/react';+import { isNonEmptyString } from '@sniptt/guards';import { isValidElement, type ReactNode, useId } from 'react';import { isDefined } from 'twenty-shared/utils';import { Radio } from 'twenty-ui/primitives/input';@@ -16,7 +17,6 @@ const StyledCard = styled.div``;const StyledHeader = styled.label<{ hasBody: boolean; hasNote: boolean }>`- align-items: center;background-color: transparent;border: none;border-bottom: ${({ hasBody }) =>@@ -24,29 +24,36 @@ const StyledHeader = styled.label<{ hasBody: boolean; hasNote: boolean }>`box-sizing: border-box;cursor: pointer;display: flex;- gap: ${themeCssVariables.spacing[1]};+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};padding: ${({ hasNote }) =>hasNote? `${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]}`: themeCssVariables.spacing[3]};- position: relative;text-align: left;width: 100%;`;-const StyledHeaderLeft = styled.div<{ hasNote: boolean }>`+const StyledTitleRow = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[1]};+`;++const StyledTitleContent = styled.div`+ align-items: center;display: flex;flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};+ flex-wrap: wrap;+ gap: ${themeCssVariables.spacing[1]};min-width: 0;- padding-right: ${({ hasNote }) =>- hasNote ? themeCssVariables.spacing[8] : '0'};`;-const StyledTitleRow = styled.div`- align-items: center;+const StyledTitleText = styled.div`+ align-items: baseline;display: flex;+ flex: 1 0 auto;+ flex-wrap: wrap;gap: ${themeCssVariables.spacing[1]};`;@@ -80,13 +87,6 @@ const StyledNote = styled.span`line-height: 1.4;`;-const StyledHeaderRight = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- min-height: ${themeCssVariables.spacing[6]};-`;-const StyledBadge = styled.span`align-items: center;background-color: ${themeCssVariables.grayScale.gray3};@@ -106,21 +106,24 @@ const StyledRadioContainer = styled.div`display: flex;height: ${themeCssVariables.spacing[6]};justify-content: center;- position: absolute;- right: ${themeCssVariables.spacing[2]};- top: ${themeCssVariables.spacing[2]};width: ${themeCssVariables.spacing[6]};`;+const StyledTags = styled.span`+ display: contents;+`;+const StyledBody = styled.div`display: flex;flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;type OnboardingPlanCardProps = {title: string;titleSuffix?: string;+ tags?: ReactNode;note?: string;badge?: string;value: boolean;@@ -130,6 +133,7 @@ type OnboardingPlanCardProps = {export const OnboardingPlanCard = ({title,titleSuffix,+ tags,note,badge,value,@@ -137,37 +141,41 @@ export const OnboardingPlanCard = ({}: OnboardingPlanCardProps) => {const titleId = useId();const noteId = useId();+ const tagsId = useId();const hasBody = isValidElement(children);const hasNote = isDefined(note);+ const hasTags = isDefined(tags);+ const describedByIds = [hasTags ? tagsId : null, hasNote ? noteId : null]+ .filter(isDefined)+ .join(' ');return (<StyledCard><StyledHeader hasBody={hasBody} hasNote={hasNote}>- <StyledHeaderLeft hasNote={hasNote}>- <StyledTitleRow>- <StyledTitle id={titleId}>{title}</StyledTitle>- {isDefined(titleSuffix) && (- <StyledTitleSuffix isEmphasized={hasNote}>- {titleSuffix}- </StyledTitleSuffix>- )}- </StyledTitleRow>- {hasNote && <StyledNote id={noteId}>{note}</StyledNote>}- </StyledHeaderLeft>- {hasNote ? (+ <StyledTitleRow>+ <StyledTitleContent>+ <StyledTitleText>+ <StyledTitle id={titleId}>{title}</StyledTitle>+ {isDefined(titleSuffix) && (+ <StyledTitleSuffix isEmphasized={hasNote}>+ {titleSuffix}+ </StyledTitleSuffix>+ )}+ </StyledTitleText>+ {hasTags && <StyledTags id={tagsId}>{tags}</StyledTags>}+ {isDefined(badge) && <StyledBadge>{badge}</StyledBadge>}+ </StyledTitleContent><StyledRadioContainer><Radiovalue={value}aria-labelledby={titleId}- aria-describedby={noteId}+ aria-describedby={+ isNonEmptyString(describedByIds) ? describedByIds : undefined+ }/></StyledRadioContainer>- ) : (- <StyledHeaderRight>- {isDefined(badge) && <StyledBadge>{badge}</StyledBadge>}- <Radio value={value} aria-labelledby={titleId} />- </StyledHeaderRight>- )}+ </StyledTitleRow>+ {hasNote && <StyledNote id={noteId}>{note}</StyledNote>}</StyledHeader>{hasBody && <StyledBody>{children}</StyledBody>}</StyledCard>diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsx b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanTag.tsxsimilarity index 59%rename from packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsxrename to packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanTag.tsxindex 2dfda8d48c9..2e0c8ef4e1a 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingPlanTag.tsx@@ -1,13 +1,13 @@import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { IconCoins } from 'twenty-ui/icon';+import { isDefined } from 'twenty-shared/utils';+import { type IconComponent } from 'twenty-ui/icon';import { themeCssVariables, useTheme } from 'twenty-ui/theme';const StyledTag = styled.div`align-items: center;background-color: ${themeCssVariables.color.green3};border: 1px solid ${themeCssVariables.color.green4};- border-radius: ${themeCssVariables.border.radius.xxl};+ border-radius: ${themeCssVariables.border.radius.pill};box-sizing: border-box;color: ${themeCssVariables.color.green9};corner-shape: round;@@ -19,37 +19,33 @@ const StyledTag = styled.div``;const StyledLabel = styled.span`- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.medium};- line-height: 1.4;-`;--const StyledSuffix = styled.span`font-size: ${themeCssVariables.font.size.sm};font-weight: ${themeCssVariables.font.weight.regular};- line-height: 1.4;`;-type OnboardingCreditsRewardTagProps = {- amount: number;+const StyledValue = styled.span`+ font-size: ${themeCssVariables.font.size.md};+ font-weight: ${themeCssVariables.font.weight.medium};+`;++type OnboardingPlanTagProps = {+ Icon: IconComponent;+ value: string;suffix?: string;};-export const OnboardingCreditsRewardTag = ({- amount,+export const OnboardingPlanTag = ({+ Icon,+ value,suffix,-}: OnboardingCreditsRewardTagProps) => {- const { t } = useLingui();+}: OnboardingPlanTagProps) => {const theme = useTheme();return (<StyledTag>- <IconCoins- size={theme.icon.size.md}- color={themeCssVariables.color.green9}- />- <StyledLabel>{t`Earn +${amount}`}</StyledLabel>- <StyledSuffix>{suffix ?? t`free credits`}</StyledSuffix>+ <Icon size={theme.icon.size.md} color={themeCssVariables.color.green9} />+ <StyledValue>{value}</StyledValue>+ {isDefined(suffix) && <StyledLabel>{suffix}</StyledLabel>}</StyledTag>);};diff --git a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingTrialExtensionTag.tsx b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingTrialExtensionTag.tsxdeleted file mode 100644index 7f672b5038a..00000000000--- a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/OnboardingTrialExtensionTag.tsx+++ /dev/null@@ -1,57 +0,0 @@-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { IconCalendarEvent } from 'twenty-ui/icon';-import { themeCssVariables, useTheme } from 'twenty-ui/theme';--const StyledTag = styled.div`- align-items: center;- background-color: ${themeCssVariables.color.green3};- border: 1px solid ${themeCssVariables.color.green4};- border-radius: ${themeCssVariables.border.radius.pill};- box-sizing: border-box;- color: ${themeCssVariables.color.green9};- corner-shape: round;- display: flex;- gap: ${themeCssVariables.spacing[1]};- height: ${themeCssVariables.spacing[6]};- padding: 0 ${themeCssVariables.spacing[2]} 0- ${themeCssVariables.spacing['1.5']};-`;--const StyledPrefix = styled.span`- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.regular};-`;--const StyledDuration = styled.span`- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.medium};-`;--const StyledSuffix = styled.span`- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.regular};-`;--type OnboardingTrialExtensionTagProps = {- duration: number;-};--export const OnboardingTrialExtensionTag = ({- duration,-}: OnboardingTrialExtensionTagProps) => {- const { t } = useLingui();- const theme = useTheme();-- return (- <StyledTag>- <IconCalendarEvent- size={theme.icon.size.md}- color={themeCssVariables.color.green9}- />- <StyledPrefix>{t`Extended`}</StyledPrefix>- <StyledDuration>{duration}</StyledDuration>- <StyledSuffix>{t`days trial`}</StyledSuffix>- </StyledTag>- );-};diff --git a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/__stories__/OnboardingPlanCard.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/__stories__/OnboardingPlanCard.stories.tsxindex 32a9507932a..8780a4478fc 100644--- a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/__stories__/OnboardingPlanCard.stories.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/__stories__/OnboardingPlanCard.stories.tsx@@ -23,6 +23,7 @@ const PlanChoices = ({><OnboardingPlanCardtitle="Upgraded"+ tags={<span>30-day trial</span>}note="Free trial with a payment method"value={true}>@@ -47,6 +48,11 @@ export const SelectionAndPaymentDetails: Story = {play: async ({ canvasElement, args }) => {const canvas = within(canvasElement);await expect(canvas.getByRole('radio', { name: 'Basic' })).toBeChecked();+ await expect(+ canvas.getByRole('radio', { name: 'Upgraded' }),+ ).toHaveAccessibleDescription(+ /30-day trial.*Free trial with a payment method/,+ );await userEvent.click(canvas.getByText('Free trial with a payment method'));await expect(canvas.getByRole('radio', { name: 'Upgraded' })).toBeChecked();await expect(args.onValueChange).toHaveBeenCalledTimes(1);diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingCreditsProgressEmptyValue.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingCreditsProgressEmptyValue.tsindex fb7a74786f0..a476e4cb56d 100644--- a/packages/twenty-front/src/modules/onboarding/constants/OnboardingCreditsProgressEmptyValue.ts+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingCreditsProgressEmptyValue.ts@@ -16,6 +16,7 @@ export const ONBOARDING_CREDITS_PROGRESS_EMPTY_VALUE: OnboardingCreditsProgresscurrentStepCredits: 0,seenCredits: 0,newlyEarnedCredits: 0,+ lostCredits: 0,isFirstCreditsGain: true,inviteTeamButtonReward: { creditsReward: 0, isRewardPerItem: false },};diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetOnboardingUpgradeTrialFreeCredits.test.ts b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetOnboardingUpgradeTrialFreeCredits.test.tsnew file mode 100644index 00000000000..9fca07c0d12--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetOnboardingUpgradeTrialFreeCredits.test.ts@@ -0,0 +1,105 @@+import { act, renderHook } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { createElement } from 'react';++import { currentUserState } from '@/auth/states/currentUserState';+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { billingState } from '@/client-config/states/billingState';+import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { ONBOARDING_FREE_CREDITS_DEFAULT_VALUE } from '@/onboarding/constants/OnboardingFreeCreditsDefaultValue';+import { useSetOnboardingUpgradeTrialFreeCredits } from '@/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits';+import { onboardingFreeCreditsFamilyState } from '@/onboarding/states/onboardingFreeCreditsFamilyState';+import { onboardingUpgradeTrialLostCreditsState } from '@/onboarding/states/onboardingUpgradeTrialLostCreditsState';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';+import { OnboardingStatus } from '~/generated-metadata/graphql';+import {+ mockCurrentWorkspace,+ mockedUserData,+} from '~/testing/mock-data/users';++const Wrapper = ({ children }: { children: React.ReactNode }) =>+ createElement(JotaiProvider, { store: jotaiStore }, children);++const setStoredUpgradeTrialCredits = (upgradeTrial: number) =>+ jotaiStore.set(+ onboardingFreeCreditsFamilyState.atomFamily(mockCurrentWorkspace.id),+ { ...ONBOARDING_FREE_CREDITS_DEFAULT_VALUE, upgradeTrial },+ );++const setOnboardingUpgradeTrialFreeCredits = (isTrialUpgraded: boolean) => {+ const { result } = renderHook(+ () => useSetOnboardingUpgradeTrialFreeCredits(),+ { wrapper: Wrapper },+ );++ act(() => {+ result.current(isTrialUpgraded);+ });+};++describe('useSetOnboardingUpgradeTrialFreeCredits', () => {+ beforeEach(() => {+ localStorage.clear();+ resetJotaiStore();+ jotaiStore.set(currentWorkspaceState.atom, {+ ...mockCurrentWorkspace,+ billingSubscriptions: [],+ });+ jotaiStore.set(billingState.atom, {+ __typename: 'Billing',+ isBillingEnabled: true,+ billingUrl: '',+ trialPeriods: [],+ });+ jotaiStore.set(onboardingConfigState.atom, {+ importContactsCreditsReward: 2,+ inviteTeamCreditsRewardPerUser: 0.5,+ installAppsCreditsReward: 1,+ createProfileCreditsReward: 0.5,+ upgradeCreditsReward: 4,+ inviteTeamMaxInvites: 4,+ });+ jotaiStore.set(currentUserState.atom, {+ ...mockedUserData,+ isWorkspaceCreator: true,+ onboardingStatus: OnboardingStatus.PLAN_REQUIRED,+ });+ });++ it('should record the upgrade credits as lost when the trial is downgraded', () => {+ setStoredUpgradeTrialCredits(4);++ setOnboardingUpgradeTrialFreeCredits(false);++ expect(jotaiStore.get(onboardingUpgradeTrialLostCreditsState.atom)).toBe(4);+ });++ it('should drop a pending loss when the trial is upgraded again', () => {+ setStoredUpgradeTrialCredits(0);+ jotaiStore.set(onboardingUpgradeTrialLostCreditsState.atom, 4);++ setOnboardingUpgradeTrialFreeCredits(true);++ expect(jotaiStore.get(onboardingUpgradeTrialLostCreditsState.atom)).toBe(0);+ });++ it('should leave a pending loss untouched when the credits do not change', () => {+ setStoredUpgradeTrialCredits(0);+ jotaiStore.set(onboardingUpgradeTrialLostCreditsState.atom, 4);++ setOnboardingUpgradeTrialFreeCredits(false);++ expect(jotaiStore.get(onboardingUpgradeTrialLostCreditsState.atom)).toBe(4);+ });++ it('should not record a loss when the preselected trial was never counted', () => {+ setStoredUpgradeTrialCredits(0);++ setOnboardingUpgradeTrialFreeCredits(false);++ expect(jotaiStore.get(onboardingUpgradeTrialLostCreditsState.atom)).toBe(0);+ });+});diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits.tsindex 1ca07054180..eae6540996e 100644--- a/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits.ts+++ b/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits.ts@@ -1,15 +1,31 @@-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';import { useSetOnboardingStepFreeCredits } from '@/onboarding/hooks/useSetOnboardingStepFreeCredits';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { onboardingUpgradeTrialLostCreditsState } from '@/onboarding/states/onboardingUpgradeTrialLostCreditsState';+import { currentWorkspaceOnboardingFreeCreditsSelector } from '@/onboarding/states/selectors/currentWorkspaceOnboardingFreeCreditsSelector';+import { onboardingCreditsProgressSelector } from '@/onboarding/states/selectors/onboardingCreditsProgressSelector';+import { useStore } from 'jotai';export const useSetOnboardingUpgradeTrialFreeCredits = () => {- const onboardingConfig = useAtomStateValue(onboardingConfigState);+ const store = useStore();const setOnboardingStepFreeCredits = useSetOnboardingStepFreeCredits();- return (isTrialUpgraded: boolean) =>- setOnboardingStepFreeCredits(- 'upgradeTrial',- isTrialUpgraded ? (onboardingConfig?.upgradeCreditsReward ?? 0) : 0,- { isQuiet: true },+ return (isTrialUpgraded: boolean) => {+ const upgradeTrialCredits = isTrialUpgraded+ ? store.get(onboardingCreditsProgressSelector.atom).rewardCreditsByStep+ .upgradeTrial+ : 0;+ const { upgradeTrial: previousUpgradeTrialCredits } = store.get(+ currentWorkspaceOnboardingFreeCreditsSelector.atom,);++ if (upgradeTrialCredits !== previousUpgradeTrialCredits) {+ store.set(+ onboardingUpgradeTrialLostCreditsState.atom,+ upgradeTrialCredits === 0 ? previousUpgradeTrialCredits : 0,+ );+ }++ setOnboardingStepFreeCredits('upgradeTrial', upgradeTrialCredits, {+ isQuiet: true,+ });+ };};diff --git a/packages/twenty-front/src/modules/onboarding/states/onboardingUpgradeTrialLostCreditsState.ts b/packages/twenty-front/src/modules/onboarding/states/onboardingUpgradeTrialLostCreditsState.tsnew file mode 100644index 00000000000..eccdc5a43ae--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/states/onboardingUpgradeTrialLostCreditsState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const onboardingUpgradeTrialLostCreditsState = createAtomState<number>({+ key: 'onboardingUpgradeTrialLostCreditsState',+ defaultValue: 0,+});diff --git a/packages/twenty-front/src/modules/onboarding/states/selectors/onboardingCreditsProgressSelector.ts b/packages/twenty-front/src/modules/onboarding/states/selectors/onboardingCreditsProgressSelector.tsindex 2f910f31c10..551eb2caf26 100644--- a/packages/twenty-front/src/modules/onboarding/states/selectors/onboardingCreditsProgressSelector.ts+++ b/packages/twenty-front/src/modules/onboarding/states/selectors/onboardingCreditsProgressSelector.ts@@ -5,6 +5,7 @@ import { billingState } from '@/client-config/states/billingState';import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';import { ONBOARDING_CREDITS_PROGRESS_EMPTY_VALUE } from '@/onboarding/constants/OnboardingCreditsProgressEmptyValue';import { onboardingCreateProfileDraftState } from '@/onboarding/states/onboardingCreateProfileDraftState';+import { onboardingUpgradeTrialLostCreditsState } from '@/onboarding/states/onboardingUpgradeTrialLostCreditsState';import { currentWorkspaceOnboardingFreeCreditsSelector } from '@/onboarding/states/selectors/currentWorkspaceOnboardingFreeCreditsSelector';import { onboardingInviteTeamValidEmailsSelector } from '@/onboarding/states/selectors/onboardingInviteTeamValidEmailsSelector';import { type OnboardingCreditsProgress } from '@/onboarding/types/OnboardingCreditsProgress';@@ -42,6 +43,7 @@ export const onboardingCreditsProgressSelector =get(currentWorkspaceMemberState)?.name,inviteTeamValidEmailsCount: get(onboardingInviteTeamValidEmailsSelector).length,+ upgradeTrialLostCredits: get(onboardingUpgradeTrialLostCreditsState),});},areEqual: isDeeplyEqual,diff --git a/packages/twenty-front/src/modules/onboarding/types/OnboardingCreditsProgress.ts b/packages/twenty-front/src/modules/onboarding/types/OnboardingCreditsProgress.tsindex 227b23bc83f..dacfa2a2c2c 100644--- a/packages/twenty-front/src/modules/onboarding/types/OnboardingCreditsProgress.ts+++ b/packages/twenty-front/src/modules/onboarding/types/OnboardingCreditsProgress.ts@@ -13,6 +13,7 @@ export type OnboardingCreditsProgress = {currentStepCredits: number;seenCredits: number;newlyEarnedCredits: number;+ lostCredits: number;isFirstCreditsGain: boolean;inviteTeamButtonReward: {creditsReward: number;diff --git a/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsProgress.test.ts b/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsProgress.test.tsindex 72553e8dded..1270f969b52 100644--- a/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsProgress.test.ts+++ b/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsProgress.test.ts@@ -92,6 +92,7 @@ describe('getOnboardingCreditsProgress', () => {currentStepCredits: 2,seenCredits: 0,newlyEarnedCredits: 0,+ lostCredits: 0,isFirstCreditsGain: true,inviteTeamButtonReward: { creditsReward: 0.5, isRewardPerItem: true },});@@ -183,6 +184,7 @@ describe('getOnboardingCreditsProgress', () => {currentStepCredits: 2,seenCredits: 0,newlyEarnedCredits: 0,+ lostCredits: 0,isFirstCreditsGain: true,inviteTeamButtonReward: { creditsReward: 0.5, isRewardPerItem: true },});@@ -274,6 +276,40 @@ describe('getOnboardingCreditsProgress', () => {expect(progress.currentStep).toBeNull();});+ it('should announce the lost upgrade credits', () => {+ const progress = getOnboardingCreditsProgress({+ onboardingFreeCredits: buildOnboardingFreeCredits({+ importContacts: 2,+ seenCredits: 2,+ }),+ onboardingConfig,+ onboardingStatus: OnboardingStatus.PLAN_REQUIRED,+ isWorkspaceCreator: true,+ isPlanRequired: true,+ profileName: null,+ inviteTeamValidEmailsCount: 0,+ upgradeTrialLostCredits: 0.5,+ });++ expect(progress.lostCredits).toBe(0.5);+ });++ it('should hold the lost upgrade credits while earned credits are announced', () => {+ const progress = getOnboardingCreditsProgress({+ onboardingFreeCredits: buildOnboardingFreeCredits({ importContacts: 2 }),+ onboardingConfig,+ onboardingStatus: OnboardingStatus.PLAN_REQUIRED,+ isWorkspaceCreator: true,+ isPlanRequired: true,+ profileName: null,+ inviteTeamValidEmailsCount: 0,+ upgradeTrialLostCredits: 0.5,+ });++ expect(progress.newlyEarnedCredits).toBe(2);+ expect(progress.lostCredits).toBe(0);+ });+it('should leave out the upgrade reward once the workspace has a plan', () => {const progress = getOnboardingCreditsProgress({onboardingFreeCredits: buildOnboardingFreeCredits(),diff --git a/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsProgress.ts b/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsProgress.tsindex e85400d8cdf..214de3b5123 100644--- a/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsProgress.ts+++ b/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsProgress.ts@@ -19,6 +19,7 @@ type GetOnboardingCreditsProgressArgs = {isPlanRequired: boolean;profileName: FullNameMetadata | null | undefined;inviteTeamValidEmailsCount: number;+ upgradeTrialLostCredits?: number;};export const getOnboardingCreditsProgress = ({@@ -29,6 +30,7 @@ export const getOnboardingCreditsProgress = ({isPlanRequired,profileName,inviteTeamValidEmailsCount,+ upgradeTrialLostCredits = 0,}: GetOnboardingCreditsProgressArgs): OnboardingCreditsProgress => {const rewardCreditsByStep: Record<OnboardingCreditsStep, number> = {importContacts: isWorkspaceCreator@@ -110,6 +112,7 @@ export const getOnboardingCreditsProgress = ({);const { seenCredits } = onboardingFreeCredits;+ const newlyEarnedCredits = earnedCredits - seenCredits;const inviteTeamButtonReward =inviteTeamValidEmailsCount > 0@@ -144,7 +147,8 @@ export const getOnboardingCreditsProgress = ({: null,currentStepCredits,seenCredits,- newlyEarnedCredits: earnedCredits - seenCredits,+ newlyEarnedCredits,+ lostCredits: newlyEarnedCredits > 0 ? 0 : upgradeTrialLostCredits,isFirstCreditsGain: seenCredits === 0,inviteTeamButtonReward,};diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.tsindex fd6a35d5344..00057755c76 100644--- a/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts@@ -31,7 +31,7 @@ export const useStripeAppearance = (): Appearance => {theme: isDark ? 'night' : 'stripe',variables: {fontFamily: theme.font.family,- fontSizeBase: '14px',+ fontSizeBase: '13px',colorPrimary: toStripeColor(theme.color.blue),colorBackground: toStripeColor(theme.background.primary),colorText: toStripeColor(theme.font.color.primary),@@ -40,23 +40,26 @@ export const useStripeAppearance = (): Appearance => {colorDanger: toStripeColor(theme.font.color.danger),colorIcon: toStripeColor(theme.font.color.tertiary),borderRadius: theme.border.radius.md,- spacingGridRow: '12px',+ spacingGridRow: '16px',+ spacingGridColumn: '8px',},rules: {'.Label': {- color: toStripeColor(theme.font.color.secondary),- fontWeight: String(theme.font.weight.medium),- fontSize: '13px',- marginBottom: '6px',+ color: toStripeColor(theme.font.color.light),+ fontWeight: String(theme.font.weight.semiBold),+ fontSize: '11px',+ marginBottom: '4px',},'.Input': {- backgroundColor: toStripeColor(theme.background.tertiary),+ backgroundColor: toStripeColor(theme.background.transparent.lighter),border: `1px solid ${toStripeColor(theme.border.color.medium)}`,boxShadow: 'none',- padding: '8px 12px',+ fontSize: '13px',+ lineHeight: '16px',+ padding: '7px 8px',},'.Input:focus': {- border: `1px solid ${toStripeColor(theme.border.color.blue)}`,+ border: `1px solid ${toStripeColor(theme.color.blue)}`,boxShadow: 'none',},'.Input--invalid': {diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsxindex b8d12a5267a..13e226f0d0b 100644--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx+++ b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx@@ -1,5 +1,4 @@import { billingState } from '@/client-config/states/billingState';-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';import { OnboardingStepPageLoader } from '@/onboarding/components/OnboardingStepPageLoader';import { ChooseYourPlanErrorState } from '@/onboarding/components/upgrade-free-trial/ChooseYourPlanErrorState';import { usePlans } from '@/settings/billing/hooks/usePlans';@@ -10,15 +9,9 @@ import { UpgradeFreeTrial } from '~/pages/onboarding/UpgradeFreeTrial';export const ChooseYourPlan = () => {const { isPlansLoaded, error, refetch } = usePlans();const billing = useAtomStateValue(billingState);- const onboardingConfig = useAtomStateValue(onboardingConfigState);if (isDefined(billing) && isPlansLoaded) {- return (- <UpgradeFreeTrial- billing={billing}- creditsReward={onboardingConfig?.upgradeCreditsReward}- />- );+ return <UpgradeFreeTrial billing={billing} />;}if (isDefined(error)) {diff --git a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsxindex 274368c95a1..1761cf5084a 100644--- a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx+++ b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx@@ -3,19 +3,21 @@ import { useAuth } from '@/auth/hooks/useAuth';import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';import { currentUserState } from '@/auth/states/currentUserState';import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';+import { useNumberFormat } from '@/localization/hooks/useNumberFormat';+import { OnboardingRewardMainButton } from '@/onboarding/components/OnboardingRewardMainButton';import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';import { StyledOnboardingContentBlock } from '@/onboarding/components/StyledOnboardingContentBlock';import { StyledOnboardingStepHeading } from '@/onboarding/components/StyledOnboardingStepHeading';import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnboardingStepSubtitle';-import { StyledOnboardingStepTagsRow } from '@/onboarding/components/StyledOnboardingStepTagsRow';import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';-import { OnboardingCreditsRewardTag } from '@/onboarding/components/import-contacts/OnboardingCreditsRewardTag';import { OnboardingPlanCard } from '@/onboarding/components/upgrade-free-trial/OnboardingPlanCard';-import { OnboardingTrialExtensionTag } from '@/onboarding/components/upgrade-free-trial/OnboardingTrialExtensionTag';import { CAL_LINK } from '@/onboarding/constants/CalLink';+import { OnboardingPlanTag } from '@/onboarding/components/upgrade-free-trial/OnboardingPlanTag';import { useSetOnboardingUpgradeTrialFreeCredits } from '@/onboarding/hooks/useSetOnboardingUpgradeTrialFreeCredits';import { isOnboardingCheckoutPendingState } from '@/onboarding/states/isOnboardingCheckoutPendingState';+import { onboardingCreditsProgressSelector } from '@/onboarding/states/selectors/onboardingCreditsProgressSelector';+import { formatOnboardingCredits } from '@/onboarding/utils/formatOnboardingCredits';import { useBaseLicensedPriceByPlanKeyAndInterval } from '@/settings/billing/hooks/useBaseLicensedPriceByPlanKeyAndInterval';import { useHandleCheckoutSession } from '@/settings/billing/hooks/useHandleCheckoutSession';import { useStripeAppearance } from '@/settings/billing/hooks/useStripeAppearance';@@ -29,32 +31,27 @@ import { Trans, useLingui } from '@lingui/react/macro';import { Elements, PaymentElement } from '@stripe/react-stripe-js';import { AppPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { InlineBanner, MainButton } from 'twenty-ui/components';-import { Loader } from 'twenty-ui/primitives/feedback';+import { InlineBanner } from 'twenty-ui/components';+import { IconCalendarEvent, IconCoins } from 'twenty-ui/icon';import { Button, RadioGroup } from 'twenty-ui/primitives/input';-import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';+import { themeCssVariables } from 'twenty-ui/theme';import {type Billing,type BillingPlanKey,type SubscriptionInterval,} from '~/generated-metadata/graphql';-const StyledPage = styled(StyledOnboardingStepPage)`- gap: ${themeCssVariables.spacing[5]};- padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[8]};-- @media (max-width: ${MOBILE_VIEWPORT}px) {- padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[4]};- }+const StyledSubtitleEmphasis = styled.span`+ color: ${themeCssVariables.font.color.primary};`;const StyledCards = styled(StyledOnboardingContentBlock)`- gap: ${themeCssVariables.spacing['1.5']};+ gap: ${themeCssVariables.spacing[4]};`;const StyledFooter = styled(StyledOnboardingContentBlock)`align-items: center;- gap: ${themeCssVariables.spacing['1.5']};+ gap: ${themeCssVariables.spacing[4]};`;const StyledLinkGroup = styled.div`@@ -74,17 +71,18 @@ const StyledLinkGroup = styled.div`type UpgradeFreeTrialProps = {billing: Billing;- creditsReward?: number;};type UpgradeFreeTrialSubmitButtonProps = {plan: BillingPlanKey;recurringInterval: SubscriptionInterval;+ creditsReward: number;};const UpgradeFreeTrialSubmitButton = ({plan,recurringInterval,+ creditsReward,}: UpgradeFreeTrialSubmitButtonProps) => {const { t } = useLingui();@@ -106,29 +104,40 @@ const UpgradeFreeTrialSubmitButton = ({};return (- <MainButton+ <OnboardingRewardMainButton+ label={t`Continue`}+ creditsReward={creditsReward}onClick={handleSubmit}- fullWidth- startIcon={isSubmitting ? <Loader /> : null}+ isLoading={isSubmitting}disabled={!isStripeReady || isSubmitting}- >{t`Continue`}</MainButton>+ />);};type UpgradeFreeTrialContentProps = {billing: Billing;isPaymentAvailable: boolean;+ trialDuration?: number;};const UpgradeFreeTrialContent = ({billing,isPaymentAvailable,+ trialDuration,}: UpgradeFreeTrialContentProps) => {const { t } = useLingui();const { getBaseLicensedPriceByPlanKeyAndInterval } =useBaseLicensedPriceByPlanKeyAndInterval();+ const upgradeCreditsReward = useAtomStateValue(+ onboardingCreditsProgressSelector,+ ).rewardCreditsByStep.upgradeTrial;+ const { numberFormat } = useNumberFormat();+ const formattedUpgradeCreditsReward = formatOnboardingCredits(+ upgradeCreditsReward,+ numberFormat,+ );const [billingCheckoutSession, setBillingCheckoutSession] = useAtomState(billingCheckoutSessionState,);@@ -186,10 +195,12 @@ const UpgradeFreeTrialContent = ({};const requirePaymentMethod = billingCheckoutSession.requirePaymentMethod;+ const hasTrialDurationTag = isDefined(trialDuration);+ const hasUpgradeCreditsTag = upgradeCreditsReward > 0;return (<>- <OnboardingStepAnimatedItem index={3}>+ <OnboardingStepAnimatedItem index={2}><RadioGrouprender={<StyledCards />}aria-label={t`Trial plan`}@@ -199,6 +210,25 @@ const UpgradeFreeTrialContent = ({<OnboardingPlanCardtitle={t`Upgraded`}titleSuffix={t`· FREE`}+ tags={+ hasTrialDurationTag || hasUpgradeCreditsTag ? (+ <>+ {hasTrialDurationTag && (+ <OnboardingPlanTag+ Icon={IconCalendarEvent}+ value={`${trialDuration}`}+ suffix={t`days`}+ />+ )}+ {hasUpgradeCreditsTag && (+ <OnboardingPlanTag+ Icon={IconCoins}+ value={`+${formattedUpgradeCreditsReward}`}+ />+ )}+ </>+ ) : undefined+ }note={t`No charge will be made. You'll receive an email reminder 7 days before it ends.`}value={true}>@@ -211,6 +241,10 @@ const UpgradeFreeTrialContent = ({? { billingDetails: { email: customerEmail } }: undefined,terms: { card: 'never' },+ wallets: {+ applePay: 'never',+ googlePay: 'never',+ },}}/>) : (@@ -233,24 +267,22 @@ const UpgradeFreeTrialContent = ({</RadioGroup></OnboardingStepAnimatedItem>- <OnboardingStepAnimatedItem index={4}>+ <OnboardingStepAnimatedItem index={3}><StyledFooter>- {requirePaymentMethod ? (- isPaymentAvailable ? (- <UpgradeFreeTrialSubmitButton- plan={billingCheckoutSession.plan}- recurringInterval={billingCheckoutSession.interval}- />- ) : (- <MainButton fullWidth disabled>{t`Continue`}</MainButton>- )+ {requirePaymentMethod && isPaymentAvailable ? (+ <UpgradeFreeTrialSubmitButton+ plan={billingCheckoutSession.plan}+ recurringInterval={billingCheckoutSession.interval}+ creditsReward={upgradeCreditsReward}+ />) : (- <MainButton+ <OnboardingRewardMainButton+ label={t`Continue`}+ creditsReward={requirePaymentMethod ? upgradeCreditsReward : 0}onClick={handleCheckoutSessionClick}- fullWidth- startIcon={isCheckoutSubmitting ? <Loader /> : null}- disabled={isCheckoutSubmitting}- >{t`Continue`}</MainButton>+ isLoading={isCheckoutSubmitting}+ disabled={requirePaymentMethod}+ />)}<StyledLinkGroup><Button variant="link" onClick={signOut}>@@ -272,10 +304,7 @@ const UpgradeFreeTrialContent = ({);};-export const UpgradeFreeTrial = ({- billing,- creditsReward,-}: UpgradeFreeTrialProps) => {+export const UpgradeFreeTrial = ({ billing }: UpgradeFreeTrialProps) => {const { t } = useLingui();const { getBaseLicensedPriceByPlanKeyAndInterval } =@@ -304,27 +333,27 @@ export const UpgradeFreeTrial = ({const trialDuration = withCreditCardTrialPeriod?.duration;return (- <StyledPage>+ <StyledOnboardingStepPage><StyledOnboardingStepHeading><OnboardingStepAnimatedItem index={0}><StyledOnboardingStepTitle>{t`Upgrade your free trial`}</StyledOnboardingStepTitle></OnboardingStepAnimatedItem><OnboardingStepAnimatedItem index={1}><StyledOnboardingStepSubtitle>- {isDefined(trialDuration)- ? t`Insert your billing details to get a ${trialDuration}-day free trial and more AI credits`- : t`Insert your billing details to get a free trial and more AI credits`}- </StyledOnboardingStepSubtitle>- </OnboardingStepAnimatedItem>- <OnboardingStepAnimatedItem index={2}>- <StyledOnboardingStepTagsRow>- {isDefined(trialDuration) && (- <OnboardingTrialExtensionTag duration={trialDuration} />- )}- {isDefined(creditsReward) && (- <OnboardingCreditsRewardTag amount={creditsReward} />+ {isDefined(trialDuration) ? (+ <Trans>+ Insert your billing details to get a {trialDuration}-day{' '}+ <StyledSubtitleEmphasis>free</StyledSubtitleEmphasis> trial and+ more AI credits+ </Trans>+ ) : (+ <Trans>+ Insert your billing details to get a{' '}+ <StyledSubtitleEmphasis>free</StyledSubtitleEmphasis> trial and+ more AI credits+ </Trans>)}- </StyledOnboardingStepTagsRow>+ </StyledOnboardingStepSubtitle></OnboardingStepAnimatedItem></StyledOnboardingStepHeading>@@ -339,11 +368,19 @@ export const UpgradeFreeTrial = ({appearance,}}>- <UpgradeFreeTrialContent billing={billing} isPaymentAvailable />+ <UpgradeFreeTrialContent+ billing={billing}+ isPaymentAvailable+ trialDuration={trialDuration}+ /></Elements>) : (- <UpgradeFreeTrialContent billing={billing} isPaymentAvailable={false} />+ <UpgradeFreeTrialContent+ billing={billing}+ isPaymentAvailable={false}+ trialDuration={trialDuration}+ />)}- </StyledPage>+ </StyledOnboardingStepPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsxindex cf898dcb1cc..c1256b84dd6 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx@@ -1,7 +1,7 @@import { getOperationName } from '~/utils/getOperationName';import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';-import { within } from 'storybook/test';+import { expect, within } from 'storybook/test';import { LIST_PLANS } from '@/settings/billing/graphql/queries/listPlans';import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';@@ -14,7 +14,10 @@ import {} from '~/testing/decorators/PageDecorator';import { graphqlMocks } from '~/testing/graphqlMocks';import { mockedApolloClient } from '~/testing/mockedApolloClient';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';+import {+ mockCurrentWorkspace,+ mockedOnboardingUserData,+} from '~/testing/mock-data/users';const meta: Meta<PageDecoratorArgs> = {title: 'Pages/Onboarding/ChooseYourPlan',@@ -30,7 +33,13 @@ const meta: Meta<PageDecoratorArgs> = {graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {return HttpResponse.json({data: {- currentUser: mockedOnboardingUserData(OnboardingStatus.COMPLETED),+ currentUser: {+ ...mockedOnboardingUserData(OnboardingStatus.COMPLETED),+ currentWorkspace: {+ ...mockCurrentWorkspace,+ billingSubscriptions: [],+ },+ },},});}),@@ -51,6 +60,12 @@ export const Default: Story = {await canvas.findByText('Upgrade your free trial', undefined, {timeout: 3000,});++ await expect(+ await canvas.findByRole('button', {+ name: 'Continue, earn 2 free credits',+ }),+ ).toBeInTheDocument();},};