The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove v1 onboarding and rely only on v2 (#22398)
Raphaël Bosi566c3b662954
diff --git a/packages/twenty-e2e-testing/lib/pom/loginPage.ts b/packages/twenty-e2e-testing/lib/pom/loginPage.tsindex 1d51a8e14c4..04b919fb5c6 100644--- a/packages/twenty-e2e-testing/lib/pom/loginPage.ts+++ b/packages/twenty-e2e-testing/lib/pom/loginPage.ts@@ -16,6 +16,9 @@ export class LoginPage {private readonly uploadImageButton: Locator;private readonly deleteImageButton: Locator;private readonly workspaceNameField: Locator;+ private readonly subdomainField: Locator;+ private readonly createWorkspaceButton: Locator;+ private readonly skipOnboardingStepButton: Locator;private readonly firstNameField: Locator;private readonly lastNameField: Locator;private readonly syncEverythingWithGoogleRadio: Locator;@@ -54,9 +57,17 @@ export class LoginPage {this.previewImageButton = page.locator('.css-1qzw107'); // TODO: fixthis.uploadImageButton = page.getByRole('button', { name: 'Upload' });this.deleteImageButton = page.getByRole('button', { name: 'Remove' });- this.workspaceNameField = page.getByPlaceholder('Apple');- this.firstNameField = page.getByPlaceholder('Tim');- this.lastNameField = page.getByPlaceholder('Cook');+ this.workspaceNameField = page.getByLabel('Name', { exact: true });+ this.subdomainField = page.getByLabel('Subdomain', { exact: true });+ this.createWorkspaceButton = page.getByRole('button', {+ name: 'Create workspace',+ });+ this.skipOnboardingStepButton = page.getByRole('button', {+ name: 'Skip',+ exact: true,+ });+ this.firstNameField = page.getByLabel('First Name', { exact: true });+ this.lastNameField = page.getByLabel('Last name', { exact: true });this.syncEverythingWithGoogleRadio = page.locator('input[value="SHARE_EVERYTHING"]',);@@ -145,6 +156,18 @@ export class LoginPage {await this.workspaceNameField.fill(workspaceName);}+ async typeSubdomain(subdomain: string) {+ await this.subdomainField.fill(subdomain);+ }++ async clickCreateWorkspaceButton() {+ await this.createWorkspaceButton.click();+ }++ async clickSkipOnboardingStep() {+ await this.skipOnboardingStepButton.click();+ }+async typeFirstName(firstName: string) {await this.firstNameField.fill(firstName);}diff --git a/packages/twenty-e2e-testing/tests/authentication/onboarding.spec.ts b/packages/twenty-e2e-testing/tests/authentication/onboarding.spec.tsnew file mode 100644index 00000000000..d61d1752589--- /dev/null+++ b/packages/twenty-e2e-testing/tests/authentication/onboarding.spec.ts@@ -0,0 +1,70 @@+import { randomUUID } from 'crypto';+import { expect, test } from './fixture';++test.use({ storageState: { cookies: [], origins: [] } });++test('New workspace signup goes through every onboarding stage', async ({+ page,+ loginPage,+}) => {+ test.setTimeout(180000);++ const suffix = randomUUID().replaceAll('-', '').slice(0, 12);+ const email = `test${suffix}@apple.dev`;+ const workspaceName = `Test ${suffix}`;+ const subdomain = `test-${suffix}`;++ await test.step('Create a new account', async () => {+ await page.goto('/welcome');+ await loginPage.clickLoginWithEmailIfVisible();+ await loginPage.typeEmail(email);+ await loginPage.clickContinueButton();+ await loginPage.typePassword(process.env.DEFAULT_PASSWORD);+ await loginPage.clickSignUpButton();+ });++ await test.step('Create the workspace', async () => {+ await expect(page.getByText('Create your workspace')).toBeVisible();+ await loginPage.typeWorkspaceName(workspaceName);+ await loginPage.typeSubdomain(subdomain);+ await loginPage.clickCreateWorkspaceButton();+ });++ await test.step('Workspace activation stage', async () => {+ await page.waitForURL('**/workspace-activation', { timeout: 90000 });+ });++ await test.step('Sync-email stage (skip when shown)', async () => {+ const syncEmailsHeading = page.getByText('Import your contacts');+ const installAppsHeading = page.getByText('Install your first apps');++ await expect(syncEmailsHeading.or(installAppsHeading)).toBeVisible({+ timeout: 90000,+ });++ if (await syncEmailsHeading.isVisible()) {+ await loginPage.clickSkipOnboardingStep();+ }+ });++ await test.step('Install-apps stage', async () => {+ await expect(page.getByText('Install your first apps')).toBeVisible();+ await loginPage.clickSkipOnboardingStep();+ });++ await test.step('Create-profile stage', async () => {+ await expect(page.getByText('Create profile')).toBeVisible();+ await loginPage.typeFirstName('Ada');+ await loginPage.typeLastName('Lovelace');+ await loginPage.clickContinueButton();+ });++ await test.step('Invite-team stage', async () => {+ await expect(page.getByText('Invite your team')).toBeVisible();+ await loginPage.clickSkipOnboardingStep();+ });++ await test.step('Lands in the app', async () => {+ await expect(page.getByTestId('workspace-dropdown')).toBeVisible();+ });+});diff --git a/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts b/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.tsindex 75e1790b964..bec2aae4762 100644--- a/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts+++ b/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts@@ -39,6 +39,8 @@ test('Sign up with invite link via email', async ({await loginPage.clickContinueButton();await loginPage.typePassword(process.env.DEFAULT_PASSWORD);await loginPage.clickSignUpButton();+ await expect(page.getByText('Create profile')).toBeVisible();+ await expect(page.getByPlaceholder('Head of Partnerships')).toBeVisible();await loginPage.typeFirstName(firstName);await loginPage.typeLastName(lastName);await loginPage.clickContinueButton();diff --git a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.tsindex 23f2802e554..56e5944435c 100644--- a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts+++ b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts@@ -85,16 +85,18 @@ const setupMockState = (calendarBookingPageId?: string | null,returnToPath?: string,currentWorkspace: object | null = { id: 'mock-workspace-id' },- isOnboardingV2 = false,+ isBillingEnabled: boolean = true,+ isMinimalMetadataReady: boolean = true,) => {jest.mocked(useAtomStateValue).mockReturnValueOnce(currentWorkspace).mockReturnValueOnce(calendarBookingPageId ?? 'mock-calendar-id')+ .mockReturnValueOnce({ isBillingEnabled }).mockReturnValueOnce([{ namePlural: objectNamePlural ?? '' }])+ .mockReturnValueOnce(isMinimalMetadataReady).mockReturnValueOnce(verifyEmailRedirectPath)- .mockReturnValueOnce(returnToPath ?? '')- .mockReturnValueOnce(isOnboardingV2);+ .mockReturnValueOnce(returnToPath ?? '');};// prettier-ignore@@ -111,6 +113,8 @@ const testCases: {returnToPath?: string;pageLayoutId?: string;useQueryResult?: { data?: unknown; loading?: boolean };+ isBillingEnabled?: boolean;+ isMinimalMetadataReady?: boolean;}[] = [{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },@@ -118,7 +122,7 @@ const testCases: {{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -129,29 +133,18 @@ const testCases: {{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },- { loc: AppPath.SignInUpV2, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },-{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: '/plan-required' },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },{ loc: AppPath.Invite, hasAccessTokenPair: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: '/workspace-activation' },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: '/create/profile' },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: '/sync/emails' },- { loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: '/invite-team' },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.Invite, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -162,7 +155,7 @@ const testCases: {{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: '/workspace-activation' },{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: '/create/profile' },{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: '/sync/emails' },- { loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: '/invite-team' },{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.ResetPassword, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -175,7 +168,7 @@ const testCases: {{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.VerifyEmail, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -186,7 +179,7 @@ const testCases: {{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.WorkspaceActivation, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -197,7 +190,7 @@ const testCases: {{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: undefined },{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.CreateProfile, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -208,21 +201,32 @@ const testCases: {{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: undefined },- { loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.SyncEmails, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },+ { loc: AppPath.InstallApps, hasAccessTokenPair: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: undefined },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },+ { loc: AppPath.InstallApps, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },+{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },{ loc: AppPath.InviteTeam, hasAccessTokenPair: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: undefined },- { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },- { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },+ { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.PlanRequired },+ { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: AppPath.PlanRequired },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },@@ -230,7 +234,7 @@ const testCases: {{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: undefined },{ loc: AppPath.BookCallDecision, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -241,7 +245,7 @@ const testCases: {{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: undefined },{ loc: AppPath.BookCall, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -252,10 +256,10 @@ const testCases: {{ loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },- { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },- { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },+ { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: undefined },+ { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },@@ -263,7 +267,7 @@ const testCases: {{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.PlanRequiredSuccess, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -274,7 +278,7 @@ const testCases: {{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.Index, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },@@ -285,7 +289,7 @@ const testCases: {{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.TasksPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -296,7 +300,7 @@ const testCases: {{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.OpportunitiesPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -307,12 +311,13 @@ const testCases: {{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined, objectNamePluralFromParams: 'existing-object', objectNamePluralFromMetadata: 'existing-object' },{ loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: AppPath.NotFound, objectNamePluralFromParams: 'non-existing-object', objectNamePluralFromMetadata: 'existing-object' },+ { loc: AppPath.RecordIndexPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined, objectNamePluralFromParams: 'non-existing-object', objectNamePluralFromMetadata: 'existing-object', isMinimalMetadataReady: false },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },@@ -320,7 +325,7 @@ const testCases: {{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.RecordShowPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -331,7 +336,7 @@ const testCases: {{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.PageLayoutPage, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -346,7 +351,7 @@ const testCases: {{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.SettingsCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -357,7 +362,7 @@ const testCases: {{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.DevelopersCatchAll, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -368,7 +373,7 @@ const testCases: {{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.Authorize, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -379,7 +384,7 @@ const testCases: {{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.NotFoundWildcard, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },@@ -390,11 +395,17 @@ const testCases: {{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },- { loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallAppsV2 },+ { loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.APPS_INSTALLATION, res: AppPath.InstallApps },{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, res: AppPath.BookCallDecision },{ loc: AppPath.NotFound, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },+ // isBillingEnabled:false — no post-invite-team upgrade interception on billing-disabled instances+ { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, isBillingEnabled: false, res: defaultHomePagePath },+ { loc: AppPath.InviteTeam, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, isBillingEnabled: false, res: AppPath.BookCallDecision },+ { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, isBillingEnabled: false, res: defaultHomePagePath },+ { loc: AppPath.PlanRequired, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_ONBOARDING, isBillingEnabled: false, res: AppPath.BookCallDecision },+// returnToPath: should redirect to saved path instead of defaultHomePagePath{ loc: AppPath.Verify, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, returnToPath: '/authorize?clientId=abc', res: '/authorize?clientId=abc' },{ loc: AppPath.SignInUp, hasAccessTokenPair: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, returnToPath: '/objects/tasks', res: '/objects/tasks' },@@ -420,6 +431,8 @@ describe('usePageChangeEffectNavigateLocation', () => {returnToPath,pageLayoutId,useQueryResult,+ isBillingEnabled,+ isMinimalMetadataReady,res,}) => {setupMockIsMatchingLocation(loc);@@ -434,6 +447,9 @@ describe('usePageChangeEffectNavigateLocation', () => {verifyEmailRedirectPath,undefined,returnToPath,+ undefined,+ isBillingEnabled ?? true,+ isMinimalMetadataReady ?? true,);expect(usePageChangeEffectNavigateLocation()).toEqual(res);@@ -448,6 +464,7 @@ describe('usePageChangeEffectNavigateLocation', () => {['isWorkspaceSuspended:true', 'isWorkspaceSuspended:false'].length) +['nonExistingObjectInParam', 'existingObjectInParam:false'].length ++ ['nonExistingObjectInParam:metadataNotReady'].length +['caseWithRedirectionToVerifyEmailRedirectPath', 'caseWithout'].length +[@@ -458,7 +475,13 @@ describe('usePageChangeEffectNavigateLocation', () => {].length +['returnToPath:verify', 'returnToPath:signInUp', 'returnToPath:index'].length +- ['notOnWorkspace:verify', 'notOnWorkspace:signInUp'].length,+ ['notOnWorkspace:verify', 'notOnWorkspace:signInUp'].length ++ [+ 'billingDisabled:inviteTeamCompleted',+ 'billingDisabled:inviteTeamBookOnboarding',+ 'billingDisabled:planRequiredCompleted',+ 'billingDisabled:planRequiredBookOnboarding',+ ].length,);});});@@ -481,152 +504,3 @@ describe('usePageChangeEffectNavigateLocation — authenticated with no current},);});--describe('usePageChangeEffectNavigateLocation — onboarding V2', () => {- const setupOnboardingV2Case = (- loc: AppPath,- onboardingStatus: OnboardingStatus,- ) => {- setupMockIsMatchingLocation(loc);- setupMockOnboardingStatus(onboardingStatus);- setupMockIsWorkspaceActivationStatusEqualsTo(false);- setupMockHasAccessTokenPair(true);- setupMockIsOnAWorkspace(true);- setupMockUseQuery();- setupMockUseParams();- setupMockState(- undefined,- undefined,- undefined,- undefined,- { id: 'mock-workspace-id' },- true,- );- };-- it('routes to WorkspaceActivationV2 when onboardingV2 is active and status is WORKSPACE_ACTIVATION', () => {- setupOnboardingV2Case(- AppPath.SignInUpV2,- OnboardingStatus.WORKSPACE_ACTIVATION,- );-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.WorkspaceActivationV2,- );- });-- it('does not redirect away from the WorkspaceActivationV2 page during activation', () => {- setupOnboardingV2Case(- AppPath.WorkspaceActivationV2,- OnboardingStatus.WORKSPACE_ACTIVATION,- );-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('routes to SyncEmailsV2 when onboardingV2 is active and status is SYNC_EMAIL', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.SYNC_EMAIL);-- expect(usePageChangeEffectNavigateLocation()).toEqual(AppPath.SyncEmailsV2);- });-- it('does not redirect away from the SyncEmailsV2 page', () => {- setupOnboardingV2Case(AppPath.SyncEmailsV2, OnboardingStatus.SYNC_EMAIL);-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('routes to CreateProfileV2 when onboardingV2 is active and status is PROFILE_CREATION', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.PROFILE_CREATION);-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.CreateProfileV2,- );- });-- it('routes to InstallAppsV2 when status is APPS_INSTALLATION', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.APPS_INSTALLATION);-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.InstallAppsV2,- );- });-- it('does not redirect away from the InstallAppsV2 page', () => {- setupOnboardingV2Case(- AppPath.InstallAppsV2,- OnboardingStatus.APPS_INSTALLATION,- );-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('does not redirect away from the CreateProfileV2 page', () => {- setupOnboardingV2Case(- AppPath.CreateProfileV2,- OnboardingStatus.PROFILE_CREATION,- );-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('routes to InviteTeamV2 when onboardingV2 is active and status is INVITE_TEAM', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.INVITE_TEAM);-- expect(usePageChangeEffectNavigateLocation()).toEqual(AppPath.InviteTeamV2);- });-- it('does not redirect away from the InviteTeamV2 page', () => {- setupOnboardingV2Case(AppPath.InviteTeamV2, OnboardingStatus.INVITE_TEAM);-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('routes to PlanRequiredV2 from InviteTeamV2 when onboardingV2 is active and onboarding is completed', () => {- setupOnboardingV2Case(AppPath.InviteTeamV2, OnboardingStatus.COMPLETED);-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.PlanRequiredV2,- );- });-- it('routes to PlanRequiredV2 from InviteTeamV2 when onboardingV2 is active and status is BOOK_ONBOARDING', () => {- setupOnboardingV2Case(- AppPath.InviteTeamV2,- OnboardingStatus.BOOK_ONBOARDING,- );-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.PlanRequiredV2,- );- });-- it('does not redirect away from the PlanRequiredV2 page when onboarding is completed', () => {- setupOnboardingV2Case(AppPath.PlanRequiredV2, OnboardingStatus.COMPLETED);-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-- it('lets completed v2 users route normally away from the invite transition', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.COMPLETED);-- expect(usePageChangeEffectNavigateLocation()).toEqual(defaultHomePagePath);- });-- it('routes to PlanRequiredV2 (never the v1 plan page) when onboardingV2 is active and status is PLAN_REQUIRED', () => {- setupOnboardingV2Case(AppPath.Index, OnboardingStatus.PLAN_REQUIRED);-- expect(usePageChangeEffectNavigateLocation()).toEqual(- AppPath.PlanRequiredV2,- );- });-- it('does not redirect away from the PlanRequiredV2 page when a plan is required', () => {- setupOnboardingV2Case(- AppPath.PlanRequiredV2,- OnboardingStatus.PLAN_REQUIRED,- );-- expect(usePageChangeEffectNavigateLocation()).toBeUndefined();- });-});diff --git a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.tsindex 8d848684aab..94881e12432 100644--- a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts+++ b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts@@ -3,10 +3,11 @@ import { ONBOARDING_PATHS } from '@/auth/constants/OnboardingPaths';import { ONGOING_USER_CREATION_PATHS } from '@/auth/constants/OngoingUserCreationPaths';import { useHasAccessTokenPair } from '@/auth/hooks/useHasAccessTokenPair';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';import { returnToPathState } from '@/auth/states/returnToPathState';+import { billingState } from '@/client-config/states/billingState';import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';+import { isMinimalMetadataReadyState } from '@/metadata-store/states/isMinimalMetadataReadyState';import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';@@ -43,6 +44,8 @@ export const usePageChangeEffectNavigateLocation = () => {const { defaultHomePagePath } = useDefaultHomePagePath();const location = useLocation();const calendarBookingPageId = useAtomStateValue(calendarBookingPageIdState);+ const billing = useAtomStateValue(billingState);+ const isBillingEnabled = billing?.isBillingEnabled ?? false;const someMatchingLocationOf = (appPaths: AppPath[]): boolean =>appPaths.some((appPath) => isMatchingLocation(location, appPath));@@ -54,6 +57,7 @@ export const usePageChangeEffectNavigateLocation = () => {const objectMetadataItem = objectMetadataItems?.find((objectMetadataItem) => objectMetadataItem.namePlural === objectNamePlural,);+ const isMinimalMetadataReady = useAtomStateValue(isMinimalMetadataReadyState);const pageLayoutId = params.pageLayoutId;const isOnPageLayoutPage = isMatchingLocation(@@ -77,8 +81,6 @@ export const usePageChangeEffectNavigateLocation = () => {? returnToPath: readReturnToPathFromUrlSearchParams();- const isOnboardingV2 = useAtomStateValue(isOnboardingV2State);-if ((!hasAccessTokenPair || !isOnAWorkspace || !isDefined(currentWorkspace)) &&!someMatchingLocationOf([@@ -93,7 +95,6 @@ export const usePageChangeEffectNavigateLocation = () => {onboardingStatus === OnboardingStatus.PLAN_REQUIRED &&!someMatchingLocationOf([AppPath.PlanRequired,- AppPath.PlanRequiredV2,AppPath.PlanRequiredSuccess,AppPath.BookCall,AppPath.BookCallDecision,@@ -105,7 +106,7 @@ export const usePageChangeEffectNavigateLocation = () => {) {return verifyEmailRedirectPath;}- return isOnboardingV2 ? AppPath.PlanRequiredV2 : AppPath.PlanRequired;+ return AppPath.PlanRequired;}if (isWorkspaceSuspended) {@@ -122,53 +123,50 @@ export const usePageChangeEffectNavigateLocation = () => {onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION &&!someMatchingLocationOf([AppPath.WorkspaceActivation,- AppPath.WorkspaceActivationV2,AppPath.BookCallDecision,AppPath.BookCall,])) {- return isOnboardingV2- ? AppPath.WorkspaceActivationV2- : AppPath.WorkspaceActivation;+ return AppPath.WorkspaceActivation;}if (onboardingStatus === OnboardingStatus.PROFILE_CREATION &&- !someMatchingLocationOf([AppPath.CreateProfile, AppPath.CreateProfileV2])+ !isMatchingLocation(location, AppPath.CreateProfile)) {- return isOnboardingV2 ? AppPath.CreateProfileV2 : AppPath.CreateProfile;+ return AppPath.CreateProfile;}if (onboardingStatus === OnboardingStatus.SYNC_EMAIL &&- !someMatchingLocationOf([AppPath.SyncEmails, AppPath.SyncEmailsV2])+ !isMatchingLocation(location, AppPath.SyncEmails)) {- return isOnboardingV2 ? AppPath.SyncEmailsV2 : AppPath.SyncEmails;+ return AppPath.SyncEmails;}if (onboardingStatus === OnboardingStatus.APPS_INSTALLATION &&- !isMatchingLocation(location, AppPath.InstallAppsV2)+ !isMatchingLocation(location, AppPath.InstallApps)) {- return AppPath.InstallAppsV2;+ return AppPath.InstallApps;}if (onboardingStatus === OnboardingStatus.INVITE_TEAM &&- !someMatchingLocationOf([AppPath.InviteTeam, AppPath.InviteTeamV2])+ !isMatchingLocation(location, AppPath.InviteTeam)) {- return isOnboardingV2 ? AppPath.InviteTeamV2 : AppPath.InviteTeam;+ return AppPath.InviteTeam;}if (- isOnboardingV2 &&+ isBillingEnabled &&(onboardingStatus === OnboardingStatus.BOOK_ONBOARDING ||onboardingStatus === OnboardingStatus.COMPLETED)) {- if (isMatchingLocation(location, AppPath.InviteTeamV2)) {- return AppPath.PlanRequiredV2;+ if (isMatchingLocation(location, AppPath.InviteTeam)) {+ return AppPath.PlanRequired;}- if (isMatchingLocation(location, AppPath.PlanRequiredV2)) {+ if (isMatchingLocation(location, AppPath.PlanRequired)) {return;}}@@ -201,6 +199,7 @@ export const usePageChangeEffectNavigateLocation = () => {}if (+ isMinimalMetadataReady &&isMatchingLocation(location, AppPath.RecordIndexPage) &&!isDefined(objectMetadataItem)) {diff --git a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsxindex 6b20e83a68b..af49c982686 100644--- a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx+++ b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx@@ -1,10 +1,7 @@import { styled } from '@linaria/react';-import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';-import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';import { NAVIGATION_DRAWER_CONSTRAINTS } from '@/ui/layout/resizable-panel/constants/NavigationDrawerConstraints';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';-import { ModalBackdrop } from 'twenty-ui/surfaces';import { LeftPanelSkeletonLoader } from '~/loading/components/LeftPanelSkeletonLoader';import { PageContentSkeletonLoader } from '~/loading/components/PageContentSkeletonLoader';@@ -28,16 +25,8 @@ const StyledLeftPanelWrapper = styled.div``;export const UserOrMetadataLoader = () => {- const showAuthModal = useShowAuthModal();-return (<StyledContainer>- {showAuthModal && (- <ModalBackdrop- overlay="dark"- backdropZIndex={RootStackingContextZIndices.RootModalBackDrop}- />- )}<StyledLeftPanelWrapper><LeftPanelSkeletonLoader /></StyledLeftPanelWrapper>diff --git a/packages/twenty-front/src/modules/analytics/components/TrackPageViewEffect.tsx b/packages/twenty-front/src/modules/analytics/components/TrackPageViewEffect.tsxnew file mode 100644index 00000000000..d5330a5d9de--- /dev/null+++ b/packages/twenty-front/src/modules/analytics/components/TrackPageViewEffect.tsx@@ -0,0 +1,46 @@+import { useEffect } from 'react';+import { useLocation } from 'react-router-dom';++import {+ setSessionId,+ useEventTracker,+} from '@/analytics/hooks/useEventTracker';+import { AnalyticsType } from '~/generated-metadata/graphql';+import { getPageTitleFromPath } from '~/utils/title-utils';++const PAGEVIEW_TRACKING_DELAY_IN_MS = 500;++const stripQueryAndHash = (url: string): string => {+ try {+ const { origin, pathname } = new URL(url);+ return `${origin}${pathname}`;+ } catch {+ return '';+ }+};++export const TrackPageViewEffect = () => {+ const location = useLocation();+ const eventTracker = useEventTracker();++ useEffect(() => {+ const timeoutId = setTimeout(() => {+ setSessionId();+ eventTracker(AnalyticsType['PAGEVIEW'], {+ name: getPageTitleFromPath(location.pathname),+ properties: {+ pathname: location.pathname,+ locale: navigator.language,+ userAgent: window.navigator.userAgent,+ href: stripQueryAndHash(window.location.href),+ referrer: stripQueryAndHash(document.referrer),+ timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ },+ });+ }, PAGEVIEW_TRACKING_DELAY_IN_MS);++ return () => clearTimeout(timeoutId);+ }, [eventTracker, location.pathname]);++ return null;+};diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.tsindex d52bf45d399..088f1362c7c 100644--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts@@ -76,7 +76,6 @@ export const useApolloFactory = (options: Partial<Options> = {}) => {setCurrentUserWorkspace(null);if (!isMatchingLocation(locationRef.current, AppPath.Verify) &&- !isMatchingLocation(locationRef.current, AppPath.VerifyV2) &&!isMatchingLocation(locationRef.current, AppPath.SignInUp) &&!isMatchingLocation(locationRef.current, AppPath.Invite) &&!isMatchingLocation(locationRef.current, AppPath.ResetPassword)diff --git a/packages/twenty-front/src/modules/app/components/App.tsx b/packages/twenty-front/src/modules/app/components/App.tsxindex bd42bb81b58..20fe0ee885a 100644--- a/packages/twenty-front/src/modules/app/components/App.tsx+++ b/packages/twenty-front/src/modules/app/components/App.tsx@@ -1,4 +1,4 @@-import { AppRouter } from '@/app/components/AppRouter';+import { DomainShell } from '@/app/components/DomainShell';import { I18nActivationGate } from '@/app/components/I18nActivationGate';import { ApolloDevLogEffect } from '@/debug/components/ApolloDevLogEffect';import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';@@ -35,7 +35,7 @@ export const App = () => {<ClickOutsideListenerContext.Providervalue={{ excludedClickOutsideId: undefined }}>- <AppRouter />+ <DomainShell /></ClickOutsideListenerContext.Provider></HelmetProvider></ExceptionHandlerProvider>diff --git a/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx b/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsxdeleted file mode 100644index df4b5e8be1c..00000000000--- a/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx+++ /dev/null@@ -1,98 +0,0 @@-import { AgentChatProvider } from '@/ai/components/AgentChatProvider';-import { ApolloProvider } from '@/apollo/components/ApolloProvider';-import { CommandMenuConfirmationModalManager } from '@/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager';-import { MinimalMetadataGater } from '@/metadata-store/components/MinimalMetadataGater';-import { IsMinimalMetadataReadyEffect } from '@/metadata-store/effect-components/IsMinimalMetadataReadyEffect';--import { GotoHotkeysEffectsProvider } from '@/app/effect-components/GotoHotkeysEffectsProvider';-import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';-import { AuthProvider } from '@/auth/components/AuthProvider';-import { SignOutOnOtherTabSignOutEffect } from '@/auth/effect-components/SignOutOnOtherTabSignOutEffect';-import { CaptchaProvider } from '@/captcha/components/CaptchaProvider';-import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';-import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';-import { MainContextStoreProvider } from '@/context-store/components/MainContextStoreProvider';-import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';-import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';-import { MinimalMetadataLoadEffect } from '@/metadata-store/effect-components/MinimalMetadataLoadEffect';-import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';-import { ApolloCoreProvider } from '@/object-metadata/components/ApolloCoreProvider';-import { PreComputedChipGeneratorsProvider } from '@/object-metadata/components/PreComputedChipGeneratorsProvider';-import { ApolloAdminProvider } from '@/settings/admin-panel/apollo/components/ApolloAdminProvider';-import { EndTrialAfterPaymentMethodGater } from '@/settings/billing/components/EndTrialAfterPaymentMethodGater';--import { CommandRunner } from '@/command-menu-item/engine-command/components/CommandRunner';-import { SSEProvider } from '@/sse-db-event/components/SSEProvider';-import { SupportChatEffect } from '@/support/components/SupportChatEffect';-import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';-import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';-import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';-import { GlobalFilePreviewModal } from '@/ui/field/display/components/GlobalFilePreviewModal';-import { BaseThemeProvider } from '@/ui/theme/components/BaseThemeProvider';-import { UserThemeProviderEffect } from '@/ui/theme/components/UserThemeProviderEffect';-import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';-import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';-import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';-import { StrictMode } from 'react';-import { Outlet, useLocation } from 'react-router-dom';-import { getPageTitleFromPath } from '~/utils/title-utils';--export const AppRouterProviders = () => {- const { pathname } = useLocation();- const pageTitle = getPageTitleFromPath(pathname);-- return (- <ApolloProvider>- <BaseThemeProvider>- <ClientConfigProviderEffect />- <UserMetadataProviderInitialEffect />- <MinimalMetadataLoadEffect />- <IsMinimalMetadataReadyEffect />- <WorkspaceProviderEffect />- <ClientConfigProvider>- <CaptchaProvider>- <MinimalMetadataGater>- <AuthProvider>- <ApolloCoreProvider>- <ApolloAdminProvider>- <SSEProvider>- <PreComputedChipGeneratorsProvider>- <UserThemeProviderEffect />- <SnackBarProvider>- <ErrorMessageEffect />- <AgentChatProvider>- <DialogComponentInstanceContext.Provider- value={{ instanceId: 'dialog-manager' }}- >- <DialogManager>- <StrictMode>- <PromiseRejectionEffect />- <EndTrialAfterPaymentMethodGater />- <GotoHotkeysEffectsProvider />- <PageTitle title={pageTitle} />- <PageFavicon />- <Outlet />- <GlobalFilePreviewModal />- <CommandMenuConfirmationModalManager />- <CommandRunner />- </StrictMode>- </DialogManager>- </DialogComponentInstanceContext.Provider>- </AgentChatProvider>- </SnackBarProvider>- <MainContextStoreProvider />- <SupportChatEffect />- <PageChangeEffect />- <SignOutOnOtherTabSignOutEffect />- </PreComputedChipGeneratorsProvider>- </SSEProvider>- </ApolloAdminProvider>- </ApolloCoreProvider>- </AuthProvider>- </MinimalMetadataGater>- </CaptchaProvider>- </ClientConfigProvider>- </BaseThemeProvider>- </ApolloProvider>- );-};diff --git a/packages/twenty-front/src/modules/app/components/DomainShell.tsx b/packages/twenty-front/src/modules/app/components/DomainShell.tsxnew file mode 100644index 00000000000..55ab0dd1433--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/DomainShell.tsx@@ -0,0 +1,40 @@+import { BrowserRouter } from 'react-router-dom';++import { RootApp } from '@/app/components/RootApp';+import { SharedAppProviders } from '@/app/components/SharedAppProviders';+import { WorkspaceApp } from '@/app/components/WorkspaceApp';+import { isOnOnboardingTransitionPath } from '@/auth/utils/isOnOnboardingTransitionPath';+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';+import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';+import { useIsCurrentLocationOnDefaultDomain } from '@/domain-manager/hooks/useIsCurrentLocationOnDefaultDomain';+import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader';++export const DomainShell = () => {+ const { isLoadedOnce } = useAtomStateValue(clientConfigApiStatusState);+ const isMultiWorkspaceEnabled = useAtomStateValue(+ isMultiWorkspaceEnabledState,+ );+ const { isDefaultDomain } = useIsCurrentLocationOnDefaultDomain();++ if (!isLoadedOnce) {+ return (+ <BrowserRouter>+ <SharedAppProviders>+ {isOnOnboardingTransitionPath(window.location.pathname) ? (+ <OnboardingPageLoader />+ ) : (+ <UserOrMetadataLoader />+ )}+ </SharedAppProviders>+ </BrowserRouter>+ );+ }++ if (!isMultiWorkspaceEnabled) {+ return <WorkspaceApp />;+ }++ return isDefaultDomain ? <RootApp /> : <WorkspaceApp />;+};diff --git a/packages/twenty-front/src/modules/app/components/I18nActivationGate.tsx b/packages/twenty-front/src/modules/app/components/I18nActivationGate.tsxindex c5faf40429f..1ed3222dcc5 100644--- a/packages/twenty-front/src/modules/app/components/I18nActivationGate.tsx+++ b/packages/twenty-front/src/modules/app/components/I18nActivationGate.tsx@@ -1,10 +1,8 @@-import { ONBOARDING_V2_PATHS } from '@/auth/constants/OnboardingV2Paths';+import { isOnOnboardingTransitionPath } from '@/auth/utils/isOnOnboardingTransitionPath';import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';import { i18n } from '@lingui/core';import { isNonEmptyString } from '@sniptt/guards';import { type ReactNode, useEffect, useState } from 'react';-import { matchPath } from 'react-router-dom';-import { isDefined } from 'twenty-shared/utils';type I18nActivationGateProps = {children: ReactNode;@@ -29,11 +27,9 @@ export const I18nActivationGate = ({ children }: I18nActivationGateProps) => {}, []);if (!isLocaleActivated) {- const isOnboardingLocation = ONBOARDING_V2_PATHS.some((onboardingPath) =>- isDefined(matchPath(onboardingPath, window.location.pathname)),- );-- return isOnboardingLocation ? <OnboardingPageLoader /> : null;+ return isOnOnboardingTransitionPath(window.location.pathname) ? (+ <OnboardingPageLoader />+ ) : null;}return <>{children}</>;diff --git a/packages/twenty-front/src/modules/app/components/RootApp.tsx b/packages/twenty-front/src/modules/app/components/RootApp.tsxnew file mode 100644index 00000000000..a687dcca0e0--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/RootApp.tsx@@ -0,0 +1,7 @@+import { RouterProvider } from 'react-router-dom';++import { useCreateRootAppRouter } from '@/app/hooks/useCreateRootAppRouter';++export const RootApp = () => {+ return <RouterProvider router={useCreateRootAppRouter()} />;+};diff --git a/packages/twenty-front/src/modules/app/components/RootAppProviders.tsx b/packages/twenty-front/src/modules/app/components/RootAppProviders.tsxnew file mode 100644index 00000000000..bde3d25c454--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/RootAppProviders.tsx@@ -0,0 +1,55 @@+import { StrictMode } from 'react';+import { Outlet, useLocation } from 'react-router-dom';++import { TrackPageViewEffect } from '@/analytics/components/TrackPageViewEffect';+import { SharedAppProviders } from '@/app/components/SharedAppProviders';+import { InitializeQueryParamStateEffect } from '@/app/effect-components/InitializeQueryParamStateEffect';+import { AuthProvider } from '@/auth/components/AuthProvider';+import { SignOutOnOtherTabSignOutEffect } from '@/auth/effect-components/SignOutOnOtherTabSignOutEffect';+import { CaptchaProvider } from '@/captcha/components/CaptchaProvider';+import { RequestFreshCaptchaTokenEffect } from '@/captcha/components/RequestFreshCaptchaTokenEffect';+import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';+import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';+import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';+import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';+import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';+import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';+import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';+import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';+import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';+import { getPageTitleFromPath } from '~/utils/title-utils';++export const RootAppProviders = () => {+ const { pathname } = useLocation();+ const pageTitle = getPageTitleFromPath(pathname);++ return (+ <SharedAppProviders>+ <CaptchaProvider>+ <UserMetadataProviderInitialEffect />+ <WorkspaceProviderEffect />+ <AuthProvider>+ <SnackBarProvider>+ <ErrorMessageEffect />+ <DialogComponentInstanceContext.Provider+ value={{ instanceId: 'dialog-manager' }}+ >+ <DialogManager>+ <StrictMode>+ <PromiseRejectionEffect />+ <PageTitle title={pageTitle} />+ <PageFavicon />+ <Outlet />+ <InitializeQueryParamStateEffect />+ <TrackPageViewEffect />+ <RequestFreshCaptchaTokenEffect />+ <SignOutOnOtherTabSignOutEffect />+ </StrictMode>+ </DialogManager>+ </DialogComponentInstanceContext.Provider>+ </SnackBarProvider>+ </AuthProvider>+ </CaptchaProvider>+ </SharedAppProviders>+ );+};diff --git a/packages/twenty-front/src/modules/app/components/SharedAppProviders.tsx b/packages/twenty-front/src/modules/app/components/SharedAppProviders.tsxnew file mode 100644index 00000000000..e1b82528b77--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/SharedAppProviders.tsx@@ -0,0 +1,19 @@+import { type PropsWithChildren } from 'react';++import { ApolloProvider } from '@/apollo/components/ApolloProvider';+import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';+import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';+import { BaseThemeProvider } from '@/ui/theme/components/BaseThemeProvider';++type SharedAppProvidersProps = PropsWithChildren;++export const SharedAppProviders = ({ children }: SharedAppProvidersProps) => {+ return (+ <ApolloProvider>+ <BaseThemeProvider>+ <ClientConfigProviderEffect />+ <ClientConfigProvider>{children}</ClientConfigProvider>+ </BaseThemeProvider>+ </ApolloProvider>+ );+};diff --git a/packages/twenty-front/src/modules/app/components/AppRouter.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsxsimilarity index 64%rename from packages/twenty-front/src/modules/app/components/AppRouter.tsxrename to packages/twenty-front/src/modules/app/components/WorkspaceApp.tsxindex a9586102ec3..5ab093fbc8a 100644--- a/packages/twenty-front/src/modules/app/components/AppRouter.tsx+++ b/packages/twenty-front/src/modules/app/components/WorkspaceApp.tsx@@ -1,10 +1,10 @@-import { useCreateAppRouter } from '@/app/hooks/useCreateAppRouter';+import { RouterProvider } from 'react-router-dom';++import { useCreateWorkspaceAppRouter } from '@/app/hooks/useCreateWorkspaceAppRouter';import { currentUserState } from '@/auth/states/currentUserState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { RouterProvider } from 'react-router-dom';-export const AppRouter = () => {- // We want to disable logic function settings but keep the code for now+export const WorkspaceApp = () => {const isFunctionSettingsEnabled = false;const currentUser = useAtomStateValue(currentUserState);@@ -15,7 +15,10 @@ export const AppRouter = () => {return (<RouterProvider- router={useCreateAppRouter(isFunctionSettingsEnabled, isAdminPageEnabled)}+ router={useCreateWorkspaceAppRouter(+ isFunctionSettingsEnabled,+ isAdminPageEnabled,+ )}/>);};diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsxnew file mode 100644index 00000000000..ca5b611c2e8--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx@@ -0,0 +1,92 @@+import { StrictMode } from 'react';+import { Outlet, useLocation } from 'react-router-dom';++import { AgentChatProvider } from '@/ai/components/AgentChatProvider';+import { TrackPageViewEffect } from '@/analytics/components/TrackPageViewEffect';+import { SharedAppProviders } from '@/app/components/SharedAppProviders';+import { GotoHotkeysEffectsProvider } from '@/app/effect-components/GotoHotkeysEffectsProvider';+import { InitializeQueryParamStateEffect } from '@/app/effect-components/InitializeQueryParamStateEffect';+import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';+import { AuthProvider } from '@/auth/components/AuthProvider';+import { SignOutOnOtherTabSignOutEffect } from '@/auth/effect-components/SignOutOnOtherTabSignOutEffect';+import { CaptchaProvider } from '@/captcha/components/CaptchaProvider';+import { RequestFreshCaptchaTokenEffect } from '@/captcha/components/RequestFreshCaptchaTokenEffect';+import { CommandMenuConfirmationModalManager } from '@/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager';+import { CommandRunner } from '@/command-menu-item/engine-command/components/CommandRunner';+import { MainContextStoreProvider } from '@/context-store/components/MainContextStoreProvider';+import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';+import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';+import { IsMinimalMetadataReadyEffect } from '@/metadata-store/effect-components/IsMinimalMetadataReadyEffect';+import { MinimalMetadataLoadEffect } from '@/metadata-store/effect-components/MinimalMetadataLoadEffect';+import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';+import { ApolloCoreProvider } from '@/object-metadata/components/ApolloCoreProvider';+import { ApolloAdminProvider } from '@/settings/admin-panel/apollo/components/ApolloAdminProvider';+import { EndTrialAfterPaymentMethodGater } from '@/settings/billing/components/EndTrialAfterPaymentMethodGater';+import { SSEProvider } from '@/sse-db-event/components/SSEProvider';+import { SupportChatEffect } from '@/support/components/SupportChatEffect';+import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';+import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';+import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';+import { GlobalFilePreviewModal } from '@/ui/field/display/components/GlobalFilePreviewModal';+import { UserThemeProviderEffect } from '@/ui/theme/components/UserThemeProviderEffect';+import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';+import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';+import { UserContextProvider } from '@/users/components/UserContextProvider';+import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';+import { getPageTitleFromPath } from '~/utils/title-utils';++export const WorkspaceAppProviders = () => {+ const { pathname } = useLocation();+ const pageTitle = getPageTitleFromPath(pathname);++ return (+ <SharedAppProviders>+ <UserMetadataProviderInitialEffect />+ <MinimalMetadataLoadEffect />+ <IsMinimalMetadataReadyEffect />+ <WorkspaceProviderEffect />+ <CaptchaProvider>+ <UserContextProvider>+ <AuthProvider>+ <ApolloCoreProvider>+ <ApolloAdminProvider>+ <SSEProvider>+ <UserThemeProviderEffect />+ <SnackBarProvider>+ <ErrorMessageEffect />+ <AgentChatProvider>+ <DialogComponentInstanceContext.Provider+ value={{ instanceId: 'dialog-manager' }}+ >+ <DialogManager>+ <StrictMode>+ <PromiseRejectionEffect />+ <EndTrialAfterPaymentMethodGater />+ <GotoHotkeysEffectsProvider />+ <PageTitle title={pageTitle} />+ <PageFavicon />+ <Outlet />+ <GlobalFilePreviewModal />+ <CommandMenuConfirmationModalManager />+ <CommandRunner />+ </StrictMode>+ </DialogManager>+ </DialogComponentInstanceContext.Provider>+ </AgentChatProvider>+ </SnackBarProvider>+ <MainContextStoreProvider />+ <SupportChatEffect />+ <InitializeQueryParamStateEffect />+ <TrackPageViewEffect />+ <RequestFreshCaptchaTokenEffect />+ <PageChangeEffect />+ <SignOutOnOtherTabSignOutEffect />+ </SSEProvider>+ </ApolloAdminProvider>+ </ApolloCoreProvider>+ </AuthProvider>+ </UserContextProvider>+ </CaptchaProvider>+ </SharedAppProviders>+ );+};diff --git a/packages/twenty-front/src/modules/app/components/__tests__/DomainShell.test.tsx b/packages/twenty-front/src/modules/app/components/__tests__/DomainShell.test.tsxnew file mode 100644index 00000000000..edc352c0279--- /dev/null+++ b/packages/twenty-front/src/modules/app/components/__tests__/DomainShell.test.tsx@@ -0,0 +1,125 @@+import { render, screen } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';++import { DomainShell } from '@/app/components/DomainShell';+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';+import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';++let isDefaultDomainValue = true;++jest.mock('@/apollo/components/ApolloProvider', () => ({+ ApolloProvider: ({ children }: React.PropsWithChildren) => <>{children}</>,+}));++jest.mock('@/ui/theme/components/BaseThemeProvider', () => ({+ BaseThemeProvider: ({ children }: React.PropsWithChildren) => <>{children}</>,+}));++jest.mock('@/client-config/components/ClientConfigProviderEffect', () => ({+ ClientConfigProviderEffect: () => null,+}));++jest.mock('@/client-config/components/ClientConfigProvider', () => ({+ ClientConfigProvider: ({ children }: React.PropsWithChildren) => (+ <>{children}</>+ ),+}));++jest.mock('@/app/components/RootApp', () => ({+ RootApp: () => <div>ROOT_APP</div>,+}));++jest.mock('@/app/components/WorkspaceApp', () => ({+ WorkspaceApp: () => <div>WORKSPACE_APP</div>,+}));++jest.mock('~/loading/components/UserOrMetadataLoader', () => ({+ UserOrMetadataLoader: () => <div>LOADER</div>,+}));++jest.mock('@/onboarding/components/OnboardingPageLoader', () => ({+ OnboardingPageLoader: () => <div>ONBOARDING_LOADER</div>,+}));++jest.mock('@/domain-manager/hooks/useIsCurrentLocationOnDefaultDomain', () => ({+ useIsCurrentLocationOnDefaultDomain: () => ({+ isDefaultDomain: isDefaultDomainValue,+ }),+}));++const renderShell = () =>+ render(+ <JotaiProvider store={jotaiStore}>+ <DomainShell />+ </JotaiProvider>,+ );++const setClientConfigLoaded = (isLoadedOnce: boolean) => {+ jotaiStore.set(clientConfigApiStatusState.atom, {+ isLoadedOnce,+ isLoading: false,+ isErrored: false,+ isSaved: isLoadedOnce,+ });+};++describe('DomainShell', () => {+ beforeEach(() => {+ resetJotaiStore();+ isDefaultDomainValue = true;+ window.history.pushState({}, '', '/');+ });++ it('shows the loader until the client config has loaded', () => {+ setClientConfigLoaded(false);+ jotaiStore.set(isMultiWorkspaceEnabledState.atom, true);++ renderShell();++ expect(screen.getByText('LOADER')).toBeInTheDocument();+ });++ it('shows the onboarding loader on onboarding paths until the client config has loaded', () => {+ setClientConfigLoaded(false);+ jotaiStore.set(isMultiWorkspaceEnabledState.atom, true);+ window.history.pushState({}, '', '/welcome');++ renderShell();++ expect(screen.getByText('ONBOARDING_LOADER')).toBeInTheDocument();+ });++ it('mounts the workspace app directly in single-workspace mode', () => {+ setClientConfigLoaded(true);+ jotaiStore.set(isMultiWorkspaceEnabledState.atom, false);+ isDefaultDomainValue = true;++ renderShell();++ expect(screen.getByText('WORKSPACE_APP')).toBeInTheDocument();+ });++ it('mounts the root app on the default domain in multi-workspace mode', () => {+ setClientConfigLoaded(true);+ jotaiStore.set(isMultiWorkspaceEnabledState.atom, true);+ isDefaultDomainValue = true;++ renderShell();++ expect(screen.getByText('ROOT_APP')).toBeInTheDocument();+ });++ it('mounts the workspace app on a workspace domain in multi-workspace mode', () => {+ setClientConfigLoaded(true);+ jotaiStore.set(isMultiWorkspaceEnabledState.atom, true);+ isDefaultDomainValue = false;++ renderShell();++ expect(screen.getByText('WORKSPACE_APP')).toBeInTheDocument();+ });+});diff --git a/packages/twenty-front/src/modules/app/effect-components/InitializeQueryParamStateEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/InitializeQueryParamStateEffect.tsxnew file mode 100644index 00000000000..b309c63ddee--- /dev/null+++ b/packages/twenty-front/src/modules/app/effect-components/InitializeQueryParamStateEffect.tsx@@ -0,0 +1,15 @@+import { useEffect } from 'react';+import { useLocation } from 'react-router-dom';++import { useInitializeQueryParamState } from '~/modules/app/hooks/useInitializeQueryParamState';++export const InitializeQueryParamStateEffect = () => {+ const location = useLocation();+ const { initializeQueryParamState } = useInitializeQueryParamState();++ useEffect(() => {+ initializeQueryParamState();+ }, [initializeQueryParamState, location]);++ return null;+};diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsxindex e8a3d548bb5..4c565aab1d9 100644--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx@@ -1,15 +1,7 @@-import {- setSessionId,- useEventTracker,-} from '@/analytics/hooks/useEventTracker';import { useExecuteTasksOnAnyLocationChange } from '@/app/hooks/useExecuteTasksOnAnyLocationChange';import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';-import { ONBOARDING_PATHS } from '@/auth/constants/OnboardingPaths';-import { ONGOING_USER_CREATION_PATHS } from '@/auth/constants/OngoingUserCreationPaths';import { useReturnToPath } from '@/auth/hooks/useReturnToPath';-import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';-import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';-import { isCaptchaRequiredForPath } from '@/captcha/utils/isCaptchaRequiredForPath';+import { useIsOnAuthOrOnboardingPage } from '@/auth/hooks/useIsOnAuthOrOnboardingPage';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';@@ -43,18 +35,9 @@ import {} from 'react-router-dom';import { AppBasePath, AppPath, SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { AnalyticsType } from '~/generated-metadata/graphql';import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';import { getPageLayoutIdForLocation } from '~/modules/app/utils/getPageLayoutIdForLocation';-import { useInitializeQueryParamState } from '~/modules/app/hooks/useInitializeQueryParamState';import { isMatchingLocation } from '~/utils/isMatchingLocation';-import { getPageTitleFromPath } from '~/utils/title-utils';--const AUTH_AND_ONBOARDING_PATHS = [- ...ONGOING_USER_CREATION_PATHS,- ...ONBOARDING_PATHS,- AppPath.ResetPassword,-];// TODO: break down into smaller functions and / or hooks// - moved usePageChangeEffectNavigateLocation into dedicated hook@@ -69,10 +52,6 @@ export const PageChangeEffect = () => {const pageChangeEffectNavigateLocation =usePageChangeEffectNavigateLocation();- const eventTracker = useEventTracker();-- const { initializeQueryParamState } = useInitializeQueryParamState();-//TODO: refactor useResetTableRowSelection hook to not throw when the argument `recordTableId` is an empty string// - replace CoreObjectNamePlural.Personconst objectNamePlural =@@ -114,9 +93,7 @@ export const PageChangeEffect = () => {const { saveReturnToPath, getReturnToPath, clearReturnToPath } =useReturnToPath();- const isOnAuthOrOnboardingPage = AUTH_AND_ONBOARDING_PATHS.some((appPath) =>- isMatchingLocation(location, appPath),- );+ const isOnAuthOrOnboardingPage = useIsOnAuthOrOnboardingPage();const closeSidePanelUnlessNotRelevant = useCallback(() => {const currentPage = store.get(sidePanelPageState.atom);@@ -159,8 +136,6 @@ export const PageChangeEffect = () => {}, [location, previousLocation, executeTasksOnAnyLocationChange, store]);useEffect(() => {- initializeQueryParamState();-if (isDefined(pageChangeEffectNavigateLocation) &&isAppEffectRedirectEnabled@@ -186,7 +161,6 @@ export const PageChangeEffect = () => {}, [navigate,pageChangeEffectNavigateLocation,- initializeQueryParamState,isAppEffectRedirectEnabled,isOnAuthOrOnboardingPage,saveReturnToPath,@@ -253,8 +227,7 @@ export const PageChangeEffect = () => {}break;}- case isMatchingLocation(location, AppPath.SignInUp):- case isMatchingLocation(location, AppPath.SignInUpV2): {+ case isMatchingLocation(location, AppPath.SignInUp): {resetFocusStackToFocusItem({focusStackItem: {focusId: PageFocusId.SignInUp,@@ -302,8 +275,7 @@ export const PageChangeEffect = () => {});break;}- case isMatchingLocation(location, AppPath.WorkspaceActivation):- case isMatchingLocation(location, AppPath.WorkspaceActivationV2): {+ case isMatchingLocation(location, AppPath.WorkspaceActivation): {resetFocusStackToFocusItem({focusStackItem: {focusId: PageFocusId.WorkspaceActivation,@@ -335,8 +307,7 @@ export const PageChangeEffect = () => {});break;}- case isMatchingLocation(location, AppPath.InviteTeam):- case isMatchingLocation(location, AppPath.InviteTeamV2): {+ case isMatchingLocation(location, AppPath.InviteTeam): {resetFocusStackToFocusItem({focusStackItem: {focusId: PageFocusId.InviteTeam,@@ -401,31 +372,5 @@ export const PageChangeEffect = () => {store,]);- useEffect(() => {- setTimeout(() => {- setSessionId();- eventTracker(AnalyticsType['PAGEVIEW'], {- name: getPageTitleFromPath(location.pathname),- properties: {- pathname: location.pathname,- locale: navigator.language,- userAgent: window.navigator.userAgent,- href: window.location.href,- referrer: document.referrer,- timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,- },- });- }, 500);- }, [eventTracker, location.pathname]);-- const { requestFreshCaptchaToken } = useRequestFreshCaptchaToken();- const isCaptchaScriptLoaded = useAtomStateValue(isCaptchaScriptLoadedState);-- useEffect(() => {- if (isCaptchaScriptLoaded && isCaptchaRequiredForPath(location.pathname)) {- requestFreshCaptchaToken();- }- }, [isCaptchaScriptLoaded, location.pathname, requestFreshCaptchaToken]);-return <></>;};diff --git a/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx b/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsxdeleted file mode 100644index 41a434ae362..00000000000--- a/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx+++ /dev/null@@ -1,401 +0,0 @@-import { AppRouterProviders } from '@/app/components/AppRouterProviders';-import { LazyRoute } from '@/app/components/LazyRoute';-import { SettingsRoutes } from '@/app/components/SettingsRoutes';-import { VerifyLoginTokenEffect } from '@/auth/components/VerifyLoginTokenEffect';--import { VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';-import indexAppPath from '@/navigation/utils/indexAppPath';-import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';-import { OnboardingV2TransitionOutlet } from '@/onboarding/components/OnboardingV2TransitionOutlet';-import { VerifyV2 } from '~/pages/onboarding/VerifyV2';-import { lazyWithPreload } from '~/utils/lazyWithPreload';-import { RecordIndexSkeletonLoader } from '@/object-record/record-index/components/RecordIndexSkeletonLoader';-import { BlankLayout } from '@/ui/layout/page/components/BlankLayout';-import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';-import { MainAppLayoutWithSidePanel } from '@/ui/layout/page/components/MainAppLayoutWithSidePanel';-import { AppPath, SettingsPath } from 'twenty-shared/types';-import { getSettingsPath } from 'twenty-shared/utils';--import { lazy } from 'react';-import {- createBrowserRouter,- createRoutesFromElements,- Navigate,- Route,-} from 'react-router-dom';--const RecordIndexPage = lazy(() =>- import('~/pages/object-record/RecordIndexPage').then((module) => ({- default: module.RecordIndexPage,- })),-);--const RecordShowPage = lazy(() =>- import('~/pages/object-record/RecordShowPage').then((module) => ({- default: module.RecordShowPage,- })),-);--const SignInUp = lazy(() =>- import('~/pages/auth/SignInUp').then((module) => ({- default: module.SignInUp,- })),-);--const SignInUpV2 = lazy(() =>- import('~/pages/auth/SignInUpV2').then((module) => ({- default: module.SignInUpV2,- })),-);--const PasswordReset = lazy(() =>- import('~/pages/auth/PasswordReset').then((module) => ({- default: module.PasswordReset,- })),-);--const Authorize = lazy(() =>- import('~/pages/auth/Authorize').then((module) => ({- default: module.Authorize,- })),-);--const WorkspaceActivation = lazy(() =>- import('~/pages/onboarding/WorkspaceActivation').then((module) => ({- default: module.WorkspaceActivation,- })),-);--const WorkspaceActivationV2 = lazyWithPreload(() =>- import('~/pages/onboarding/WorkspaceActivationV2').then((module) => ({- default: module.WorkspaceActivationV2,- })),-);--const CreateProfile = lazy(() =>- import('~/pages/onboarding/CreateProfile').then((module) => ({- default: module.CreateProfile,- })),-);--const CreateProfileV2 = lazyWithPreload(() =>- import('~/pages/onboarding/CreateProfileV2').then((module) => ({- default: module.CreateProfileV2,- })),-);--const SyncEmails = lazy(() =>- import('~/pages/onboarding/SyncEmails').then((module) => ({- default: module.SyncEmails,- })),-);--const SyncEmailsV2 = lazyWithPreload(() =>- import('~/pages/onboarding/SyncEmailsV2').then((module) => ({- default: module.SyncEmailsV2,- })),-);--const InstallAppsV2 = lazyWithPreload(() =>- import('~/pages/onboarding/InstallAppsV2').then((module) => ({- default: module.InstallAppsV2,- })),-);--const InviteTeam = lazy(() =>- import('~/pages/onboarding/InviteTeam').then((module) => ({- default: module.InviteTeam,- })),-);--const InviteTeamV2 = lazyWithPreload(() =>- import('~/pages/onboarding/InviteTeamV2').then((module) => ({- default: module.InviteTeamV2,- })),-);--const ChooseYourPlan = lazy(() =>- import('~/pages/onboarding/ChooseYourPlan').then((module) => ({- default: module.ChooseYourPlan,- })),-);--const ChooseYourPlanV2 = lazyWithPreload(() =>- import('~/pages/onboarding/ChooseYourPlanV2').then((module) => ({- default: module.ChooseYourPlanV2,- })),-);--const PaymentSuccess = lazy(() =>- import('~/pages/onboarding/PaymentSuccess').then((module) => ({- default: module.PaymentSuccess,- })),-);--const BookCallDecision = lazy(() =>- import('~/pages/onboarding/BookCallDecision').then((module) => ({- default: module.BookCallDecision,- })),-);--const BookCall = lazy(() =>- import('~/pages/onboarding/BookCall').then((module) => ({- default: module.BookCall,- })),-);--const StandalonePageLayoutPage = lazy(() =>- import('~/pages/page-layout/StandalonePageLayoutPage').then((module) => ({- default: module.StandalonePageLayoutPage,- })),-);--const NotFound = lazy(() =>- import('~/pages/not-found/NotFound').then((module) => ({- default: module.NotFound,- })),-);--const preloadOnboardingV2Pages = () => {- void WorkspaceActivationV2.preload();- void CreateProfileV2.preload();- void SyncEmailsV2.preload();- void InstallAppsV2.preload();- void InviteTeamV2.preload();- void ChooseYourPlanV2.preload();-- return null;-};--export const useCreateAppRouter = (- isFunctionSettingsEnabled?: boolean,- isAdminPageEnabled?: boolean,-) =>- createBrowserRouter(- createRoutesFromElements(- <Route- element={<AppRouterProviders />}- // To switch state to `loading` temporarily to enable us- // to set scroll position before the page is rendered- loader={async () => Promise.resolve(null)}- >- <Route element={<DefaultLayout />}>- <Route path={AppPath.Verify} element={<VerifyLoginTokenEffect />} />- <Route path={AppPath.VerifyEmail} element={<VerifyEmailEffect />} />- <Route- path={AppPath.SignInUp}- element={- <LazyRoute fallback={null}>- <SignInUp />- </LazyRoute>- }- />- <Route- path={AppPath.Invite}- element={- <LazyRoute fallback={null}>- <SignInUp />- </LazyRoute>- }- />- <Route- path={AppPath.ResetPassword}- element={- <LazyRoute fallback={null}>- <PasswordReset />- </LazyRoute>- }- />- <Route- path={AppPath.WorkspaceActivation}- element={- <LazyRoute fallback={null}>- <WorkspaceActivation />- </LazyRoute>- }- />- <Route- path={AppPath.CreateProfile}- element={- <LazyRoute fallback={null}>- <CreateProfile />- </LazyRoute>- }- />- <Route- path={AppPath.SyncEmails}- element={- <LazyRoute fallback={null}>- <SyncEmails />- </LazyRoute>- }- />- <Route- path={AppPath.InviteTeam}- element={- <LazyRoute fallback={null}>- <InviteTeam />- </LazyRoute>- }- />- <Route- path={AppPath.PlanRequired}- element={- <LazyRoute fallback={null}>- <ChooseYourPlan />- </LazyRoute>- }- />- <Route- path={AppPath.PlanRequiredSuccess}- element={- <LazyRoute fallback={null}>- <PaymentSuccess />- </LazyRoute>- }- />- <Route- path={AppPath.BookCallDecision}- element={- <LazyRoute fallback={null}>- <BookCallDecision />- </LazyRoute>- }- />- <Route- path={AppPath.BookCall}- element={- <LazyRoute fallback={null}>- <BookCall />- </LazyRoute>- }- />- <Route element={<MainAppLayoutWithSidePanel />}>- <Route path={indexAppPath.getIndexAppPath()} element={<></>} />- <Route- path={AppPath.RecordIndexPage}- element={- <LazyRoute fallback={<RecordIndexSkeletonLoader />}>- <RecordIndexPage />- </LazyRoute>- }- />- <Route- path={AppPath.RecordShowPage}- element={- <LazyRoute>- <RecordShowPage />- </LazyRoute>- }- />- <Route- path={AppPath.PageLayoutPage}- element={- <LazyRoute>- <StandalonePageLayoutPage />- </LazyRoute>- }- />- <Route- path={AppPath.SettingsCatchAll}- element={- <SettingsRoutes- isFunctionSettingsEnabled={isFunctionSettingsEnabled}- isAdminPageEnabled={isAdminPageEnabled}- />- }- />- {/* Deep link for twenty.com/dpa → in-app generator. This route is- inside the authenticated layout, so an unauthenticated hit is- login-gated and returns here after sign-in. */}- <Route- path={AppPath.Dpa}- element={- <Navigate to={getSettingsPath(SettingsPath.LegalDpa)} replace />- }- />- <Route- path={AppPath.NotFoundWildcard}- element={- <LazyRoute>- <NotFound />- </LazyRoute>- }- />- </Route>- </Route>- <Route element={<BlankLayout />}>- <Route- element={<OnboardingV2TransitionOutlet />}- loader={preloadOnboardingV2Pages}- >- <Route- path={AppPath.SignInUpV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <SignInUpV2 />- </LazyRoute>- }- />- <Route path={AppPath.VerifyV2} element={<VerifyV2 />} />- <Route- path={AppPath.WorkspaceActivationV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <WorkspaceActivationV2 />- </LazyRoute>- }- />- <Route- path={AppPath.CreateProfileV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <CreateProfileV2 />- </LazyRoute>- }- />- <Route- path={AppPath.SyncEmailsV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <SyncEmailsV2 />- </LazyRoute>- }- />- <Route- path={AppPath.InstallAppsV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <InstallAppsV2 />- </LazyRoute>- }- />- <Route- path={AppPath.InviteTeamV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <InviteTeamV2 />- </LazyRoute>- }- />- <Route- path={AppPath.PlanRequiredV2}- element={- <LazyRoute fallback={<OnboardingPageLoader />}>- <ChooseYourPlanV2 />- </LazyRoute>- }- />- </Route>- <Route- path={AppPath.Authorize}- element={- <LazyRoute>- <Authorize />- </LazyRoute>- }- />- </Route>- </Route>,- ),- );diff --git a/packages/twenty-front/src/modules/app/hooks/useCreateRootAppRouter.tsx b/packages/twenty-front/src/modules/app/hooks/useCreateRootAppRouter.tsxnew file mode 100644index 00000000000..eb57c820c9b--- /dev/null+++ b/packages/twenty-front/src/modules/app/hooks/useCreateRootAppRouter.tsx@@ -0,0 +1,91 @@+import { lazy, useState } from 'react';+import {+ createBrowserRouter,+ createRoutesFromElements,+ Navigate,+ Route,+} from 'react-router-dom';+import { AppPath } from 'twenty-shared/types';++import { LazyRoute } from '@/app/components/LazyRoute';+import { RootAppProviders } from '@/app/components/RootAppProviders';+import { VerifyEmail } from '@/auth/components/VerifyEmail';+import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';+import { OnboardingTransitionOutlet } from '@/onboarding/components/OnboardingTransitionOutlet';+import { AuthFlowLayout } from '@/ui/layout/page/components/AuthFlowLayout';+import { BlankLayout } from '@/ui/layout/page/components/BlankLayout';++const SignInUp = lazy(() =>+ import('~/pages/auth/SignInUp').then((module) => ({+ default: module.SignInUp,+ })),+);++const Authorize = lazy(() =>+ import('~/pages/auth/Authorize').then((module) => ({+ default: module.Authorize,+ })),+);++const PasswordReset = lazy(() =>+ import('~/pages/auth/PasswordReset').then((module) => ({+ default: module.PasswordReset,+ })),+);++const createRootAppRouter = () =>+ createBrowserRouter(+ createRoutesFromElements(+ <Route element={<RootAppProviders />} loader={async () => null}>+ <Route element={<BlankLayout />}>+ <Route element={<OnboardingTransitionOutlet />}>+ <Route+ path={AppPath.SignInUp}+ element={+ <LazyRoute fallback={<OnboardingPageLoader />}>+ <SignInUp />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.Invite}+ element={+ <LazyRoute fallback={<OnboardingPageLoader />}>+ <SignInUp />+ </LazyRoute>+ }+ />+ </Route>+ </Route>+ <Route element={<AuthFlowLayout />}>+ <Route path={AppPath.VerifyEmail} element={<VerifyEmail />} />+ <Route+ path={AppPath.ResetPassword}+ element={+ <LazyRoute fallback={null}>+ <PasswordReset />+ </LazyRoute>+ }+ />+ </Route>+ <Route+ path={AppPath.Authorize}+ element={+ <LazyRoute>+ <Authorize />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.NotFoundWildcard}+ element={<Navigate to={AppPath.SignInUp} replace />}+ />+ </Route>,+ ),+ );++export const useCreateRootAppRouter = () => {+ const [router] = useState(createRootAppRouter);++ return router;+};diff --git a/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsx b/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsxnew file mode 100644index 00000000000..703139d353c--- /dev/null+++ b/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsx@@ -0,0 +1,341 @@+import { lazy, useMemo } from 'react';+import {+ createBrowserRouter,+ createRoutesFromElements,+ Navigate,+ Route,+} from 'react-router-dom';+import { AppPath, SettingsPath } from 'twenty-shared/types';+import { getSettingsPath } from 'twenty-shared/utils';++import { LazyRoute } from '@/app/components/LazyRoute';+import { SettingsRoutes } from '@/app/components/SettingsRoutes';+import { WorkspaceAppProviders } from '@/app/components/WorkspaceAppProviders';+import { VerifyEmail } from '@/auth/components/VerifyEmail';+import { MinimalMetadataGate } from '@/metadata-store/components/MinimalMetadataGate';+import indexAppPath from '@/navigation/utils/indexAppPath';+import { OnboardingActivationOutlet } from '@/onboarding/components/OnboardingActivationOutlet';+import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';+import { OnboardingStepLayout } from '@/onboarding/components/OnboardingStepLayout';+import { OnboardingStepPageLoader } from '@/onboarding/components/OnboardingStepPageLoader';+import { OnboardingTransitionOutlet } from '@/onboarding/components/OnboardingTransitionOutlet';+import { RecordIndexSkeletonLoader } from '@/object-record/record-index/components/RecordIndexSkeletonLoader';+import { AuthFlowLayout } from '@/ui/layout/page/components/AuthFlowLayout';+import { BlankLayout } from '@/ui/layout/page/components/BlankLayout';+import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';+import { MainAppLayoutWithSidePanel } from '@/ui/layout/page/components/MainAppLayoutWithSidePanel';+import { Verify } from '~/pages/onboarding/Verify';+import { lazyWithPreload } from '~/utils/lazyWithPreload';++const RecordIndexPage = lazy(() =>+ import('~/pages/object-record/RecordIndexPage').then((module) => ({+ default: module.RecordIndexPage,+ })),+);++const RecordShowPage = lazy(() =>+ import('~/pages/object-record/RecordShowPage').then((module) => ({+ default: module.RecordShowPage,+ })),+);++const SignInUp = lazy(() =>+ import('~/pages/auth/SignInUp').then((module) => ({+ default: module.SignInUp,+ })),+);++const PasswordReset = lazy(() =>+ import('~/pages/auth/PasswordReset').then((module) => ({+ default: module.PasswordReset,+ })),+);++const Authorize = lazy(() =>+ import('~/pages/auth/Authorize').then((module) => ({+ default: module.Authorize,+ })),+);++const WorkspaceActivation = lazyWithPreload(() =>+ import('~/pages/onboarding/WorkspaceActivation').then((module) => ({+ default: module.WorkspaceActivation,+ })),+);++const CreateProfile = lazyWithPreload(() =>+ import('~/pages/onboarding/CreateProfile').then((module) => ({+ default: module.CreateProfile,+ })),+);++const SyncEmails = lazyWithPreload(() =>+ import('~/pages/onboarding/SyncEmails').then((module) => ({+ default: module.SyncEmails,+ })),+);++const InstallApps = lazyWithPreload(() =>+ import('~/pages/onboarding/InstallApps').then((module) => ({+ default: module.InstallApps,+ })),+);++const InviteTeam = lazyWithPreload(() =>+ import('~/pages/onboarding/InviteTeam').then((module) => ({+ default: module.InviteTeam,+ })),+);++const ChooseYourPlan = lazyWithPreload(() =>+ import('~/pages/onboarding/ChooseYourPlan').then((module) => ({+ default: module.ChooseYourPlan,+ })),+);++const PaymentSuccess = lazy(() =>+ import('~/pages/onboarding/PaymentSuccess').then((module) => ({+ default: module.PaymentSuccess,+ })),+);++const BookCallDecision = lazy(() =>+ import('~/pages/onboarding/BookCallDecision').then((module) => ({+ default: module.BookCallDecision,+ })),+);++const BookCall = lazy(() =>+ import('~/pages/onboarding/BookCall').then((module) => ({+ default: module.BookCall,+ })),+);++const StandalonePageLayoutPage = lazy(() =>+ import('~/pages/page-layout/StandalonePageLayoutPage').then((module) => ({+ default: module.StandalonePageLayoutPage,+ })),+);++const NotFound = lazy(() =>+ import('~/pages/not-found/NotFound').then((module) => ({+ default: module.NotFound,+ })),+);++const preloadOnboardingPages = () => {+ void WorkspaceActivation.preload();+ void CreateProfile.preload();+ void SyncEmails.preload();+ void InstallApps.preload();+ void InviteTeam.preload();+ void ChooseYourPlan.preload();++ return null;+};++const createWorkspaceAppRouter = (+ isFunctionSettingsEnabled?: boolean,+ isAdminPageEnabled?: boolean,+) =>+ createBrowserRouter(+ createRoutesFromElements(+ <Route+ element={<WorkspaceAppProviders />}+ loader={async () => Promise.resolve(null)}+ >+ <Route element={<MinimalMetadataGate />}>+ <Route element={<DefaultLayout />}>+ <Route element={<MainAppLayoutWithSidePanel />}>+ <Route path={indexAppPath.getIndexAppPath()} element={<></>} />+ <Route+ path={AppPath.RecordIndexPage}+ element={+ <LazyRoute fallback={<RecordIndexSkeletonLoader />}>+ <RecordIndexPage />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.RecordShowPage}+ element={+ <LazyRoute>+ <RecordShowPage />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.PageLayoutPage}+ element={+ <LazyRoute>+ <StandalonePageLayoutPage />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.SettingsCatchAll}+ element={+ <SettingsRoutes+ isFunctionSettingsEnabled={isFunctionSettingsEnabled}+ isAdminPageEnabled={isAdminPageEnabled}+ />+ }+ />+ <Route+ path={AppPath.Dpa}+ element={+ <Navigate+ to={getSettingsPath(SettingsPath.LegalDpa)}+ replace+ />+ }+ />+ <Route+ path={AppPath.NotFoundWildcard}+ element={+ <LazyRoute>+ <NotFound />+ </LazyRoute>+ }+ />+ </Route>+ </Route>+ </Route>+ <Route element={<AuthFlowLayout />}>+ <Route path={AppPath.VerifyEmail} element={<VerifyEmail />} />+ <Route+ path={AppPath.ResetPassword}+ element={+ <LazyRoute fallback={null}>+ <PasswordReset />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.PlanRequiredSuccess}+ element={+ <LazyRoute fallback={null}>+ <PaymentSuccess />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.BookCallDecision}+ element={+ <LazyRoute fallback={null}>+ <BookCallDecision />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.BookCall}+ element={+ <LazyRoute fallback={null}>+ <BookCall />+ </LazyRoute>+ }+ />+ </Route>+ <Route element={<BlankLayout />}>+ <Route+ element={<OnboardingTransitionOutlet />}+ loader={preloadOnboardingPages}+ >+ <Route+ path={AppPath.SignInUp}+ element={+ <LazyRoute fallback={<OnboardingPageLoader />}>+ <SignInUp />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.Invite}+ element={+ <LazyRoute fallback={<OnboardingPageLoader />}>+ <SignInUp />+ </LazyRoute>+ }+ />+ </Route>+ <Route+ element={<OnboardingActivationOutlet />}+ loader={preloadOnboardingPages}+ >+ <Route path={AppPath.Verify} element={<Verify />} />+ <Route+ path={AppPath.WorkspaceActivation}+ element={+ <LazyRoute fallback={null}>+ <WorkspaceActivation />+ </LazyRoute>+ }+ />+ </Route>+ <Route+ element={<OnboardingStepLayout />}+ loader={preloadOnboardingPages}+ >+ <Route+ path={AppPath.CreateProfile}+ element={+ <LazyRoute fallback={<OnboardingStepPageLoader />}>+ <CreateProfile />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.SyncEmails}+ element={+ <LazyRoute fallback={<OnboardingStepPageLoader />}>+ <SyncEmails />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.InstallApps}+ element={+ <LazyRoute fallback={<OnboardingStepPageLoader />}>+ <InstallApps />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.InviteTeam}+ element={+ <LazyRoute fallback={<OnboardingStepPageLoader />}>+ <InviteTeam />+ </LazyRoute>+ }+ />+ <Route+ path={AppPath.PlanRequired}+ element={+ <LazyRoute fallback={<OnboardingStepPageLoader />}>+ <ChooseYourPlan />+ </LazyRoute>+ }+ />+ </Route>+ <Route+ path={AppPath.Authorize}+ element={+ <LazyRoute>+ <Authorize />+ </LazyRoute>+ }+ />+ </Route>+ </Route>,+ ),+ );++export const useCreateWorkspaceAppRouter = (+ isFunctionSettingsEnabled?: boolean,+ isAdminPageEnabled?: boolean,+) =>+ useMemo(+ () =>+ createWorkspaceAppRouter(isFunctionSettingsEnabled, isAdminPageEnabled),+ [isFunctionSettingsEnabled, isAdminPageEnabled],+ );diff --git a/packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.ts b/packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.tsindex 33f1faeb150..2bc96a5f5dd 100644--- a/packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.ts+++ b/packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.ts@@ -1,7 +1,6 @@import { useCallback } from 'react';import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';import { returnToPathState } from '@/auth/states/returnToPathState';import { type BillingCheckoutSession } from '@/auth/types/billingCheckoutSession.type';import { isValidReturnToPath } from '@/auth/utils/isValidReturnToPath';@@ -51,11 +50,6 @@ export const useInitializeQueryParamState = () => {store.set(returnToPathState.atom, value);}},- onboardingV2: (value: string) => {- if (value === 'true') {- store.set(isOnboardingV2State.atom, true);- }- },};const queryParams = new URLSearchParams(window.location.search);diff --git a/packages/twenty-front/src/modules/auth/components/AuthModal.tsx b/packages/twenty-front/src/modules/auth/components/AuthModal.tsxdeleted file mode 100644index 7107efdc97b..00000000000--- a/packages/twenty-front/src/modules/auth/components/AuthModal.tsx+++ /dev/null@@ -1,45 +0,0 @@-import { AuthModalMountEffect } from '@/auth/components/AuthModalMountEffect';-import { AUTH_MODAL_ID } from '@/auth/constants/AuthModalId';-import { getAuthModalConfig } from '@/auth/utils/getAuthModalConfig';-import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStatefulWrapper';-import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';-import { styled } from '@linaria/react';-import React from 'react';-import { useLocation } from 'react-router-dom';--const StyledContent = styled.div`- align-items: center;- display: flex;- flex-direction: column;- justify-content: center;- min-height: 320px;-`;--type AuthModalProps = {- children: React.ReactNode;-};--export const AuthModal = ({ children }: AuthModalProps) => {- const location = useLocation();- const config = getAuthModalConfig(location);-- return (- <>- <AuthModalMountEffect />- <ModalStatefulWrapper- modalInstanceId={AUTH_MODAL_ID}- padding="none"- size={config.size}- overlay={config.overlay}- >- {config.showScrollWrapper ? (- <ScrollWrapper componentInstanceId="scroll-wrapper-modal-content">- <StyledContent>{children}</StyledContent>- </ScrollWrapper>- ) : (- <>{children}</>- )}- </ModalStatefulWrapper>- </>- );-};diff --git a/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx b/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsxdeleted file mode 100644index 65056985222..00000000000--- a/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { useModal } from '@/ui/layout/modal/hooks/useModal';-import { useEffect } from 'react';--import { AUTH_MODAL_ID } from '@/auth/constants/AuthModalId';--// TODO: Remove this component when we refactor the auth modal to open it directly in the PageChangeEffect-export const AuthModalMountEffect = () => {- const { openModal, closeModal } = useModal();-- useEffect(() => {- openModal(AUTH_MODAL_ID);-- return () => {- closeModal(AUTH_MODAL_ID);- };- }, [openModal, closeModal]);-- return null;-};diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmail.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmail.tsxnew file mode 100644index 00000000000..86cfb5899f0--- /dev/null+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmail.tsx@@ -0,0 +1,33 @@+import { SubTitle } from '@/auth/components/SubTitle';+import { VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';+import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';+import { OnboardingVerifyLayout } from '@/onboarding/components/OnboardingVerifyLayout';+import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import { useSearchParams } from 'react-router-dom';+import { ModalContent } from 'twenty-ui/surfaces';++export const VerifyEmail = () => {+ const { t } = useLingui();+ const [searchParams] = useSearchParams();+ const [isError, setIsError] = useState(false);++ const email = searchParams.get('email');++ if (isError) {+ return (+ <ModalContent isVerticallyCentered isHorizontallyCentered>+ <EmailVerificationSent email={email} isError={true} />+ </ModalContent>+ );+ }++ return (+ <>+ <VerifyEmailEffect onError={() => setIsError(true)} />+ <OnboardingVerifyLayout>+ <SubTitle>{t`Verifying your email`}</SubTitle>+ </OnboardingVerifyLayout>+ </>+ );+};diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsxindex 00260f061a7..130448346f4 100644--- a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx@@ -1,26 +1,27 @@-import { useAuth } from '@/auth/hooks/useAuth';-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { CombinedGraphQLErrors } from '@apollo/client/errors';-import { AppPath } from 'twenty-shared/types';-import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';+import { useAuth } from '@/auth/hooks/useAuth';import { useVerifyLogin } from '@/auth/hooks/useVerifyLogin';import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';-import { ModalContent } from 'twenty-ui/surfaces';+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { CombinedGraphQLErrors } from '@apollo/client/errors';import { useLingui } from '@lingui/react/macro';-import { useEffect, useState } from 'react';+import { useEffect } from 'react';import { useSearchParams } from 'react-router-dom';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { AppPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { useNavigateApp } from '~/hooks/useNavigateApp';import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';-import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-export const VerifyEmailEffect = () => {+type VerifyEmailEffectProps = {+ onError: () => void;+};++export const VerifyEmailEffect = ({ onError }: VerifyEmailEffectProps) => {const {verifyEmailAndGetLoginToken,verifyEmailAndGetWorkspaceAgnosticToken,@@ -29,7 +30,6 @@ export const VerifyEmailEffect = () => {const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();const [searchParams] = useSearchParams();- const [isError, setIsError] = useState(false);const setVerifyEmailRedirectPath = useSetAtomState(verifyEmailRedirectPathState,@@ -109,7 +109,7 @@ export const VerifyEmailEffect = () => {navigate(AppPath.SignInUp);}- setIsError(true);+ onError();}};@@ -123,13 +123,5 @@ export const VerifyEmailEffect = () => {// oxlint-disable-next-line react-hooks/exhaustive-deps}, [clientConfigApiStatus.isLoadedOnce]);- if (isError) {- return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <EmailVerificationSent email={email} isError={true} />- </ModalContent>- );- }-return <></>;};diff --git a/packages/twenty-front/src/modules/auth/components/VerifyLoginTokenEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyLoginTokenEffect.tsxindex 1bf270b56fa..6bac7ad32f1 100644--- a/packages/twenty-front/src/modules/auth/components/VerifyLoginTokenEffect.tsx+++ b/packages/twenty-front/src/modules/auth/components/VerifyLoginTokenEffect.tsx@@ -1,4 +1,4 @@-import { useEffect } from 'react';+import { useEffect, useRef } from 'react';import { useSearchParams } from 'react-router-dom';import { useHasAccessTokenPair } from '@/auth/hooks/useHasAccessTokenPair';@@ -21,17 +21,21 @@ export const VerifyLoginTokenEffect = () => {clientConfigApiStatusState,);+ // oxlint-disable-next-line twenty/no-state-useref+ const hasVerifiedRef = useRef(false);+useEffect(() => {- if (!clientConfigLoaded) {+ if (!clientConfigLoaded || hasVerifiedRef.current) {return;}+ hasVerifiedRef.current = true;+if (isDefined(loginToken)) {verifyLoginToken(loginToken);} else if (!hasAccessTokenPair) {navigate(AppPath.SignInUp);}- // Verify only needs to run once at mount// oxlint-disable-next-line react-hooks/exhaustive-deps}, [clientConfigLoaded]);diff --git a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmail.stories.tsxsimilarity index 68%rename from packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsxrename to packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmail.stories.tsxindex ce04af70a96..9af93e928b3 100644--- a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx+++ b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmail.stories.tsx@@ -1,14 +1,14 @@-import { type VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';+import { type VerifyEmail } from '@/auth/components/VerifyEmail';import { type Meta, type StoryObj } from '@storybook/react-vite';import { MemoryRouter, Route, Routes } from 'react-router-dom';-// Mock component that just renders the error state of VerifyEmailEffect directly-// (since normal VerifyEmailEffect has async logic that's hard to test in Storybook)+// Mock component that just renders the error state of VerifyEmail directly+// (since normal VerifyEmail has async logic that's hard to test in Storybook)import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';import { ModalContent } from 'twenty-ui/surfaces';import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';-const VerifyEmailEffectErrorState = ({ email = '[email protected]' }) => {+const VerifyEmailErrorState = ({ email = '[email protected]' }) => {return (<ModalContent isVerticallyCentered isHorizontallyCentered><EmailVerificationSent email={email} isError={true} />@@ -16,9 +16,9 @@ const VerifyEmailEffectErrorState = ({ email = '[email protected]' }) => {);};-const meta: Meta<typeof VerifyEmailEffectErrorState> = {- title: 'Modules/Auth/VerifyEmailEffect',- component: VerifyEmailEffectErrorState,+const meta: Meta<typeof VerifyEmailErrorState> = {+ title: 'Modules/Auth/VerifyEmail',+ component: VerifyEmailErrorState,decorators: [(Story) => (<div style={{ padding: '24px' }}>@@ -29,13 +29,13 @@ const meta: Meta<typeof VerifyEmailEffectErrorState> = {],parameters: {codeSection: {- docs: 'IMPORTANT: When rendering EmailVerificationSent from VerifyEmailEffect, always wrap it with ModalContent to maintain consistent styling.',+ docs: 'IMPORTANT: When rendering EmailVerificationSent from VerifyEmail, always wrap it with ModalContent to maintain consistent styling.',},},};export default meta;-type Story = StoryObj<typeof VerifyEmailEffect>;+type Story = StoryObj<typeof VerifyEmail>;export const ErrorState: Story = {args: {@@ -43,7 +43,7 @@ export const ErrorState: Story = {},};-export const IntegratedExample: StoryObj<typeof VerifyEmailEffect> = {+export const IntegratedExample: StoryObj<typeof VerifyEmail> = {render: () => (<MemoryRouterinitialEntries={[@@ -53,7 +53,7 @@ export const IntegratedExample: StoryObj<typeof VerifyEmailEffect> = {<Routes><Routepath="/verify-email"- element={<VerifyEmailEffectErrorState email="[email protected]" />}+ element={<VerifyEmailErrorState email="[email protected]" />}/></Routes></MemoryRouter>diff --git a/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmailEffect.test.tsx b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmailEffect.test.tsxrename to packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsxindex 677982459a4..e4c2b2ed0a6 100644--- a/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmailEffect.test.tsx+++ b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsx@@ -7,7 +7,7 @@ import { SOURCE_LOCALE } from 'twenty-shared/translations';import { AppPath } from 'twenty-shared/types';import { ThemeProvider } from 'twenty-ui/theme-constants';-import { VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';+import { VerifyEmail } from '@/auth/components/VerifyEmail';import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';import {jotaiStore,@@ -60,7 +60,7 @@ jest.mock('@/ui/feedback/snack-bar-manager/hooks/useSnackBar', () => ({}),}));-// Rendered by VerifyEmailEffect in the error state; isolate it from Apollo.+// Rendered by VerifyEmail in the error state; isolate it from Apollo.jest.mock('@/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken',() => ({@@ -76,20 +76,20 @@ dynamicActivate(SOURCE_LOCALE);const VERIFY_EMAIL_URL ='/verify-email?email=user%40example.com&emailVerificationToken=valid-token';-const renderEffect = (initialEntry: string) =>+const renderVerifyEmail = (initialEntry: string) =>render(<JotaiProvider store={jotaiStore}><ThemeProvider colorScheme="light"><I18nProvider i18n={i18n}><MemoryRouter initialEntries={[initialEntry]}>- <VerifyEmailEffect />+ <VerifyEmail /></MemoryRouter></I18nProvider></ThemeProvider></JotaiProvider>,);-describe('VerifyEmailEffect', () => {+describe('VerifyEmail', () => {beforeEach(() => {jest.clearAllMocks();resetJotaiStore();@@ -106,7 +106,7 @@ describe('VerifyEmailEffect', () => {it('navigates to the SignInUp page after a successful workspace-agnostic verification on the central domain', async () => {verifyEmailAndGetWorkspaceAgnosticTokenMock.mockResolvedValue(undefined);- renderEffect(VERIFY_EMAIL_URL);+ renderVerifyEmail(VERIFY_EMAIL_URL);await waitFor(() => {expect(verifyEmailAndGetWorkspaceAgnosticTokenMock).toHaveBeenCalledWith(@@ -128,7 +128,7 @@ describe('VerifyEmailEffect', () => {new Error('verification failed'),);- renderEffect(VERIFY_EMAIL_URL);+ renderVerifyEmail(VERIFY_EMAIL_URL);await waitFor(() => {expect(enqueueErrorSnackBarMock).toHaveBeenCalled();@@ -143,7 +143,7 @@ describe('VerifyEmailEffect', () => {workspaceUrls: { subdomainUrl: 'https://foo.twenty.com/' },});- renderEffect(VERIFY_EMAIL_URL);+ renderVerifyEmail(VERIFY_EMAIL_URL);await waitFor(() => {expect(verifyEmailAndGetLoginTokenMock).toHaveBeenCalledWith(diff --git a/packages/twenty-front/src/modules/auth/components/__tests__/VerifyLoginTokenEffect.test.tsx b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyLoginTokenEffect.test.tsxnew file mode 100644index 00000000000..723c78f69a1--- /dev/null+++ b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyLoginTokenEffect.test.tsx@@ -0,0 +1,72 @@+import { act, render, waitFor } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { StrictMode } from 'react';+import { MemoryRouter } from 'react-router-dom';++import { VerifyLoginTokenEffect } from '@/auth/components/VerifyLoginTokenEffect';+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';++const verifyLoginTokenMock = jest.fn();+const navigateMock = jest.fn();++jest.mock('@/auth/hooks/useVerifyLogin', () => ({+ useVerifyLogin: () => ({ verifyLoginToken: verifyLoginTokenMock }),+}));++jest.mock('~/hooks/useNavigateApp', () => ({+ useNavigateApp: () => navigateMock,+}));++jest.mock('@/auth/hooks/useHasAccessTokenPair', () => ({+ useHasAccessTokenPair: () => false,+}));++const setClientConfigSaved = (isSaved: boolean) => {+ jotaiStore.set(clientConfigApiStatusState.atom, {+ isLoadedOnce: true,+ isLoading: false,+ isErrored: false,+ isSaved,+ });+};++const renderEffect = (initialEntry: string) =>+ render(+ <JotaiProvider store={jotaiStore}>+ <MemoryRouter initialEntries={[initialEntry]}>+ <StrictMode>+ <VerifyLoginTokenEffect />+ </StrictMode>+ </MemoryRouter>+ </JotaiProvider>,+ );++describe('VerifyLoginTokenEffect', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ resetJotaiStore();+ setClientConfigSaved(true);+ });++ it('verifies the login token at most once even when the gating config re-triggers the effect', async () => {+ renderEffect('/verify?loginToken=login-token');++ await waitFor(() => {+ expect(verifyLoginTokenMock).toHaveBeenCalledWith('login-token');+ });+ expect(verifyLoginTokenMock).toHaveBeenCalledTimes(1);++ await act(async () => {+ setClientConfigSaved(false);+ });+ await act(async () => {+ setClientConfigSaved(true);+ });++ expect(verifyLoginTokenMock).toHaveBeenCalledTimes(1);+ });+});diff --git a/packages/twenty-front/src/modules/auth/constants/AuthAndOnboardingPaths.ts b/packages/twenty-front/src/modules/auth/constants/AuthAndOnboardingPaths.tsnew file mode 100644index 00000000000..4602abbba1c--- /dev/null+++ b/packages/twenty-front/src/modules/auth/constants/AuthAndOnboardingPaths.ts@@ -0,0 +1,9 @@+import { ONBOARDING_PATHS } from '@/auth/constants/OnboardingPaths';+import { ONGOING_USER_CREATION_PATHS } from '@/auth/constants/OngoingUserCreationPaths';+import { AppPath } from 'twenty-shared/types';++export const AUTH_AND_ONBOARDING_PATHS = [+ ...ONGOING_USER_CREATION_PATHS,+ ...ONBOARDING_PATHS,+ AppPath.ResetPassword,+];diff --git a/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts b/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.tsdeleted file mode 100644index a0eac56aa28..00000000000--- a/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts+++ /dev/null@@ -1,24 +0,0 @@-import { type ModalOverlay, type ModalSize } from 'twenty-ui/surfaces';-import { AppPath } from 'twenty-shared/types';--type AuthModalConfigType = {- size: ModalSize;- overlay: ModalOverlay;- showScrollWrapper: boolean;-};--export const AUTH_MODAL_CONFIG: {- default: AuthModalConfigType;- [key: string]: AuthModalConfigType;-} = {- default: {- size: 'medium',- overlay: 'dark',- showScrollWrapper: true,- },- [AppPath.BookCall]: {- size: 'extraLarge',- overlay: 'transparent',- showScrollWrapper: false,- },-};diff --git a/packages/twenty-front/src/modules/auth/constants/AuthModalId.ts b/packages/twenty-front/src/modules/auth/constants/AuthModalId.tsdeleted file mode 100644index 934f56df24a..00000000000--- a/packages/twenty-front/src/modules/auth/constants/AuthModalId.ts+++ /dev/null@@ -1 +0,0 @@-export const AUTH_MODAL_ID = 'auth-modal';diff --git a/packages/twenty-front/src/modules/auth/constants/OnboardingPaths.ts b/packages/twenty-front/src/modules/auth/constants/OnboardingPaths.tsindex d7bcf74bf1e..7c84b997b96 100644--- a/packages/twenty-front/src/modules/auth/constants/OnboardingPaths.ts+++ b/packages/twenty-front/src/modules/auth/constants/OnboardingPaths.ts@@ -2,16 +2,11 @@ import { AppPath } from 'twenty-shared/types';export const ONBOARDING_PATHS = [AppPath.WorkspaceActivation,- AppPath.WorkspaceActivationV2,AppPath.CreateProfile,- AppPath.CreateProfileV2,AppPath.SyncEmails,- AppPath.SyncEmailsV2,- AppPath.InstallAppsV2,+ AppPath.InstallApps,AppPath.InviteTeam,- AppPath.InviteTeamV2,AppPath.PlanRequired,- AppPath.PlanRequiredV2,AppPath.PlanRequiredSuccess,AppPath.BookCallDecision,AppPath.BookCall,diff --git a/packages/twenty-front/src/modules/auth/constants/OnboardingTransitionPaths.ts b/packages/twenty-front/src/modules/auth/constants/OnboardingTransitionPaths.tsnew file mode 100644index 00000000000..5c399c74e19--- /dev/null+++ b/packages/twenty-front/src/modules/auth/constants/OnboardingTransitionPaths.ts@@ -0,0 +1,15 @@+import { AppPath } from 'twenty-shared/types';++export const ONBOARDING_TRANSITION_PATHS = [+ AppPath.SignInUp,+ AppPath.Invite,+ AppPath.Verify,+ AppPath.VerifyEmail,+ AppPath.WorkspaceActivation,+ AppPath.CreateProfile,+ AppPath.SyncEmails,+ AppPath.InstallApps,+ AppPath.InviteTeam,+ AppPath.PlanRequired,+ AppPath.PlanRequiredSuccess,+];diff --git a/packages/twenty-front/src/modules/auth/constants/OnboardingV2Paths.ts b/packages/twenty-front/src/modules/auth/constants/OnboardingV2Paths.tsdeleted file mode 100644index bb858f0cb84..00000000000--- a/packages/twenty-front/src/modules/auth/constants/OnboardingV2Paths.ts+++ /dev/null@@ -1,12 +0,0 @@-import { AppPath } from 'twenty-shared/types';--export const ONBOARDING_V2_PATHS = [- AppPath.SignInUpV2,- AppPath.VerifyV2,- AppPath.WorkspaceActivationV2,- AppPath.CreateProfileV2,- AppPath.SyncEmailsV2,- AppPath.InstallAppsV2,- AppPath.InviteTeamV2,- AppPath.PlanRequiredV2,-];diff --git a/packages/twenty-front/src/modules/auth/constants/OngoingUserCreationPaths.ts b/packages/twenty-front/src/modules/auth/constants/OngoingUserCreationPaths.tsindex da2d31434f5..db499b4c504 100644--- a/packages/twenty-front/src/modules/auth/constants/OngoingUserCreationPaths.ts+++ b/packages/twenty-front/src/modules/auth/constants/OngoingUserCreationPaths.ts@@ -3,8 +3,6 @@ import { AppPath } from 'twenty-shared/types';export const ONGOING_USER_CREATION_PATHS = [AppPath.Invite,AppPath.SignInUp,- AppPath.SignInUpV2,AppPath.VerifyEmail,AppPath.Verify,- AppPath.VerifyV2,];diff --git a/packages/twenty-front/src/modules/auth/hooks/useIsOnAuthOrOnboardingPage.ts b/packages/twenty-front/src/modules/auth/hooks/useIsOnAuthOrOnboardingPage.tsnew file mode 100644index 00000000000..f798598fe47--- /dev/null+++ b/packages/twenty-front/src/modules/auth/hooks/useIsOnAuthOrOnboardingPage.ts@@ -0,0 +1,11 @@+import { AUTH_AND_ONBOARDING_PATHS } from '@/auth/constants/AuthAndOnboardingPaths';+import { useLocation } from 'react-router-dom';+import { isMatchingLocation } from '~/utils/isMatchingLocation';++export const useIsOnAuthOrOnboardingPage = () => {+ const location = useLocation();++ return AUTH_AND_ONBOARDING_PATHS.some((appPath) =>+ isMatchingLocation(location, appPath),+ );+};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/FooterNote.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/FooterNote.tsxindex 9e843aca5fa..94bd5d1677b 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/FooterNote.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/FooterNote.tsx@@ -3,13 +3,15 @@ import { Trans } from '@lingui/react/macro';import { useWorkspaceBypass } from '@/auth/sign-in-up/hooks/useWorkspaceBypass';import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledCopyContainer = styled.div`align-items: center;color: ${themeCssVariables.font.color.tertiary};font-size: ${themeCssVariables.font.size.sm};- max-width: 280px;+ line-height: 1.4;+ max-width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;text-align: center;& > a {diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsxindex 38881e7d96c..abeb172ffe1 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx@@ -8,6 +8,8 @@ import { FormProvider } from 'react-hook-form';import { ClickToActionLink, UndecoratedLink } from 'twenty-ui/navigation';import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { SignInUpWithCredentials } from '@/auth/sign-in-up/components/internal/SignInUpWithCredentials';import { SignInUpWithGoogle } from '@/auth/sign-in-up/components/internal/SignInUpWithGoogle';import { SignInUpWithMicrosoft } from '@/auth/sign-in-up/components/internal/SignInUpWithMicrosoft';@@ -36,6 +38,11 @@ import {import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';+const StyledContentContainer = styled(StyledOnboardingContentContainer)`+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;+`;+const StyledWorkspaceContainer = styled.div`background-color: ${themeCssVariables.background.secondary};border: 1px solid ${themeCssVariables.border.color.light};@@ -156,70 +163,82 @@ export const SignInUpGlobalScopeForm = () => {);};+ const availableWorkspacesList = [+ ...availableWorkspaces.availableWorkspacesForSignIn,+ ...availableWorkspaces.availableWorkspacesForSignUp,+ ];+return (<>{signInUpStep === SignInUpStep.WorkspaceSelection && (- <StyledOnboardingContentContainer>+ <StyledContentContainer><StyledWorkspaceContainer>- {[- ...availableWorkspaces.availableWorkspacesForSignIn,- ...availableWorkspaces.availableWorkspacesForSignUp,- ].map((availableWorkspace) => (- <UndecoratedLink+ {availableWorkspacesList.map((availableWorkspace, index) => (+ <OnboardingStepAnimatedItemkey={availableWorkspace.id}- to={getAvailableWorkspaceUrl(availableWorkspace)}+ index={index}+ >+ <UndecoratedLink+ to={getAvailableWorkspaceUrl(availableWorkspace)}+ >+ <StyledWorkspaceItem>+ <StyledWorkspaceContent>+ <Avatar+ placeholder={availableWorkspace.displayName || ''}+ avatarUrl={getAbsoluteImageUrl(+ availableWorkspace.logo ?? DEFAULT_WORKSPACE_LOGO,+ )}+ size="lg"+ />+ <StyledWorkspaceTextContainer>+ <StyledWorkspaceName>+ {availableWorkspace.displayName ||+ availableWorkspace.id}+ </StyledWorkspaceName>+ <StyledWorkspaceUrl>+ {+ new URL(+ getWorkspaceUrl(availableWorkspace.workspaceUrls),+ ).hostname+ }+ </StyledWorkspaceUrl>+ </StyledWorkspaceTextContainer>+ <StyledChevronIcon>+ <IconChevronRight size={theme.icon.size.md} />+ </StyledChevronIcon>+ </StyledWorkspaceContent>+ </StyledWorkspaceItem>+ </UndecoratedLink>+ </OnboardingStepAnimatedItem>+ ))}+ {!isDDLLocked && (+ <OnboardingStepAnimatedItem+ index={availableWorkspacesList.length}>- <StyledWorkspaceItem>+ <StyledWorkspaceItem+ onClick={() =>+ setSignInUpStep(SignInUpStep.WorkspaceCreation)+ }+ ><StyledWorkspaceContent>- <Avatar- placeholder={availableWorkspace.displayName || ''}- avatarUrl={getAbsoluteImageUrl(- availableWorkspace.logo ?? DEFAULT_WORKSPACE_LOGO,- )}- size="lg"- />+ <StyledWorkspaceLogo>+ <IconPlus size={theme.icon.size.lg} />+ </StyledWorkspaceLogo><StyledWorkspaceTextContainer>- <StyledWorkspaceName>- {availableWorkspace.displayName ||- availableWorkspace.id}- </StyledWorkspaceName>- <StyledWorkspaceUrl>- {- new URL(- getWorkspaceUrl(availableWorkspace.workspaceUrls),- ).hostname- }- </StyledWorkspaceUrl>+ <StyledWorkspaceName>{t`Create a workspace`}</StyledWorkspaceName></StyledWorkspaceTextContainer><StyledChevronIcon><IconChevronRight size={theme.icon.size.md} /></StyledChevronIcon></StyledWorkspaceContent></StyledWorkspaceItem>- </UndecoratedLink>- ))}- {!isDDLLocked && (- <StyledWorkspaceItem- onClick={() => setSignInUpStep(SignInUpStep.WorkspaceCreation)}- >- <StyledWorkspaceContent>- <StyledWorkspaceLogo>- <IconPlus size={theme.icon.size.lg} />- </StyledWorkspaceLogo>- <StyledWorkspaceTextContainer>- <StyledWorkspaceName>{t`Create a workspace`}</StyledWorkspaceName>- </StyledWorkspaceTextContainer>- <StyledChevronIcon>- <IconChevronRight size={theme.icon.size.md} />- </StyledChevronIcon>- </StyledWorkspaceContent>- </StyledWorkspaceItem>+ </OnboardingStepAnimatedItem>)}</StyledWorkspaceContainer>- </StyledOnboardingContentContainer>+ </StyledContentContainer>)}{signInUpStep !== SignInUpStep.WorkspaceSelection && (- <StyledOnboardingContentContainer>+ <StyledContentContainer>{authProviders.google && (<SignInUpWithGoogleaction="list-available-workspaces"@@ -233,7 +252,9 @@ export const SignInUpGlobalScopeForm = () => {/>)}{(authProviders.google || authProviders.microsoft) && (- <HorizontalSeparator />+ <HorizontalSeparator+ color={themeCssVariables.background.transparent.light}+ />)}{/* oxlint-disable-next-line react/jsx-props-no-spreading */}<FormProvider {...form}>@@ -248,7 +269,7 @@ export const SignInUpGlobalScopeForm = () => {</ClickToActionLink></StyledForgotPasswordLinkContainer>)}- </StyledOnboardingContentContainer>+ </StyledContentContainer>)}</>);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpV2StandardContent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsxsimilarity index 68%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpV2StandardContent.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsxindex 40427385b87..f7b6bb92432 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpV2StandardContent.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsx@@ -3,13 +3,28 @@ import { Title } from '@/auth/components/Title';import { FooterNote } from '@/auth/sign-in-up/components/FooterNote';import { WorkspaceSelectionFooter } from '@/auth/sign-in-up/components/WorkspaceSelectionFooter';import { SignInUpStep } from '@/auth/states/signInUpStepState';+import { styled } from '@linaria/react';import { type JSX } from 'react';import { AppPath } from 'twenty-shared/types';import { AnimatedEaseIn } from 'twenty-ui/layout';import { ModalContent } from 'twenty-ui/surfaces';+import { themeCssVariables } from 'twenty-ui/theme-constants';import { type PublicWorkspaceData } from '~/generated-metadata/graphql';-type SignInUpV2StandardContentProps = {+const StyledTitleContainer = styled.div`+ line-height: 1.2;+ margin-top: ${themeCssVariables.spacing[10]};+`;++const StyledFormContainer = styled.div`+ align-items: center;+ display: flex;+ flex-direction: column;+ margin-bottom: ${themeCssVariables.spacing[6]};+ margin-top: ${themeCssVariables.spacing[6]};+`;++type SignInUpStandardContentProps = {workspacePublicData: PublicWorkspaceData | null;signInUpForm: JSX.Element | null;signInUpStep: SignInUpStep;@@ -17,13 +32,13 @@ type SignInUpV2StandardContentProps = {onClickOnLogo: () => void;};-export const SignInUpV2StandardContent = ({+export const SignInUpStandardContent = ({workspacePublicData,signInUpForm,signInUpStep,title,onClickOnLogo,-}: SignInUpV2StandardContentProps) => {+}: SignInUpStandardContentProps) => {return (<ModalContent isVerticallyCentered isHorizontallyCentered><AnimatedEaseIn>@@ -31,11 +46,13 @@ export const SignInUpV2StandardContent = ({secondaryLogo={workspacePublicData?.logo}placeholder={workspacePublicData?.displayName}onClick={onClickOnLogo}- to={AppPath.SignInUpV2}+ to={AppPath.SignInUp}/></AnimatedEaseIn>- <Title animate>{title}</Title>- {signInUpForm}+ <StyledTitleContainer>+ <Title animate>{title}</Title>+ </StyledTitleContainer>+ <StyledFormContainer>{signInUpForm}</StyledFormContainer>{signInUpStep === SignInUpStep.WorkspaceSelection && (<WorkspaceSelectionFooter />)}diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceActivationV2.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceActivationV2.tsxdeleted file mode 100644index 7146279550e..00000000000--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceActivationV2.tsx+++ /dev/null@@ -1,77 +0,0 @@-import { SubTitle } from '@/auth/components/SubTitle';-import { WORKSPACE_ACTIVATION_MESSAGES } from '@/auth/sign-in-up/constants/WorkspaceActivationMessages';-import { OnboardingPulsingLogo } from '@/onboarding/components/OnboardingPulsingLogo';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { motion, useReducedMotion } from 'framer-motion';-import { useContext } from 'react';-import { ThemeContext } from 'twenty-ui/theme-constants';--const STEP_OPACITIES = [1, 0.4, 0.12];-const VISIBLE_STEP_COUNT = STEP_OPACITIES.length;-const STEP_HEIGHT_IN_PX = 28;-const STEPS_CONTAINER_HEIGHT_IN_PX = STEP_HEIGHT_IN_PX * VISIBLE_STEP_COUNT;--const StyledStepsContainer = styled.div`- height: ${STEPS_CONTAINER_HEIGHT_IN_PX}px;- position: relative;- width: 100%;-`;--const StyledStepBase = styled.div`- left: 0;- position: absolute;- right: 0;- top: 0;-`;--const StyledStep = motion.create(StyledStepBase);--type SignInUpWorkspaceActivationV2Props = {- messageIndex: number;-};--export const SignInUpWorkspaceActivationV2 = ({- messageIndex,-}: SignInUpWorkspaceActivationV2Props) => {- const { i18n } = useLingui();- const { theme } = useContext(ThemeContext);- const shouldReduceMotion = useReducedMotion();-- const messages = WORKSPACE_ACTIVATION_MESSAGES.map((message) =>- i18n._(message),- );-- return (- <>- <OnboardingPulsingLogo />- <StyledStepsContainer>- {messages.map((message, index) => {- const stepOffset = index - messageIndex;- const isVisible = stepOffset >= 0 && stepOffset < VISIBLE_STEP_COUNT;-- return (- <StyledStep- key={message}- initial={false}- animate={{- opacity: isVisible ? STEP_OPACITIES[stepOffset] : 0,- y: stepOffset * STEP_HEIGHT_IN_PX,- }}- transition={- shouldReduceMotion- ? { duration: 0 }- : {- duration: theme.animation.duration.normal,- ease: 'easeInOut',- }- }- >- <SubTitle>{message}</SubTitle>- </StyledStep>- );- })}- </StyledStepsContainer>- </>- );-};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceCreationLoader.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceCreationLoader.tsxdeleted file mode 100644index 9fa49281206..00000000000--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceCreationLoader.tsx+++ /dev/null@@ -1,28 +0,0 @@-import { SignInUpWorkspaceActivationV2 } from '@/auth/sign-in-up/components/SignInUpWorkspaceActivationV2';-import { SignInUpWorkspaceActivationV2Effect } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceActivationV2Effect';-import { styled } from '@linaria/react';-import { useState } from 'react';--const StyledContainer = styled.div`- align-items: center;- display: flex;- flex: 1;- flex-direction: column;- justify-content: center;- min-height: 100%;- width: 100%;-`;--export const SignInUpWorkspaceCreationLoader = () => {- const [messageIndex, setMessageIndex] = useState(0);-- return (- <StyledContainer>- <SignInUpWorkspaceActivationV2Effect- messageIndex={messageIndex}- setMessageIndex={setMessageIndex}- />- <SignInUpWorkspaceActivationV2 messageIndex={messageIndex} />- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/SignInUpWorkspaceActivationV2.stories.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/SignInUpWorkspaceActivationV2.stories.tsxdeleted file mode 100644index e3801b98542..00000000000--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/SignInUpWorkspaceActivationV2.stories.tsx+++ /dev/null@@ -1,38 +0,0 @@-import { type Meta, type StoryObj } from '@storybook/react-vite';--import { SignInUpWorkspaceActivationV2 } from '@/auth/sign-in-up/components/SignInUpWorkspaceActivationV2';-import { SignInUpWorkspaceActivationV2Effect } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceActivationV2Effect';-import { useState } from 'react';-import { ModalContent } from 'twenty-ui/surfaces';-import { ComponentDecorator } from 'twenty-ui/testing';--const RenderWithModalContent = () => {- const [messageIndex, setMessageIndex] = useState(0);-- return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <SignInUpWorkspaceActivationV2Effect- messageIndex={messageIndex}- setMessageIndex={setMessageIndex}- />- <SignInUpWorkspaceActivationV2 messageIndex={messageIndex} />- </ModalContent>- );-};--const meta: Meta<typeof SignInUpWorkspaceActivationV2> = {- title: 'Modules/Auth/SignInUpWorkspaceActivationV2',- component: SignInUpWorkspaceActivationV2,- decorators: [ComponentDecorator],- parameters: {- codeSection: {- docs: 'This component should always be wrapped with ModalContent in the app.\n\nCorrect usage:\n```tsx\n<ModalContent isVerticallyCentered isHorizontallyCentered>\n <SignInUpWorkspaceActivationV2 />\n</ModalContent>\n```\n',- },- },- render: RenderWithModalContent,-};--export default meta;-type Story = StoryObj<typeof SignInUpWorkspaceActivationV2>;--export const Default: Story = {};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsxindex 112478d26a6..efb02e7747c 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx@@ -5,15 +5,16 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledPillContainer = styled.span`position: absolute;- right: calc(-1 * ${themeCssVariables.spacing[5]});- top: calc(-1 * ${themeCssVariables.spacing[2]});+ right: -14px;+ top: -10px;> span {- background: ${themeCssVariables.color.blue3};- border: 1px solid ${themeCssVariables.color.blue5};- border-radius: ${themeCssVariables.border.radius.pill};- color: ${themeCssVariables.color.blue};+ background: ${themeCssVariables.accent.accent3};+ border: 1px solid ${themeCssVariables.accent.accent5};+ border-radius: ${themeCssVariables.border.radius.md};+ color: ${themeCssVariables.accent.accent9};font-weight: ${themeCssVariables.font.weight.semiBold};+ height: ${themeCssVariables.spacing[5]};}`;diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsxindex 7449b31a469..4ab2e519e4f 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx@@ -17,13 +17,11 @@ import { Trans, useLingui } from '@lingui/react/macro';import { OTPInput, type SlotProps } from 'input-otp';import { useState } from 'react';import { Controller } from 'react-hook-form';-import { useLocation } from 'react-router-dom';import { AppPath } from 'twenty-shared/types';import { MainButton } from 'twenty-ui/input';import { ClickToActionLink } from 'twenty-ui/navigation';import { themeCssVariables } from 'twenty-ui/theme-constants';import { useNavigateApp } from '~/hooks/useNavigateApp';-import { isMatchingLocation } from '~/utils/isMatchingLocation';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';@@ -183,7 +181,6 @@ export const SignInUpTOTPVerification = () => {const { enqueueErrorSnackBar } = useSnackBar();const navigate = useNavigateApp();- const location = useLocation();const { readCaptchaToken } = useReadCaptchaToken();const { isCaptchaReady } = useCaptcha();const loginToken = useAtomStateValue(loginTokenState);@@ -206,11 +203,7 @@ export const SignInUpTOTPVerification = () => {const captchaToken = readCaptchaToken();if (!loginToken) {- return navigate(- isMatchingLocation(location, AppPath.SignInUpV2)- ? AppPath.SignInUpV2- : AppPath.SignInUp,- );+ return navigate(AppPath.SignInUp);}await getAuthTokensFromOTP(values.otp, loginToken, captchaToken);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsxindex 518fdd919b8..ab149988d64 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx@@ -1,51 +1,137 @@-import { SubTitle } from '@/auth/components/SubTitle';-import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';import { useSignUpInNewWorkspace } from '@/auth/sign-in-up/hooks/useSignUpInNewWorkspace';+import { OnboardingAnimatedReveal } from '@/onboarding/components/OnboardingAnimatedReveal';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { useWorkspaceSubdomainField } from '@/auth/sign-in-up/hooks/useWorkspaceSubdomainField';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';+import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';-import { ImageInput } from '@/ui/input/components/ImageInput';-import { InputHint } from '@/ui/input/components/InputHint';-import { InputLabel } from '@/ui/input/components/InputLabel';import { TextInput } from '@/ui/input/components/TextInput';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { useLingui } from '@lingui/react/macro';import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';-import { useEffect, useState } from 'react';+import { useEffect, useRef, useState } from 'react';import { Key } from 'ts-key-enum';import { isDefined } from 'twenty-shared/utils';-import { Loader } from 'twenty-ui/feedback';-import { MainButton } from 'twenty-ui/input';-import { ClickToActionLink } from 'twenty-ui/navigation';+import { Avatar } from 'twenty-ui/data-display';+import { IconTrash, IconUpload } from 'twenty-ui/icon';+import { Button, LightIconButton, MainButton } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';-const StyledSection = styled.div`- margin-top: ${themeCssVariables.spacing[4]};+const StyledContentContainer = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[14]};+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;+`;++const StyledHeading = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+`;++const StyledTitle = styled.div`+ color: ${themeCssVariables.font.color.primary};+ font-size: ${themeCssVariables.font.size.xl};+ font-weight: ${themeCssVariables.font.weight.semiBold};+ line-height: 1.2;+`;++const StyledSubtitle = styled.div`+ color: ${themeCssVariables.font.color.secondary};+ font-size: ${themeCssVariables.font.size.md};+ line-height: 1.4;+`;++const StyledFormSection = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[8]};+ padding-bottom: ${themeCssVariables.spacing[4]};width: 100%;`;-const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[6]};+const StyledLogoRow = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+`;++const StyledLogoAvatar = styled(Avatar)`+ height: ${themeCssVariables.spacing[8]};+ width: ${themeCssVariables.spacing[8]};+`;++const StyledLogoButtons = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing['0.5']};+`;++const StyledHiddenFileInput = styled.input`+ display: none;+`;++const StyledSubdomainSection = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[2]};width: 100%;`;-const StyledAvailableHint = styled.div`- color: ${themeCssVariables.color.green};- font-size: ${themeCssVariables.font.size.xs};- font-weight: ${themeCssVariables.font.weight.regular};- margin-top: ${themeCssVariables.spacing[0.5]};+const StyledAlternativesBox = styled.div`+ background-color: ${themeCssVariables.background.transparent.lighter};+ border: 1px solid ${themeCssVariables.border.color.medium};+ border-radius: ${themeCssVariables.border.radius.md};+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[2]};+ padding: ${themeCssVariables.spacing[3]};`;-const StyledUnavailableHint = styled.div`- color: ${themeCssVariables.color.red};+const StyledAlternativesLabel = styled.span`+ color: ${themeCssVariables.font.color.secondary};+ font-size: ${themeCssVariables.font.size.sm};+ font-weight: ${themeCssVariables.font.weight.medium};+ padding-bottom: ${themeCssVariables.spacing[1]};+`;++const StyledAlternativeRows = styled.div`display: flex;flex-direction: column;+ gap: ${themeCssVariables.spacing[1]};+`;++const StyledAlternativeRow = styled.button`+ align-items: center;+ background: transparent;+ border: none;+ color: ${themeCssVariables.color.green};+ cursor: pointer;+ display: flex;font-size: ${themeCssVariables.font.size.xs};+ font-weight: ${themeCssVariables.font.weight.semiBold};gap: ${themeCssVariables.spacing[1]};- margin-top: ${themeCssVariables.spacing[0.5]};+ padding: 2px 0;+ text-align: left;+`;++const StyledAvailabilityDotBox = styled.div`+ display: flex;+ padding: ${themeCssVariables.spacing[1]};+`;++const StyledAvailabilityDot = styled.div`+ background-color: ${themeCssVariables.color.green};+ border-radius: 50%;+ box-shadow: 0 0 0 3px ${themeCssVariables.color.green5};+ flex-shrink: 0;+ height: 6px;+ width: 6px;`;export const SignInUpWorkspaceCreationForm = () => {@@ -56,33 +142,37 @@ export const SignInUpWorkspaceCreationForm = () => {isMultiWorkspaceEnabledState,);- const setIsOnboardingV2 = useSetAtomState(isOnboardingV2State);-- const [isSubmitting, setIsSubmitting] = useState(false);+ const isCreatingWorkspace = useAtomStateValue(isCreatingWorkspaceState);+ const setIsCreatingWorkspace = useSetAtomState(isCreatingWorkspaceState);const [logo, setLogo] = useState<File | undefined>(undefined);const [logoPreviewUrl, setLogoPreviewUrl] = useState<string | undefined>(undefined,);+ const hiddenFileInputRef = useRef<HTMLInputElement>(null);const {workspaceName,subdomain,status,errorMessage,- suggestion,+ suggestions,isAvailable,handleWorkspaceNameChange,handleSubdomainChange,- applySuggestion,+ applySuggestionValue,} = useWorkspaceSubdomainField({isSubdomainEnabled: isMultiWorkspaceEnabled,});const isContinueDisabled =workspaceName.trim() === '' ||- isSubmitting ||+ isCreatingWorkspace ||(isMultiWorkspaceEnabled && !isAvailable);+ const openFilePicker = () => {+ hiddenFileInputRef.current?.click();+ };+const handleLogoUpload = (file: File) => {if (!isDefined(file)) {return;@@ -111,16 +201,16 @@ export const SignInUpWorkspaceCreationForm = () => {return;}- setIsSubmitting(true);- setIsOnboardingV2(false);- try {- await createWorkspace({- displayName: workspaceName.trim(),- ...(isMultiWorkspaceEnabled ? { subdomain } : {}),- logo,- });- } finally {- setIsSubmitting(false);+ setIsCreatingWorkspace(true);++ const isWorkspaceCreated = await createWorkspace({+ displayName: workspaceName.trim(),+ ...(isMultiWorkspaceEnabled ? { subdomain } : {}),+ logo,+ });++ if (!isWorkspaceCreated) {+ setIsCreatingWorkspace(false);}};@@ -144,75 +234,122 @@ export const SignInUpWorkspaceCreationForm = () => {: undefined;return (- <StyledOnboardingContentContainer>- <SubTitle>- {isMultiWorkspaceEnabled- ? t`Pick a name and a web address for your new workspace.`- : t`Pick a name and a logo for your new workspace.`}- </SubTitle>- <StyledSection>- <InputLabel>{t`Workspace logo`}</InputLabel>- <ImageInput- picture={logoPreviewUrl}- onUpload={handleLogoUpload}- onRemove={handleLogoRemove}- />- </StyledSection>- <StyledSection>- <TextInput- autoFocus- label={t`Workspace name`}- value={workspaceName}- placeholder={t`Apple`}- onChange={handleWorkspaceNameChange}- onKeyDown={handleKeyDown}- fullWidth- />- </StyledSection>- {isMultiWorkspaceEnabled && (- <StyledSection>+ <StyledContentContainer>+ <StyledHeading>+ <OnboardingStepAnimatedItem index={0}>+ <StyledTitle>{t`Create your workspace`}</StyledTitle>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <StyledSubtitle>+ {t`Move work forward across teams and agents`}+ </StyledSubtitle>+ </OnboardingStepAnimatedItem>+ </StyledHeading>+ <StyledFormSection>+ <OnboardingStepAnimatedItem index={2}>+ <StyledLogoRow>+ <StyledLogoAvatar+ avatarUrl={logoPreviewUrl}+ placeholder={+ isNonEmptyString(workspaceName) ? workspaceName : '?'+ }+ placeholderColorSeed={workspaceName}+ type="squared"+ size="xl"+ onClick={openFilePicker}+ />+ <StyledHiddenFileInput+ type="file"+ ref={hiddenFileInputRef}+ accept="image/jpeg, image/png, image/gif"+ onChange={(event) => {+ const file = event.target.files?.[0];+ if (isDefined(file)) {+ handleLogoUpload(file);+ }+ event.target.value = '';+ }}+ />+ <StyledLogoButtons>+ <Button+ Icon={IconUpload}+ title={t`Upload logo`}+ variant="secondary"+ onClick={openFilePicker}+ />+ <LightIconButton+ Icon={IconTrash}+ accent="tertiary"+ size="medium"+ onClick={handleLogoRemove}+ disabled={!isDefined(logoPreviewUrl)}+ aria-label={t`Remove logo`}+ />+ </StyledLogoButtons>+ </StyledLogoRow>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={3}><TextInput- label={t`Workspace address`}- value={subdomain}- placeholder={t`apple`}- onChange={handleSubdomainChange}+ autoFocus+ label={t`Name`}+ value={workspaceName}+ placeholder={t`Apple`}+ onChange={handleWorkspaceNameChange}onKeyDown={handleKeyDown}- rightAdornment={- isNonEmptyString(frontDomain) ? `.${frontDomain}` : undefined- }- error={subdomainError}- noErrorHelper={- status === 'unavailable' || !isDefined(subdomainError)- }fullWidth/>- {status === 'checking' && <InputHint>{t`Checking…`}</InputHint>}- {status === 'available' && (- <StyledAvailableHint>- {t`This address is available`}- </StyledAvailableHint>- )}- {status === 'unavailable' && (- <StyledUnavailableHint>- {subdomainError}- {isDefined(suggestion) && (- <ClickToActionLink onClick={applySuggestion}>- {t`Use ${suggestion} instead`}- </ClickToActionLink>- )}- </StyledUnavailableHint>- )}- </StyledSection>- )}- <StyledButtonContainer>+ </OnboardingStepAnimatedItem>+ {isMultiWorkspaceEnabled && (+ <OnboardingStepAnimatedItem index={4}>+ <StyledSubdomainSection>+ <TextInput+ label={t`Subdomain`}+ value={subdomain}+ placeholder={t`apple`}+ onChange={handleSubdomainChange}+ onKeyDown={handleKeyDown}+ rightAdornment={+ isNonEmptyString(frontDomain) ? `.${frontDomain}` : undefined+ }+ error={subdomainError}+ noErrorHelper={+ status === 'unavailable' || !isDefined(subdomainError)+ }+ fullWidth+ />+ <OnboardingAnimatedReveal isVisible={status === 'unavailable'}>+ <StyledAlternativesBox>+ <StyledAlternativesLabel>+ {t`Subdomain already in use, here are some alternatives:`}+ </StyledAlternativesLabel>+ <StyledAlternativeRows>+ {suggestions.map((alternative) => (+ <StyledAlternativeRow+ key={alternative}+ type="button"+ onClick={() => applySuggestionValue(alternative)}+ >+ <StyledAvailabilityDotBox>+ <StyledAvailabilityDot />+ </StyledAvailabilityDotBox>+ {alternative}+ </StyledAlternativeRow>+ ))}+ </StyledAlternativeRows>+ </StyledAlternativesBox>+ </OnboardingAnimatedReveal>+ </StyledSubdomainSection>+ </OnboardingStepAnimatedItem>+ )}+ </StyledFormSection>+ <OnboardingStepAnimatedItem index={isMultiWorkspaceEnabled ? 5 : 4}><MainButton- title={t`Continue`}+ title={t`Create workspace`}onClick={handleSubmit}disabled={isContinueDisabled}- Icon={() => (isSubmitting ? <Loader /> : null)}fullWidth/>- </StyledButtonContainer>- </StyledOnboardingContentContainer>+ </OnboardingStepAnimatedItem>+ </StyledContentContainer>);};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationFormV2.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationFormV2.tsxdeleted file mode 100644index 3c59b0acb64..00000000000--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationFormV2.tsx+++ /dev/null@@ -1,297 +0,0 @@-import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';-import { useSignUpInNewWorkspace } from '@/auth/sign-in-up/hooks/useSignUpInNewWorkspace';-import { useWorkspaceSubdomainField } from '@/auth/sign-in-up/hooks/useWorkspaceSubdomainField';-import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';-import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';-import { TextInput } from '@/ui/input/components/TextInput';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { useEffect, useRef, useState } from 'react';-import { Key } from 'ts-key-enum';-import { isDefined } from 'twenty-shared/utils';-import { Avatar } from 'twenty-ui/data-display';-import { IconTrash, IconUpload } from 'twenty-ui/icon';-import { Button, LightIconButton, MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledHeading = styled.div`- margin-bottom: ${themeCssVariables.spacing[6]};-`;--const StyledTitle = styled.div`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};-`;--const StyledSubtitle = styled.div`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.sm};- margin-top: ${themeCssVariables.spacing[1]};-`;--const StyledSection = styled.div`- margin-top: ${themeCssVariables.spacing[4]};- width: 100%;-`;--const StyledLogoRow = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[2]};-`;--const StyledHiddenFileInput = styled.input`- display: none;-`;--const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[6]};- width: 100%;-`;--const StyledAlternativesBox = styled.div`- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.sm};- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[2]};- margin-top: ${themeCssVariables.spacing[2]};- padding: ${themeCssVariables.spacing[3]};-`;--const StyledAlternativesLabel = styled.span`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.xs};-`;--const StyledAlternativeRow = styled.button`- align-items: center;- background: transparent;- border: none;- color: ${themeCssVariables.color.green};- cursor: pointer;- display: flex;- font-size: ${themeCssVariables.font.size.sm};- gap: ${themeCssVariables.spacing[2]};- padding: 0;- text-align: left;-`;--const StyledAvailabilityDot = styled.div`- background-color: ${themeCssVariables.color.green};- border-radius: 50%;- flex-shrink: 0;- height: 6px;- width: 6px;-`;--export const SignInUpWorkspaceCreationFormV2 = () => {- const { t } = useLingui();- const { createWorkspace } = useSignUpInNewWorkspace();- const { frontDomain } = useAtomStateValue(domainConfigurationState);- const isMultiWorkspaceEnabled = useAtomStateValue(- isMultiWorkspaceEnabledState,- );-- const isCreatingWorkspace = useAtomStateValue(isCreatingWorkspaceState);- const setIsCreatingWorkspace = useSetAtomState(isCreatingWorkspaceState);- const setIsOnboardingV2 = useSetAtomState(isOnboardingV2State);- const [logo, setLogo] = useState<File | undefined>(undefined);- const [logoPreviewUrl, setLogoPreviewUrl] = useState<string | undefined>(- undefined,- );- const hiddenFileInputRef = useRef<HTMLInputElement>(null);-- const {- workspaceName,- subdomain,- status,- errorMessage,- suggestions,- isAvailable,- handleWorkspaceNameChange,- handleSubdomainChange,- applySuggestionValue,- } = useWorkspaceSubdomainField({- isSubdomainEnabled: isMultiWorkspaceEnabled,- });-- const isContinueDisabled =- workspaceName.trim() === '' ||- isCreatingWorkspace ||- (isMultiWorkspaceEnabled && !isAvailable);-- const openFilePicker = () => {- hiddenFileInputRef.current?.click();- };-- const handleLogoUpload = (file: File) => {- if (!isDefined(file)) {- return;- }- setLogo(file);- setLogoPreviewUrl(URL.createObjectURL(file));- };-- const handleLogoRemove = () => {- setLogo(undefined);- setLogoPreviewUrl(undefined);- };-- useEffect(() => {- if (!isDefined(logoPreviewUrl)) {- return;- }-- return () => {- URL.revokeObjectURL(logoPreviewUrl);- };- }, [logoPreviewUrl]);-- const handleSubmit = async () => {- if (isContinueDisabled) {- return;- }-- setIsCreatingWorkspace(true);- setIsOnboardingV2(true);-- const isWorkspaceCreated = await createWorkspace({- displayName: workspaceName.trim(),- ...(isMultiWorkspaceEnabled ? { subdomain } : {}),- logo,- });-- if (!isWorkspaceCreated) {- setIsCreatingWorkspace(false);- }- };-- const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {- if (event.nativeEvent.isComposing || event.keyCode === 229) {- return;- }- if (event.key === Key.Enter) {- event.preventDefault();- handleSubmit();- }- };-- const subdomainError =- status === 'invalid'- ? errorMessage- : status === 'unavailable'- ? t`This address is already taken`- : status === 'error'- ? t`Couldn't check availability. Please try again.`- : undefined;-- return (- <StyledOnboardingContentContainer>- <StyledHeading>- <StyledTitle>{t`Create your workspace`}</StyledTitle>- <StyledSubtitle>- {t`Move work forward across teams and agents`}- </StyledSubtitle>- </StyledHeading>- <StyledSection>- <StyledLogoRow>- <Avatar- avatarUrl={logoPreviewUrl}- placeholder={isNonEmptyString(workspaceName) ? workspaceName : '?'}- placeholderColorSeed={workspaceName}- type="squared"- size="xl"- onClick={openFilePicker}- />- <StyledHiddenFileInput- type="file"- ref={hiddenFileInputRef}- accept="image/jpeg, image/png, image/gif"- onChange={(event) => {- const file = event.target.files?.[0];- if (isDefined(file)) {- handleLogoUpload(file);- }- event.target.value = '';- }}- />- <Button- Icon={IconUpload}- title={t`Upload logo`}- variant="secondary"- onClick={openFilePicker}- />- <LightIconButton- Icon={IconTrash}- accent="tertiary"- onClick={handleLogoRemove}- disabled={!isDefined(logoPreviewUrl)}- aria-label={t`Remove logo`}- />- </StyledLogoRow>- </StyledSection>- <StyledSection>- <TextInput- autoFocus- label={t`Name`}- value={workspaceName}- placeholder={t`Apple`}- onChange={handleWorkspaceNameChange}- onKeyDown={handleKeyDown}- fullWidth- />- </StyledSection>- {isMultiWorkspaceEnabled && (- <StyledSection>- <TextInput- label={t`Subdomain`}- value={subdomain}- placeholder={t`apple`}- onChange={handleSubdomainChange}- onKeyDown={handleKeyDown}- rightAdornment={- isNonEmptyString(frontDomain) ? `.${frontDomain}` : undefined- }- error={subdomainError}- noErrorHelper={- status === 'unavailable' || !isDefined(subdomainError)- }- fullWidth- />- {status === 'unavailable' && (- <StyledAlternativesBox>- <StyledAlternativesLabel>- {t`Subdomain already in use, here are some alternatives:`}- </StyledAlternativesLabel>- {suggestions.map((alternative) => (- <StyledAlternativeRow- key={alternative}- type="button"- onClick={() => applySuggestionValue(alternative)}- >- <StyledAvailabilityDot />- {alternative}- </StyledAlternativeRow>- ))}- </StyledAlternativesBox>- )}- </StyledSection>- )}- <StyledButtonContainer>- <MainButton- title={t`Create workspace`}- onClick={handleSubmit}- disabled={isContinueDisabled}- fullWidth- />- </StyledButtonContainer>- </StyledOnboardingContentContainer>- );-};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationForm.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationForm.test.tsxindex 0eb1272c4ff..bcb02ce1c64 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationForm.test.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationForm.test.tsx@@ -6,6 +6,7 @@ import { SOURCE_LOCALE } from 'twenty-shared/translations';import { ThemeProvider } from 'twenty-ui/theme-constants';import { SignInUpWorkspaceCreationForm } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm';+import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';import {jotaiStore,@@ -14,7 +15,7 @@ import {import { dynamicActivate } from '~/utils/i18n/dynamicActivate';const createWorkspaceMock = jest.fn();-const applySuggestionMock = jest.fn();+const applySuggestionValueMock = jest.fn();const handleSubdomainChangeMock = jest.fn();const handleWorkspaceNameChangeMock = jest.fn();const useWorkspaceSubdomainFieldMock = jest.fn();@@ -56,11 +57,11 @@ describe('SignInUpWorkspaceCreationForm', () => {subdomain: 'apple',status: 'available',errorMessage: undefined,- suggestion: undefined,+ suggestions: [],isAvailable: true,handleWorkspaceNameChange: handleWorkspaceNameChangeMock,handleSubdomainChange: handleSubdomainChangeMock,- applySuggestion: applySuggestionMock,+ applySuggestionValue: applySuggestionValueMock,});});@@ -69,35 +70,18 @@ describe('SignInUpWorkspaceCreationForm', () => {setMultiWorkspaceEnabled(true);});- it('keeps Continue disabled until a workspace name is entered', () => {- useWorkspaceSubdomainFieldMock.mockReturnValue({- workspaceName: '',- subdomain: '',- status: 'idle',- errorMessage: undefined,- suggestion: undefined,- isAvailable: false,- handleWorkspaceNameChange: handleWorkspaceNameChangeMock,- handleSubdomainChange: handleSubdomainChangeMock,- applySuggestion: applySuggestionMock,- });-- renderForm();-- expect(screen.getByRole('button', { name: 'Continue' })).toBeDisabled();- });-- it('creates the workspace with the chosen name and address in the same tab', async () => {- createWorkspaceMock.mockResolvedValue(undefined);+ it('creates the workspace with the chosen name and subdomain', async () => {+ createWorkspaceMock.mockResolvedValue(true);renderForm();- const continueButton = screen.getByRole('button', { name: 'Continue' });-- expect(continueButton).toBeEnabled();+ const createButton = screen.getByRole('button', {+ name: 'Create workspace',+ });+ expect(createButton).toBeEnabled();await act(async () => {- fireEvent.click(continueButton);+ fireEvent.click(createButton);});expect(createWorkspaceMock).toHaveBeenCalledWith({@@ -107,61 +91,73 @@ describe('SignInUpWorkspaceCreationForm', () => {});});- it('passes the picked logo file when creating the workspace', async () => {- createWorkspaceMock.mockResolvedValue(undefined);-- const { container } = renderForm();+ it('keeps the loader on through a successful creation, until the redirect', async () => {+ let resolveCreateWorkspace: () => void = () => {};+ createWorkspaceMock.mockReturnValue(+ new Promise<boolean>((resolve) => {+ resolveCreateWorkspace = () => resolve(true);+ }),+ );- const fileInput = container.querySelector(- 'input[type="file"]',- ) as HTMLInputElement;- const logoFile = new File(['logo'], 'logo.png', { type: 'image/png' });+ renderForm();await act(async () => {- fireEvent.change(fileInput, { target: { files: [logoFile] } });+ fireEvent.click(+ screen.getByRole('button', { name: 'Create workspace' }),+ );});+ expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(true);+ expect(createWorkspaceMock).toHaveBeenCalledTimes(1);+await act(async () => {- fireEvent.click(screen.getByRole('button', { name: 'Continue' }));+ resolveCreateWorkspace();});- expect(createWorkspaceMock).toHaveBeenCalledWith({- displayName: 'Apple',- subdomain: 'apple',- logo: logoFile,- });+ expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(true);});- it('routes name edits back through the field hook', () => {+ it('returns to the form when workspace creation fails', async () => {+ createWorkspaceMock.mockResolvedValue(false);+renderForm();- fireEvent.change(screen.getByLabelText('Workspace name'), {- target: { value: 'Acme' },+ await act(async () => {+ fireEvent.click(+ screen.getByRole('button', { name: 'Create workspace' }),+ );});- expect(handleWorkspaceNameChangeMock).toHaveBeenCalledWith('Acme');+ expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(false);});- it('offers a one-click suggestion when the address is taken', () => {+ it('lists available alternatives and applies the picked one when the subdomain is taken', () => {useWorkspaceSubdomainFieldMock.mockReturnValue({- workspaceName: 'Apple',- subdomain: 'apple',+ workspaceName: 'Stripe',+ subdomain: 'stripe',status: 'unavailable',errorMessage: undefined,- suggestion: 'apple-2',+ suggestions: ['stripe-2', 'mystripe', 'stripeeinc'],isAvailable: false,handleWorkspaceNameChange: handleWorkspaceNameChangeMock,handleSubdomainChange: handleSubdomainChangeMock,- applySuggestion: applySuggestionMock,+ applySuggestionValue: applySuggestionValueMock,});renderForm();- expect(screen.getByRole('button', { name: 'Continue' })).toBeDisabled();+ expect(+ screen.getByText(+ 'Subdomain already in use, here are some alternatives:',+ ),+ ).toBeInTheDocument();+ expect(+ screen.getByRole('button', { name: 'Create workspace' }),+ ).toBeDisabled();- fireEvent.click(screen.getByText('Use apple-2 instead'));+ fireEvent.click(screen.getByRole('button', { name: 'mystripe' }));- expect(applySuggestionMock).toHaveBeenCalledTimes(1);+ expect(applySuggestionValueMock).toHaveBeenCalledWith('mystripe');});});@@ -170,40 +166,18 @@ describe('SignInUpWorkspaceCreationForm', () => {setMultiWorkspaceEnabled(false);});- it('hides the workspace address field', () => {- renderForm();-- expect(screen.getByLabelText('Workspace name')).toBeInTheDocument();- expect(- screen.queryByLabelText('Workspace address'),- ).not.toBeInTheDocument();- });-- it('enables Continue based on the name only and creates without a subdomain', async () => {- createWorkspaceMock.mockResolvedValue(undefined);-- // An unavailable subdomain status must not block submission when the- // address field is hidden.- useWorkspaceSubdomainFieldMock.mockReturnValue({- workspaceName: 'Apple',- subdomain: 'apple',- status: 'unavailable',- errorMessage: undefined,- suggestion: 'apple-2',- isAvailable: false,- handleWorkspaceNameChange: handleWorkspaceNameChangeMock,- handleSubdomainChange: handleSubdomainChangeMock,- applySuggestion: applySuggestionMock,- });+ it('hides the subdomain field and creates without a subdomain', async () => {+ createWorkspaceMock.mockResolvedValue(true);renderForm();- const continueButton = screen.getByRole('button', { name: 'Continue' });-- expect(continueButton).toBeEnabled();+ expect(screen.getByLabelText('Name')).toBeInTheDocument();+ expect(screen.queryByLabelText('Subdomain')).not.toBeInTheDocument();await act(async () => {- fireEvent.click(continueButton);+ fireEvent.click(+ screen.getByRole('button', { name: 'Create workspace' }),+ );});expect(createWorkspaceMock).toHaveBeenCalledWith({diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationFormV2.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationFormV2.test.tsxdeleted file mode 100644index 8f4a4111dcb..00000000000--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpWorkspaceCreationFormV2.test.tsx+++ /dev/null@@ -1,192 +0,0 @@-import { i18n } from '@lingui/core';-import { I18nProvider } from '@lingui/react';-import { act, fireEvent, render, screen } from '@testing-library/react';-import { Provider as JotaiProvider } from 'jotai';-import { SOURCE_LOCALE } from 'twenty-shared/translations';-import { ThemeProvider } from 'twenty-ui/theme-constants';--import { SignInUpWorkspaceCreationFormV2 } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationFormV2';-import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';-import {- jotaiStore,- resetJotaiStore,-} from '@/ui/utilities/state/jotai/jotaiStore';-import { dynamicActivate } from '~/utils/i18n/dynamicActivate';--const createWorkspaceMock = jest.fn();-const applySuggestionValueMock = jest.fn();-const handleSubdomainChangeMock = jest.fn();-const handleWorkspaceNameChangeMock = jest.fn();-const useWorkspaceSubdomainFieldMock = jest.fn();--jest.mock('@/auth/sign-in-up/hooks/useSignUpInNewWorkspace', () => ({- useSignUpInNewWorkspace: () => ({ createWorkspace: createWorkspaceMock }),-}));--jest.mock('@/auth/sign-in-up/hooks/useWorkspaceSubdomainField', () => ({- useWorkspaceSubdomainField: () => useWorkspaceSubdomainFieldMock(),-}));--global.URL.createObjectURL = jest.fn(() => 'blob:logo-preview');-global.URL.revokeObjectURL = jest.fn();--dynamicActivate(SOURCE_LOCALE);--const setMultiWorkspaceEnabled = (isEnabled: boolean) => {- jotaiStore.set(isMultiWorkspaceEnabledState.atom, isEnabled);-};--const renderForm = () =>- render(- <JotaiProvider store={jotaiStore}>- <ThemeProvider colorScheme="light">- <I18nProvider i18n={i18n}>- <SignInUpWorkspaceCreationFormV2 />- </I18nProvider>- </ThemeProvider>- </JotaiProvider>,- );--describe('SignInUpWorkspaceCreationFormV2', () => {- beforeEach(() => {- jest.clearAllMocks();- resetJotaiStore();- useWorkspaceSubdomainFieldMock.mockReturnValue({- workspaceName: 'Apple',- subdomain: 'apple',- status: 'available',- errorMessage: undefined,- suggestions: [],- isAvailable: true,- handleWorkspaceNameChange: handleWorkspaceNameChangeMock,- handleSubdomainChange: handleSubdomainChangeMock,- applySuggestionValue: applySuggestionValueMock,- });- });-- describe('multi-workspace', () => {- beforeEach(() => {- setMultiWorkspaceEnabled(true);- });-- it('creates the workspace with the chosen name and subdomain', async () => {- createWorkspaceMock.mockResolvedValue(true);-- renderForm();-- const createButton = screen.getByRole('button', {- name: 'Create workspace',- });- expect(createButton).toBeEnabled();-- await act(async () => {- fireEvent.click(createButton);- });-- expect(createWorkspaceMock).toHaveBeenCalledWith({- displayName: 'Apple',- subdomain: 'apple',- logo: undefined,- });- });-- it('keeps the loader on through a successful creation, until the redirect', async () => {- let resolveCreateWorkspace: () => void = () => {};- createWorkspaceMock.mockReturnValue(- new Promise<boolean>((resolve) => {- resolveCreateWorkspace = () => resolve(true);- }),- );-- renderForm();-- await act(async () => {- fireEvent.click(- screen.getByRole('button', { name: 'Create workspace' }),- );- });-- expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(true);- expect(createWorkspaceMock).toHaveBeenCalledTimes(1);-- await act(async () => {- resolveCreateWorkspace();- });-- expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(true);- });-- it('returns to the form when workspace creation fails', async () => {- createWorkspaceMock.mockResolvedValue(false);-- renderForm();-- await act(async () => {- fireEvent.click(- screen.getByRole('button', { name: 'Create workspace' }),- );- });-- expect(jotaiStore.get(isCreatingWorkspaceState.atom)).toBe(false);- });-- it('lists available alternatives and applies the picked one when the subdomain is taken', () => {- useWorkspaceSubdomainFieldMock.mockReturnValue({- workspaceName: 'Stripe',- subdomain: 'stripe',- status: 'unavailable',- errorMessage: undefined,- suggestions: ['stripe-2', 'mystripe', 'stripeeinc'],- isAvailable: false,- handleWorkspaceNameChange: handleWorkspaceNameChangeMock,- handleSubdomainChange: handleSubdomainChangeMock,- applySuggestionValue: applySuggestionValueMock,- });-- renderForm();-- expect(- screen.getByText(- 'Subdomain already in use, here are some alternatives:',- ),- ).toBeInTheDocument();- expect(- screen.getByRole('button', { name: 'Create workspace' }),- ).toBeDisabled();-- fireEvent.click(screen.getByRole('button', { name: 'mystripe' }));-- expect(applySuggestionValueMock).toHaveBeenCalledWith('mystripe');- });- });-- describe('single-workspace', () => {- beforeEach(() => {- setMultiWorkspaceEnabled(false);- });-- it('hides the subdomain field and creates without a subdomain', async () => {- createWorkspaceMock.mockResolvedValue(true);-- renderForm();-- expect(screen.getByLabelText('Name')).toBeInTheDocument();- expect(screen.queryByLabelText('Subdomain')).not.toBeInTheDocument();-- await act(async () => {- fireEvent.click(- screen.getByRole('button', { name: 'Create workspace' }),- );- });-- expect(createWorkspaceMock).toHaveBeenCalledWith({- displayName: 'Apple',- logo: undefined,- });- expect(createWorkspaceMock.mock.calls[0][0]).not.toHaveProperty(- 'subdomain',- );- });- });-});diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useWorkspaceSubdomainField.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useWorkspaceSubdomainField.test.tsxindex b371525d053..a7afcf64613 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useWorkspaceSubdomainField.test.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useWorkspaceSubdomainField.test.tsx@@ -140,7 +140,6 @@ describe('useWorkspaceSubdomainField', () => {'taken-3','taken-4',]);- expect(result.current.suggestion).toBe('taken-2');expect(result.current.isAvailable).toBe(false);});diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.tsindex 237f636903c..6fedcafcde0 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts@@ -1,5 +1,4 @@import { useAuth } from '@/auth/hooks/useAuth';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';@@ -14,7 +13,6 @@ import {import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';import { useLingui } from '@lingui/react/macro';-import { useStore } from 'jotai';export const useSignUpInNewWorkspace = () => {const { redirectToWorkspaceDomain } = useRedirectToWorkspaceDomain();@@ -22,7 +20,6 @@ export const useSignUpInNewWorkspace = () => {const isMultiWorkspaceEnabled = useAtomStateValue(isMultiWorkspaceEnabledState,);- const store = useStore();const { enqueueErrorSnackBar } = useSnackBar();const { t } = useLingui();@@ -76,11 +73,9 @@ export const useSignUpInNewWorkspace = () => {return true;}- const isOnboardingV2 = store.get(isOnboardingV2State.atom);-await redirectToWorkspaceDomain(getWorkspaceUrl(data.signUpInNewWorkspace.workspace.workspaceUrls),- isOnboardingV2 ? AppPath.VerifyV2 : AppPath.Verify,+ AppPath.Verify,{ loginToken },'_self',);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceSubdomainField.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceSubdomainField.tsindex 3b388a8c3af..e7b5bec08da 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceSubdomainField.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceSubdomainField.ts@@ -166,27 +166,15 @@ export const useWorkspaceSubdomainField = ({debouncedAvailabilityCheck(value, { adoptSuggestion: false });};- const suggestion: string | undefined = suggestions[0];-- const applySuggestion = () => {- if (!isDefined(suggestion)) {- return;- }-- applySuggestionValue(suggestion);- };-return {workspaceName,subdomain,status,errorMessage,- suggestion,suggestions,isAvailable: status === 'available',handleWorkspaceNameChange,handleSubdomainChange,- applySuggestion,applySuggestionValue,};};diff --git a/packages/twenty-front/src/modules/auth/states/__tests__/isOnboardingV2State.test.ts b/packages/twenty-front/src/modules/auth/states/__tests__/isOnboardingV2State.test.tsdeleted file mode 100644index 0201b574b8a..00000000000--- a/packages/twenty-front/src/modules/auth/states/__tests__/isOnboardingV2State.test.ts+++ /dev/null@@ -1,49 +0,0 @@-import { createStore } from 'jotai';--import { type isOnboardingV2State as IsOnboardingV2State } from '@/auth/states/isOnboardingV2State';--const loadAtom = (): typeof IsOnboardingV2State => {- let state: typeof IsOnboardingV2State | undefined;-- jest.isolateModules(() => {- state = require('@/auth/states/isOnboardingV2State').isOnboardingV2State;- });-- if (state === undefined) {- throw new Error('Failed to load isOnboardingV2State');- }-- return state;-};--describe('isOnboardingV2State', () => {- afterEach(() => {- sessionStorage.clear();- jest.resetModules();- });-- it('hydrates from sessionStorage on load so the flag survives the email-connect OAuth round-trip', () => {- sessionStorage.setItem('isOnboardingV2State', JSON.stringify(true));-- const isOnboardingV2State = loadAtom();-- expect(createStore().get(isOnboardingV2State.atom)).toBe(true);- });-- it('writes through to sessionStorage when set', () => {- const isOnboardingV2State = loadAtom();- const store = createStore();-- store.set(isOnboardingV2State.atom, true);-- expect(sessionStorage.getItem('isOnboardingV2State')).toBe(- JSON.stringify(true),- );- });-- it('defaults to false when nothing is persisted', () => {- const isOnboardingV2State = loadAtom();-- expect(createStore().get(isOnboardingV2State.atom)).toBe(false);- });-});diff --git a/packages/twenty-front/src/modules/auth/states/isOnboardingV2State.ts b/packages/twenty-front/src/modules/auth/states/isOnboardingV2State.tsdeleted file mode 100644index dd35a5437c4..00000000000--- a/packages/twenty-front/src/modules/auth/states/isOnboardingV2State.ts+++ /dev/null@@ -1,7 +0,0 @@-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const isOnboardingV2State = createAtomState<boolean>({- key: 'isOnboardingV2State',- defaultValue: false,- useSessionStorage: true,-});diff --git a/packages/twenty-front/src/modules/auth/utils/getAuthModalConfig.ts b/packages/twenty-front/src/modules/auth/utils/getAuthModalConfig.tsdeleted file mode 100644index 50f3b602876..00000000000--- a/packages/twenty-front/src/modules/auth/utils/getAuthModalConfig.ts+++ /dev/null@@ -1,18 +0,0 @@-import { AUTH_MODAL_CONFIG } from '@/auth/constants/AuthModalConfig';-import { type Location } from 'react-router-dom';-import { AppPath } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { isMatchingLocation } from '~/utils/isMatchingLocation';--export const getAuthModalConfig = (location: Location) => {- for (const path of Object.values(AppPath)) {- if (- isMatchingLocation(location, path) &&- isDefined(AUTH_MODAL_CONFIG[path])- ) {- return AUTH_MODAL_CONFIG[path];- }- }-- return AUTH_MODAL_CONFIG.default;-};diff --git a/packages/twenty-front/src/modules/auth/utils/isOnOnboardingTransitionPath.ts b/packages/twenty-front/src/modules/auth/utils/isOnOnboardingTransitionPath.tsnew file mode 100644index 00000000000..3a3a5fa6b4b--- /dev/null+++ b/packages/twenty-front/src/modules/auth/utils/isOnOnboardingTransitionPath.ts@@ -0,0 +1,9 @@+import { matchPath } from 'react-router-dom';+import { isDefined } from 'twenty-shared/utils';++import { ONBOARDING_TRANSITION_PATHS } from '@/auth/constants/OnboardingTransitionPaths';++export const isOnOnboardingTransitionPath = (pathname: string) =>+ ONBOARDING_TRANSITION_PATHS.some((onboardingPath) =>+ isDefined(matchPath(onboardingPath, pathname)),+ );diff --git a/packages/twenty-front/src/modules/captcha/components/RequestFreshCaptchaTokenEffect.tsx b/packages/twenty-front/src/modules/captcha/components/RequestFreshCaptchaTokenEffect.tsxnew file mode 100644index 00000000000..73635ad34c3--- /dev/null+++ b/packages/twenty-front/src/modules/captcha/components/RequestFreshCaptchaTokenEffect.tsx@@ -0,0 +1,21 @@+import { useEffect } from 'react';+import { useLocation } from 'react-router-dom';++import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';+import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';+import { isCaptchaRequiredForPath } from '@/captcha/utils/isCaptchaRequiredForPath';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';++export const RequestFreshCaptchaTokenEffect = () => {+ const location = useLocation();+ const { requestFreshCaptchaToken } = useRequestFreshCaptchaToken();+ const isCaptchaScriptLoaded = useAtomStateValue(isCaptchaScriptLoadedState);++ useEffect(() => {+ if (isCaptchaScriptLoaded && isCaptchaRequiredForPath(location.pathname)) {+ requestFreshCaptchaToken();+ }+ }, [isCaptchaScriptLoaded, location.pathname, requestFreshCaptchaToken]);++ return null;+};diff --git a/packages/twenty-front/src/modules/captcha/constants/CaptchaProtectedPaths.ts b/packages/twenty-front/src/modules/captcha/constants/CaptchaProtectedPaths.tsindex b71a6d6a0d1..a48182f1452 100644--- a/packages/twenty-front/src/modules/captcha/constants/CaptchaProtectedPaths.ts+++ b/packages/twenty-front/src/modules/captcha/constants/CaptchaProtectedPaths.ts@@ -2,9 +2,7 @@ import { AppPath } from 'twenty-shared/types';export const CAPTCHA_PROTECTED_PATHS: string[] = [AppPath.SignInUp,- AppPath.SignInUpV2,AppPath.Verify,- AppPath.VerifyV2,AppPath.VerifyEmail,AppPath.ResetPassword,AppPath.Invite,diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates.tsindex 9564aed9a61..44a83f4da61 100644--- a/packages/twenty-front/src/modules/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates.ts+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates.ts@@ -1,7 +1,6 @@import { useCallback } from 'react';import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';import { returnToPathState } from '@/auth/states/returnToPathState';import { BILLING_CHECKOUT_SESSION_DEFAULT_VALUE } from '@/settings/billing/constants/BillingCheckoutSessionDefaultValue';import { isNonEmptyString } from '@sniptt/guards';@@ -12,7 +11,6 @@ export const useBuildSearchParamsFromUrlSyncedStates = () => {const buildSearchParamsFromUrlSyncedStates = useCallback(async () => {const billingCheckoutSession = store.get(billingCheckoutSessionState.atom);const returnToPath = store.get(returnToPathState.atom);- const isOnboardingV2 = store.get(isOnboardingV2State.atom);const output = {...(billingCheckoutSession !== BILLING_CHECKOUT_SESSION_DEFAULT_VALUE@@ -21,7 +19,6 @@ export const useBuildSearchParamsFromUrlSyncedStates = () => {}: {}),...(isNonEmptyString(returnToPath) ? { returnToPath } : {}),- ...(isOnboardingV2 ? { onboardingV2: 'true' } : {}),};return output;diff --git a/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGate.tsx b/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGate.tsxnew file mode 100644index 00000000000..1ecde385893--- /dev/null+++ b/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGate.tsx@@ -0,0 +1,20 @@+import { Outlet } from 'react-router-dom';++import { isMinimalMetadataReadyState } from '@/metadata-store/states/isMinimalMetadataReadyState';+import { PreComputedChipGeneratorsProvider } from '@/object-metadata/components/PreComputedChipGeneratorsProvider';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader';++export const MinimalMetadataGate = () => {+ const isMinimalMetadataReady = useAtomStateValue(isMinimalMetadataReadyState);++ if (!isMinimalMetadataReady) {+ return <UserOrMetadataLoader />;+ }++ return (+ <PreComputedChipGeneratorsProvider>+ <Outlet />+ </PreComputedChipGeneratorsProvider>+ );+};diff --git a/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGater.tsx b/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGater.tsxdeleted file mode 100644index 705ab42a256..00000000000--- a/packages/twenty-front/src/modules/metadata-store/components/MinimalMetadataGater.tsx+++ /dev/null@@ -1,49 +0,0 @@-import React from 'react';--import { isMinimalMetadataReadyState } from '@/metadata-store/states/isMinimalMetadataReadyState';-import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { UserContext } from '@/users/contexts/UserContext';-import { useLocation } from 'react-router-dom';-import { AppPath } from 'twenty-shared/types';-import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader';-import { isMatchingLocation } from '~/utils/isMatchingLocation';--export const MinimalMetadataGater = ({ children }: React.PropsWithChildren) => {- const isMinimalMetadataReady = useAtomStateValue(isMinimalMetadataReadyState);- const location = useLocation();-- const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();-- const isOnExcludedPath =- isMatchingLocation(location, AppPath.Verify) ||- isMatchingLocation(location, AppPath.VerifyV2) ||- isMatchingLocation(location, AppPath.VerifyEmail) ||- isMatchingLocation(location, AppPath.SignInUp) ||- isMatchingLocation(location, AppPath.SignInUpV2) ||- isMatchingLocation(location, AppPath.Invite) ||- isMatchingLocation(location, AppPath.ResetPassword) ||- isMatchingLocation(location, AppPath.WorkspaceActivation) ||- isMatchingLocation(location, AppPath.WorkspaceActivationV2) ||- isMatchingLocation(location, AppPath.PlanRequired) ||- isMatchingLocation(location, AppPath.PlanRequiredSuccess) ||- isMatchingLocation(location, AppPath.Authorize);-- const shouldShowLoader = !isMinimalMetadataReady && !isOnExcludedPath;-- if (shouldShowLoader) {- return <UserOrMetadataLoader />;- }-- return (- <UserContext.Provider- value={{- dateFormat,- timeFormat,- timeZone,- }}- >- {children}- </UserContext.Provider>- );-};diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/MinimalMetadataLoadEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/MinimalMetadataLoadEffect.tsxindex 2f11cd147ca..04b7d188ea2 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/MinimalMetadataLoadEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/MinimalMetadataLoadEffect.tsx@@ -1,4 +1,5 @@import { useHasAccessTokenPair } from '@/auth/hooks/useHasAccessTokenPair';+import { useIsOnAuthOrOnboardingPage } from '@/auth/hooks/useIsOnAuthOrOnboardingPage';import { currentUserState } from '@/auth/states/currentUserState';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadedState';@@ -21,8 +22,11 @@ export const MinimalMetadataLoadEffect = () => {const { loadMinimalMetadata } = useLoadMinimalMetadata();const { loadStaleMetadataEntities } = useLoadStaleMetadataEntities();+ const isOnAuthOrOnboardingPage = useIsOnAuthOrOnboardingPage();+const isActiveWorkspace = isWorkspaceActiveOrSuspended(currentWorkspace);- const shouldLoadRealMetadata = hasAccessTokenPair && isActiveWorkspace;+ const shouldLoadRealMetadata =+ hasAccessTokenPair && isActiveWorkspace && !isOnAuthOrOnboardingPage;useEffect(() => {if (!isCurrentUserLoaded && !isDefined(currentUser)) {diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationOutlet.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationOutlet.tsxnew file mode 100644index 00000000000..79af43ed4dd--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationOutlet.tsx@@ -0,0 +1,23 @@+import { Outlet } from 'react-router-dom';++import { OnboardingActivationStepsProgress } from '@/onboarding/components/OnboardingActivationStepsProgress';+import { OnboardingVerifyLayout } from '@/onboarding/components/OnboardingVerifyLayout';+import { onboardingActivationFailedState } from '@/onboarding/states/onboardingActivationFailedState';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';++export const OnboardingActivationOutlet = () => {+ const onboardingActivationFailed = useAtomStateValue(+ onboardingActivationFailedState,+ );++ return (+ <>+ {!onboardingActivationFailed && (+ <OnboardingVerifyLayout>+ <OnboardingActivationStepsProgress />+ </OnboardingVerifyLayout>+ )}+ <Outlet />+ </>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationSteps.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationSteps.tsxnew file mode 100644index 00000000000..ff9cd75ddf6--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationSteps.tsx@@ -0,0 +1,62 @@+import { SubTitle } from '@/auth/components/SubTitle';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';+import { styled } from '@linaria/react';+import { type MessageDescriptor } from '@lingui/core';+import { useLingui } from '@lingui/react/macro';+import { motion } from 'framer-motion';++const STEP_OPACITIES = [1, 0.4, 0.12];+const VISIBLE_STEP_COUNT = STEP_OPACITIES.length;+const STEP_HEIGHT_IN_PX = 28;+const STEPS_CONTAINER_HEIGHT_IN_PX = STEP_HEIGHT_IN_PX * VISIBLE_STEP_COUNT;++const StyledStepsContainer = styled.div`+ height: ${STEPS_CONTAINER_HEIGHT_IN_PX}px;+ position: relative;+ width: 100%;+`;++const StyledStepBase = styled.div`+ left: 0;+ position: absolute;+ right: 0;+ top: 0;+`;++const StyledStep = motion.create(StyledStepBase);++type OnboardingActivationStepsProps = {+ messages: MessageDescriptor[];+ messageIndex: number;+};++export const OnboardingActivationSteps = ({+ messages,+ messageIndex,+}: OnboardingActivationStepsProps) => {+ const { i18n } = useLingui();+ const transition = useOnboardingMotionTransition();++ return (+ <StyledStepsContainer>+ {messages.map((message, index) => {+ const stepOffset = index - messageIndex;+ const isVisible = stepOffset >= 0 && stepOffset < VISIBLE_STEP_COUNT;++ return (+ <StyledStep+ key={message.id}+ initial={false}+ animate={{+ opacity: isVisible ? STEP_OPACITIES[stepOffset] : 0,+ y: stepOffset * STEP_HEIGHT_IN_PX,+ }}+ transition={transition}+ >+ <SubTitle>{i18n._(message)}</SubTitle>+ </StyledStep>+ );+ })}+ </StyledStepsContainer>+ );+};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceActivationV2Effect.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsEffect.tsxsimilarity index 55%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceActivationV2Effect.tsxrename to packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsEffect.tsxindex aba5a9f0deb..33f3b07e138 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceActivationV2Effect.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsEffect.tsx@@ -1,20 +1,20 @@-import { WORKSPACE_ACTIVATION_MESSAGES } from '@/auth/sign-in-up/constants/WorkspaceActivationMessages';import { type Dispatch, type SetStateAction, useEffect } from 'react';const MESSAGE_INTERVAL_IN_MS = 1000;-type SignInUpWorkspaceActivationV2EffectProps = {+type OnboardingActivationStepsEffectProps = {messageIndex: number;setMessageIndex: Dispatch<SetStateAction<number>>;+ messageCount: number;};-export const SignInUpWorkspaceActivationV2Effect = ({+export const OnboardingActivationStepsEffect = ({messageIndex,setMessageIndex,-}: SignInUpWorkspaceActivationV2EffectProps) => {+ messageCount,+}: OnboardingActivationStepsEffectProps) => {useEffect(() => {- const isLastMessage =- messageIndex >= WORKSPACE_ACTIVATION_MESSAGES.length - 1;+ const isLastMessage = messageIndex >= messageCount - 1;if (isLastMessage) {return;@@ -25,7 +25,7 @@ export const SignInUpWorkspaceActivationV2Effect = ({}, MESSAGE_INTERVAL_IN_MS);return () => clearTimeout(timeout);- }, [messageIndex, setMessageIndex]);+ }, [messageIndex, setMessageIndex, messageCount]);return <></>;};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsProgress.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsProgress.tsxnew file mode 100644index 00000000000..65f7407e5a4--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingActivationStepsProgress.tsx@@ -0,0 +1,57 @@+import { useEffect, useState } from 'react';+import { useMatch } from 'react-router-dom';++import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';+import { OnboardingActivationSteps } from '@/onboarding/components/OnboardingActivationSteps';+import { OnboardingActivationStepsEffect } from '@/onboarding/components/OnboardingActivationStepsEffect';+import { ONBOARDING_ACTIVATION_MESSAGES } from '@/onboarding/constants/OnboardingActivationMessages';+import { WORKSPACE_ACTIVATION_FIRST_MESSAGE_INDEX } from '@/onboarding/constants/WorkspaceActivationFirstMessageIndex';+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { AppPath } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { OnboardingStatus } from '~/generated-metadata/graphql';++export const OnboardingActivationStepsProgress = () => {+ const isActivating = isDefined(useMatch(AppPath.WorkspaceActivation));+ const isCreatingWorkspace = useAtomStateValue(isCreatingWorkspaceState);+ const onboardingStatus = useOnboardingStatus();++ const shouldShowWorkspaceActivationMessages =+ isActivating ||+ isCreatingWorkspace ||+ onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION;++ const messages = shouldShowWorkspaceActivationMessages+ ? ONBOARDING_ACTIVATION_MESSAGES+ : ONBOARDING_ACTIVATION_MESSAGES.slice(+ 0,+ WORKSPACE_ACTIVATION_FIRST_MESSAGE_INDEX,+ );++ const [messageIndex, setMessageIndex] = useState(+ isActivating ? WORKSPACE_ACTIVATION_FIRST_MESSAGE_INDEX : 0,+ );++ useEffect(() => {+ setMessageIndex(+ isActivating ? WORKSPACE_ACTIVATION_FIRST_MESSAGE_INDEX : 0,+ );+ }, [isActivating]);++ return (+ <>+ {isActivating && (+ <OnboardingActivationStepsEffect+ messageIndex={messageIndex}+ setMessageIndex={setMessageIndex}+ messageCount={ONBOARDING_ACTIVATION_MESSAGES.length}+ />+ )}+ <OnboardingActivationSteps+ messages={messages}+ messageIndex={messageIndex}+ />+ </>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingAnimatedReveal.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingAnimatedReveal.tsxnew file mode 100644index 00000000000..b0909dbc42b--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingAnimatedReveal.tsx@@ -0,0 +1,41 @@+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';+import { styled } from '@linaria/react';+import { AnimatePresence, motion } from 'framer-motion';+import { type ReactNode } from 'react';++const StyledAnimatedRevealBase = styled.div`+ max-width: 100%;+ overflow: hidden;+`;++const StyledAnimatedReveal = motion.create(StyledAnimatedRevealBase);++type OnboardingAnimatedRevealProps = {+ isVisible: boolean;+ children: ReactNode;+ className?: string;+};++export const OnboardingAnimatedReveal = ({+ isVisible,+ children,+ className,+}: OnboardingAnimatedRevealProps) => {+ const transition = useOnboardingMotionTransition();++ return (+ <AnimatePresence initial={false}>+ {isVisible && (+ <StyledAnimatedReveal+ className={className}+ initial={{ opacity: 0, height: 0 }}+ animate={{ opacity: 1, height: 'auto' }}+ exit={{ opacity: 0, height: 0 }}+ transition={transition}+ >+ {children}+ </StyledAnimatedReveal>+ )}+ </AnimatePresence>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2Header.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsxsimilarity index 78%rename from packages/twenty-front/src/modules/onboarding/components/OnboardingV2Header.tsxrename to packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsxindex 321926c8a22..ee2d2d218ae 100644--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2Header.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx@@ -1,23 +1,25 @@+import { useOnboardingContentWidth } from '@/onboarding/hooks/useOnboardingContentWidth';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';import { styled } from '@linaria/react';+import { motion } from 'framer-motion';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import { IconChevronLeft, IconCoins, IconInfoCircle } from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/input';import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';-const HEADER_CENTER_WIDTH = 340;-const StyledHeader = styled.div`- align-items: center;+ align-items: flex-start;box-sizing: border-box;display: flex;justify-content: space-between;- padding: ${themeCssVariables.spacing[8]};+ padding: ${themeCssVariables.spacing[8]} ${themeCssVariables.spacing[8]} 1px;width: 100%;`;const StyledSide = styled.div`align-items: center;+ box-sizing: border-box;display: flex;flex: 1 1 0;min-width: 0;@@ -28,19 +30,20 @@ const StyledLeftSide = styled(StyledSide)`padding-right: ${themeCssVariables.spacing[1]};`;-const StyledCenter = styled.div`+const StyledCenter = styled.div<{ contentWidth: number }>`align-items: center;display: flex;- flex: 0 1 ${HEADER_CENTER_WIDTH}px;+ flex: 0 1 ${({ contentWidth }) => `${contentWidth}px`};justify-content: flex-start;min-width: 0;`;const StyledRightSide = styled(StyledSide)`justify-content: flex-end;+ padding-left: ${themeCssVariables.spacing[1]};`;-const StyledLogo = styled.div`+const StyledLogoBase = styled.div`background-image: url('/images/integrations/twenty-logo.svg');background-size: cover;height: ${themeCssVariables.spacing[6]};@@ -48,6 +51,8 @@ const StyledLogo = styled.div`width: ${themeCssVariables.spacing[6]};`;+const StyledLogo = motion.create(StyledLogoBase);+const StyledFreeCredits = styled.div`align-items: center;color: ${themeCssVariables.font.color.tertiary};@@ -89,20 +94,23 @@ const StyledInfoTag = styled.div`display: flex;height: ${themeCssVariables.spacing[6]};justify-content: center;- padding: 0 ${themeCssVariables.spacing['1.5']};+ padding: 0 ${themeCssVariables.spacing['1.5']} 0+ ${themeCssVariables.spacing[1]};`;-type OnboardingV2HeaderProps = {+type OnboardingHeaderProps = {onBack?: () => void;freeCredits?: number;};-export const OnboardingV2Header = ({+export const OnboardingHeader = ({onBack,freeCredits,-}: OnboardingV2HeaderProps) => {+}: OnboardingHeaderProps) => {const { t } = useLingui();const theme = useTheme();+ const contentWidth = useOnboardingContentWidth();+ const transition = useOnboardingMotionTransition();return (<StyledHeader>@@ -111,14 +119,14 @@ export const OnboardingV2Header = ({<LightIconButtonIcon={IconChevronLeft}accent="tertiary"- size="medium"+ size="small"onClick={onBack}aria-label={t`Go back`}/>)}</StyledLeftSide>- <StyledCenter>- <StyledLogo />+ <StyledCenter contentWidth={contentWidth}>+ <StyledLogo layout transition={transition} /></StyledCenter><StyledRightSide>{isDefined(freeCredits) && (diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2Layout.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingLayout.tsxsimilarity index 65%rename from packages/twenty-front/src/modules/onboarding/components/OnboardingV2Layout.tsxrename to packages/twenty-front/src/modules/onboarding/components/OnboardingLayout.tsxindex b51b6f5f23d..757c7316e7d 100644--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2Layout.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingLayout.tsx@@ -1,4 +1,4 @@-import { OnboardingV2Header } from '@/onboarding/components/OnboardingV2Header';+import { OnboardingHeader } from '@/onboarding/components/OnboardingHeader';import { styled } from '@linaria/react';import { type ReactNode } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -11,19 +11,19 @@ const StyledBackground = styled.div`width: 100%;`;-type OnboardingV2LayoutProps = {+type OnboardingLayoutProps = {children: ReactNode;onBack?: () => void;freeCredits?: number;};-export const OnboardingV2Layout = ({+export const OnboardingLayout = ({children,onBack,freeCredits,-}: OnboardingV2LayoutProps) => (+}: OnboardingLayoutProps) => (<StyledBackground>- <OnboardingV2Header onBack={onBack} freeCredits={freeCredits} />+ <OnboardingHeader onBack={onBack} freeCredits={freeCredits} />{children}</StyledBackground>);diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingPageLoader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingPageLoader.tsxindex 41a924b8456..66d694f6b79 100644--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingPageLoader.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingPageLoader.tsx@@ -4,7 +4,7 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledContainer = styled.div`align-items: center;- background: ${themeCssVariables.background.primary};+ background: ${themeCssVariables.background.secondary};display: flex;flex-direction: column;height: 100dvh;diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipButton.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipButton.tsxnew file mode 100644index 00000000000..04a728b284c--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipButton.tsx@@ -0,0 +1,34 @@+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledSkipButton = styled.button`+ background-color: transparent;+ border: 1px solid ${themeCssVariables.border.color.light};+ border-radius: ${themeCssVariables.border.radius.md};+ color: ${themeCssVariables.font.color.tertiary};+ cursor: pointer;+ font-family: ${themeCssVariables.font.family};+ font-size: ${themeCssVariables.font.size.md};+ font-weight: ${themeCssVariables.font.weight.semiBold};+ height: ${themeCssVariables.spacing[8]};+ padding: 0 ${themeCssVariables.spacing[5]};+`;++type OnboardingSkipButtonProps = {+ onClick: () => void;+ disabled?: boolean;+};++export const OnboardingSkipButton = ({+ onClick,+ disabled,+}: OnboardingSkipButtonProps) => {+ const { t } = useLingui();++ return (+ <StyledSkipButton type="button" onClick={onClick} disabled={disabled}>+ {t`Skip`}+ </StyledSkipButton>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingStepAnimatedItem.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepAnimatedItem.tsxnew file mode 100644index 00000000000..47094cf1759--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepAnimatedItem.tsx@@ -0,0 +1,44 @@+import { styled } from '@linaria/react';+import { motion, useReducedMotion } from 'framer-motion';+import { type ReactNode } from 'react';+import { ONBOARDING_MOTION_SLIDE_OFFSET } from '@/onboarding/constants/OnboardingMotionSlideOffset';+import { ONBOARDING_MOTION_STAGGER_DELAY } from '@/onboarding/constants/OnboardingMotionStaggerDelay';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';++const StyledAnimatedItemBase = styled.div`+ max-width: 100%;+`;++const StyledAnimatedItem = motion.create(StyledAnimatedItemBase);++type OnboardingStepAnimatedItemProps = {+ index: number;+ children: ReactNode;+ className?: string;+};++export const OnboardingStepAnimatedItem = ({+ index,+ children,+ className,+}: OnboardingStepAnimatedItemProps) => {+ const transition = useOnboardingMotionTransition();+ const shouldReduceMotion = useReducedMotion();++ return (+ <StyledAnimatedItem+ className={className}+ initial={{+ opacity: 0,+ y: shouldReduceMotion ? 0 : ONBOARDING_MOTION_SLIDE_OFFSET,+ }}+ animate={{ opacity: 1, y: 0 }}+ transition={{+ ...transition,+ delay: shouldReduceMotion ? 0 : index * ONBOARDING_MOTION_STAGGER_DELAY,+ }}+ >+ {children}+ </StyledAnimatedItem>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingStepLayout.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepLayout.tsxnew file mode 100644index 00000000000..1e18008ef6f--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepLayout.tsx@@ -0,0 +1,13 @@+import { OnboardingLayout } from '@/onboarding/components/OnboardingLayout';+import { OnboardingTransitionOutlet } from '@/onboarding/components/OnboardingTransitionOutlet';+import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';++export const OnboardingStepLayout = () => {+ const freeCredits = useOnboardingFreeCreditsTotal();++ return (+ <OnboardingLayout freeCredits={freeCredits}>+ <OnboardingTransitionOutlet />+ </OnboardingLayout>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingStepPageLoader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepPageLoader.tsxnew file mode 100644index 00000000000..ada09ba9c4d--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingStepPageLoader.tsx@@ -0,0 +1,17 @@+import { OnboardingPulsingLogo } from '@/onboarding/components/OnboardingPulsingLogo';+import { styled } from '@linaria/react';++const StyledContainer = styled.div`+ align-items: center;+ display: flex;+ flex: 1;+ justify-content: center;+ min-height: 0;+ width: 100%;+`;++export const OnboardingStepPageLoader = () => (+ <StyledContainer>+ <OnboardingPulsingLogo />+ </StyledContainer>+);diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsxdeleted file mode 100644index b124404da84..00000000000--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx+++ /dev/null@@ -1,42 +0,0 @@-import { ONBOARDING_SYNC_EMAILS_OPTIONS } from '@/onboarding/constants/OnboardingSyncEmailsOptions';-import { SettingsAccountsRadioSettingsCard } from '@/settings/accounts/components/SettingsAccountsRadioSettingsCard';-import { SettingsAccountsVisibilityIcon } from '@/settings/accounts/components/SettingsAccountsVisibilityIcon';-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { MessageChannelVisibility } from '~/generated/graphql';--type OnboardingSyncEmailsSettingsCardProps = {- onChange: (nextValue: MessageChannelVisibility) => void;- value?: MessageChannelVisibility;-};--const StyledCardMediaContainer = styled.div`- width: ${themeCssVariables.spacing[10]};-`;--export const OnboardingSyncEmailsSettingsCard = ({- onChange,- value = MessageChannelVisibility.SHARE_EVERYTHING,-}: OnboardingSyncEmailsSettingsCardProps) => {- const optionsWithCardMedia = ONBOARDING_SYNC_EMAILS_OPTIONS.map((option) => ({- ...option,- cardMedia: (- <StyledCardMediaContainer>- <SettingsAccountsVisibilityIcon- metadata={option.cardMediaProps.metadata}- subject={option.cardMediaProps.subject}- body={option.cardMediaProps.body}- />- </StyledCardMediaContainer>- ),- }));-- return (- <SettingsAccountsRadioSettingsCard- name="sync-emails-visibility"- options={optionsWithCardMedia}- value={value}- onChange={onChange}- />- );-};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2TransitionOutlet.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingTransitionOutlet.tsxsimilarity index 61%rename from packages/twenty-front/src/modules/onboarding/components/OnboardingV2TransitionOutlet.tsxrename to packages/twenty-front/src/modules/onboarding/components/OnboardingTransitionOutlet.tsxindex 1fc36f265fc..b88b75043a2 100644--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingV2TransitionOutlet.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingTransitionOutlet.tsx@@ -1,8 +1,8 @@+import { ONBOARDING_MOTION_SLIDE_OFFSET } from '@/onboarding/constants/OnboardingMotionSlideOffset';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';import { styled } from '@linaria/react';import { AnimatePresence, motion, useReducedMotion } from 'framer-motion';-import { useContext } from 'react';import { useLocation, useOutlet } from 'react-router-dom';-import { ThemeContext } from 'twenty-ui/theme-constants';const StyledTransitionContainer = styled.div`display: flex;@@ -14,38 +14,32 @@ const StyledTransitionContainer = styled.div`const StyledTransitionPage = styled(motion.div)`display: flex;+ flex-direction: column;inset: 0;min-height: 0;min-width: 0;position: absolute;`;-export const OnboardingV2TransitionOutlet = () => {+export const OnboardingTransitionOutlet = () => {const { pathname } = useLocation();const outlet = useOutlet();const shouldReduceMotion = useReducedMotion();- const { theme } = useContext(ThemeContext);+ const transition = useOnboardingMotionTransition();return (<StyledTransitionContainer><AnimatePresence initial={false}><StyledTransitionPagekey={pathname}- initial={{ opacity: 0, y: theme.spacingMultiplicator }}- animate={{ opacity: 1, y: 0 }}+ initial={{ opacity: 0 }}+ animate={{ opacity: 1 }}exit={{opacity: 0,- y: -theme.spacingMultiplicator,+ y: shouldReduceMotion ? 0 : -ONBOARDING_MOTION_SLIDE_OFFSET,pointerEvents: 'none',}}- transition={- shouldReduceMotion- ? { duration: 0 }- : {- duration: theme.animation.duration.normal,- ease: 'easeInOut',- }- }+ transition={transition}>{outlet}</StyledTransitionPage>diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingVerifyLayout.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingVerifyLayout.tsxnew file mode 100644index 00000000000..abf1734ba12--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingVerifyLayout.tsx@@ -0,0 +1,27 @@+import { OnboardingPulsingLogo } from '@/onboarding/components/OnboardingPulsingLogo';+import { styled } from '@linaria/react';+import { type ReactNode } from 'react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledContainer = styled.div`+ align-items: center;+ background: ${themeCssVariables.background.secondary};+ display: flex;+ flex-direction: column;+ height: 100%;+ justify-content: center;+ width: 100%;+`;++type OnboardingVerifyLayoutProps = {+ children: ReactNode;+};++export const OnboardingVerifyLayout = ({+ children,+}: OnboardingVerifyLayoutProps) => (+ <StyledContainer>+ <OnboardingPulsingLogo />+ {children}+ </StyledContainer>+);diff --git a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepHeading.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepHeading.tsnew file mode 100644index 00000000000..1ae4c2faed1--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepHeading.ts@@ -0,0 +1,11 @@+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++export const StyledOnboardingStepHeading = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;+`;diff --git a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepPage.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepPage.tsnew file mode 100644index 00000000000..32be70d5b82--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepPage.ts@@ -0,0 +1,16 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++export const StyledOnboardingStepPage = styled.div`+ align-items: center;+ background-color: ${themeCssVariables.background.secondary};+ box-sizing: border-box;+ display: flex;+ flex: 1 1 0;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[14]};+ min-height: 0;+ overflow-y: auto;+ padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};+ width: 100%;+`;diff --git a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepSubtitle.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepSubtitle.tsnew file mode 100644index 00000000000..f44b79e12ca--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepSubtitle.ts@@ -0,0 +1,9 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++export const StyledOnboardingStepSubtitle = styled.p`+ color: ${themeCssVariables.font.color.secondary};+ font-size: ${themeCssVariables.font.size.md};+ line-height: 1.4;+ margin: 0;+`;diff --git a/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.tsnew file mode 100644index 00000000000..c2df9129ef7--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTagsRow.ts@@ -0,0 +1,9 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++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/StyledOnboardingStepTitle.ts b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTitle.tsnew file mode 100644index 00000000000..3af5bab0cf6--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/StyledOnboardingStepTitle.ts@@ -0,0 +1,10 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++export const StyledOnboardingStepTitle = styled.h1`+ color: ${themeCssVariables.font.color.primary};+ font-size: ${themeCssVariables.font.size.xl};+ font-weight: ${themeCssVariables.font.weight.semiBold};+ line-height: 1.2;+ margin: 0;+`;diff --git a/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingActivationSteps.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingActivationSteps.stories.tsxnew file mode 100644index 00000000000..f6732b597b1--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingActivationSteps.stories.tsx@@ -0,0 +1,38 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';++import { OnboardingActivationSteps } from '@/onboarding/components/OnboardingActivationSteps';+import { OnboardingActivationStepsEffect } from '@/onboarding/components/OnboardingActivationStepsEffect';+import { ONBOARDING_ACTIVATION_MESSAGES } from '@/onboarding/constants/OnboardingActivationMessages';+import { useState } from 'react';+import { ModalContent } from 'twenty-ui/surfaces';+import { ComponentDecorator } from 'twenty-ui/testing';++const RenderWithModalContent = () => {+ const [messageIndex, setMessageIndex] = useState(0);++ return (+ <ModalContent isVerticallyCentered isHorizontallyCentered>+ <OnboardingActivationStepsEffect+ messageIndex={messageIndex}+ setMessageIndex={setMessageIndex}+ messageCount={ONBOARDING_ACTIVATION_MESSAGES.length}+ />+ <OnboardingActivationSteps+ messages={ONBOARDING_ACTIVATION_MESSAGES}+ messageIndex={messageIndex}+ />+ </ModalContent>+ );+};++const meta: Meta<typeof OnboardingActivationSteps> = {+ title: 'Modules/Onboarding/OnboardingActivationSteps',+ component: OnboardingActivationSteps,+ decorators: [ComponentDecorator],+ render: RenderWithModalContent,+};++export default meta;+type Story = StoryObj<typeof OnboardingActivationSteps>;++export const Default: Story = {};diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsxindex f322eb38362..b13462e38d5 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingCreditsRewardTag.tsx@@ -7,7 +7,7 @@ const StyledTag = styled.div`align-items: center;background-color: ${themeCssVariables.color.green3};border: 1px solid ${themeCssVariables.color.green4};- border-radius: ${themeCssVariables.border.radius.pill};+ border-radius: ${themeCssVariables.border.radius.xxl};box-sizing: border-box;color: ${themeCssVariables.color.green9};display: flex;@@ -20,11 +20,13 @@ 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 = {diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsxindex c77aed6bca2..87b7c7e8d34 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx@@ -2,24 +2,25 @@ import { OnboardingImportPreviewCompanies } from '@/onboarding/components/importimport { OnboardingImportPreviewEmails } from '@/onboarding/components/import-contacts/OnboardingImportPreviewEmails';import { OnboardingImportPreviewSyncBadge } from '@/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge';import { OnboardingImportPrivacyNote } from '@/onboarding/components/import-contacts/OnboardingImportPrivacyNote';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme-constants';-const PREVIEW_WIDTH = 340;-const PREVIEW_HEIGHT = 200;+const PREVIEW_HEIGHT = 198;const StyledCard = styled.div`align-items: center;background-color: ${themeCssVariables.background.secondary};border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.xl};+ border-radius: 12px;box-sizing: border-box;display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[3]};+ max-width: 100%;overflow: hidden;padding-bottom: ${themeCssVariables.spacing[3]};- width: ${PREVIEW_WIDTH}px;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;const StyledColumns = styled.div`diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsxindex 780b5d3577f..d75ab85afd3 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx@@ -37,7 +37,7 @@ const StyledEmailRow = styled.div<{ isUnread: boolean }>`: themeCssVariables.font.color.tertiary};display: flex;flex-shrink: 0;- font-size: ${themeCssVariables.font.size.xs};+ font-size: ${themeCssVariables.font.size.sm};gap: ${themeCssVariables.spacing[2]};height: ${EMAIL_ROW_HEIGHT}px;padding: 0 ${themeCssVariables.spacing[3]};@@ -46,7 +46,7 @@ const StyledEmailRow = styled.div<{ isUnread: boolean }>`const StyledEmailCheckbox = styled.div`border: 1px solid ${themeCssVariables.font.color.light};- border-radius: ${themeCssVariables.border.radius.xs};+ border-radius: 1px;box-sizing: border-box;flex-shrink: 0;height: ${EMAIL_CHECKBOX_SIZE}px;@@ -67,29 +67,30 @@ const StyledEmailSender = styled.span<{ isUnread: boolean }>``;const StyledEmailSubject = styled.span`- color: ${themeCssVariables.font.color.tertiary};+ color: ${themeCssVariables.font.color.secondary};`;-const StyledEventCard = styled.div<{ color: 'yellow' | 'blue' }>`+const StyledEventCard = styled.div<{ color: 'orange' | 'sky' }>`background-color: ${({ color }) =>- color === 'yellow'- ? themeCssVariables.color.yellow3- : themeCssVariables.color.blue3};+ color === 'orange'+ ? themeCssVariables.color.orange3+ : themeCssVariables.color.sky3};border-left: 2px solid${({ color }) =>- color === 'yellow'- ? themeCssVariables.color.yellow8- : themeCssVariables.color.blue8};- border-radius: ${themeCssVariables.border.radius.sm};- box-shadow: ${themeCssVariables.boxShadow.light};+ color === 'orange'+ ? themeCssVariables.color.orange11+ : themeCssVariables.color.sky11};+ border-radius: ${themeCssVariables.border.radius.md};+ box-shadow: ${themeCssVariables.boxShadow.strong};box-sizing: border-box;color: ${({ color }) =>- color === 'yellow'- ? themeCssVariables.color.yellow11- : themeCssVariables.color.blue11};+ color === 'orange'+ ? themeCssVariables.color.orange11+ : themeCssVariables.color.sky11};display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[1]};+ line-height: 1.1;padding: ${themeCssVariables.spacing[2]};position: absolute;width: 160px;@@ -101,15 +102,15 @@ const StyledEventTitle = styled.span``;const StyledEventTime = styled.span`- font-size: ${themeCssVariables.font.size.xs};+ font-size: 10px;`;const EVENT_CARD_POSITIONS: Record<ImportContactsPreviewCalendarEvent['color'],{ top: number; left: number; rotate: number }> = {- blue: { top: -6, left: 41, rotate: 10 },- yellow: { top: 150, left: 20, rotate: -7 },+ orange: { top: 160, left: 22, rotate: -7 },+ sky: { top: -4, left: 44, rotate: 10 },};const EmailRow = ({ email }: { email: ImportContactsPreviewEmail }) => (diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsxindex 25a434f2610..f151f8cae0d 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx@@ -9,8 +9,8 @@ const StyledBadge = styled.div`backdrop-filter: blur(20px);background-color: ${themeCssVariables.background.transparent.secondary};border: 1px solid ${themeCssVariables.background.transparent.lighter};- border-radius: 0 ${themeCssVariables.border.radius.md}- ${themeCssVariables.border.radius.md} 0;+ border-left: none;+ border-radius: ${themeCssVariables.border.radius.md};box-shadow: ${themeCssVariables.boxShadow.strong};box-sizing: border-box;display: flex;@@ -18,7 +18,7 @@ const StyledBadge = styled.div`left: 50%;padding: ${themeCssVariables.spacing[2]};position: absolute;- top: 84px;+ top: 83px;transform: translateX(-50%);`;@@ -29,6 +29,7 @@ const StyledDivider = styled.div``;const StyledTwentyLogo = styled.img`+ border-radius: ${themeCssVariables.border.radius.xs};height: ${SYNC_BADGE_LOGO_SIZE}px;width: ${SYNC_BADGE_LOGO_SIZE}px;`;diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsxindex cdaf05080c8..3b56fe0f566 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx@@ -13,6 +13,10 @@ const StyledNote = styled.div`gap: ${themeCssVariables.spacing[1]};`;+const StyledNoteText = styled.span`+ line-height: 1.4;+`;+export const OnboardingImportPrivacyNote = () => {const { t } = useLingui();@@ -22,7 +26,9 @@ export const OnboardingImportPrivacyNote = () => {size={PRIVACY_NOTE_ICON_SIZE}color={themeCssVariables.font.color.tertiary}/>- {t`Only you will be able to see your emails and events`}+ <StyledNoteText>+ {t`Only you will be able to see your emails and events`}+ </StyledNoteText></StyledNote>);};diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingTrustBadges.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingTrustBadges.tsxindex e4d58eb1a1e..cd229345d15 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingTrustBadges.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingTrustBadges.tsx@@ -16,11 +16,13 @@ const TRUSTED_BY_LOGOS = [const StyledRow = styled.div`align-items: center;display: flex;+ flex-wrap: wrap;gap: ${themeCssVariables.spacing[2]};justify-content: center;+ max-width: 100%;`;-const StyledBadge = styled.div`+const StyledBadge = styled.div<{ hasClusterLeading: boolean }>`align-items: center;background-color: ${themeCssVariables.background.primary};border: 1px solid ${themeCssVariables.border.color.medium};@@ -32,13 +34,18 @@ const StyledBadge = styled.div`font-weight: ${themeCssVariables.font.weight.semiBold};gap: ${themeCssVariables.spacing[1]};height: ${themeCssVariables.spacing[7]};- padding: 0 ${themeCssVariables.spacing[2]} 0 ${themeCssVariables.spacing[1]};+ overflow: hidden;+ padding: 0 10px 0+ ${({ hasClusterLeading }) =>+ hasClusterLeading+ ? themeCssVariables.spacing['0.5']+ : themeCssVariables.spacing[1]};`;const StyledSeal = styled.img`- height: 20px;+ height: 21px;object-fit: contain;- width: 20px;+ width: 21px;`;const StyledLogoCluster = styled.div`@@ -48,9 +55,9 @@ const StyledLogoCluster = styled.div``;const StyledClusterLogo = styled.img`- height: 18px;+ height: ${themeCssVariables.spacing[6]};object-fit: contain;- width: auto;+ width: ${themeCssVariables.spacing[6]};`;const StyledBadgeLabel = styled.span`@@ -58,12 +65,17 @@ const StyledBadgeLabel = styled.span``;type TrustBadgeProps = {+ hasClusterLeading?: boolean;label: string;leading: ReactNode;};-const TrustBadge = ({ label, leading }: TrustBadgeProps) => (- <StyledBadge>+const TrustBadge = ({+ hasClusterLeading = false,+ label,+ leading,+}: TrustBadgeProps) => (+ <StyledBadge hasClusterLeading={hasClusterLeading}>{leading}<StyledBadgeLabel>{label}</StyledBadgeLabel></StyledBadge>@@ -77,6 +89,7 @@ export const OnboardingTrustBadges = () => (/><TrustBadgelabel="+10k"+ hasClusterLeadingleading={<StyledLogoCluster>{TRUSTED_BY_LOGOS.map((logo) => (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 42f2f5fceb9..ba2c943f93d 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@@ -15,27 +15,32 @@ const StyledCard = styled.div`width: 100%;`;-const StyledHeader = styled.button<{ hasBody: boolean }>`- align-items: flex-start;+const StyledHeader = styled.button<{ hasBody: boolean; hasNote: boolean }>`+ align-items: center;background-color: transparent;border: none;border-bottom: ${({ hasBody }) =>hasBody ? `1px solid ${themeCssVariables.border.color.light}` : 'none'};cursor: pointer;display: flex;- gap: ${themeCssVariables.spacing[2]};- justify-content: space-between;- padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};+ gap: ${themeCssVariables.spacing[1]};+ padding: ${({ hasNote }) =>+ hasNote+ ? `${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]}`+ : themeCssVariables.spacing[3]};+ position: relative;text-align: left;width: 100%;`;-const StyledHeaderLeft = styled.div`+const StyledHeaderLeft = styled.div<{ hasNote: boolean }>`display: flex;flex: 1 1 0;flex-direction: column;- gap: ${themeCssVariables.spacing[2]};+ gap: ${themeCssVariables.spacing[4]};min-width: 0;+ padding-right: ${({ hasNote }) =>+ hasNote ? themeCssVariables.spacing[8] : '0'};`;const StyledTitleRow = styled.div`@@ -48,35 +53,61 @@ const StyledTitle = styled.span`color: ${themeCssVariables.font.color.primary};font-size: ${themeCssVariables.font.size.md};font-weight: ${themeCssVariables.font.weight.medium};+ line-height: 1.4;`;-const StyledTitleSuffix = styled.span`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.regular};+const StyledTitleSuffix = styled.span<{ isEmphasized: boolean }>`+ color: ${({ isEmphasized }) =>+ isEmphasized+ ? themeCssVariables.font.color.tertiary+ : themeCssVariables.font.color.extraLight};+ font-size: ${({ isEmphasized }) =>+ isEmphasized+ ? themeCssVariables.font.size.md+ : themeCssVariables.font.size.sm};+ font-weight: ${({ isEmphasized }) =>+ isEmphasized+ ? themeCssVariables.font.weight.medium+ : themeCssVariables.font.weight.regular};+ line-height: 1.4;`;const StyledNote = styled.span`color: ${themeCssVariables.font.color.light};font-size: ${themeCssVariables.font.size.sm};font-weight: ${themeCssVariables.font.weight.regular};+ line-height: 1.4;`;const StyledHeaderRight = styled.div`align-items: center;display: flex;- gap: ${themeCssVariables.spacing[2]};+ gap: ${themeCssVariables.spacing[1]};+ min-height: ${themeCssVariables.spacing[6]};`;const StyledBadge = styled.span`align-items: center;- background-color: ${themeCssVariables.background.tertiary};+ background-color: ${themeCssVariables.grayScale.gray3};border-radius: ${themeCssVariables.border.radius.pill};+ box-sizing: border-box;color: ${themeCssVariables.font.color.tertiary};display: flex;font-size: ${themeCssVariables.font.size.sm};font-weight: ${themeCssVariables.font.weight.medium};- padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};+ height: ${themeCssVariables.spacing[5]};+ padding: 0 ${themeCssVariables.spacing[2]};+`;++const StyledRadioContainer = styled.div`+ align-items: center;+ display: flex;+ height: ${themeCssVariables.spacing[6]};+ justify-content: center;+ position: absolute;+ right: ${themeCssVariables.spacing[2]};+ top: ${themeCssVariables.spacing[2]};+ width: ${themeCssVariables.spacing[6]};`;const StyledBody = styled.div`@@ -105,23 +136,37 @@ export const OnboardingPlanCard = ({children,}: OnboardingPlanCardProps) => {const hasBody = isValidElement(children);+ const hasNote = isDefined(note);return (<StyledCard>- <StyledHeader type="button" hasBody={hasBody} onClick={onSelect}>- <StyledHeaderLeft>+ <StyledHeader+ type="button"+ hasBody={hasBody}+ hasNote={hasNote}+ onClick={onSelect}+ >+ <StyledHeaderLeft hasNote={hasNote}><StyledTitleRow><StyledTitle>{title}</StyledTitle>{isDefined(titleSuffix) && (- <StyledTitleSuffix>{titleSuffix}</StyledTitleSuffix>+ <StyledTitleSuffix isEmphasized={hasNote}>+ {titleSuffix}+ </StyledTitleSuffix>)}</StyledTitleRow>- {isDefined(note) && <StyledNote>{note}</StyledNote>}+ {hasNote && <StyledNote>{note}</StyledNote>}</StyledHeaderLeft>- <StyledHeaderRight>- {isDefined(badge) && <StyledBadge>{badge}</StyledBadge>}- <Radio checked={selected} />- </StyledHeaderRight>+ {hasNote ? (+ <StyledRadioContainer>+ <Radio checked={selected} />+ </StyledRadioContainer>+ ) : (+ <StyledHeaderRight>+ {isDefined(badge) && <StyledBadge>{badge}</StyledBadge>}+ <Radio checked={selected} />+ </StyledHeaderRight>+ )}</StyledHeader>{hasBody && <StyledBody>{children}</StyledBody>}</StyledCard>diff --git a/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewCalendarEvents.ts b/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewCalendarEvents.tsindex daec8ac0363..717cf98eead 100644--- a/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewCalendarEvents.ts+++ b/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewCalendarEvents.ts@@ -2,7 +2,7 @@ export type ImportContactsPreviewCalendarEvent = {id: string;title: string;time: string;- color: 'yellow' | 'blue';+ color: 'orange' | 'sky';};export const IMPORT_CONTACTS_PREVIEW_CALENDAR_EVENTS = [@@ -10,12 +10,12 @@ export const IMPORT_CONTACTS_PREVIEW_CALENDAR_EVENTS = [id: 'tim-apple-anthropic',title: 'Tim Apple x Anthropic',time: '10:00am',- color: 'yellow',+ color: 'orange',},{id: 'dario-amodei',title: 'Dario Amodei',time: '3:00pm',- color: 'blue',+ color: 'sky',},] satisfies ImportContactsPreviewCalendarEvent[];diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingActivationMessages.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingActivationMessages.tsnew file mode 100644index 00000000000..33e01c23eb6--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingActivationMessages.ts@@ -0,0 +1,7 @@+import { WORKSPACE_ACTIVATION_MESSAGES } from '@/auth/sign-in-up/constants/WorkspaceActivationMessages';+import { msg } from '@lingui/core/macro';++export const ONBOARDING_ACTIVATION_MESSAGES = [+ msg`Verifying your login token`,+ ...WORKSPACE_ACTIVATION_MESSAGES,+];diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingContentBlockWidth.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingContentBlockWidth.tsnew file mode 100644index 00000000000..76b4cdb197b--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingContentBlockWidth.ts@@ -0,0 +1 @@+export const ONBOARDING_CONTENT_BLOCK_WIDTH = 340;diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionSlideOffset.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionSlideOffset.tsnew file mode 100644index 00000000000..0e3a158ea3a--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionSlideOffset.ts@@ -0,0 +1 @@+export const ONBOARDING_MOTION_SLIDE_OFFSET = 12;diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionStaggerDelay.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionStaggerDelay.tsnew file mode 100644index 00000000000..c14462606c3--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingMotionStaggerDelay.ts@@ -0,0 +1 @@+export const ONBOARDING_MOTION_STAGGER_DELAY = 0.07;diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingSyncEmailsOptions.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingSyncEmailsOptions.tsdeleted file mode 100644index bd77d80f10b..00000000000--- a/packages/twenty-front/src/modules/onboarding/constants/OnboardingSyncEmailsOptions.ts+++ /dev/null@@ -1,46 +0,0 @@-import { msg } from '@lingui/core/macro';--import { MessageChannelVisibility } from '~/generated/graphql';--type OnboardingEmailVisibilityProps = {- metadata: 'active' | 'inactive';- subject: 'active' | 'inactive';- body: 'active' | 'inactive';-};--const { ONBOARDING_SYNC_EMAILS_OPTIONS } = {- ONBOARDING_SYNC_EMAILS_OPTIONS: [- {- title: msg`Everything`,- description: msg`Your emails and events content will be shared with your team.`,- value: MessageChannelVisibility.SHARE_EVERYTHING,- cardMediaProps: {- metadata: 'active',- subject: 'active',- body: 'active',- } as OnboardingEmailVisibilityProps,- },- {- title: msg`Subject and metadata`,- description: msg`Your email subjects and meeting titles will be shared with your team.`,- value: MessageChannelVisibility.SUBJECT,- cardMediaProps: {- metadata: 'active',- subject: 'active',- body: 'inactive',- } as OnboardingEmailVisibilityProps,- },- {- title: msg`Metadata`,- description: msg`Only the timestamp & participants will be shared with your team.`,- value: MessageChannelVisibility.METADATA,- cardMediaProps: {- metadata: 'active',- subject: 'inactive',- body: 'inactive',- } as OnboardingEmailVisibilityProps,- },- ],-};--export { ONBOARDING_SYNC_EMAILS_OPTIONS };diff --git a/packages/twenty-front/src/modules/onboarding/constants/UpgradeStepContentWidth.ts b/packages/twenty-front/src/modules/onboarding/constants/UpgradeStepContentWidth.tsnew file mode 100644index 00000000000..aab60fbd2bf--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/UpgradeStepContentWidth.ts@@ -0,0 +1 @@+export const UPGRADE_STEP_CONTENT_WIDTH = 440;diff --git a/packages/twenty-front/src/modules/onboarding/constants/WorkspaceActivationFirstMessageIndex.ts b/packages/twenty-front/src/modules/onboarding/constants/WorkspaceActivationFirstMessageIndex.tsnew file mode 100644index 00000000000..ff145fe10e3--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/WorkspaceActivationFirstMessageIndex.ts@@ -0,0 +1,5 @@+import { WORKSPACE_ACTIVATION_MESSAGES } from '@/auth/sign-in-up/constants/WorkspaceActivationMessages';+import { ONBOARDING_ACTIVATION_MESSAGES } from '@/onboarding/constants/OnboardingActivationMessages';++export const WORKSPACE_ACTIVATION_FIRST_MESSAGE_INDEX =+ ONBOARDING_ACTIVATION_MESSAGES.length - WORKSPACE_ACTIVATION_MESSAGES.length;diff --git a/packages/twenty-front/src/modules/onboarding/effect-components/InstallAppsAutoSkipEffect.tsx b/packages/twenty-front/src/modules/onboarding/effect-components/InstallAppsAutoSkipEffect.tsxdeleted file mode 100644index 3ba89fa758d..00000000000--- a/packages/twenty-front/src/modules/onboarding/effect-components/InstallAppsAutoSkipEffect.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { useTriggerInstallAppsOnboardingStep } from '@/onboarding/hooks/useTriggerInstallAppsOnboardingStep';-import { useEffect, useRef } from 'react';--type InstallAppsAutoSkipEffectProps = {- onError: () => void;-};--export const InstallAppsAutoSkipEffect = ({- onError,-}: InstallAppsAutoSkipEffectProps) => {- const triggerInstallAppsOnboardingStep =- useTriggerInstallAppsOnboardingStep();-- // oxlint-disable-next-line twenty/no-state-useref- const hasSkippedRef = useRef(false);-- useEffect(() => {- if (hasSkippedRef.current) {- return;- }- hasSkippedRef.current = true;-- const skip = async () => {- try {- await triggerInstallAppsOnboardingStep([]);- } catch {- onError();- }- };-- void skip();- }, [triggerInstallAppsOnboardingStep, onError]);-- return null;-};diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts b/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.tsindex eb733449b97..d711ca63221 100644--- a/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts+++ b/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts@@ -1,5 +1,3 @@-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';-import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';@@ -17,7 +15,6 @@ import { type SubmitHandler, useFieldArray, useForm } from 'react-hook-form';import { Key } from 'ts-key-enum';import { isDefined } from 'twenty-shared/utils';import { GetInviteSuggestionsDocument } from '~/generated-metadata/graphql';-import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';import { z } from 'zod';const validationSchema = z.object({@@ -28,15 +25,11 @@ type InviteTeamFormInput = z.infer<typeof validationSchema>;export const useInviteTeam = () => {const { t } = useLingui();- const { copyToClipboard } = useCopyToClipboard();const { enqueueSuccessSnackBar } = useSnackBar();const { sendInvitation } = useCreateWorkspaceInvitation();const setNextOnboardingStatus = useSetNextOnboardingStatus();const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);const onboardingConfig = useAtomStateValue(onboardingConfigState);- const currentWorkspace = useAtomStateValue(currentWorkspaceState);- const calendarBookingPageId = useAtomStateValue(calendarBookingPageIdState);- const hasCalendarBooking = isDefined(calendarBookingPageId);const {control,@@ -125,13 +118,6 @@ export const useInviteTeam = () => {return '[email protected]';};- const copyInviteLink = () => {- if (isDefined(currentWorkspace?.inviteHash)) {- const inviteLink = `${window.location.origin}/invite/${currentWorkspace?.inviteHash}`;- copyToClipboard(inviteLink, t`Link copied to clipboard`);- }- };-const onSubmit: SubmitHandler<InviteTeamFormInput> = useCallback(async (data) => {const emails = Array.from(@@ -197,12 +183,8 @@ export const useInviteTeam = () => {handleSubmit,onSubmit,handleSkip,- copyInviteLink,getPlaceholder,- hasPrefilledSuggestions,- hasCalendarBooking,isValid,isSubmitting,- currentWorkspace,};};diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingContentWidth.ts b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingContentWidth.tsnew file mode 100644index 00000000000..93142f018be--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingContentWidth.ts@@ -0,0 +1,13 @@+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';+import { UPGRADE_STEP_CONTENT_WIDTH } from '@/onboarding/constants/UpgradeStepContentWidth';+import { useLocation } from 'react-router-dom';+import { AppPath } from 'twenty-shared/types';+import { isMatchingLocation } from '~/utils/isMatchingLocation';++export const useOnboardingContentWidth = () => {+ const location = useLocation();++ return isMatchingLocation(location, AppPath.PlanRequired)+ ? UPGRADE_STEP_CONTENT_WIDTH+ : ONBOARDING_CONTENT_BLOCK_WIDTH;+};diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingMotionTransition.ts b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingMotionTransition.tsnew file mode 100644index 00000000000..5f68611fbfa--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingMotionTransition.ts@@ -0,0 +1,11 @@+import { type Transition, useReducedMotion } from 'framer-motion';+import { useTheme } from 'twenty-ui/theme-constants';++export const useOnboardingMotionTransition = (): Transition => {+ const theme = useTheme();+ const shouldReduceMotion = useReducedMotion();++ return shouldReduceMotion+ ? { duration: 0 }+ : { duration: theme.animation.duration.normal, ease: 'easeInOut' };+};diff --git a/packages/twenty-front/src/modules/onboarding/states/onboardingActivationFailedState.ts b/packages/twenty-front/src/modules/onboarding/states/onboardingActivationFailedState.tsnew file mode 100644index 00000000000..4fc9f8bf2aa--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/states/onboardingActivationFailedState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const onboardingActivationFailedState = createAtomState<boolean>({+ key: 'onboardingActivationFailedState',+ defaultValue: false,+});diff --git a/packages/twenty-front/src/modules/settings/billing/components/TrialCard.tsx b/packages/twenty-front/src/modules/settings/billing/components/TrialCard.tsxdeleted file mode 100644index e0374a484c5..00000000000--- a/packages/twenty-front/src/modules/settings/billing/components/TrialCard.tsx+++ /dev/null@@ -1,38 +0,0 @@-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { themeCssVariables } from 'twenty-ui/theme-constants';--type TrialCardProps = {- duration: number;- withCreditCard: boolean;-};--const StyledTrialCardContainer = styled.div`- display: flex;- flex-direction: column;-`;--const StyledTrialDurationContainer = styled.div`- color: ${themeCssVariables.font.color.secondary};- display: flex;- font-size: ${themeCssVariables.font.size.md};- margin-bottom: ${themeCssVariables.spacing[2]};-`;--const StyledCreditCardRequirementContainer = styled.div`- color: ${themeCssVariables.font.color.tertiary};- display: flex;- font-size: ${themeCssVariables.font.size.md};-`;--export const TrialCard = ({ duration, withCreditCard }: TrialCardProps) => {- const { t } = useLingui();- return (- <StyledTrialCardContainer>- <StyledTrialDurationContainer>{t`${duration} days trial`}</StyledTrialDurationContainer>- <StyledCreditCardRequirementContainer>- {withCreditCard ? t`With Credit Card` : t`No Credit Card`}- </StyledCreditCardRequirementContainer>- </StyledTrialCardContainer>- );-};diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.tsindex ecfff268a6a..fa041fb1589 100644--- a/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useStripeAppearance.ts@@ -32,11 +32,42 @@ export const useStripeAppearance = (): Appearance => {return {theme: isDark ? 'night' : 'stripe',variables: {+ fontFamily: theme.font.family,+ fontSizeBase: '14px',colorPrimary: toStripeColor(theme.color.blue),colorBackground: toStripeColor(theme.background.primary),colorText: toStripeColor(theme.font.color.primary),+ colorTextSecondary: toStripeColor(theme.font.color.tertiary),+ colorTextPlaceholder: toStripeColor(theme.font.color.light),colorDanger: toStripeColor(theme.font.color.danger),- borderRadius: '8px',+ colorIcon: toStripeColor(theme.font.color.tertiary),+ borderRadius: theme.border.radius.md,+ spacingGridRow: '12px',+ },+ rules: {+ '.Label': {+ color: toStripeColor(theme.font.color.secondary),+ fontWeight: String(theme.font.weight.medium),+ fontSize: '13px',+ marginBottom: '6px',+ },+ '.Input': {+ backgroundColor: toStripeColor(theme.background.tertiary),+ border: `1px solid ${toStripeColor(theme.border.color.medium)}`,+ boxShadow: 'none',+ padding: '8px 12px',+ },+ '.Input:focus': {+ border: `1px solid ${toStripeColor(theme.border.color.blue)}`,+ boxShadow: 'none',+ },+ '.Input--invalid': {+ border: `1px solid ${toStripeColor(theme.border.color.danger)}`,+ boxShadow: 'none',+ },+ '.Input::placeholder': {+ color: toStripeColor(theme.font.color.light),+ },},};};diff --git a/packages/twenty-front/src/modules/settings/billing/components/SubscriptionPaymentForm.tsx b/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.tssimilarity index 53%rename from packages/twenty-front/src/modules/settings/billing/components/SubscriptionPaymentForm.tsxrename to packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.tsindex 23629a68d32..403d3da949b 100644--- a/packages/twenty-front/src/modules/settings/billing/components/SubscriptionPaymentForm.tsx+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.ts@@ -1,71 +1,39 @@-import { currentUserState } from '@/auth/states/currentUserState';-import { useStripeAppearance } from '@/settings/billing/hooks/useStripeAppearance';-import { useStripePromise } from '@/settings/billing/hooks/useStripePromise';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { CombinedGraphQLErrors } from '@apollo/client/errors';import { useMutation } from '@apollo/client/react';-import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import {- Elements,- PaymentElement,- useElements,- useStripe,-} from '@stripe/react-stripe-js';+import { useElements, useStripe } from '@stripe/react-stripe-js';import { useState } from 'react';import { AppPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { Info, Loader } from 'twenty-ui/feedback';-import { MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';import {type BillingPlanKey,type SubscriptionInterval,CreateSubscriptionPaymentIntentDocument,} from '~/generated-metadata/graphql';-type SubscriptionPaymentFormContentProps = {+type UseSubmitSubscriptionPaymentParams = {plan: BillingPlanKey;recurringInterval: SubscriptionInterval;};-type SubscriptionPaymentFormProps = SubscriptionPaymentFormContentProps & {- amount: number;-};--const StyledFormContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- margin-bottom: ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledButtonContainer = styled.div`- display: flex;- justify-content: center;-`;--const SubscriptionPaymentFormContent = ({+export const useSubmitSubscriptionPayment = ({plan,recurringInterval,-}: SubscriptionPaymentFormContentProps) => {+}: UseSubmitSubscriptionPaymentParams) => {const stripe = useStripe();const elements = useElements();const { enqueueErrorSnackBar } = useSnackBar();const [isSubmitting, setIsSubmitting] = useState(false);- const customerEmail = useAtomStateValue(currentUserState)?.email;-const [createSubscriptionPaymentIntent] = useMutation(CreateSubscriptionPaymentIntentDocument,);const isStripeReady = isDefined(stripe) && isDefined(elements);- const handleSubmit = async () => {- if (!isStripeReady) {+ const submit = async () => {+ if (!isDefined(stripe) || !isDefined(elements)) {return;}@@ -135,56 +103,5 @@ const SubscriptionPaymentFormContent = ({}};- return (- <StyledFormContainer>- <PaymentElement- options={{- defaultValues: isDefined(customerEmail)- ? { billingDetails: { email: customerEmail } }- : undefined,- }}- />- <StyledButtonContainer>- <MainButton- title={t`Continue`}- onClick={handleSubmit}- width={200}- Icon={() => (isSubmitting ? <Loader /> : null)}- disabled={!isStripeReady || isSubmitting}- />- </StyledButtonContainer>- </StyledFormContainer>- );-};--export const SubscriptionPaymentForm = ({- plan,- recurringInterval,- amount,-}: SubscriptionPaymentFormProps) => {- const stripePromise = useStripePromise();- const appearance = useStripeAppearance();-- if (!isDefined(stripePromise)) {- return (- <StyledFormContainer>- <Info- accent="danger"- text={t`Card payment is currently unavailable. Please verify your Stripe configuration or contact your workspace admin.`}- />- </StyledFormContainer>- );- }-- return (- <Elements- stripe={stripePromise}- options={{ mode: 'subscription', amount, currency: 'usd', appearance }}- >- <SubscriptionPaymentFormContent- plan={plan}- recurringInterval={recurringInterval}- />- </Elements>- );+ return { submit, isSubmitting, isStripeReady };};diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsxdeleted file mode 100644index ab21c5d97ab..00000000000--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { SettingsPath } from 'twenty-shared/types';-import { getSettingsPath } from 'twenty-shared/utils';-import { IconSearch, IconSettings } from 'twenty-ui/icon';-import { getOsControlSymbol, useIsMobile } from 'twenty-ui/utilities';--import { BACKGROUND_MOCK_WORKSPACE_ITEMS } from '@/sign-in-background-mock/constants/BackgroundMockNavigationItems';-import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';-import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';-import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';-import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';-import { DEFAULT_WORKSPACE_NAME } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName';--const StyledMainSectionWrapper = styled.div`- min-height: fit-content;-`;--export type BackgroundMockNavigationDrawerProps = {- className?: string;-};--export const BackgroundMockNavigationDrawer = ({- className,-}: BackgroundMockNavigationDrawerProps) => {- const isMobile = useIsMobile();- const { t } = useLingui();-- return (- <NavigationDrawer className={className} title={DEFAULT_WORKSPACE_NAME}>- {!isMobile && (- <StyledMainSectionWrapper>- <NavigationDrawerSection>- <NavigationDrawerItem- label={t`Search`}- Icon={IconSearch}- onClick={() => {}}- modifier={{ keyboard: [getOsControlSymbol(), 'K'] }}- />- <NavigationDrawerItem- label={t`Settings`}- to={getSettingsPath(SettingsPath.ProfilePage)}- onClick={() => {}}- Icon={IconSettings}- />- </NavigationDrawerSection>- </StyledMainSectionWrapper>- )}- <NavigationDrawerSection>- <NavigationDrawerSectionTitle label={t`Workspace`} />- {BACKGROUND_MOCK_WORKSPACE_ITEMS.map((item, index) => (- <NavigationDrawerItem- key={item.label}- label={item.label}- Icon={item.Icon}- iconColor={item.color}- active={index === 0}- onClick={() => {}}- />- ))}- </NavigationDrawerSection>- </NavigationDrawer>- );-};diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.tsdeleted file mode 100644index 6ea7ba51c11..00000000000--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts+++ /dev/null@@ -1,38 +0,0 @@-import {- IconBuildingSkyscraper,- IconCalendarEvent,- IconCheckbox,- type IconComponent,- IconFileText,- IconHeart,- IconLayoutDashboard,- IconNotes,- IconRocket,- IconStar,- IconTargetArrow,- IconUser,- IconUserCircle,-} from 'twenty-ui/icon';-import { type ThemeColor } from 'twenty-ui/theme';--export type BackgroundMockNavigationItem = {- label: string;- Icon: IconComponent;- color: ThemeColor;-};--export const BACKGROUND_MOCK_WORKSPACE_ITEMS = [- { label: 'Companies', Icon: IconBuildingSkyscraper, color: 'blue' },- { label: 'People', Icon: IconUser, color: 'blue' },- { label: 'Opportunities', Icon: IconTargetArrow, color: 'red' },- { label: 'Tasks', Icon: IconCheckbox, color: 'turquoise' },- { label: 'Notes', Icon: IconNotes, color: 'turquoise' },- { label: 'Dashboards', Icon: IconLayoutDashboard, color: 'orange' },- { label: 'Workflows', Icon: IconRocket, color: 'pink' },- { label: 'Rockets', Icon: IconRocket, color: 'sky' },- { label: 'Pets', Icon: IconHeart, color: 'orange' },- { label: 'Survey results', Icon: IconStar, color: 'yellow' },- { label: 'Employment Histories', Icon: IconUserCircle, color: 'green' },- { label: 'Pet Care Agreements', Icon: IconFileText, color: 'purple' },- { label: 'Star History', Icon: IconCalendarEvent, color: 'red' },-] satisfies BackgroundMockNavigationItem[];diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.tsdeleted file mode 100644index b79c1ebb4d3..00000000000--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts+++ /dev/null@@ -1,8 +0,0 @@-import { IconFileText, IconSettings } from 'twenty-ui/icon';--import { type BackgroundMockNavigationItem } from '@/sign-in-background-mock/constants/BackgroundMockNavigationItems';--export const BACKGROUND_MOCK_OTHER_ITEMS = [- { label: 'Settings', Icon: IconSettings, color: 'gray' },- { label: 'Documentation', Icon: IconFileText, color: 'gray' },-] satisfies BackgroundMockNavigationItem[];diff --git a/packages/twenty-front/src/modules/types/PageFocusId.ts b/packages/twenty-front/src/modules/types/PageFocusId.tsindex 674bc75bc29..c2e739fefd1 100644--- a/packages/twenty-front/src/modules/types/PageFocusId.ts+++ b/packages/twenty-front/src/modules/types/PageFocusId.ts@@ -3,7 +3,6 @@ export enum PageFocusId {WorkspaceActivation = 'workspace-activation',SignInUp = 'sign-in-up',CreateProfile = 'create-profile',- CreateProfileV2 = 'create-profile-v2',InviteTeam = 'invite-team',SyncEmail = 'sync-email',PlanRequired = 'plan-required',diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx b/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsxdeleted file mode 100644index 8c8306b46fc..00000000000--- a/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx+++ /dev/null@@ -1,65 +0,0 @@-import { renderHook } from '@testing-library/react';-import * as reactRouterDom from 'react-router-dom';--import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';-import { AppPath } from 'twenty-shared/types';-import { isMatchingLocation } from '~/utils/isMatchingLocation';--jest.mock('react-router-dom', () => ({- useLocation: jest.fn(),-}));--const mockUseLocation = reactRouterDom.useLocation as jest.Mock;--jest.mock('~/utils/isMatchingLocation');-const mockIsMatchingLocation = jest.mocked(isMatchingLocation);--const setupMockIsMatchingLocation = (pathname: string) => {- mockUseLocation.mockReturnValue({ pathname });- mockIsMatchingLocation.mockImplementation(- (_location, path) => path === pathname,- );-};--const getResult = () =>- renderHook(() => {- return useShowAuthModal();- });--const testCases = [- { loc: AppPath.Verify, res: true },- { loc: AppPath.VerifyEmail, res: true },- { loc: AppPath.SignInUp, res: true },- { loc: AppPath.Invite, res: true },- { loc: AppPath.ResetPassword, res: true },- { loc: AppPath.WorkspaceActivation, res: true },- { loc: AppPath.SyncEmails, res: true },- { loc: AppPath.InviteTeam, res: true },- { loc: AppPath.PlanRequired, res: true },- { loc: AppPath.PlanRequiredSuccess, res: true },- { loc: AppPath.BookCallDecision, res: true },- { loc: AppPath.BookCall, res: true },-- { loc: AppPath.Index, res: false },- { loc: AppPath.RecordIndexPage, res: false },- { loc: AppPath.RecordShowPage, res: false },- { loc: AppPath.SettingsCatchAll, res: false },- { loc: AppPath.DevelopersCatchAll, res: false },- { loc: AppPath.Authorize, res: false },- { loc: AppPath.NotFoundWildcard, res: false },- { loc: AppPath.NotFound, res: false },-];--describe('useShowAuthModal', () => {- testCases.forEach((testCase) => {- it(`testCase for location ${testCase.loc} should return ${testCase.res}`, () => {- setupMockIsMatchingLocation(testCase.loc);- const { result } = getResult();- if (testCase.res) {- expect(result.current).toBeTruthy();- } else {- expect(result.current).toBeFalsy();- }- });- });-});diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts b/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.tsdeleted file mode 100644index 4e678cb62f1..00000000000--- a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts+++ /dev/null@@ -1,31 +0,0 @@-import { useMemo } from 'react';--import { useLocation } from 'react-router-dom';-import { AppPath } from 'twenty-shared/types';-import { isMatchingLocation } from '~/utils/isMatchingLocation';--export const useShowAuthModal = () => {- const location = useLocation();-- return useMemo(() => {- if (- isMatchingLocation(location, AppPath.Invite) ||- isMatchingLocation(location, AppPath.InviteTeam) ||- isMatchingLocation(location, AppPath.CreateProfile) ||- isMatchingLocation(location, AppPath.SyncEmails) ||- isMatchingLocation(location, AppPath.ResetPassword) ||- isMatchingLocation(location, AppPath.VerifyEmail) ||- isMatchingLocation(location, AppPath.Verify) ||- isMatchingLocation(location, AppPath.SignInUp) ||- isMatchingLocation(location, AppPath.WorkspaceActivation) ||- isMatchingLocation(location, AppPath.PlanRequired) ||- isMatchingLocation(location, AppPath.PlanRequiredSuccess) ||- isMatchingLocation(location, AppPath.BookCallDecision) ||- isMatchingLocation(location, AppPath.BookCall)- ) {- return true;- }-- return false;- }, [location]);-};diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/AuthFlowLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/AuthFlowLayout.tsxnew file mode 100644index 00000000000..bffa9b94cd6--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/page/components/AuthFlowLayout.tsx@@ -0,0 +1,17 @@+import { styled } from '@linaria/react';+import { Outlet } from 'react-router-dom';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledBackground = styled.div`+ background: ${themeCssVariables.background.secondary};+ display: flex;+ flex-direction: column;+ height: 100dvh;+ width: 100%;+`;++export const AuthFlowLayout = () => (+ <StyledBackground>+ <Outlet />+ </StyledBackground>+);diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsxindex 6e585793ddd..9b7b214e6c4 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx@@ -1,4 +1,3 @@-import { AuthModal } from '@/auth/components/AuthModal';import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';import { AppFullScreenErrorFallback } from '@/error-handler/components/AppFullScreenErrorFallback';import { AppPageErrorFallback } from '@/error-handler/components/AppPageErrorFallback';@@ -9,19 +8,9 @@ import { LayoutCustomizationBar } from '@/layout-customization/components/Layoutimport { AppNavigationDrawer } from '@/navigation/components/AppNavigationDrawer';import { MobileNavigationBar } from '@/navigation/components/MobileNavigationBar';import { PageDragDropProvider } from '@/navigation-menu-item/display/dnd/providers/PageDragDropProvider';-import { BackgroundMockNavigationDrawer } from '@/sign-in-background-mock/components/BackgroundMockNavigationDrawer';-import { Suspense, lazy } from 'react';--const BackgroundMockPage = lazy(() =>- import('@/sign-in-background-mock/components/BackgroundMockPage').then(- (module) => ({ default: module.BackgroundMockPage }),- ),-);import { useShowFullscreen } from '@/ui/layout/fullscreen/hooks/useShowFullscreen';-import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { styled } from '@linaria/react';-import { AnimatePresence, LayoutGroup } from 'framer-motion';import { Outlet } from 'react-router-dom';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledLayout = styled.div`@@ -85,7 +74,6 @@ const StyledMainContainer = styled.div`export const DefaultLayout = () => {const isMobile = useIsMobile();- const showAuthModal = useShowAuthModal();const useShowFullScreen = useShowFullscreen();return (@@ -97,41 +85,20 @@ export const DefaultLayout = () => {<LayoutCustomizationBar /><StyledPageContainer><PageDragDropProvider>- {!showAuthModal && <KeyboardShortcutMenu />}- {showAuthModal ? (- <StyledNavigationDrawerWrapper>- <BackgroundMockNavigationDrawer />- </StyledNavigationDrawerWrapper>- ) : useShowFullScreen ? null : (+ <KeyboardShortcutMenu />+ {useShowFullScreen ? null : (<StyledNavigationDrawerWrapper><AppNavigationDrawer /></StyledNavigationDrawerWrapper>)}- {showAuthModal ? (- <>- <StyledMainContainer>- <Suspense fallback={null}>- <BackgroundMockPage />- </Suspense>- </StyledMainContainer>- <AnimatePresence mode="wait">- <LayoutGroup>- <AuthModal>- <Outlet />- </AuthModal>- </LayoutGroup>- </AnimatePresence>- </>- ) : (- <StyledMainContainer>- <AppErrorBoundary FallbackComponent={AppPageErrorFallback}>- <Outlet />- </AppErrorBoundary>- </StyledMainContainer>- )}+ <StyledMainContainer>+ <AppErrorBoundary FallbackComponent={AppPageErrorFallback}>+ <Outlet />+ </AppErrorBoundary>+ </StyledMainContainer></PageDragDropProvider></StyledPageContainer>- {isMobile && !showAuthModal && <MobileNavigationBar />}+ {isMobile && <MobileNavigationBar />}</AppErrorBoundary></StyledLayout></FileUploadProvider>diff --git a/packages/twenty-front/src/modules/users/components/UserContextProvider.tsx b/packages/twenty-front/src/modules/users/components/UserContextProvider.tsxnew file mode 100644index 00000000000..c96b9023e46--- /dev/null+++ b/packages/twenty-front/src/modules/users/components/UserContextProvider.tsx@@ -0,0 +1,16 @@+import { type PropsWithChildren } from 'react';++import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';+import { UserContext } from '@/users/contexts/UserContext';++type UserContextProviderProps = PropsWithChildren;++export const UserContextProvider = ({ children }: UserContextProviderProps) => {+ const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();++ return (+ <UserContext.Provider value={{ dateFormat, timeFormat, timeZone }}>+ {children}+ </UserContext.Provider>+ );+};diff --git a/packages/twenty-front/src/pages/auth/SignInUp.tsx b/packages/twenty-front/src/pages/auth/SignInUp.tsxindex 1a023a33d92..683fa1bbd8a 100644--- a/packages/twenty-front/src/pages/auth/SignInUp.tsx+++ b/packages/twenty-front/src/pages/auth/SignInUp.tsx@@ -1,5 +1,6 @@import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';+import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';import {SignInUpStep,signInUpStepState,@@ -10,21 +11,20 @@ import { styled } from '@linaria/react';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { Logo } from '@/auth/components/Logo';-import { Title } from '@/auth/components/Title';import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';-import { FooterNote } from '@/auth/sign-in-up/components/FooterNote';import { SignInUpGlobalScopeForm } from '@/auth/sign-in-up/components/SignInUpGlobalScopeForm';+import { SignInUpStandardContent } from '@/auth/sign-in-up/components/SignInUpStandardContent';import { SignInUpWorkspaceScopeForm } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeForm';-import { WorkspaceSelectionFooter } from '@/auth/sign-in-up/components/WorkspaceSelectionFooter';import { SignInUpSSOIdentityProviderSelection } from '@/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection';+import { OnboardingLayout } from '@/onboarding/components/OnboardingLayout';+import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';import { SignInUpWorkspaceCreationForm } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm';import { SignInUpWorkspaceScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect';import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';import { useGetPublicWorkspaceDataByDomain } from '@/domain-manager/hooks/useGetPublicWorkspaceDataByDomain';import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';import { useIsCurrentLocationOnDefaultDomain } from '@/domain-manager/hooks/useIsCurrentLocationOnDefaultDomain';-import { type JSX, useMemo } from 'react';+import { useMemo } from 'react';import { SignInUpGlobalScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect';import { SignInUpTwoFactorAuthenticationProvision } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision';@@ -37,8 +37,6 @@ import { useSearchParams } from 'react-router-dom';import { isDefined } from 'twenty-shared/utils';import { Loader } from 'twenty-ui/feedback';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { AnimatedEaseIn } from 'twenty-ui/layout';-import { type PublicWorkspaceData } from '~/generated-metadata/graphql';const StyledLoaderContainer = styled.div`align-items: center;@@ -49,48 +47,20 @@ const StyledLoaderContainer = styled.div`width: 100%;`;-const StandardContent = ({- workspacePublicData,- signInUpForm,- signInUpStep,- title,- onClickOnLogo,-}: {- workspacePublicData: PublicWorkspaceData | null;- signInUpForm: JSX.Element | null;- signInUpStep: SignInUpStep;- title: string;- onClickOnLogo: () => void;-}) => {- return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <AnimatedEaseIn>- <Logo- secondaryLogo={workspacePublicData?.logo}- placeholder={workspacePublicData?.displayName}- onClick={onClickOnLogo}- />- </AnimatedEaseIn>- <Title animate>{title}</Title>- {signInUpForm}- {signInUpStep === SignInUpStep.WorkspaceSelection && (- <WorkspaceSelectionFooter />- )}- {![- SignInUpStep.Password,- SignInUpStep.TwoFactorAuthenticationProvision,- SignInUpStep.TwoFactorAuthenticationVerification,- SignInUpStep.WorkspaceSelection,- SignInUpStep.WorkspaceCreation,- ].includes(signInUpStep) && <FooterNote />}- </ModalContent>- );-};+const StyledBackground = styled.div`+ background: ${themeCssVariables.background.secondary};+ display: flex;+ flex-direction: column;+ height: 100dvh;+ overflow-y: auto;+ width: 100%;+`;export const SignInUp = () => {const { t } = useLingui();const setSignInUpStep = useSetAtomState(signInUpStepState);const clientConfigApiStatus = useAtomStateValue(clientConfigApiStatusState);+ const isCreatingWorkspace = useAtomStateValue(isCreatingWorkspaceState);const { form } = useSignInUpForm();const { signInUpStep } = useSignInUp(form);@@ -105,12 +75,22 @@ export const SignInUp = () => {const { workspaceInviteHash, workspace: workspaceFromInviteHash } =useWorkspaceFromInviteHash();- const [searchParams] = useSearchParams();+ const [searchParams, setSearchParams] = useSearchParams();const onClickOnLogo = () => {setSignInUpStep(SignInUpStep.Init);};+ const onBackFromWorkspaceCreation = () => {+ if (searchParams.has('action')) {+ const nextSearchParams = new URLSearchParams(searchParams);+ nextSearchParams.delete('action');+ setSearchParams(nextSearchParams, { replace: true });+ }++ setSignInUpStep(SignInUpStep.WorkspaceSelection);+ };+const isGlobalScope = isDefaultDomain && isMultiWorkspaceEnabled;const title = useMemo(() => {@@ -220,21 +200,27 @@ export const SignInUp = () => {workspacePublicData,]);- if (signInUpStep === SignInUpStep.EmailVerification) {- return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <EmailVerificationSent email={searchParams.get('email')} />- </ModalContent>- );- }-- return (- <StandardContent- workspacePublicData={workspacePublicData}- signInUpForm={signInUpForm}- signInUpStep={signInUpStep}- title={title}- onClickOnLogo={onClickOnLogo}- />+ return signInUpStep === SignInUpStep.WorkspaceCreation ? (+ <OnboardingLayout+ onBack={!isCreatingWorkspace ? onBackFromWorkspaceCreation : undefined}+ >+ <StyledOnboardingStepPage>{signInUpForm}</StyledOnboardingStepPage>+ </OnboardingLayout>+ ) : (+ <StyledBackground>+ {signInUpStep === SignInUpStep.EmailVerification ? (+ <ModalContent isVerticallyCentered isHorizontallyCentered>+ <EmailVerificationSent email={searchParams.get('email')} />+ </ModalContent>+ ) : (+ <SignInUpStandardContent+ workspacePublicData={workspacePublicData}+ signInUpForm={signInUpForm}+ signInUpStep={signInUpStep}+ title={title}+ onClickOnLogo={onClickOnLogo}+ />+ )}+ </StyledBackground>);};diff --git a/packages/twenty-front/src/pages/auth/SignInUpV2.tsx b/packages/twenty-front/src/pages/auth/SignInUpV2.tsxdeleted file mode 100644index 1feac10cd87..00000000000--- a/packages/twenty-front/src/pages/auth/SignInUpV2.tsx+++ /dev/null@@ -1,217 +0,0 @@-import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';-import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';-import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';-import {- SignInUpStep,- signInUpStepState,-} from '@/auth/states/signInUpStepState';-import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';-import { styled } from '@linaria/react';--import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';--import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';-import { SignInUpGlobalScopeForm } from '@/auth/sign-in-up/components/SignInUpGlobalScopeForm';-import { SignInUpV2StandardContent } from '@/auth/sign-in-up/components/SignInUpV2StandardContent';-import { SignInUpWorkspaceScopeForm } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeForm';-import { SignInUpSSOIdentityProviderSelection } from '@/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { SignInUpWorkspaceCreationFormV2 } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationFormV2';-import { SignInUpWorkspaceScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect';-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';-import { useGetPublicWorkspaceDataByDomain } from '@/domain-manager/hooks/useGetPublicWorkspaceDataByDomain';-import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';-import { useIsCurrentLocationOnDefaultDomain } from '@/domain-manager/hooks/useIsCurrentLocationOnDefaultDomain';-import { useMemo } from 'react';--import { SignInUpGlobalScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect';-import { SignInUpTwoFactorAuthenticationProvision } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision';-import { SignInUpTOTPVerification } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification';-import { useWorkspaceFromInviteHash } from '@/auth/sign-in-up/hooks/useWorkspaceFromInviteHash';-import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';-import { ModalContent } from 'twenty-ui/surfaces';-import { useLingui } from '@lingui/react/macro';-import { useSearchParams } from 'react-router-dom';-import { isDefined } from 'twenty-shared/utils';-import { Loader } from 'twenty-ui/feedback';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledLoaderContainer = styled.div`- align-items: center;- display: flex;- justify-content: center;- margin-bottom: ${themeCssVariables.spacing[8]};- margin-top: ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledBackground = styled.div`- background: ${themeCssVariables.background.secondary};- display: flex;- flex-direction: column;- height: 100dvh;- overflow-y: auto;- width: 100%;-`;--export const SignInUpV2 = () => {- const { t } = useLingui();- const setSignInUpStep = useSetAtomState(signInUpStepState);- const clientConfigApiStatus = useAtomStateValue(clientConfigApiStatusState);- const isCreatingWorkspace = useAtomStateValue(isCreatingWorkspaceState);-- const { form } = useSignInUpForm();- const { signInUpStep } = useSignInUp(form);- const { isDefaultDomain } = useIsCurrentLocationOnDefaultDomain();- const { isOnAWorkspace } = useIsCurrentLocationOnAWorkspace();- const workspacePublicData = useAtomStateValue(workspacePublicDataState);- const { loading: getPublicWorkspaceDataLoading } =- useGetPublicWorkspaceDataByDomain();- const isMultiWorkspaceEnabled = useAtomStateValue(- isMultiWorkspaceEnabledState,- );- const { workspaceInviteHash, workspace: workspaceFromInviteHash } =- useWorkspaceFromInviteHash();-- const [searchParams] = useSearchParams();-- const onClickOnLogo = () => {- setSignInUpStep(SignInUpStep.Init);- };-- const isGlobalScope = isDefaultDomain && isMultiWorkspaceEnabled;-- const title = useMemo(() => {- if (isDefined(workspaceInviteHash)) {- const workspaceName = workspaceFromInviteHash?.displayName ?? '';- return t`Join ${workspaceName} team`;- }-- if (signInUpStep === SignInUpStep.WorkspaceSelection) {- return t`Choose a Workspace`;- }-- if (signInUpStep === SignInUpStep.WorkspaceCreation) {- return t`Create your workspace`;- }-- if (signInUpStep === SignInUpStep.TwoFactorAuthenticationProvision) {- return t`Setup your 2FA`;- }-- if (signInUpStep === SignInUpStep.TwoFactorAuthenticationVerification) {- return t`Verify code from the app`;- }-- if (isGlobalScope) {- return t`Welcome to Twenty`;- }-- const workspaceName = workspacePublicData?.displayName;-- if (!workspaceName) {- return t`Welcome to your workspace`;- }-- return t`Welcome, ${workspaceName}.`;- }, [- workspaceInviteHash,- signInUpStep,- workspacePublicData?.displayName,- isGlobalScope,- t,- workspaceFromInviteHash?.displayName,- ]);-- const signInUpForm = useMemo(() => {- if (getPublicWorkspaceDataLoading || !clientConfigApiStatus.isLoadedOnce) {- return (- <StyledLoaderContainer>- <Loader color="gray" />- </StyledLoaderContainer>- );- }-- // The workspace creation form is shared by both multi-workspace and- // single-workspace self-host, so it must render regardless of domain or- // workspace scope.- if (signInUpStep === SignInUpStep.WorkspaceCreation) {- return <SignInUpWorkspaceCreationFormV2 />;- }-- if (isDefaultDomain && isMultiWorkspaceEnabled) {- return (- <>- <SignInUpGlobalScopeFormEffect />- <SignInUpGlobalScopeForm />- </>- );- }-- if (- isOnAWorkspace &&- signInUpStep === SignInUpStep.SSOIdentityProviderSelection- ) {- return <SignInUpSSOIdentityProviderSelection />;- }-- if (signInUpStep === SignInUpStep.TwoFactorAuthenticationProvision) {- return <SignInUpTwoFactorAuthenticationProvision />;- }-- if (signInUpStep === SignInUpStep.TwoFactorAuthenticationVerification) {- return <SignInUpTOTPVerification />;- }-- if (isDefined(workspacePublicData) && isOnAWorkspace) {- return (- <>- <SignInUpWorkspaceScopeFormEffect />- <SignInUpWorkspaceScopeForm />- </>- );- }-- return (- <>- <SignInUpGlobalScopeFormEffect />- <SignInUpGlobalScopeForm />- </>- );- }, [- clientConfigApiStatus.isLoadedOnce,- isDefaultDomain,- isMultiWorkspaceEnabled,- isOnAWorkspace,- getPublicWorkspaceDataLoading,- signInUpStep,- workspacePublicData,- ]);-- return signInUpStep === SignInUpStep.WorkspaceCreation ? (- <OnboardingV2Layout- onBack={!isCreatingWorkspace ? onClickOnLogo : undefined}- >- <ModalContent isVerticallyCentered isHorizontallyCentered>- {signInUpForm}- </ModalContent>- </OnboardingV2Layout>- ) : (- <StyledBackground>- {signInUpStep === SignInUpStep.EmailVerification ? (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <EmailVerificationSent email={searchParams.get('email')} />- </ModalContent>- ) : (- <SignInUpV2StandardContent- workspacePublicData={workspacePublicData}- signInUpForm={signInUpForm}- signInUpStep={signInUpStep}- title={title}- onClickOnLogo={onClickOnLogo}- />- )}- </StyledBackground>- );-};diff --git a/packages/twenty-front/src/pages/auth/__stories__/SignInUpV2.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/SignInUpV2.stories.tsxdeleted file mode 100644index bc10152a292..00000000000--- a/packages/twenty-front/src/pages/auth/__stories__/SignInUpV2.stories.tsx+++ /dev/null@@ -1,85 +0,0 @@-import { getOperationName } from '~/utils/getOperationName';-import { type Meta, type StoryObj } from '@storybook/react-vite';-import { HttpResponse, graphql } from 'msw';-import { useEffect } from 'react';-import { fireEvent, within } from 'storybook/test';--import { captchaTokenState } from '@/captcha/states/captchaTokenState';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';--import { AppPath } from 'twenty-shared/types';-import { SignInUpV2 } from '~/pages/auth/SignInUpV2';--const CaptchaTokenSetterEffect = () => {- const setCaptchaToken = useSetAtomState(captchaTokenState);-- useEffect(() => {- setCaptchaToken('MOCKED_CAPTCHA_TOKEN');- }, [setCaptchaToken]);-- return null;-};--const SignInUpV2WithCaptcha = () => {- return (- <>- <CaptchaTokenSetterEffect />- <SignInUpV2 />- </>- );-};--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Auth/SignInUpV2',- component: SignInUpV2WithCaptcha,- decorators: [PageDecorator],- args: { routePath: AppPath.SignInUpV2 },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: null,- errors: [- {- message: 'Unauthorized',- extensions: {- code: 'UNAUTHENTICATED',- response: {- statusCode: 401,- message: 'Unauthorized',- },- },- },- ],- });- }),- graphqlMocks.handlers,- ],- },- cookie: '',- },-};--export default meta;--export type Story = StoryObj<typeof SignInUpV2WithCaptcha>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);- const continueWithEmailButton = await canvas.findByText(- 'Continue with Email',- {},- { timeout: 3000 },- );-- await fireEvent.click(continueWithEmailButton);- },-};diff --git a/packages/twenty-front/src/pages/onboarding/BookCall.tsx b/packages/twenty-front/src/pages/onboarding/BookCall.tsxindex ad75614ed3d..01e4d08721c 100644--- a/packages/twenty-front/src/pages/onboarding/BookCall.tsx+++ b/packages/twenty-front/src/pages/onboarding/BookCall.tsx@@ -5,14 +5,14 @@ import { Link } from 'react-router-dom';import { currentUserState } from '@/auth/states/currentUserState';import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';-import { ModalContent, ModalFooter } from 'twenty-ui/surfaces';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';+import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { AppPath } from 'twenty-shared/types';import { IconChevronLeft, IconChevronRightPipe } from 'twenty-ui/icon';import { LightButton } from 'twenty-ui/input';-import { ThemeContext } from 'twenty-ui/theme-constants';+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { useIsMobile } from 'twenty-ui/utilities';import { useMutation } from '@apollo/client/react';import {@@ -20,6 +20,32 @@ import {SkipBookOnboardingStepDocument,} from '~/generated-metadata/graphql';+const StyledPage = styled.div`+ display: flex;+ flex: 1;+ flex-direction: column;+ min-height: 0;+ width: 100%;+`;++const StyledContent = styled.div`+ align-items: center;+ display: flex;+ flex: 1;+ justify-content: center;+ min-height: 0;+ overflow: hidden;+ width: 100%;+`;++const StyledFooter = styled.div`+ align-items: center;+ display: flex;+ justify-content: center;+ padding: ${themeCssVariables.spacing[2]};+ width: 100%;+`;+export const BookCall = () => {const { colorScheme } = useContext(ThemeContext);@@ -41,15 +67,10 @@ export const BookCall = () => {};return (- <>- <ModalContent- noPadding- overflowHidden- isHorizontallyCentered- isVerticallyCentered- >+ <StyledPage>+ <StyledContent><ScrollWrapper- componentInstanceId="scroll-wrapper-modal-content"+ componentInstanceId="scroll-wrapper-book-call"autoHeight={!isMobile}><Cal@@ -62,8 +83,8 @@ export const BookCall = () => {}}/></ScrollWrapper>- </ModalContent>- <ModalFooter autoHeight centered smallPadding>+ </StyledContent>+ <StyledFooter>{isPlanRequired ? (<Link to={AppPath.PlanRequired}><LightButton Icon={IconChevronLeft} title={t`Back`} />@@ -75,7 +96,7 @@ export const BookCall = () => {onClick={handleCompleteOnboarding}/>)}- </ModalFooter>- </>+ </StyledFooter>+ </StyledPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx b/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsxindex a43338b56fe..948072bb660 100644--- a/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx+++ b/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx@@ -1,7 +1,6 @@import { SubTitle } from '@/auth/components/SubTitle';import { Title } from '@/auth/components/Title';import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';-import { ModalContent } from 'twenty-ui/surfaces';import { styled } from '@linaria/react';import { Trans, useLingui } from '@lingui/react/macro';import { Link } from 'react-router-dom';@@ -11,9 +10,21 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';import { useMutation } from '@apollo/client/react';import { SkipBookOnboardingStepDocument } from '~/generated-metadata/graphql';+const StyledPage = styled.div`+ align-items: center;+ display: flex;+ flex: 1;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[8]};+ justify-content: center;+ min-height: 0;+ width: 100%;+`;+const StyledCoverImage = styled.img`border-radius: ${themeCssVariables.border.radius.sm};height: 204px;+ max-width: 100%;object-fit: cover;width: 320px;`;@@ -52,7 +63,7 @@ export const BookCallDecision = () => {};return (- <ModalContent gap={8} isVerticallyCentered isHorizontallyCentered>+ <StyledPage><StyledTitleContainer><Title noMarginTop><Trans>Book your onboarding</Trans>@@ -73,6 +84,6 @@ export const BookCallDecision = () => {</StyledLinkContainer><LightButton title={t`Finish`} onClick={handleFinish} /></StyledButtonContainer>- </ModalContent>+ </StyledPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsxindex 8b436155027..b8723300299 100644--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx+++ b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx@@ -1,25 +1,22 @@-import { ModalContent } from 'twenty-ui/surfaces';-import { styled } from '@linaria/react';-import { isDefined } from 'twenty-shared/utils';-import { ChooseYourPlanContent } from '~/pages/onboarding/internal/ChooseYourPlanContent';import { billingState } from '@/client-config/states/billingState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';import { usePlans } from '@/settings/billing/hooks/usePlans';--const StyledChooseYourPlanPlaceholder = styled.div`- height: 566px;-`;+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { isDefined } from 'twenty-shared/utils';+import { UpgradeFreeTrial } from '~/pages/onboarding/UpgradeFreeTrial';export const ChooseYourPlan = () => {const { isPlansLoaded } = usePlans();const billing = useAtomStateValue(billingState);- return (- <ModalContent isVerticallyCentered>- {isDefined(billing) && isPlansLoaded ? (- <ChooseYourPlanContent billing={billing} />- ) : (- <StyledChooseYourPlanPlaceholder />- )}- </ModalContent>+ const onboardingConfig = useAtomStateValue(onboardingConfigState);++ return isDefined(billing) && isPlansLoaded ? (+ <UpgradeFreeTrial+ billing={billing}+ creditsReward={onboardingConfig?.upgradeCreditsReward}+ />+ ) : (+ <OnboardingPageLoader />);};diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlanV2.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlanV2.tsxdeleted file mode 100644index 4604b24b088..00000000000--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlanV2.tsx+++ /dev/null@@ -1,33 +0,0 @@-import { billingState } from '@/client-config/states/billingState';-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';-import { usePlans } from '@/settings/billing/hooks/usePlans';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { isDefined } from 'twenty-shared/utils';-import { UpgradeFreeTrial } from '~/pages/onboarding/UpgradeFreeTrial';--const StyledPlaceholder = styled.div`- flex: 1 1 0;-`;--export const ChooseYourPlanV2 = () => {- const { isPlansLoaded } = usePlans();- const billing = useAtomStateValue(billingState);- const onboardingConfig = useAtomStateValue(onboardingConfigState);- const freeCreditsTotal = useOnboardingFreeCreditsTotal();-- return (- <OnboardingV2Layout freeCredits={freeCreditsTotal}>- {isDefined(billing) && isPlansLoaded ? (- <UpgradeFreeTrial- billing={billing}- creditsReward={onboardingConfig?.upgradeCreditsReward}- />- ) : (- <StyledPlaceholder />- )}- </OnboardingV2Layout>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsxindex 5bc3bcbd4ca..583fc1e7180 100644--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx@@ -1,69 +1,75 @@-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { zodResolver } from '@hookform/resolvers/zod';-import { styled } from '@linaria/react';-import { useCallback, useState } from 'react';-import { Controller, type SubmitHandler, useForm } from 'react-hook-form';-import { Key } from 'ts-key-enum';-import { z } from 'zod';--import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';import { currentUserState } from '@/auth/states/currentUserState';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';+import { OnboardingProfilePictureUploader } from '@/onboarding/components/OnboardingProfilePictureUploader';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+import { StyledOnboardingStepHeading } from '@/onboarding/components/StyledOnboardingStepHeading';+import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';+import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnboardingStepSubtitle';+import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { usePrefetchInviteSuggestions } from '@/onboarding/hooks/usePrefetchInviteSuggestions';import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';-import { WorkspaceMemberPictureUploader } from '@/settings/workspace-member/components/WorkspaceMemberPictureUploader';import { PageFocusId } from '@/types/PageFocusId';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { TextInput } from '@/ui/input/components/TextInput';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { CombinedGraphQLErrors } from '@apollo/client/errors';+import { zodResolver } from '@hookform/resolvers/zod';+import { styled } from '@linaria/react';import { i18n } from '@lingui/core';import { msg } from '@lingui/core/macro';-import { Trans, useLingui } from '@lingui/react/macro';+import { useLingui } from '@lingui/react/macro';+import { useCallback, useState } from 'react';+import { Controller, type SubmitHandler, useForm } from 'react-hook-form';+import { Key } from 'ts-key-enum';import { isDefined } from 'twenty-shared/utils';-import { H2Title } from 'twenty-ui/typography';import { MainButton } from 'twenty-ui/input';-import { ModalContent } from 'twenty-ui/surfaces';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { z } from 'zod';-const StyledContentContainer = styled.div`- width: 100%;+const StyledForm = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[8]};+ max-width: 100%;+ padding-bottom: ${themeCssVariables.spacing[4]};+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;-const StyledSectionContainer = styled.div`- margin-top: ${themeCssVariables.spacing[8]};+const StyledNameRow = styled.div`+ align-items: flex-end;+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+ width: 100%;`;-const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[8]};- width: 200px;+const StyledNameField = styled.div`+ flex: 1 1 0;+ min-width: 0;`;-const StyledComboInputContainer = styled.div`+const StyledButtonContainer = styled.div`display: flex;- flex-direction: row;- > * + * {- margin-left: ${themeCssVariables.spacing[4]};- }+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;const firstNameErrorMessage = msg`First name can not be empty`;const lastNameErrorMessage = msg`Last name can not be empty`;-const validationSchema = z- .object({- firstName: z.string().min(1, {- error: i18n._(firstNameErrorMessage),- }),- lastName: z.string().min(1, {- error: i18n._(lastNameErrorMessage),- }),- })- .required();+const validationSchema = z.object({+ firstName: z.string().min(1, {+ error: i18n._(firstNameErrorMessage),+ }),+ lastName: z.string().min(1, {+ error: i18n._(lastNameErrorMessage),+ }),+ jobTitle: z.string(),+});type Form = z.infer<typeof validationSchema>;@@ -81,17 +87,16 @@ export const CreateProfile = () => {);const { updateWorkspaceMemberSettings } = useUpdateWorkspaceMemberSettings();- // Formconst {control,handleSubmit,formState: { isValid, isSubmitting },- getValues,} = useForm<Form>({mode: 'onChange',defaultValues: {firstName: currentWorkspaceMember?.name?.firstName ?? '',lastName: currentWorkspaceMember?.name?.lastName ?? '',+ jobTitle: currentWorkspaceMember?.jobTitle ?? '',},resolver: zodResolver(validationSchema),});@@ -113,6 +118,7 @@ export const CreateProfile = () => {firstName: data.firstName,lastName: data.lastName,},+ jobTitle: data.jobTitle,colorScheme: 'System',},});@@ -126,6 +132,7 @@ export const CreateProfile = () => {firstName: data.firstName,lastName: data.lastName,},+ jobTitle: data.jobTitle,colorScheme: 'System',}: member,@@ -164,7 +171,7 @@ export const CreateProfile = () => {const handleEnter = () => {if (isEditingMode) {- onSubmit(getValues());+ handleSubmit(onSubmit)();}};@@ -176,85 +183,107 @@ export const CreateProfile = () => {});return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <Title noMarginTop>- <Trans>Create profile</Trans>- </Title>- <SubTitle>- <Trans>How you'll be identified on the app.</Trans>- </SubTitle>- <StyledContentContainer>- <StyledSectionContainer>- <H2Title title={t`Picture`} />- {currentWorkspaceMember?.id && (- <WorkspaceMemberPictureUploader- workspaceMemberId={currentWorkspaceMember.id}- />- )}- </StyledSectionContainer>- <StyledSectionContainer>- <H2Title- title={t`Name`}- description={t`Your name as it will be displayed on the app`}+ <StyledOnboardingStepPage>+ <StyledOnboardingStepHeading>+ <OnboardingStepAnimatedItem index={0}>+ <StyledOnboardingStepTitle>{t`Create profile`}</StyledOnboardingStepTitle>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <StyledOnboardingStepSubtitle>+ {t`How you'll appear to teammates and agents.`}+ </StyledOnboardingStepSubtitle>+ </OnboardingStepAnimatedItem>+ </StyledOnboardingStepHeading>++ <OnboardingStepAnimatedItem index={2}>+ <StyledForm>+ <StyledNameRow>+ {isDefined(currentWorkspaceMember?.id) && (+ <OnboardingProfilePictureUploader+ workspaceMemberId={currentWorkspaceMember.id}+ />+ )}+ <StyledNameField>+ <Controller+ name="firstName"+ control={control}+ render={({+ field: { onChange, onBlur, value },+ fieldState: { error },+ }) => (+ <TextInput+ autoFocus+ label={t`First Name`}+ value={value}+ onFocus={() => setIsEditingMode(true)}+ onBlur={() => {+ onBlur();+ setIsEditingMode(false);+ }}+ onChange={onChange}+ placeholder={t`Tim`}+ error={error?.message}+ fullWidth+ />+ )}+ />+ </StyledNameField>+ <StyledNameField>+ <Controller+ name="lastName"+ control={control}+ render={({+ field: { onChange, onBlur, value },+ fieldState: { error },+ }) => (+ <TextInput+ label={t`Last name`}+ value={value}+ onFocus={() => setIsEditingMode(true)}+ onBlur={() => {+ onBlur();+ setIsEditingMode(false);+ }}+ onChange={onChange}+ placeholder={t`Apple`}+ error={error?.message}+ fullWidth+ />+ )}+ />+ </StyledNameField>+ </StyledNameRow>+ <Controller+ name="jobTitle"+ control={control}+ render={({ field: { onChange, onBlur, value } }) => (+ <TextInput+ label={t`Job Title`}+ value={value}+ onFocus={() => setIsEditingMode(true)}+ onBlur={() => {+ onBlur();+ setIsEditingMode(false);+ }}+ onChange={onChange}+ placeholder={t`Head of Partnerships`}+ fullWidth+ />+ )}+ />+ </StyledForm>+ </OnboardingStepAnimatedItem>++ <OnboardingStepAnimatedItem index={3}>+ <StyledButtonContainer>+ <MainButton+ title={t`Continue`}+ onClick={handleSubmit(onSubmit)}+ disabled={!isValid || isSubmitting}+ fullWidth/>- {/* TODO: When react-web-hook-form is added to edit page we should create a dedicated component with context */}- <StyledComboInputContainer>- <Controller- name="firstName"- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- autoFocus- label={t`First Name`}- value={value}- onFocus={() => setIsEditingMode(true)}- onBlur={() => {- onBlur();- setIsEditingMode(false);- }}- onChange={onChange}- placeholder={t`Tim`}- error={error?.message}- fullWidth- />- )}- />- <Controller- name="lastName"- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- label={t`Last Name`}- value={value}- onFocus={() => setIsEditingMode(true)}- onBlur={() => {- onBlur();- setIsEditingMode(false);- }}- onChange={onChange}- placeholder={t`Cook`}- error={error?.message}- fullWidth- />- )}- />- </StyledComboInputContainer>- </StyledSectionContainer>- </StyledContentContainer>- <StyledButtonContainer>- <MainButton- title={t`Continue`}- onClick={handleSubmit(onSubmit)}- disabled={!isValid || isSubmitting}- fullWidth- />- </StyledButtonContainer>- </ModalContent>+ </StyledButtonContainer>+ </OnboardingStepAnimatedItem>+ </StyledOnboardingStepPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfileV2.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfileV2.tsxdeleted file mode 100644index a0946ce6350..00000000000--- a/packages/twenty-front/src/pages/onboarding/CreateProfileV2.tsx+++ /dev/null@@ -1,313 +0,0 @@-import { currentUserState } from '@/auth/states/currentUserState';-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';-import { OnboardingProfilePictureUploader } from '@/onboarding/components/OnboardingProfilePictureUploader';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';-import { usePrefetchInviteSuggestions } from '@/onboarding/hooks/usePrefetchInviteSuggestions';-import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';-import { PageFocusId } from '@/types/PageFocusId';-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { TextInput } from '@/ui/input/components/TextInput';-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { CombinedGraphQLErrors } from '@apollo/client/errors';-import { zodResolver } from '@hookform/resolvers/zod';-import { styled } from '@linaria/react';-import { i18n } from '@lingui/core';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react/macro';-import { useCallback, useState } from 'react';-import { Controller, type SubmitHandler, useForm } from 'react-hook-form';-import { Key } from 'ts-key-enum';-import { isDefined } from 'twenty-shared/utils';-import { MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { z } from 'zod';--const CONTENT_BLOCK_WIDTH = 340;--const StyledContent = styled.div`- align-items: center;- background-color: ${themeCssVariables.background.secondary};- box-sizing: border-box;- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[14]};- min-height: 0;- overflow-y: auto;- padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledHeading = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledTitle = styled.h1`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin: 0;-`;--const StyledSubtitle = styled.p`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.md};- margin: 0;-`;--const StyledForm = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[8]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledNameRow = styled.div`- align-items: flex-end;- display: flex;- gap: ${themeCssVariables.spacing[2]};- width: 100%;-`;--const StyledNameField = styled.div`- flex: 1 1 0;- min-width: 0;-`;--const StyledButtonContainer = styled.div`- display: flex;- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const firstNameErrorMessage = msg`First name can not be empty`;-const lastNameErrorMessage = msg`Last name can not be empty`;--const validationSchema = z.object({- firstName: z.string().min(1, {- error: i18n._(firstNameErrorMessage),- }),- lastName: z.string().min(1, {- error: i18n._(lastNameErrorMessage),- }),- jobTitle: z.string(),-});--type Form = z.infer<typeof validationSchema>;--export const CreateProfileV2 = () => {- const { t } = useLingui();- const setNextOnboardingStatus = useSetNextOnboardingStatus();- const freeCreditsTotal = useOnboardingFreeCreditsTotal();-- usePrefetchInviteSuggestions();-- const { enqueueErrorSnackBar } = useSnackBar();- const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);- const setCurrentUser = useSetAtomState(currentUserState);- const setCurrentWorkspaceMembers = useSetAtomState(- currentWorkspaceMembersState,- );- const { updateWorkspaceMemberSettings } = useUpdateWorkspaceMemberSettings();-- const {- control,- handleSubmit,- formState: { isValid, isSubmitting },- } = useForm<Form>({- mode: 'onChange',- defaultValues: {- firstName: currentWorkspaceMember?.name?.firstName ?? '',- lastName: currentWorkspaceMember?.name?.lastName ?? '',- jobTitle: currentWorkspaceMember?.jobTitle ?? '',- },- resolver: zodResolver(validationSchema),- });-- const onSubmit: SubmitHandler<Form> = useCallback(- async (data) => {- try {- if (!currentWorkspaceMember?.id) {- throw new Error('User is not logged in');- }- if (!data.firstName || !data.lastName) {- throw new Error('First name or last name is missing');- }-- await updateWorkspaceMemberSettings({- workspaceMemberId: currentWorkspaceMember.id,- update: {- name: {- firstName: data.firstName,- lastName: data.lastName,- },- jobTitle: data.jobTitle,- colorScheme: 'System',- },- });-- setCurrentWorkspaceMembers((members) =>- members.map((member) =>- member.id === currentWorkspaceMember?.id- ? {- ...member,- name: {- firstName: data.firstName,- lastName: data.lastName,- },- jobTitle: data.jobTitle,- colorScheme: 'System',- }- : member,- ),- );-- setCurrentUser((current) => {- if (isDefined(current)) {- return {- ...current,- firstName: data.firstName,- lastName: data.lastName,- };- }- return current;- });-- setNextOnboardingStatus();- } catch (error: any) {- enqueueErrorSnackBar({- apolloError: CombinedGraphQLErrors.is(error) ? error : undefined,- });- }- },- [- currentWorkspaceMember?.id,- setNextOnboardingStatus,- enqueueErrorSnackBar,- setCurrentWorkspaceMembers,- setCurrentUser,- updateWorkspaceMemberSettings,- ],- );-- const [isEditingMode, setIsEditingMode] = useState(false);-- const handleEnter = () => {- if (isEditingMode) {- handleSubmit(onSubmit)();- }- };-- useHotkeysOnFocusedElement({- keys: Key.Enter,- callback: handleEnter,- focusId: PageFocusId.CreateProfileV2,- dependencies: [handleEnter],- });-- return (- <OnboardingV2Layout freeCredits={freeCreditsTotal}>- <StyledContent>- <StyledHeading>- <StyledTitle>{t`Create profile`}</StyledTitle>- <StyledSubtitle>- {t`How you'll appear to teammates and agents.`}- </StyledSubtitle>- </StyledHeading>-- <StyledForm>- <StyledNameRow>- {isDefined(currentWorkspaceMember?.id) && (- <OnboardingProfilePictureUploader- workspaceMemberId={currentWorkspaceMember.id}- />- )}- <StyledNameField>- <Controller- name="firstName"- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- autoFocus- label={t`First Name`}- value={value}- onFocus={() => setIsEditingMode(true)}- onBlur={() => {- onBlur();- setIsEditingMode(false);- }}- onChange={onChange}- placeholder={t`Tim`}- error={error?.message}- fullWidth- />- )}- />- </StyledNameField>- <StyledNameField>- <Controller- name="lastName"- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- label={t`Last name`}- value={value}- onFocus={() => setIsEditingMode(true)}- onBlur={() => {- onBlur();- setIsEditingMode(false);- }}- onChange={onChange}- placeholder={t`Apple`}- error={error?.message}- fullWidth- />- )}- />- </StyledNameField>- </StyledNameRow>- <Controller- name="jobTitle"- control={control}- render={({ field: { onChange, onBlur, value } }) => (- <TextInput- label={t`Job Title`}- value={value}- onFocus={() => setIsEditingMode(true)}- onBlur={() => {- onBlur();- setIsEditingMode(false);- }}- onChange={onChange}- placeholder={t`Head of Partnerships`}- fullWidth- />- )}- />- </StyledForm>-- <StyledButtonContainer>- <MainButton- title={t`Continue`}- onClick={handleSubmit(onSubmit)}- disabled={!isValid || isSubmitting}- fullWidth- />- </StyledButtonContainer>- </StyledContent>- </OnboardingV2Layout>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsxindex af521583ca4..d78a931ef1a 100644--- a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx+++ b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx@@ -1,6 +1,14 @@+import { OnboardingSkipButton } from '@/onboarding/components/OnboardingSkipButton';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+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 { OnboardingImportPreview } from '@/onboarding/components/import-contacts/OnboardingImportPreview';import { OnboardingTrustBadges } from '@/onboarding/components/import-contacts/OnboardingTrustBadges';+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';@@ -8,52 +16,20 @@ import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';import { MainButton } from 'twenty-ui/input';import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';-const CONTENT_BLOCK_WIDTH = 340;--const StyledPage = styled.div`- align-items: center;- background-color: ${themeCssVariables.background.secondary};- box-sizing: border-box;- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[14]};- min-height: 0;- overflow-y: auto;- padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledHeading = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;+const StyledOnboardingStep = styled(StyledOnboardingStepPage)`+ gap: ${themeCssVariables.spacing[8]};`;-const StyledTitle = styled.h1`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin: 0;-`;--const StyledSubtitle = styled.p`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.md};- margin: 0;-`;--const StyledCreditsRow = styled.div`- display: flex;- padding-top: ${themeCssVariables.spacing[1]};+const StyledSubtitle = styled(StyledOnboardingStepSubtitle)`+ max-width: 100%;+ width: 320px;`;const StyledMiddle = styled.div`- align-items: center;+ align-items: flex-start;display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[5]};+ gap: ${themeCssVariables.spacing[2]};`;const StyledFooter = styled.div`@@ -61,29 +37,17 @@ const StyledFooter = styled.div`display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;const StyledButtons = styled.div`display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[4]};+ gap: ${themeCssVariables.spacing[2]};width: 100%;`;-const StyledSkipButton = styled.button`- background-color: transparent;- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.md};- color: ${themeCssVariables.font.color.tertiary};- cursor: pointer;- font-family: ${themeCssVariables.font.family};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.semiBold};- height: ${themeCssVariables.spacing[8]};- padding: 0 ${themeCssVariables.spacing[5]};-`;-type ImportContactsProps = {creditsReward?: number;onContinueWithGoogle?: () => void;@@ -101,49 +65,55 @@ export const ImportContacts = ({const theme = useTheme();return (- <StyledPage>- <StyledHeading>- <StyledTitle>{t`Import your contacts`}</StyledTitle>- <StyledSubtitle>- {t`Connect your email and calendar to see your entire network instantly. Takes only 30 seconds.`}- </StyledSubtitle>+ <StyledOnboardingStep>+ <StyledOnboardingStepHeading>+ <OnboardingStepAnimatedItem index={0}>+ <StyledOnboardingStepTitle>{t`Import your contacts`}</StyledOnboardingStepTitle>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <StyledSubtitle>+ {t`Connect your email and calendar to see your entire network instantly. Takes only 30 seconds.`}+ </StyledSubtitle>+ </OnboardingStepAnimatedItem>{isDefined(creditsReward) && (- <StyledCreditsRow>- <OnboardingCreditsRewardTag amount={creditsReward} />- </StyledCreditsRow>+ <OnboardingStepAnimatedItem index={2}>+ <StyledOnboardingStepTagsRow>+ <OnboardingCreditsRewardTag amount={creditsReward} />+ </StyledOnboardingStepTagsRow>+ </OnboardingStepAnimatedItem>)}- </StyledHeading>+ </StyledOnboardingStepHeading>- <StyledMiddle>- <OnboardingTrustBadges />- <OnboardingImportPreview />- </StyledMiddle>+ <OnboardingStepAnimatedItem index={3}>+ <StyledMiddle>+ <OnboardingTrustBadges />+ <OnboardingImportPreview />+ </StyledMiddle>+ </OnboardingStepAnimatedItem>- <StyledFooter>- <StyledButtons>- {isDefined(onContinueWithMicrosoft) && (- <MainButton- title={t`Continue with Microsoft`}- fullWidth- onClick={onContinueWithMicrosoft}- Icon={() => <IconMicrosoft size={theme.icon.size.sm} />}- />- )}- {isDefined(onContinueWithGoogle) && (- <MainButton- title={t`Continue with Google`}- fullWidth- onClick={onContinueWithGoogle}- Icon={() => <IconGoogle size={theme.icon.size.sm} />}- />- )}- </StyledButtons>- {isDefined(onSkip) && (- <StyledSkipButton type="button" onClick={onSkip}>- {t`Skip`}- </StyledSkipButton>- )}- </StyledFooter>- </StyledPage>+ <OnboardingStepAnimatedItem index={4}>+ <StyledFooter>+ <StyledButtons>+ {isDefined(onContinueWithMicrosoft) && (+ <MainButton+ title={t`Continue with Microsoft`}+ fullWidth+ onClick={onContinueWithMicrosoft}+ Icon={() => <IconMicrosoft size={theme.icon.size.md} />}+ />+ )}+ {isDefined(onContinueWithGoogle) && (+ <MainButton+ title={t`Continue with Google`}+ fullWidth+ onClick={onContinueWithGoogle}+ Icon={() => <IconGoogle size={theme.icon.size.md} />}+ />+ )}+ </StyledButtons>+ {isDefined(onSkip) && <OnboardingSkipButton onClick={onSkip} />}+ </StyledFooter>+ </OnboardingStepAnimatedItem>+ </StyledOnboardingStep>);};diff --git a/packages/twenty-front/src/pages/onboarding/InstallApps.tsx b/packages/twenty-front/src/pages/onboarding/InstallApps.tsxindex 536ad231f0b..fe5fb36bc1b 100644--- a/packages/twenty-front/src/pages/onboarding/InstallApps.tsx+++ b/packages/twenty-front/src/pages/onboarding/InstallApps.tsx@@ -1,234 +1,38 @@-import { OnboardingCreditsRewardTag } from '@/onboarding/components/import-contacts/OnboardingCreditsRewardTag';-import { type OnboardingInstallableApp } from '@/onboarding/types/OnboardingInstallableApp';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { Avatar } from 'twenty-ui/data-display';-import { IconCheck, IconPlus } from 'twenty-ui/icon';-import { IconButton, MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';--const CONTENT_BLOCK_WIDTH = 340;--const StyledContent = styled.div`- align-items: center;- background-color: ${themeCssVariables.background.secondary};- box-sizing: border-box;- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[14]};- min-height: 0;- overflow-y: auto;- padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledHeading = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledTitleRow = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[2]};-`;--const StyledTitle = styled.h1`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin: 0;-`;--const StyledBetaTag = styled.span`- align-items: center;- background-color: ${themeCssVariables.background.tertiary};- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.pill};- box-sizing: border-box;- color: ${themeCssVariables.font.color.tertiary};- display: flex;- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.medium};- height: ${themeCssVariables.spacing[6]};- padding: 0 ${themeCssVariables.spacing[2]};-`;--const StyledSubtitle = styled.p`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.md};- margin: 0;-`;--const StyledCreditsRow = styled.div`- display: flex;- padding-top: ${themeCssVariables.spacing[1]};-`;--const StyledCard = styled.div`- background-color: ${themeCssVariables.background.primary};- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.md};- box-sizing: border-box;- display: flex;- flex-direction: column;- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledAppRow = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[3]};- padding: ${themeCssVariables.spacing[4]};-- & + & {- border-top: 1px solid ${themeCssVariables.border.color.light};- }-`;--const StyledAppText = styled.div`- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};- min-width: 0;-`;--const StyledAppLabel = styled.span`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.medium};-`;--const StyledAppDescription = styled.span`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.sm};-`;--const StyledFooter = styled.div`- align-items: flex-end;- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledInstallButton = styled.div`- width: 100%;-`;--const StyledSkipButton = styled.button`- background-color: transparent;- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.md};- color: ${themeCssVariables.font.color.tertiary};- cursor: pointer;- font-family: ${themeCssVariables.font.family};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.semiBold};- height: ${themeCssVariables.spacing[8]};- padding: 0 ${themeCssVariables.spacing[5]};-`;--type InstallAppsProps = {- apps: (OnboardingInstallableApp & { logo: string | null })[];- selectedUniversalIdentifiers: string[];- creditsRewardPerApp?: number;- isCompleting: boolean;- onToggleApp: (universalIdentifier: string) => void;- onInstall: () => void;- onSkip: () => void;-};--export const InstallApps = ({- apps,- selectedUniversalIdentifiers,- creditsRewardPerApp,- isCompleting,- onToggleApp,- onInstall,- onSkip,-}: InstallAppsProps) => {- const { t } = useLingui();+import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { useMarketplaceApps } from '@/marketplace/hooks/useMarketplaceApps';+import { ONBOARDING_INSTALLABLE_APPS } from '@/onboarding/constants/OnboardingInstallableApps';+import { useInstallOnboardingApps } from '@/onboarding/hooks/useInstallOnboardingApps';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { InstallAppsContent } from '~/pages/onboarding/InstallAppsContent';++export const InstallApps = () => {+ const { data: marketplaceApps } = useMarketplaceApps();+ const onboardingConfig = useAtomStateValue(onboardingConfigState);+ const {+ selectedUniversalIdentifiers,+ isCompleting,+ toggleApp,+ installSelectedAppsAndContinue,+ skip,+ } = useInstallOnboardingApps();++ const apps = ONBOARDING_INSTALLABLE_APPS.map((app) => ({+ ...app,+ logo:+ marketplaceApps.find(+ (marketplaceApp) => marketplaceApp.id === app.universalIdentifier,+ )?.logo ?? null,+ }));return (- <StyledContent>- <StyledHeading>- <StyledTitleRow>- <StyledTitle>{t`Install your first apps`}</StyledTitle>- <StyledBetaTag>{t`Beta`}</StyledBetaTag>- </StyledTitleRow>- <StyledSubtitle>- {t`Get the most out of your CRM by installing some apps`}- </StyledSubtitle>- {isDefined(creditsRewardPerApp) && (- <StyledCreditsRow>- <OnboardingCreditsRewardTag- amount={creditsRewardPerApp * apps.length}- suffix={t`free credits (${creditsRewardPerApp} per tool)`}- />- </StyledCreditsRow>- )}- </StyledHeading>-- <StyledCard>- {apps.map((app) => {- const labelText = t(app.label);- const isSelected = selectedUniversalIdentifiers.includes(- app.universalIdentifier,- );-- return (- <StyledAppRow key={app.universalIdentifier}>- <Avatar- avatarUrl={getAbsoluteImageUrl(app.logo)}- placeholder={labelText}- placeholderColorSeed={app.universalIdentifier}- size="md"- type="squared"- />- <StyledAppText>- <StyledAppLabel>{labelText}</StyledAppLabel>- <StyledAppDescription>- {t(app.description)}- </StyledAppDescription>- </StyledAppText>- <IconButton- Icon={isSelected ? IconCheck : IconPlus}- variant="secondary"- accent={isSelected ? 'blue' : 'default'}- ariaLabel={- isSelected ? t`Deselect ${labelText}` : t`Select ${labelText}`- }- onClick={() => onToggleApp(app.universalIdentifier)}- />- </StyledAppRow>- );- })}- </StyledCard>-- <StyledFooter>- <StyledInstallButton>- <MainButton- title={t`Install`}- onClick={onInstall}- disabled={isCompleting}- fullWidth- />- </StyledInstallButton>- <StyledSkipButton- type="button"- onClick={onSkip}- disabled={isCompleting}- >- {t`Skip`}- </StyledSkipButton>- </StyledFooter>- </StyledContent>+ <InstallAppsContent+ apps={apps}+ selectedUniversalIdentifiers={selectedUniversalIdentifiers}+ creditsRewardPerApp={onboardingConfig?.installAppsCreditsRewardPerApp}+ isCompleting={isCompleting}+ onToggleApp={toggleApp}+ onInstall={installSelectedAppsAndContinue}+ onSkip={skip}+ />);};diff --git a/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsxnew file mode 100644index 00000000000..1324a2ef2a4--- /dev/null+++ b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx@@ -0,0 +1,208 @@+import { OnboardingSkipButton } from '@/onboarding/components/OnboardingSkipButton';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+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 { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';+import { type OnboardingInstallableApp } from '@/onboarding/types/OnboardingInstallableApp';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { isDefined } from 'twenty-shared/utils';+import { Avatar } from 'twenty-ui/data-display';+import { IconCheck, IconPlus } from 'twenty-ui/icon';+import { IconButton, MainButton } from 'twenty-ui/input';+import { AnimatedIconCrossfade } from 'twenty-ui/layout';+import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';++const StyledTitleRow = styled.div`+ align-items: center;+ display: flex;+ gap: 10px;+`;++const StyledBetaTag = styled.span`+ align-items: center;+ background-color: ${themeCssVariables.grayScale.gray3};+ border: 1px solid ${themeCssVariables.border.color.light};+ border-radius: ${themeCssVariables.border.radius.pill};+ box-sizing: border-box;+ color: ${themeCssVariables.grayScale.gray10};+ display: flex;+ font-size: ${themeCssVariables.font.size.md};+ font-weight: ${themeCssVariables.font.weight.medium};+ height: ${themeCssVariables.spacing[6]};+ line-height: 1.4;+ padding: 0 ${themeCssVariables.spacing[2]};+`;++const StyledCard = styled.div`+ background-color: ${themeCssVariables.background.primary};+ border: 1px solid ${themeCssVariables.border.color.medium};+ border-radius: ${themeCssVariables.border.radius.md};+ box-sizing: border-box;+ display: flex;+ flex-direction: column;+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;+`;++const StyledAppRow = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[3]};+ padding: ${themeCssVariables.spacing[4]};++ & + & {+ border-top: 1px solid ${themeCssVariables.border.color.light};+ }+`;++const StyledAppText = styled.div`+ display: flex;+ flex: 1 1 0;+ flex-direction: column;+ gap: 10px;+ min-width: 0;+`;++const StyledAppLabel = styled.span`+ color: ${themeCssVariables.font.color.primary};+ font-size: ${themeCssVariables.font.size.md};+ font-weight: ${themeCssVariables.font.weight.medium};+ line-height: 1.4;+`;++const StyledAppDescription = styled.span`+ color: ${themeCssVariables.font.color.tertiary};+ font-size: ${themeCssVariables.font.size.sm};+ line-height: 1.4;+`;++const StyledFooter = styled.div`+ align-items: flex-end;+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[3]};+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;+`;++const StyledInstallButton = styled.div`+ width: 100%;+`;++type InstallAppsContentProps = {+ apps: (OnboardingInstallableApp & { logo: string | null })[];+ selectedUniversalIdentifiers: string[];+ creditsRewardPerApp?: number;+ isCompleting: boolean;+ onToggleApp: (universalIdentifier: string) => void;+ onInstall: () => void;+ onSkip: () => void;+};++export const InstallAppsContent = ({+ apps,+ selectedUniversalIdentifiers,+ creditsRewardPerApp,+ isCompleting,+ onToggleApp,+ onInstall,+ onSkip,+}: InstallAppsContentProps) => {+ const { t } = useLingui();+ const theme = useTheme();++ return (+ <StyledOnboardingStepPage>+ <StyledOnboardingStepHeading>+ <OnboardingStepAnimatedItem index={0}>+ <StyledTitleRow>+ <StyledOnboardingStepTitle>{t`Install your first apps`}</StyledOnboardingStepTitle>+ <StyledBetaTag>{t`Beta`}</StyledBetaTag>+ </StyledTitleRow>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <StyledOnboardingStepSubtitle>+ {t`Get the most out of your CRM by installing some apps`}+ </StyledOnboardingStepSubtitle>+ </OnboardingStepAnimatedItem>+ {isDefined(creditsRewardPerApp) && (+ <OnboardingStepAnimatedItem index={2}>+ <StyledOnboardingStepTagsRow>+ <OnboardingCreditsRewardTag+ amount={creditsRewardPerApp * apps.length}+ suffix={t`free credits (${creditsRewardPerApp} per tool)`}+ />+ </StyledOnboardingStepTagsRow>+ </OnboardingStepAnimatedItem>+ )}+ </StyledOnboardingStepHeading>++ <OnboardingStepAnimatedItem index={3}>+ <StyledCard>+ {apps.map((app) => {+ const labelText = t(app.label);+ const isSelected = selectedUniversalIdentifiers.includes(+ app.universalIdentifier,+ );++ return (+ <StyledAppRow key={app.universalIdentifier}>+ <Avatar+ avatarUrl={getAbsoluteImageUrl(app.logo)}+ placeholder={labelText}+ placeholderColorSeed={app.universalIdentifier}+ size="lg"+ type="squared"+ />+ <StyledAppText>+ <StyledAppLabel>{labelText}</StyledAppLabel>+ <StyledAppDescription>+ {t(app.description)}+ </StyledAppDescription>+ </StyledAppText>+ <IconButton+ size="small"+ variant="secondary"+ accent={isSelected ? 'blue' : 'default'}+ ariaLabel={+ isSelected+ ? t`Deselect ${labelText}`+ : t`Select ${labelText}`+ }+ onClick={() => onToggleApp(app.universalIdentifier)}+ >+ <AnimatedIconCrossfade+ isActive={isSelected}+ ActiveIcon={IconCheck}+ InactiveIcon={IconPlus}+ size={theme.icon.size.md}+ />+ </IconButton>+ </StyledAppRow>+ );+ })}+ </StyledCard>+ </OnboardingStepAnimatedItem>++ <OnboardingStepAnimatedItem index={4}>+ <StyledFooter>+ <StyledInstallButton>+ <MainButton+ title={t`Install`}+ onClick={onInstall}+ disabled={isCompleting}+ fullWidth+ />+ </StyledInstallButton>+ <OnboardingSkipButton onClick={onSkip} disabled={isCompleting} />+ </StyledFooter>+ </OnboardingStepAnimatedItem>+ </StyledOnboardingStepPage>+ );+};diff --git a/packages/twenty-front/src/pages/onboarding/InstallAppsV2.tsx b/packages/twenty-front/src/pages/onboarding/InstallAppsV2.tsxdeleted file mode 100644index 346dc3f947a..00000000000--- a/packages/twenty-front/src/pages/onboarding/InstallAppsV2.tsx+++ /dev/null@@ -1,56 +0,0 @@-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';-import { useMarketplaceApps } from '@/marketplace/hooks/useMarketplaceApps';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { ONBOARDING_INSTALLABLE_APPS } from '@/onboarding/constants/OnboardingInstallableApps';-import { InstallAppsAutoSkipEffect } from '@/onboarding/effect-components/InstallAppsAutoSkipEffect';-import { useInstallOnboardingApps } from '@/onboarding/hooks/useInstallOnboardingApps';-import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useCallback, useState } from 'react';-import { InstallApps } from '~/pages/onboarding/InstallApps';--export const InstallAppsV2 = () => {- const isOnboardingV2 = useAtomStateValue(isOnboardingV2State);- const { data: marketplaceApps } = useMarketplaceApps();- const onboardingConfig = useAtomStateValue(onboardingConfigState);- const freeCreditsTotal = useOnboardingFreeCreditsTotal();- const [hasAutoSkipFailed, setHasAutoSkipFailed] = useState(false);- const {- selectedUniversalIdentifiers,- isCompleting,- toggleApp,- installSelectedAppsAndContinue,- skip,- } = useInstallOnboardingApps();-- const handleAutoSkipError = useCallback(() => {- setHasAutoSkipFailed(true);- }, []);-- if (!isOnboardingV2 && !hasAutoSkipFailed) {- return <InstallAppsAutoSkipEffect onError={handleAutoSkipError} />;- }-- const apps = ONBOARDING_INSTALLABLE_APPS.map((app) => ({- ...app,- logo:- marketplaceApps.find(- (marketplaceApp) => marketplaceApp.id === app.universalIdentifier,- )?.logo ?? null,- }));-- return (- <OnboardingV2Layout freeCredits={freeCreditsTotal}>- <InstallApps- apps={apps}- selectedUniversalIdentifiers={selectedUniversalIdentifiers}- creditsRewardPerApp={onboardingConfig?.installAppsCreditsRewardPerApp}- isCompleting={isCompleting}- onToggleApp={toggleApp}- onInstall={installSelectedAppsAndContinue}- onSkip={skip}- />- </OnboardingV2Layout>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsxindex d856f485081..eeaa8874476 100644--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx@@ -1,41 +1,42 @@-import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';+import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { OnboardingSkipButton } from '@/onboarding/components/OnboardingSkipButton';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';+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 { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';+import { ONBOARDING_MOTION_SLIDE_OFFSET } from '@/onboarding/constants/OnboardingMotionSlideOffset';import { useInviteTeam } from '@/onboarding/hooks/useInviteTeam';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';import { TextInput } from '@/ui/input/components/TextInput';-import { ModalContent } from 'twenty-ui/surfaces';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';-import { Trans, useLingui } from '@lingui/react/macro';+import { useLingui } from '@lingui/react/macro';+import { AnimatePresence, motion } from 'framer-motion';import { Controller } from 'react-hook-form';import { isDefined } from 'twenty-shared/utils';-import { IconCopy } from 'twenty-ui/icon';-import { SeparatorLineText } from 'twenty-ui/typography';-import { LightButton, MainButton } from 'twenty-ui/input';-import { ClickToActionLink } from 'twenty-ui/navigation';+import { IconX } from 'twenty-ui/icon';+import { MainButton } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';-const StyledAnimatedContainer = styled.div`+const StyledForm = styled.div`display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[4]};- overflow-x: hidden;- overflow-y: scroll;- padding: ${themeCssVariables.spacing[8]} 0;- width: 100%;+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;-const StyledActionLinkContainer = styled.div`+const StyledFooter = styled.div`+ align-items: flex-end;display: flex;- justify-content: center;-`;--const StyledButtonContainer = styled.div`- display: flex;- justify-content: center;- width: 200px;-`;--const StyledActionSkipLinkContainer = styled.div`- margin: ${themeCssVariables.spacing[3]} 0 0;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[3]};+ max-width: 100%;+ width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;export const InviteTeam = () => {@@ -43,87 +44,92 @@ export const InviteTeam = () => {const {control,fields,+ remove,handleSubmit,onSubmit,handleSkip,- copyInviteLink,getPlaceholder,- hasPrefilledSuggestions,- hasCalendarBooking,isValid,isSubmitting,- currentWorkspace,} = useInviteTeam();+ const onboardingConfig = useAtomStateValue(onboardingConfigState);+ const creditsRewardPerUser = onboardingConfig?.inviteTeamCreditsRewardPerUser;+ const transition = useOnboardingMotionTransition();return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <Title>- <Trans>Invite your team</Trans>- </Title>- <SubTitle>- {hasPrefilledSuggestions ? (- <Trans>- We found teammates from your calendar. Review and invite them.- </Trans>- ) : (- <Trans>- Get the most out of your workspace by inviting your team.- </Trans>- )}- </SubTitle>- <StyledAnimatedContainer>- {fields.map((field, index) => (- <Controller- key={index}- name={`emails.${index}.email`}- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- autoFocus={index === 0}- type="email"- value={value}- placeholder={getPlaceholder(index)}- onBlur={onBlur}- error={error?.message}- onChange={onChange}- noErrorHelper- fullWidth- />- )}- />- ))}- {isDefined(currentWorkspace?.inviteHash) && (- <>- <SeparatorLineText>- <Trans>or</Trans>- </SeparatorLineText>- <StyledActionLinkContainer>- <LightButton- title={t`Copy invitation link`}- accent="tertiary"- onClick={copyInviteLink}- Icon={IconCopy}+ <StyledOnboardingStepPage>+ <StyledOnboardingStepHeading>+ <OnboardingStepAnimatedItem index={0}>+ <StyledOnboardingStepTitle>{t`Invite your team`}</StyledOnboardingStepTitle>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <StyledOnboardingStepSubtitle>+ {t`Get the most out of your workspace by inviting your team.`}+ </StyledOnboardingStepSubtitle>+ </OnboardingStepAnimatedItem>+ {isDefined(creditsRewardPerUser) && (+ <OnboardingStepAnimatedItem index={2}>+ <StyledOnboardingStepTagsRow>+ <OnboardingCreditsRewardTag+ amount={creditsRewardPerUser}+ suffix={t`free credits per user`}/>- </StyledActionLinkContainer>- </>+ </StyledOnboardingStepTagsRow>+ </OnboardingStepAnimatedItem>)}- </StyledAnimatedContainer>- <StyledButtonContainer>- <MainButton- title={hasCalendarBooking ? t`Continue` : t`Finish`}- disabled={!isValid || isSubmitting}- onClick={handleSubmit(onSubmit)}- fullWidth- />- </StyledButtonContainer>- <StyledActionSkipLinkContainer>- <ClickToActionLink onClick={handleSkip}>- <Trans>Skip</Trans>- </ClickToActionLink>- </StyledActionSkipLinkContainer>- </ModalContent>+ </StyledOnboardingStepHeading>++ <OnboardingStepAnimatedItem index={3}>+ <StyledForm>+ <AnimatePresence initial={false}>+ {fields.map((field, index) => (+ <motion.div+ key={field.id}+ layout+ initial={{ opacity: 0, y: -ONBOARDING_MOTION_SLIDE_OFFSET }}+ animate={{ opacity: 1, y: 0 }}+ exit={{ opacity: 0, y: -ONBOARDING_MOTION_SLIDE_OFFSET }}+ transition={transition}+ >+ <Controller+ name={`emails.${index}.email`}+ control={control}+ render={({+ field: { onChange, onBlur, value },+ fieldState: { error },+ }) => (+ <TextInput+ autoFocus={index === 0}+ type="email"+ value={value}+ placeholder={getPlaceholder(index)}+ onBlur={onBlur}+ error={error?.message}+ onChange={onChange}+ RightIcon={IconX}+ onRightIconClick={() => remove(index)}+ noErrorHelper+ fullWidth+ />+ )}+ />+ </motion.div>+ ))}+ </AnimatePresence>+ </StyledForm>+ </OnboardingStepAnimatedItem>++ <OnboardingStepAnimatedItem index={4}>+ <StyledFooter>+ <MainButton+ title={t`Invite`}+ disabled={!isValid || isSubmitting}+ onClick={handleSubmit(onSubmit)}+ fullWidth+ />+ <OnboardingSkipButton onClick={handleSkip} />+ </StyledFooter>+ </OnboardingStepAnimatedItem>+ </StyledOnboardingStepPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeamV2.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeamV2.tsxdeleted file mode 100644index 7978652d0ee..00000000000--- a/packages/twenty-front/src/pages/onboarding/InviteTeamV2.tsx+++ /dev/null@@ -1,162 +0,0 @@-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';-import { OnboardingCreditsRewardTag } from '@/onboarding/components/import-contacts/OnboardingCreditsRewardTag';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { useInviteTeam } from '@/onboarding/hooks/useInviteTeam';-import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';-import { TextInput } from '@/ui/input/components/TextInput';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { Controller } from 'react-hook-form';-import { isDefined } from 'twenty-shared/utils';-import { IconX } from 'twenty-ui/icon';-import { MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const CONTENT_BLOCK_WIDTH = 340;--const StyledPage = styled.div`- align-items: center;- background-color: ${themeCssVariables.background.secondary};- box-sizing: border-box;- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[14]};- min-height: 0;- overflow-y: auto;- padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};- width: 100%;-`;--const StyledHeading = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledTitle = styled.h1`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin: 0;-`;--const StyledSubtitle = styled.p`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.md};- margin: 0;-`;--const StyledCreditsRow = styled.div`- display: flex;- padding-top: ${themeCssVariables.spacing[1]};-`;--const StyledForm = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledFooter = styled.div`- align-items: flex-end;- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledSkipButton = styled.button`- background-color: transparent;- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.md};- color: ${themeCssVariables.font.color.tertiary};- cursor: pointer;- font-family: ${themeCssVariables.font.family};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.semiBold};- height: ${themeCssVariables.spacing[8]};- padding: 0 ${themeCssVariables.spacing[5]};-`;--export const InviteTeamV2 = () => {- const { t } = useLingui();- const {- control,- fields,- remove,- handleSubmit,- onSubmit,- handleSkip,- getPlaceholder,- isValid,- isSubmitting,- } = useInviteTeam();- const onboardingConfig = useAtomStateValue(onboardingConfigState);- const creditsRewardPerUser = onboardingConfig?.inviteTeamCreditsRewardPerUser;- const freeCreditsTotal = useOnboardingFreeCreditsTotal();-- return (- <OnboardingV2Layout freeCredits={freeCreditsTotal}>- <StyledPage>- <StyledHeading>- <StyledTitle>{t`Invite your team`}</StyledTitle>- <StyledSubtitle>- {t`Get the most out of your workspace by inviting your team.`}- </StyledSubtitle>- {isDefined(creditsRewardPerUser) && (- <StyledCreditsRow>- <OnboardingCreditsRewardTag- amount={creditsRewardPerUser}- suffix={t`free credits per user`}- />- </StyledCreditsRow>- )}- </StyledHeading>-- <StyledForm>- {fields.map((field, index) => (- <Controller- key={field.id}- name={`emails.${index}.email`}- control={control}- render={({- field: { onChange, onBlur, value },- fieldState: { error },- }) => (- <TextInput- autoFocus={index === 0}- type="email"- value={value}- placeholder={getPlaceholder(index)}- onBlur={onBlur}- error={error?.message}- onChange={onChange}- RightIcon={IconX}- onRightIconClick={() => remove(index)}- noErrorHelper- fullWidth- />- )}- />- ))}- </StyledForm>-- <StyledFooter>- <MainButton- title={t`Invite`}- disabled={!isValid || isSubmitting}- onClick={handleSubmit(onSubmit)}- fullWidth- />- <StyledSkipButton type="button" onClick={handleSkip}>- {t`Skip`}- </StyledSkipButton>- </StyledFooter>- </StyledPage>- </OnboardingV2Layout>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsxindex 3f3a3706731..9ab5b16dd62 100644--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx@@ -1,85 +1,124 @@import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';import { currentUserState } from '@/auth/states/currentUserState';-import { OnboardingModalCircularIcon } from '@/onboarding/components/OnboardingModalCircularIcon';-import { ModalContent } from 'twenty-ui/surfaces';+import { OnboardingAnimatedReveal } from '@/onboarding/components/OnboardingAnimatedReveal';+import { OnboardingVerifyLayout } from '@/onboarding/components/OnboardingVerifyLayout';+import { useOnboardingMotionTransition } from '@/onboarding/hooks/useOnboardingMotionTransition';+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';-import { styled } from '@linaria/react';+import { useLazyQuery } from '@apollo/client/react';import { t } from '@lingui/core/macro';-import { useState } from 'react';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { AppPath } from 'twenty-shared/types';+import { styled } from '@linaria/react';+import { AnimatePresence, motion } from 'framer-motion';+import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { IconCheck } from 'twenty-ui/icon';-import { Loader } from 'twenty-ui/feedback';import { MainButton } from 'twenty-ui/input';-import { AnimatedEaseIn } from 'twenty-ui/layout';-import { useLazyQuery } from '@apollo/client/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';import { GetCurrentUserDocument } from '~/generated-metadata/graphql';-import { useNavigateApp } from '~/hooks/useNavigateApp';-const StyledTitleContainer = styled.div`- align-items: center;- display: flex;- flex-direction: column;- text-align: center;+const SUBSCRIPTION_CONFIRMATION_POLL_INTERVAL_MS = 2000;+const SUBSCRIPTION_CONFIRMATION_MAX_ATTEMPTS = 30;++const StyledRetryButtonContainer = styled.div`+ margin-top: ${themeCssVariables.spacing[8]};+ width: 200px;`;export const PaymentSuccess = () => {- const navigate = useNavigateApp();const subscriptionStatus = useSubscriptionStatus();const [getCurrentUser] = useLazyQuery(GetCurrentUserDocument, {fetchPolicy: 'network-only',});const setCurrentUser = useSetAtomState(currentUserState);- const [isLoading, setIsLoading] = useState(false);- const navigateWithSubscriptionCheck = async () => {- if (isLoading) return;+ const { enqueueErrorSnackBar } = useSnackBar();+ const [hasTimedOut, setHasTimedOut] = useState(false);+ const [confirmationRunIndex, setConfirmationRunIndex] = useState(0);++ useEffect(() => {+ let attempts = 0;+ let timeoutId: ReturnType<typeof setTimeout> | undefined;+ let cancelled = false;- setIsLoading(true);+ const confirmSubscription = async () => {+ if (cancelled) {+ return;+ }- try {if (isDefined(subscriptionStatus)) {- navigate(AppPath.WorkspaceActivation);return;}const result = await getCurrentUser();++ if (cancelled) {+ return;+ }+const currentUser = result.data?.currentUser;const refreshedSubscriptionStatus =currentUser?.currentWorkspace?.currentBillingSubscription?.status;if (isDefined(currentUser) && isDefined(refreshedSubscriptionStatus)) {setCurrentUser(currentUser);- navigate(AppPath.WorkspaceActivation);return;}- throw new Error(- t`We're waiting for a confirmation from our payment provider (Stripe).\nPlease try again in a few seconds, sorry.`,+ attempts += 1;++ if (attempts >= SUBSCRIPTION_CONFIRMATION_MAX_ATTEMPTS) {+ setHasTimedOut(true);+ enqueueErrorSnackBar({+ message: t`We're still waiting for a confirmation from our payment provider (Stripe). Please refresh in a few seconds.`,+ });+ return;+ }++ timeoutId = setTimeout(+ () => void confirmSubscription(),+ SUBSCRIPTION_CONFIRMATION_POLL_INTERVAL_MS,);- } catch (error) {- setIsLoading(false);- throw error;- }+ };++ void confirmSubscription();++ return () => {+ cancelled = true;+ if (isDefined(timeoutId)) {+ clearTimeout(timeoutId);+ }+ };+ // oxlint-disable-next-line react-hooks/exhaustive-deps+ }, [confirmationRunIndex, subscriptionStatus]);++ const handleRetry = () => {+ setHasTimedOut(false);+ setConfirmationRunIndex((previous) => previous + 1);};+ const transition = useOnboardingMotionTransition();+return (- <ModalContent gap={8} isVerticallyCentered isHorizontallyCentered>- <AnimatedEaseIn>- <OnboardingModalCircularIcon Icon={IconCheck} />- </AnimatedEaseIn>- <StyledTitleContainer>- <Title noMarginTop>{t`All set!`}</Title>- <SubTitle>{t`Your account has been activated.`}</SubTitle>- </StyledTitleContainer>- <MainButton- title={t`Start`}- width={200}- onClick={navigateWithSubscriptionCheck}- Icon={() => (isLoading ? <Loader /> : null)}- disabled={isLoading}- />- </ModalContent>+ <OnboardingVerifyLayout>+ <AnimatePresence mode="wait" initial={false}>+ <motion.div+ key={hasTimedOut ? 'timed-out' : 'confirming'}+ initial={{ opacity: 0 }}+ animate={{ opacity: 1 }}+ exit={{ opacity: 0 }}+ transition={transition}+ >+ <SubTitle>+ {hasTimedOut+ ? t`We're still waiting for the payment confirmation`+ : t`Confirming your payment`}+ </SubTitle>+ </motion.div>+ </AnimatePresence>+ <OnboardingAnimatedReveal isVisible={hasTimedOut}>+ <StyledRetryButtonContainer>+ <MainButton title={t`Retry`} onClick={handleRetry} fullWidth />+ </StyledRetryButtonContainer>+ </OnboardingAnimatedReveal>+ </OnboardingVerifyLayout>);};diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsxindex 3bd8631daaa..abe6f5e1d81 100644--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx@@ -1,91 +1,29 @@-import { styled } from '@linaria/react';-import { useContext, useState } from 'react';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { Key } from 'ts-key-enum';--import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';-import { OnboardingSyncEmailsSettingsCard } from '@/onboarding/components/OnboardingSyncEmailsSettingsCard';-import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';-+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';import { isGoogleCalendarEnabledState } from '@/client-config/states/isGoogleCalendarEnabledState';import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMessagingEnabledState';import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';+import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { OnboardingPageLoader } from '@/onboarding/components/OnboardingPageLoader';+import { SyncEmailsAutoSkipEffect } from '@/onboarding/effect-components/SyncEmailsAutoSkipEffect';+import { useSkipSyncEmailOnboardingStep } from '@/onboarding/hooks/useSkipSyncEmailOnboardingStep';+import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';-import { PageFocusId } from '@/types/PageFocusId';-import { ModalContent } from 'twenty-ui/surfaces';-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';-import { t } from '@lingui/core/macro';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { useCallback, useState } from 'react';import { AppPath, ConnectedAccountProvider } from 'twenty-shared/types';-import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';-import { MainButton } from 'twenty-ui/input';-import { ClickToActionLink } from 'twenty-ui/navigation';-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { useMutation } from '@apollo/client/react';+import { ImportContacts } from '~/pages/onboarding/ImportContacts';import {CalendarChannelVisibility,MessageChannelVisibility,} from '~/generated/graphql';-import { SkipSyncEmailOnboardingStepDocument } from '~/generated-metadata/graphql';-import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState';-import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';--const StyledSyncEmailsContainer = styled.div`- display: flex;- flex-direction: row;- gap: ${themeCssVariables.spacing[2]};- margin: ${themeCssVariables.spacing[8]} 0;- width: 100%;-`;--const StyledActionLinkContainer = styled.div`- display: flex;- flex-direction: row;- margin: ${themeCssVariables.spacing[3]} 0 0;- padding-top: ${themeCssVariables.spacing[2]};-`;--const StyledProviderContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[3]};-`;export const SyncEmails = () => {- const { theme } = useContext(ThemeContext);const { triggerApisOAuth } = useTriggerApisOAuth();- const setNextOnboardingStatus = useSetNextOnboardingStatus();- const [visibility, setVisibility] = useState<MessageChannelVisibility>(- MessageChannelVisibility.SHARE_EVERYTHING,- );- const [lastAuthenticatedMethod] = useAtomState(lastAuthenticatedMethodState);- const [skipSyncEmailOnboardingStatusMutation] = useMutation(- SkipSyncEmailOnboardingStepDocument,- );-- const handleButtonClick = async (provider: ConnectedAccountProvider) => {- const calendarChannelVisibility =- visibility === MessageChannelVisibility.SHARE_EVERYTHING- ? CalendarChannelVisibility.SHARE_EVERYTHING- : CalendarChannelVisibility.METADATA;-- await triggerApisOAuth(provider, {- redirectLocation: AppPath.Index,- messageVisibility: visibility,- calendarVisibility: calendarChannelVisibility,- skipMessageChannelConfiguration: true,- });- };-- const continueWithoutSync = async () => {- await skipSyncEmailOnboardingStatusMutation();- setNextOnboardingStatus();- };-- const userAuthenticatedWithSSO =- lastAuthenticatedMethod === AuthenticatedMethod.SSO;+ const skipSyncEmailOnboardingStep = useSkipSyncEmailOnboardingStep();+ const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);+ const [hasAutoSkipFailed, setHasAutoSkipFailed] = useState(false);const isGoogleMessagingEnabled = useAtomStateValue(isGoogleMessagingEnabledState,@@ -93,11 +31,9 @@ export const SyncEmails = () => {const isMicrosoftMessagingEnabled = useAtomStateValue(isMicrosoftMessagingEnabledState,);-const isGoogleCalendarEnabled = useAtomStateValue(isGoogleCalendarEnabledState,);-const isMicrosoftCalendarEnabled = useAtomStateValue(isMicrosoftCalendarEnabledState,);@@ -106,76 +42,76 @@ export const SyncEmails = () => {isGoogleMessagingEnabled || isGoogleCalendarEnabled;const isMicrosoftProviderEnabled =isMicrosoftMessagingEnabled || isMicrosoftCalendarEnabled;+ const hasProviderEnabled =+ isGoogleProviderEnabled || isMicrosoftProviderEnabled;+ const isClientConfigLoaded = useAtomStateValue(+ clientConfigApiStatusState,+ ).isLoadedOnce;+ const onboardingConfig = useAtomStateValue(onboardingConfigState);++ const connectWithProvider = async (provider: ConnectedAccountProvider) => {+ setOnboardingFreeCredits((current) => ({+ ...current,+ importContacts: onboardingConfig?.importContactsCreditsReward ?? 0,+ }));++ try {+ await triggerApisOAuth(provider, {+ redirectLocation: AppPath.Index,+ messageVisibility: MessageChannelVisibility.METADATA,+ calendarVisibility: CalendarChannelVisibility.METADATA,+ skipMessageChannelConfiguration: true,+ });+ } catch (error) {+ setOnboardingFreeCredits((current) => ({+ ...current,+ importContacts: 0,+ }));++ throw error;+ }+ };++ const handleSkip = async () => {+ await skipSyncEmailOnboardingStep();++ setOnboardingFreeCredits((current) => ({+ ...current,+ importContacts: 0,+ }));+ };++ const handleAutoSkipError = useCallback(() => {+ setHasAutoSkipFailed(true);+ }, []);++ if (!isClientConfigLoaded) {+ return <OnboardingPageLoader />;+ }- useHotkeysOnFocusedElement({- keys: Key.Enter,- callback: async () => {- await continueWithoutSync();- },- focusId: PageFocusId.SyncEmail,- dependencies: [continueWithoutSync],- });+ if (!hasProviderEnabled && !hasAutoSkipFailed) {+ return (+ <>+ <SyncEmailsAutoSkipEffect onError={handleAutoSkipError} />+ <OnboardingPageLoader />+ </>+ );+ }return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <Title noMarginTop>{t`Emails and Calendar`}</Title>- <SubTitle>- {t`Sync your Emails and Calendar with Twenty. Choose your privacy settings.`}- </SubTitle>- <StyledSyncEmailsContainer>- <OnboardingSyncEmailsSettingsCard- value={visibility}- onChange={setVisibility}- />- </StyledSyncEmailsContainer>- <StyledProviderContainer>- {!userAuthenticatedWithSSO && isGoogleProviderEnabled && (- <MainButton- title={t`Sync with Google`}- onClick={() => handleButtonClick(ConnectedAccountProvider.GOOGLE)}- width={200}- Icon={() => <IconGoogle size={theme.icon.size.sm} />}- />- )}- {!userAuthenticatedWithSSO && isMicrosoftProviderEnabled && (- <MainButton- title={t`Sync with Outlook`}- onClick={() =>- handleButtonClick(ConnectedAccountProvider.MICROSOFT)- }- width={200}- Icon={() => <IconMicrosoft size={theme.icon.size.sm} />}- />- )}- {!isMicrosoftProviderEnabled && !isGoogleProviderEnabled && (- <MainButton- title={t`Continue`}- onClick={continueWithoutSync}- width={144}- />- )}- {userAuthenticatedWithSSO && isMicrosoftProviderEnabled && (- <MainButton- title={t`Continue`}- onClick={() =>- handleButtonClick(ConnectedAccountProvider.MICROSOFT)- }- width={144}- />- )}- {userAuthenticatedWithSSO && isGoogleProviderEnabled && (- <MainButton- title={t`Continue`}- onClick={() => handleButtonClick(ConnectedAccountProvider.GOOGLE)}- width={144}- />- )}- </StyledProviderContainer>- <StyledActionLinkContainer>- <ClickToActionLink onClick={continueWithoutSync}>- {t`Continue without sync`}- </ClickToActionLink>- </StyledActionLinkContainer>- </ModalContent>+ <ImportContacts+ creditsReward={onboardingConfig?.importContactsCreditsReward}+ onContinueWithGoogle={+ isGoogleProviderEnabled+ ? () => connectWithProvider(ConnectedAccountProvider.GOOGLE)+ : undefined+ }+ onContinueWithMicrosoft={+ isMicrosoftProviderEnabled+ ? () => connectWithProvider(ConnectedAccountProvider.MICROSOFT)+ : undefined+ }+ onSkip={handleSkip}+ />);};diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmailsV2.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmailsV2.tsxdeleted file mode 100644index 3cc25660bde..00000000000--- a/packages/twenty-front/src/pages/onboarding/SyncEmailsV2.tsx+++ /dev/null@@ -1,116 +0,0 @@-import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';-import { isGoogleCalendarEnabledState } from '@/client-config/states/isGoogleCalendarEnabledState';-import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMessagingEnabledState';-import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';-import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';-import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';-import { OnboardingV2Layout } from '@/onboarding/components/OnboardingV2Layout';-import { SyncEmailsAutoSkipEffect } from '@/onboarding/effect-components/SyncEmailsAutoSkipEffect';-import { useOnboardingFreeCreditsTotal } from '@/onboarding/hooks/useOnboardingFreeCreditsTotal';-import { useSkipSyncEmailOnboardingStep } from '@/onboarding/hooks/useSkipSyncEmailOnboardingStep';-import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { useCallback, useState } from 'react';-import { AppPath, ConnectedAccountProvider } from 'twenty-shared/types';-import { ImportContacts } from '~/pages/onboarding/ImportContacts';-import {- CalendarChannelVisibility,- MessageChannelVisibility,-} from '~/generated/graphql';--export const SyncEmailsV2 = () => {- const { triggerApisOAuth } = useTriggerApisOAuth();- const skipSyncEmailOnboardingStep = useSkipSyncEmailOnboardingStep();- const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);- const freeCreditsTotal = useOnboardingFreeCreditsTotal();- const [hasAutoSkipFailed, setHasAutoSkipFailed] = useState(false);-- const isGoogleMessagingEnabled = useAtomStateValue(- isGoogleMessagingEnabledState,- );- const isMicrosoftMessagingEnabled = useAtomStateValue(- isMicrosoftMessagingEnabledState,- );- const isGoogleCalendarEnabled = useAtomStateValue(- isGoogleCalendarEnabledState,- );- const isMicrosoftCalendarEnabled = useAtomStateValue(- isMicrosoftCalendarEnabledState,- );-- const isGoogleProviderEnabled =- isGoogleMessagingEnabled || isGoogleCalendarEnabled;- const isMicrosoftProviderEnabled =- isMicrosoftMessagingEnabled || isMicrosoftCalendarEnabled;- const hasProviderEnabled =- isGoogleProviderEnabled || isMicrosoftProviderEnabled;- const isClientConfigLoaded = useAtomStateValue(- clientConfigApiStatusState,- ).isLoadedOnce;- const onboardingConfig = useAtomStateValue(onboardingConfigState);-- const connectWithProvider = async (provider: ConnectedAccountProvider) => {- setOnboardingFreeCredits((current) => ({- ...current,- importContacts: onboardingConfig?.importContactsCreditsReward ?? 0,- }));-- try {- await triggerApisOAuth(provider, {- redirectLocation: AppPath.Index,- messageVisibility: MessageChannelVisibility.METADATA,- calendarVisibility: CalendarChannelVisibility.METADATA,- skipMessageChannelConfiguration: true,- });- } catch (error) {- setOnboardingFreeCredits((current) => ({- ...current,- importContacts: 0,- }));-- throw error;- }- };-- const handleSkip = () => {- setOnboardingFreeCredits((current) => ({- ...current,- importContacts: 0,- }));-- return skipSyncEmailOnboardingStep();- };-- const handleAutoSkipError = useCallback(() => {- setHasAutoSkipFailed(true);- }, []);-- if (!isClientConfigLoaded) {- return null;- }-- if (!hasProviderEnabled && !hasAutoSkipFailed) {- return <SyncEmailsAutoSkipEffect onError={handleAutoSkipError} />;- }-- return (- <OnboardingV2Layout freeCredits={freeCreditsTotal}>- <ImportContacts- creditsReward={onboardingConfig?.importContactsCreditsReward}- onContinueWithGoogle={- isGoogleProviderEnabled- ? () => connectWithProvider(ConnectedAccountProvider.GOOGLE)- : undefined- }- onContinueWithMicrosoft={- isMicrosoftProviderEnabled- ? () => connectWithProvider(ConnectedAccountProvider.MICROSOFT)- : undefined- }- onSkip={handleSkip}- />- </OnboardingV2Layout>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsxindex 900c9f49bec..68c280a3afc 100644--- a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx+++ b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx@@ -1,90 +1,77 @@import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';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 { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';+import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnboardingStepSubtitle';+import { StyledOnboardingStepTagsRow } from '@/onboarding/components/StyledOnboardingStepTagsRow';+import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';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 { SubscriptionPaymentForm } from '@/settings/billing/components/SubscriptionPaymentForm';+import { UPGRADE_STEP_CONTENT_WIDTH } from '@/onboarding/constants/UpgradeStepContentWidth';import { useBaseLicensedPriceByPlanKeyAndInterval } from '@/settings/billing/hooks/useBaseLicensedPriceByPlanKeyAndInterval';import { useHandleCheckoutSession } from '@/settings/billing/hooks/useHandleCheckoutSession';+import { useStripeAppearance } from '@/settings/billing/hooks/useStripeAppearance';+import { useStripePromise } from '@/settings/billing/hooks/useStripePromise';+import { useSubmitSubscriptionPayment } from '@/settings/billing/hooks/useSubmitSubscriptionPayment';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';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 { Loader } from 'twenty-ui/feedback';+import { Info, Loader } from 'twenty-ui/feedback';import { MainButton } from 'twenty-ui/input';import { CAL_LINK, ClickToActionLink } from 'twenty-ui/navigation';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { type Billing } from '~/generated-metadata/graphql';+import {+ type Billing,+ type BillingPlanKey,+ type SubscriptionInterval,+} from '~/generated-metadata/graphql';-const CONTENT_BLOCK_WIDTH = 340;--const StyledPage = styled.div`- align-items: center;- background-color: ${themeCssVariables.background.secondary};- box-sizing: border-box;- display: flex;- flex: 1 1 0;- flex-direction: column;- gap: ${themeCssVariables.spacing[14]};- min-height: 0;- overflow-y: auto;- padding: ${themeCssVariables.spacing[16]} ${themeCssVariables.spacing[8]};- width: 100%;+const StyledPage = styled(StyledOnboardingStepPage)`+ gap: ${themeCssVariables.spacing[5]};+ padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[8]};`;const StyledHeading = styled.div`display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;-`;--const StyledTitle = styled.h1`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin: 0;-`;--const StyledSubtitle = styled.p`- color: ${themeCssVariables.font.color.secondary};- font-size: ${themeCssVariables.font.size.md};- margin: 0;-`;--const StyledTagsRow = styled.div`- display: flex;- gap: ${themeCssVariables.spacing[1]};- padding-top: ${themeCssVariables.spacing[1]};+ max-width: 100%;+ width: ${UPGRADE_STEP_CONTENT_WIDTH}px;`;const StyledCards = styled.div`display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;+ gap: ${themeCssVariables.spacing['1.5']};+ max-width: 100%;+ width: ${UPGRADE_STEP_CONTENT_WIDTH}px;`;const StyledFooter = styled.div`align-items: center;display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- width: ${CONTENT_BLOCK_WIDTH}px;+ gap: ${themeCssVariables.spacing['1.5']};+ max-width: 100%;+ width: ${UPGRADE_STEP_CONTENT_WIDTH}px;`;const StyledLinkGroup = styled.div`align-items: center;display: flex;- gap: ${themeCssVariables.spacing[1]};+ gap: ${themeCssVariables.spacing[2]};justify-content: center;> span {- background-color: ${themeCssVariables.font.color.light};+ background-color: ${themeCssVariables.font.color.extraLight};border-radius: 50%;height: 2px;width: 2px;@@ -96,10 +83,42 @@ type UpgradeFreeTrialProps = {creditsReward?: number;};-export const UpgradeFreeTrial = ({+type UpgradeFreeTrialSubmitButtonProps = {+ plan: BillingPlanKey;+ recurringInterval: SubscriptionInterval;+};++const UpgradeFreeTrialSubmitButton = ({+ plan,+ recurringInterval,+}: UpgradeFreeTrialSubmitButtonProps) => {+ const { t } = useLingui();++ const { submit, isSubmitting, isStripeReady } = useSubmitSubscriptionPayment({+ plan,+ recurringInterval,+ });++ return (+ <MainButton+ title={t`Continue`}+ onClick={submit}+ fullWidth+ Icon={() => (isSubmitting ? <Loader /> : null)}+ disabled={!isStripeReady || isSubmitting}+ />+ );+};++type UpgradeFreeTrialContentProps = {+ billing: Billing;+ isPaymentAvailable: boolean;+};++const UpgradeFreeTrialContent = ({billing,- creditsReward,-}: UpgradeFreeTrialProps) => {+ isPaymentAvailable,+}: UpgradeFreeTrialContentProps) => {const { t } = useLingui();const { getBaseLicensedPriceByPlanKeyAndInterval } =@@ -110,13 +129,7 @@ export const UpgradeFreeTrial = ({);const calendarBookingPageId = useAtomStateValue(calendarBookingPageIdState);-- const [verifyEmailRedirectPath, setVerifyEmailRedirectPath] = useAtomState(- verifyEmailRedirectPathState,- );- if (isDefined(verifyEmailRedirectPath)) {- setVerifyEmailRedirectPath(undefined);- }+ const customerEmail = useAtomStateValue(currentUserState)?.email;const { signOut } = useAuth();@@ -126,20 +139,18 @@ export const UpgradeFreeTrial = ({billingCheckoutSession.interval,);- const withCreditCardTrialPeriod = billing.trialPeriods.find(- (trialPeriod) => trialPeriod.isCreditCardRequired,- );const withoutCreditCardTrialPeriod = billing.trialPeriods.find((trialPeriod) =>!trialPeriod.isCreditCardRequired && trialPeriod.duration !== 0,);- const { handleCheckoutSession, isSubmitting } = useHandleCheckoutSession({- recurringInterval: billingCheckoutSession.interval,- plan: billingCheckoutSession.plan,- requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,- successUrlPath: AppPath.PlanRequiredSuccess,- });+ const { handleCheckoutSession, isSubmitting: isCheckoutSubmitting } =+ useHandleCheckoutSession({+ recurringInterval: billingCheckoutSession.interval,+ plan: billingCheckoutSession.plan,+ requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,+ successUrlPath: AppPath.PlanRequiredSuccess,+ });const selectTrialPeriod = (withCreditCard: boolean) => () => {if (@@ -155,79 +166,160 @@ export const UpgradeFreeTrial = ({};const requirePaymentMethod = billingCheckoutSession.requirePaymentMethod;++ return (+ <>+ <OnboardingStepAnimatedItem index={3}>+ <StyledCards>+ <OnboardingPlanCard+ title={t`Upgraded`}+ titleSuffix={t`· FREE`}+ note={t`No charge will be made. You'll receive an email reminder 7 days before it ends.`}+ selected={requirePaymentMethod}+ onSelect={selectTrialPeriod(true)}+ >+ {requirePaymentMethod &&+ (isPaymentAvailable ? (+ <PaymentElement+ options={{+ layout: 'tabs',+ defaultValues: isDefined(customerEmail)+ ? { billingDetails: { email: customerEmail } }+ : undefined,+ terms: { card: 'never' },+ }}+ />+ ) : (+ <Info+ accent="danger"+ text={t`Card payment is currently unavailable. Please verify your Stripe configuration or contact your workspace admin.`}+ />+ ))}+ </OnboardingPlanCard>++ {isDefined(withoutCreditCardTrialPeriod) && (+ <OnboardingPlanCard+ title={t`Basic`}+ titleSuffix={t`without credit card`}+ badge={t`${withoutCreditCardTrialPeriod.duration} days`}+ selected={!requirePaymentMethod}+ onSelect={selectTrialPeriod(false)}+ />+ )}+ </StyledCards>+ </OnboardingStepAnimatedItem>++ <OnboardingStepAnimatedItem index={4}>+ <StyledFooter>+ {requirePaymentMethod ? (+ isPaymentAvailable ? (+ <UpgradeFreeTrialSubmitButton+ plan={billingCheckoutSession.plan}+ recurringInterval={billingCheckoutSession.interval}+ />+ ) : (+ <MainButton title={t`Continue`} fullWidth disabled />+ )+ ) : (+ <MainButton+ title={t`Continue`}+ onClick={handleCheckoutSession}+ fullWidth+ Icon={() => (isCheckoutSubmitting ? <Loader /> : null)}+ disabled={isCheckoutSubmitting}+ />+ )}+ <StyledLinkGroup>+ <ClickToActionLink onClick={signOut}>+ <Trans>Log out</Trans>+ </ClickToActionLink>+ <span />+ <ClickToActionLink+ href={calendarBookingPageId ? AppPath.BookCall : CAL_LINK}+ target={calendarBookingPageId ? '_self' : '_blank'}+ rel={calendarBookingPageId ? '' : 'noreferrer'}+ >+ <Trans>Book a Call</Trans>+ </ClickToActionLink>+ </StyledLinkGroup>+ </StyledFooter>+ </OnboardingStepAnimatedItem>+ </>+ );+};++export const UpgradeFreeTrial = ({+ billing,+ creditsReward,+}: UpgradeFreeTrialProps) => {+ const { t } = useLingui();++ const { getBaseLicensedPriceByPlanKeyAndInterval } =+ useBaseLicensedPriceByPlanKeyAndInterval();++ const billingCheckoutSession = useAtomStateValue(billingCheckoutSessionState);++ const [verifyEmailRedirectPath, setVerifyEmailRedirectPath] = useAtomState(+ verifyEmailRedirectPathState,+ );+ if (isDefined(verifyEmailRedirectPath)) {+ setVerifyEmailRedirectPath(undefined);+ }++ const stripePromise = useStripePromise();+ const appearance = useStripeAppearance();++ const baseProductPrice = getBaseLicensedPriceByPlanKeyAndInterval(+ billingCheckoutSession.plan,+ billingCheckoutSession.interval,+ );++ const withCreditCardTrialPeriod = billing.trialPeriods.find(+ (trialPeriod) => trialPeriod.isCreditCardRequired,+ );const trialDuration = withCreditCardTrialPeriod?.duration;return (<StyledPage><StyledHeading>- <StyledTitle>{t`Upgrade your free trial`}</StyledTitle>- <StyledSubtitle>- {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`}- </StyledSubtitle>- <StyledTagsRow>- {isDefined(trialDuration) && (- <OnboardingTrialExtensionTag duration={trialDuration} />- )}- {isDefined(creditsReward) && (- <OnboardingCreditsRewardTag amount={creditsReward} />- )}- </StyledTagsRow>+ <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} />+ )}+ </StyledOnboardingStepTagsRow>+ </OnboardingStepAnimatedItem></StyledHeading>- <StyledCards>- <OnboardingPlanCard- title={t`Upgraded`}- titleSuffix={t`· FREE`}- note={t`No charge will be made. You'll receive an email reminder 7 days before it ends.`}- selected={requirePaymentMethod}- onSelect={selectTrialPeriod(true)}+ {isDefined(stripePromise) && isDefined(baseProductPrice) ? (+ <Elements+ stripe={stripePromise}+ options={{+ mode: 'subscription',+ amount: baseProductPrice.unitAmount,+ currency: 'usd',+ paymentMethodTypes: ['card'],+ appearance,+ }}>- {requirePaymentMethod && isDefined(baseProductPrice) && (- <SubscriptionPaymentForm- plan={billingCheckoutSession.plan}- recurringInterval={billingCheckoutSession.interval}- amount={baseProductPrice.unitAmount}- />- )}- </OnboardingPlanCard>-- {isDefined(withoutCreditCardTrialPeriod) && (- <OnboardingPlanCard- title={t`Basic`}- titleSuffix={t`without credit card`}- badge={t`${withoutCreditCardTrialPeriod.duration} days`}- selected={!requirePaymentMethod}- onSelect={selectTrialPeriod(false)}- />- )}- </StyledCards>-- <StyledFooter>- {!requirePaymentMethod && (- <MainButton- title={t`Continue`}- onClick={handleCheckoutSession}- fullWidth- Icon={() => (isSubmitting ? <Loader /> : null)}- disabled={isSubmitting}- />- )}- <StyledLinkGroup>- <ClickToActionLink onClick={signOut}>- <Trans>Log out</Trans>- </ClickToActionLink>- <span />- <ClickToActionLink- href={calendarBookingPageId ? AppPath.BookCall : CAL_LINK}- target={calendarBookingPageId ? '_self' : '_blank'}- rel={calendarBookingPageId ? '' : 'noreferrer'}- >- <Trans>Book a Call</Trans>- </ClickToActionLink>- </StyledLinkGroup>- </StyledFooter>+ <UpgradeFreeTrialContent billing={billing} isPaymentAvailable />+ </Elements>+ ) : (+ <UpgradeFreeTrialContent billing={billing} isPaymentAvailable={false} />+ )}</StyledPage>);};diff --git a/packages/twenty-front/src/pages/onboarding/Verify.tsx b/packages/twenty-front/src/pages/onboarding/Verify.tsxnew file mode 100644index 00000000000..2de1a186c7e--- /dev/null+++ b/packages/twenty-front/src/pages/onboarding/Verify.tsx@@ -0,0 +1,17 @@+import { useEffect } from 'react';++import { VerifyLoginTokenEffect } from '@/auth/components/VerifyLoginTokenEffect';+import { onboardingActivationFailedState } from '@/onboarding/states/onboardingActivationFailedState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';++export const Verify = () => {+ const setOnboardingActivationFailed = useSetAtomState(+ onboardingActivationFailedState,+ );++ useEffect(() => {+ setOnboardingActivationFailed(false);+ }, [setOnboardingActivationFailed]);++ return <VerifyLoginTokenEffect />;+};diff --git a/packages/twenty-front/src/pages/onboarding/VerifyV2.tsx b/packages/twenty-front/src/pages/onboarding/VerifyV2.tsxdeleted file mode 100644index a9b5d29a492..00000000000--- a/packages/twenty-front/src/pages/onboarding/VerifyV2.tsx+++ /dev/null@@ -1,28 +0,0 @@-import { SubTitle } from '@/auth/components/SubTitle';-import { VerifyLoginTokenEffect } from '@/auth/components/VerifyLoginTokenEffect';-import { OnboardingPulsingLogo } from '@/onboarding/components/OnboardingPulsingLogo';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledContainer = styled.div`- align-items: center;- background: ${themeCssVariables.background.primary};- display: flex;- flex-direction: column;- height: 100%;- justify-content: center;- width: 100%;-`;--export const VerifyV2 = () => {- const { t } = useLingui();-- return (- <StyledContainer>- <VerifyLoginTokenEffect />- <OnboardingPulsingLogo />- <SubTitle>{t`Verifying your email`}</SubTitle>- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsxindex ce77d70d36c..24fa1170380 100644--- a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx+++ b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx@@ -1,47 +1,42 @@import { styled } from '@linaria/react';-import { useCallback, useEffect, useRef, useState } from 'react';+import { useCallback, useEffect, useRef } from 'react';+import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';import { Logo } from '@/auth/components/Logo';import { SubTitle } from '@/auth/components/SubTitle';import { Title } from '@/auth/components/Title';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';+import { onboardingActivationFailedState } from '@/onboarding/states/onboardingActivationFailedState';+import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { ModalContent } from 'twenty-ui/surfaces';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';import { CombinedGraphQLErrors } from '@apollo/client/errors';+import { useMutation } from '@apollo/client/react';import { Trans, useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';--import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';-import { Loader } from 'twenty-ui/feedback';import { MainButton } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { useMutation } from '@apollo/client/react';import { ActivateWorkspaceDocument } from '~/generated-metadata/graphql';-const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[8]};- width: 200px;-`;--const StyledLoaderContainer = styled.div`+const StyledContainer = styled.div`align-items: center;+ background: ${themeCssVariables.background.secondary};display: flex;+ flex-direction: column;+ height: 100%;justify-content: center;- margin-bottom: ${themeCssVariables.spacing[8]};- margin-top: ${themeCssVariables.spacing[8]};width: 100%;`;-type ActivationStep = 'pending' | 'database' | 'data-model' | 'prefill';--const StyledActivationStep = styled.div`- align-items: center;- display: flex;- justify-content: center;- width: 100%;+const StyledButtonContainer = styled.div`+ margin-top: ${themeCssVariables.spacing[8]};+ width: 200px;`;export const WorkspaceActivation = () => {@@ -52,29 +47,21 @@ export const WorkspaceActivation = () => {const [activateWorkspace, { loading: isActivating }] = useMutation(ActivateWorkspaceDocument,);- const [activationStep, setActivationStep] =- useState<ActivationStep>('pending');- const [hasFailed, setHasFailed] = useState(false);+ const onboardingActivationFailed = useAtomStateValue(+ onboardingActivationFailedState,+ );+ const setOnboardingActivationFailed = useSetAtomState(+ onboardingActivationFailedState,+ );const currentWorkspace = useAtomStateValue(currentWorkspaceState);+ const setIsCreatingWorkspace = useSetAtomState(isCreatingWorkspaceState);+ const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);+ const setIsAppEffectRedirectEnabled = useSetAtomState(+ isAppEffectRedirectEnabledState,+ );const activate = useCallback(async () => {- setHasFailed(false);-- const databaseTimeout = setTimeout(() => {- setActivationStep('database');- }, 500);- const dataModelTimeout = setTimeout(() => {- setActivationStep('data-model');- }, 2000);- const prefillTimeout = setTimeout(() => {- setActivationStep('prefill');- }, 5000);-- const clearStepTimeouts = () => {- clearTimeout(databaseTimeout);- clearTimeout(dataModelTimeout);- clearTimeout(prefillTimeout);- };+ setOnboardingActivationFailed(false);try {const result = await activateWorkspace({@@ -87,22 +74,27 @@ export const WorkspaceActivation = () => {throw result.error;}+ setIsAppEffectRedirectEnabled(false);await loadCurrentUser();setNextOnboardingStatus();+ setIsCreatingWorkspace(false);+ setIsAppEffectRedirectEnabled(true);} catch (error) {- setActivationStep('pending');- setHasFailed(true);+ setIsAppEffectRedirectEnabled(true);+ setIsCreatingWorkspace(false);+ setOnboardingActivationFailed(true);enqueueErrorSnackBar({apolloError: CombinedGraphQLErrors.is(error) ? error : undefined,});- } finally {- clearStepTimeouts();}}, [activateWorkspace,enqueueErrorSnackBar,loadCurrentUser,+ setOnboardingActivationFailed,+ setIsAppEffectRedirectEnabled,+ setIsCreatingWorkspace,setNextOnboardingStatus,]);@@ -118,68 +110,54 @@ export const WorkspaceActivation = () => {}hasTriggeredRef.current = true;+ setOnboardingFreeCredits({+ importContacts: 0,+ inviteTeam: 0,+ installApps: 0,+ });void activate();- }, [activate, currentWorkspace]);+ }, [activate, currentWorkspace, setOnboardingFreeCredits]);++ if (!onboardingActivationFailed) {+ return null;+ }return (- <ModalContent isVerticallyCentered isHorizontallyCentered>- <Logo- primaryLogo={- isNonEmptyString(currentWorkspace?.logo)- ? currentWorkspace?.logo- : undefined- }- />- <Title>- {hasFailed ? (+ <StyledContainer>+ <OnboardingStepAnimatedItem index={0}>+ <Logo+ primaryLogo={+ isNonEmptyString(currentWorkspace?.logo)+ ? currentWorkspace?.logo+ : undefined+ }+ />+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={1}>+ <Title><Trans>Workspace creation failed</Trans>- ) : (- <Trans>Creating your workspace</Trans>- )}- </Title>- {hasFailed ? (- <>- <SubTitle>- <Trans>- Something went wrong while creating your workspace. Please try- again.- </Trans>- </SubTitle>- <StyledButtonContainer>- <MainButton- title={t`Retry`}- onClick={() => {- void activate();- }}- disabled={isActivating}- fullWidth- />- </StyledButtonContainer>- </>- ) : (- <>- <StyledActivationStep>- {activationStep === 'database' && (- <SubTitle>- <Trans>Setting up your database...</Trans>- </SubTitle>- )}- {activationStep === 'data-model' && (- <SubTitle>- <Trans>Creating your data model...</Trans>- </SubTitle>- )}- {activationStep === 'prefill' && (- <SubTitle>- <Trans>Prefilling your workspace data...</Trans>- </SubTitle>- )}- </StyledActivationStep>- <StyledLoaderContainer>- <Loader color="gray" />- </StyledLoaderContainer>- </>- )}- </ModalContent>+ </Title>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={2}>+ <SubTitle>+ <Trans>+ Something went wrong while creating your workspace. Please try+ again.+ </Trans>+ </SubTitle>+ </OnboardingStepAnimatedItem>+ <OnboardingStepAnimatedItem index={3}>+ <StyledButtonContainer>+ <MainButton+ title={t`Retry`}+ onClick={() => {+ void activate();+ }}+ disabled={isActivating}+ fullWidth+ />+ </StyledButtonContainer>+ </OnboardingStepAnimatedItem>+ </StyledContainer>);};diff --git a/packages/twenty-front/src/pages/onboarding/WorkspaceActivationV2.tsx b/packages/twenty-front/src/pages/onboarding/WorkspaceActivationV2.tsxdeleted file mode 100644index 789cf51fc30..00000000000--- a/packages/twenty-front/src/pages/onboarding/WorkspaceActivationV2.tsx+++ /dev/null@@ -1,142 +0,0 @@-import { styled } from '@linaria/react';-import { useCallback, useEffect, useRef, useState } from 'react';--import { Logo } from '@/auth/components/Logo';-import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';-import { SignInUpWorkspaceCreationLoader } from '@/auth/sign-in-up/components/SignInUpWorkspaceCreationLoader';-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';-import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';-import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';-import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';-import { CombinedGraphQLErrors } from '@apollo/client/errors';-import { useMutation } from '@apollo/client/react';-import { Trans, useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { isDefined } from 'twenty-shared/utils';-import { MainButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { ActivateWorkspaceDocument } from '~/generated-metadata/graphql';--const StyledContainer = styled.div`- align-items: center;- background: ${themeCssVariables.background.primary};- display: flex;- flex-direction: column;- height: 100%;- justify-content: center;- width: 100%;-`;--const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[8]};- width: 200px;-`;--export const WorkspaceActivationV2 = () => {- const { t } = useLingui();- const { enqueueErrorSnackBar } = useSnackBar();- const setNextOnboardingStatus = useSetNextOnboardingStatus();- const { loadCurrentUser } = useLoadCurrentUser();- const [activateWorkspace, { loading: isActivating }] = useMutation(- ActivateWorkspaceDocument,- );- const [hasFailed, setHasFailed] = useState(false);- const currentWorkspace = useAtomStateValue(currentWorkspaceState);- const setIsCreatingWorkspace = useSetAtomState(isCreatingWorkspaceState);- const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);-- const activate = useCallback(async () => {- setHasFailed(false);-- try {- const result = await activateWorkspace({- variables: {- input: {},- },- });-- if (isDefined(result.error)) {- throw result.error;- }-- await loadCurrentUser();- setIsCreatingWorkspace(false);- setNextOnboardingStatus();- } catch (error) {- setHasFailed(true);-- enqueueErrorSnackBar({- apolloError: CombinedGraphQLErrors.is(error) ? error : undefined,- });- }- }, [- activateWorkspace,- enqueueErrorSnackBar,- loadCurrentUser,- setIsCreatingWorkspace,- setNextOnboardingStatus,- ]);-- // Guard the one-shot trigger with a ref, not state: a ref mutation is- // synchronous and survives StrictMode's double-invocation of effects, whereas- // a state flag stays false in the second (same-closure) invocation and fires- // a second concurrent activation that trips the server's lock.- // oxlint-disable-next-line twenty/no-state-useref- const hasTriggeredRef = useRef(false);- useEffect(() => {- if (hasTriggeredRef.current || !isDefined(currentWorkspace)) {- return;- }-- hasTriggeredRef.current = true;- setOnboardingFreeCredits({- importContacts: 0,- inviteTeam: 0,- installApps: 0,- });- void activate();- }, [activate, currentWorkspace, setOnboardingFreeCredits]);-- if (!hasFailed) {- return (- <StyledContainer>- <SignInUpWorkspaceCreationLoader />- </StyledContainer>- );- }-- return (- <StyledContainer>- <Logo- primaryLogo={- isNonEmptyString(currentWorkspace?.logo)- ? currentWorkspace?.logo- : undefined- }- />- <Title>- <Trans>Workspace creation failed</Trans>- </Title>- <SubTitle>- <Trans>- Something went wrong while creating your workspace. Please try again.- </Trans>- </SubTitle>- <StyledButtonContainer>- <MainButton- title={t`Retry`}- onClick={() => {- void activate();- }}- disabled={isActivating}- fullWidth- />- </StyledButtonContainer>- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsxindex 5556d456eb1..3910d1ca648 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx@@ -25,9 +25,7 @@ const meta: Meta<PageDecoratorArgs> = {graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {return HttpResponse.json({data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.PLAN_REQUIRED,- ),+ currentUser: mockedOnboardingUserData(OnboardingStatus.COMPLETED),},});}),@@ -45,7 +43,7 @@ export const Default: Story = {play: async ({ canvasElement }) => {const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Choose your Trial', undefined, {+ await canvas.findByText('Upgrade your free trial', undefined, {timeout: 3000,});},diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlanV2.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlanV2.stories.tsxdeleted file mode 100644index 0cd4a8ca248..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlanV2.stories.tsx+++ /dev/null@@ -1,50 +0,0 @@-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 { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';-import { AppPath } from 'twenty-shared/types';-import { OnboardingStatus } from '~/generated-metadata/graphql';-import { ChooseYourPlanV2 } from '~/pages/onboarding/ChooseYourPlanV2';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/ChooseYourPlanV2',- component: ChooseYourPlanV2,- decorators: [PageDecorator],- args: { routePath: AppPath.PlanRequiredV2 },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(OnboardingStatus.COMPLETED),- },- });- }),- ...graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof ChooseYourPlanV2>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);-- await canvas.findByText('Upgrade your free trial', undefined, {- timeout: 3000,- });- },-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsxindex 83655ffeb14..26810566849 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx@@ -2,10 +2,10 @@ 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 { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';import { AppPath } from 'twenty-shared/types';+import { OnboardingStatus } from '~/generated-metadata/graphql';+import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';import { CreateProfile } from '~/pages/onboarding/CreateProfile';import {PageDecorator,diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfileV2.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfileV2.stories.tsxdeleted file mode 100644index 886678ce4d2..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfileV2.stories.tsx+++ /dev/null@@ -1,49 +0,0 @@-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 { AppPath } from 'twenty-shared/types';--import { OnboardingStatus } from '~/generated-metadata/graphql';-import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';-import { CreateProfileV2 } from '~/pages/onboarding/CreateProfileV2';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/CreateProfileV2',- component: CreateProfileV2,- decorators: [PageDecorator],- args: { routePath: AppPath.CreateProfileV2 },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.PROFILE_CREATION,- ),- },- });- }),- graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof CreateProfileV2>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Create profile');- },-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/InstallAppsV2.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/InstallApps.stories.tsxsimilarity index 75%rename from packages/twenty-front/src/pages/onboarding/__stories__/InstallAppsV2.stories.tsxrename to packages/twenty-front/src/pages/onboarding/__stories__/InstallApps.stories.tsxindex 2cd34255530..a3e134189ce 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/InstallAppsV2.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/InstallApps.stories.tsx@@ -4,12 +4,10 @@ import { HttpResponse, graphql } from 'msw';import { within } from 'storybook/test';import { AppPath } from 'twenty-shared/types';-import { isOnboardingV2State } from '@/auth/states/isOnboardingV2State';import { FIND_MANY_MARKETPLACE_APPS } from '@/marketplace/graphql/queries/findManyMarketplaceApps';-import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { OnboardingStatus } from '~/generated-metadata/graphql';import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';-import { InstallAppsV2 } from '~/pages/onboarding/InstallAppsV2';+import { InstallApps } from '~/pages/onboarding/InstallApps';import {PageDecorator,type PageDecoratorArgs,@@ -18,17 +16,10 @@ import { graphqlMocks } from '~/testing/graphqlMocks';import { mockedOnboardingUserData } from '~/testing/mock-data/users';const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/InstallAppsV2',- component: InstallAppsV2,- decorators: [- (Story) => {- jotaiStore.set(isOnboardingV2State.atom, true);-- return <Story />;- },- PageDecorator,- ],- args: { routePath: AppPath.InstallAppsV2 },+ title: 'Pages/Onboarding/InstallApps',+ component: InstallApps,+ decorators: [PageDecorator],+ args: { routePath: AppPath.InstallApps },parameters: {msw: {handlers: [@@ -57,7 +48,7 @@ const meta: Meta<PageDecoratorArgs> = {export default meta;-export type Story = StoryObj<typeof InstallAppsV2>;+export type Story = StoryObj<typeof InstallApps>;export const Default: Story = {play: async ({ canvasElement }) => {diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeamV2.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeamV2.stories.tsxdeleted file mode 100644index 74980a21e46..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeamV2.stories.tsx+++ /dev/null@@ -1,49 +0,0 @@-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 { AppPath } from 'twenty-shared/types';--import { OnboardingStatus } from '~/generated-metadata/graphql';-import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';-import { InviteTeamV2 } from '~/pages/onboarding/InviteTeamV2';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/InviteTeamV2',- component: InviteTeamV2,- decorators: [PageDecorator],- args: { routePath: AppPath.InviteTeamV2 },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.INVITE_TEAM,- ),- },- });- }),- graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof InviteTeamV2>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Invite your team');- },-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsxdeleted file mode 100644index 26fc7b4b1cf..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx+++ /dev/null@@ -1,50 +0,0 @@-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 { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';-import { AppPath } from 'twenty-shared/types';-import { OnboardingStatus } from '~/generated-metadata/graphql';-import { PaymentSuccess } from '~/pages/onboarding/PaymentSuccess';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/PaymentSuccess',- component: PaymentSuccess,- decorators: [PageDecorator],- args: { routePath: AppPath.PlanRequiredSuccess },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.WORKSPACE_ACTIVATION,- ),- },- });- }),- graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof PaymentSuccess>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);-- await canvas.findByText('Start');- },-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsxindex a7450085005..72c8336b950 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx@@ -44,6 +44,6 @@ export type Story = StoryObj<typeof SyncEmails>;export const Default: Story = {play: async ({ canvasElement }) => {const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Emails and Calendar');+ await canvas.findByText('Import your contacts');},};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmailsV2.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmailsV2.stories.tsxdeleted file mode 100644index 5a3f03448cc..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmailsV2.stories.tsx+++ /dev/null@@ -1,49 +0,0 @@-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 { AppPath } from 'twenty-shared/types';--import { OnboardingStatus } from '~/generated-metadata/graphql';-import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';-import { SyncEmailsV2 } from '~/pages/onboarding/SyncEmailsV2';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/SyncEmailsV2',- component: SyncEmailsV2,- decorators: [PageDecorator],- args: { routePath: AppPath.SyncEmailsV2 },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.SYNC_EMAIL,- ),- },- });- }),- graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof SyncEmailsV2>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Import your contacts');- },-};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/WorkspaceActivation.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/WorkspaceActivation.stories.tsxdeleted file mode 100644index 3d4273cbf16..00000000000--- a/packages/twenty-front/src/pages/onboarding/__stories__/WorkspaceActivation.stories.tsx+++ /dev/null@@ -1,51 +0,0 @@-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 { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';-import { AppPath } from 'twenty-shared/types';-import { OnboardingStatus } from '~/generated-metadata/graphql';-import { WorkspaceActivation } from '~/pages/onboarding/WorkspaceActivation';-import {- PageDecorator,- type PageDecoratorArgs,-} from '~/testing/decorators/PageDecorator';-import { graphqlMocks } from '~/testing/graphqlMocks';-import { mockedOnboardingUserData } from '~/testing/mock-data/users';--const meta: Meta<PageDecoratorArgs> = {- title: 'Pages/Onboarding/WorkspaceActivation',- component: WorkspaceActivation,- decorators: [PageDecorator],- args: { routePath: AppPath.WorkspaceActivation },- parameters: {- msw: {- handlers: [- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {- return HttpResponse.json({- data: {- currentUser: mockedOnboardingUserData(- OnboardingStatus.WORKSPACE_ACTIVATION,- ),- },- });- }),- graphqlMocks.handlers,- ],- },- },-};--export default meta;--export type Story = StoryObj<typeof WorkspaceActivation>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement.ownerDocument.body);- await canvas.findByText('Creating your workspace', undefined, {- timeout: 3000,- });- },-};diff --git a/packages/twenty-front/src/pages/onboarding/internal/ChooseYourPlanContent.tsx b/packages/twenty-front/src/pages/onboarding/internal/ChooseYourPlanContent.tsxdeleted file mode 100644index 40b48f05dc2..00000000000--- a/packages/twenty-front/src/pages/onboarding/internal/ChooseYourPlanContent.tsx+++ /dev/null@@ -1,183 +0,0 @@-import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';-import { SubTitle } from '@/auth/components/SubTitle';-import { Title } from '@/auth/components/Title';-import { useAuth } from '@/auth/hooks/useAuth';-import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';-import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';-import { SubscriptionPaymentForm } from '@/settings/billing/components/SubscriptionPaymentForm';-import { TrialCard } from '@/settings/billing/components/TrialCard';-import { useBaseLicensedPriceByPlanKeyAndInterval } from '@/settings/billing/hooks/useBaseLicensedPriceByPlanKeyAndInterval';-import { useBaseProductByPlanKey } from '@/settings/billing/hooks/useBaseProductByPlanKey';-import { useHandleCheckoutSession } from '@/settings/billing/hooks/useHandleCheckoutSession';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { Trans, useLingui } from '@lingui/react/macro';-import { AppPath } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { Loader } from 'twenty-ui/feedback';-import { CardPicker, MainButton } from 'twenty-ui/input';-import { CAL_LINK, ClickToActionLink } from 'twenty-ui/navigation';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { type Billing } from '~/generated-metadata/graphql';--const StyledChooseTrialContainer = styled.div`- display: flex;- flex-direction: row;- gap: ${themeCssVariables.spacing[2]};- margin-bottom: ${themeCssVariables.spacing[4]};- margin-top: ${themeCssVariables.spacing[8]};- width: 100%;-- > * {- flex: 1 1 0;- min-width: 0;- }-`;--const StyledLinkGroup = styled.div`- align-items: center;- display: flex;- flex-direction: row;- gap: ${themeCssVariables.spacing[1]};- justify-content: center;- margin-top: ${themeCssVariables.spacing[4]};-- > span {- background-color: ${themeCssVariables.font.color.light};- border-radius: 50%;- height: 2px;- width: 2px;- }-`;--export const ChooseYourPlanContent = ({ billing }: { billing: Billing }) => {- const { t } = useLingui();-- const { getBaseProductByPlanKey } = useBaseProductByPlanKey();- const { getBaseLicensedPriceByPlanKeyAndInterval } =- useBaseLicensedPriceByPlanKeyAndInterval();-- const [billingCheckoutSession, setBillingCheckoutSession] = useAtomState(- billingCheckoutSessionState,- );-- const calendarBookingPageId = useAtomStateValue(calendarBookingPageIdState);-- const [verifyEmailRedirectPath, setVerifyEmailRedirectPath] = useAtomState(- verifyEmailRedirectPathState,- );- if (isDefined(verifyEmailRedirectPath)) {- setVerifyEmailRedirectPath(undefined);- }-- const currentPlanKey = billingCheckoutSession.plan;-- const baseProduct = getBaseProductByPlanKey(currentPlanKey);- const baseProductPrice = getBaseLicensedPriceByPlanKeyAndInterval(- currentPlanKey,- billingCheckoutSession.interval,- );-- const hasWithoutCreditCardTrialPeriod = billing?.trialPeriods.some(- (trialPeriod) =>- !trialPeriod.isCreditCardRequired && trialPeriod.duration !== 0,- );- const withCreditCardTrialPeriod = billing?.trialPeriods.find(- (trialPeriod) => trialPeriod.isCreditCardRequired,- );-- const { handleCheckoutSession, isSubmitting } = useHandleCheckoutSession({- recurringInterval: billingCheckoutSession.interval,- plan: billingCheckoutSession.plan,- requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,- successUrlPath: AppPath.PlanRequiredSuccess,- });-- const handleTrialPeriodChange = (withCreditCard: boolean) => {- return () => {- if (- isDefined(baseProductPrice) &&- billingCheckoutSession.requirePaymentMethod !== withCreditCard- ) {- setBillingCheckoutSession({- plan: currentPlanKey,- interval: baseProductPrice.recurringInterval,- requirePaymentMethod: withCreditCard,- });- }- };- };-- const { signOut } = useAuth();-- const withCreditCardTrialPeriodDuration = withCreditCardTrialPeriod?.duration;-- return (- <>- <Title noMarginTop>- {hasWithoutCreditCardTrialPeriod- ? t`Choose your Trial`- : t`Get your subscription`}- </Title>- {hasWithoutCreditCardTrialPeriod ? (- <SubTitle>{baseProduct.name}</SubTitle>- ) : (- withCreditCardTrialPeriod && (- <SubTitle>- {t`Enjoy a ${withCreditCardTrialPeriodDuration}-days free trial`}- </SubTitle>- )- )}- {hasWithoutCreditCardTrialPeriod && (- <StyledChooseTrialContainer>- {billing.trialPeriods.map((trialPeriod) => (- <CardPicker- checked={- billingCheckoutSession.requirePaymentMethod ===- trialPeriod.isCreditCardRequired- }- handleChange={handleTrialPeriodChange(- trialPeriod.isCreditCardRequired,- )}- key={trialPeriod.duration}- >- <TrialCard- duration={trialPeriod.duration}- withCreditCard={trialPeriod.isCreditCardRequired}- />- </CardPicker>- ))}- </StyledChooseTrialContainer>- )}- {billingCheckoutSession.requirePaymentMethod ? (- <SubscriptionPaymentForm- plan={billingCheckoutSession.plan}- recurringInterval={billingCheckoutSession.interval}- amount={baseProductPrice.unitAmount}- />- ) : (- <MainButton- title={t`Continue`}- onClick={handleCheckoutSession}- width={200}- Icon={() => isSubmitting && <Loader />}- disabled={isSubmitting}- />- )}- <StyledLinkGroup>- <ClickToActionLink onClick={signOut}>- <Trans>Log out</Trans>- </ClickToActionLink>- <span />- <ClickToActionLink- href={calendarBookingPageId ? AppPath.BookCall : CAL_LINK}- target={calendarBookingPageId ? '_self' : '_blank'}- rel={calendarBookingPageId ? '' : 'noreferrer'}- >- <Trans>Book a Call</Trans>- </ClickToActionLink>- </StyledLinkGroup>- </>- );-};diff --git a/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts b/packages/twenty-front/src/testing/constants/UntestedAppPaths.tsindex 8bfe768b146..22422b62dcd 100644--- a/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts+++ b/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts@@ -3,14 +3,7 @@ import { AppPath } from 'twenty-shared/types';export const UNTESTED_APP_PATHS = [AppPath.Settings,AppPath.Developers,- AppPath.VerifyV2,- AppPath.WorkspaceActivationV2,- AppPath.CreateProfileV2,- AppPath.SyncEmailsV2,- AppPath.InstallAppsV2,- AppPath.InviteTeamV2,- AppPath.PlanRequiredV2,- // Public, unauthenticated redirect route handled in useCreateAppRouter — not- // part of the onboarding/auth page-change navigation matrix.+ // Public, unauthenticated redirect route handled in useCreateWorkspaceAppRouter+ // — not part of the onboarding/auth page-change navigation matrix.AppPath.Dpa,];diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsxindex 82a8e7232a9..d13adac81ba 100644--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx@@ -6,16 +6,16 @@ import { HelmetProvider } from '@dr.pogodin/react-helmet';import {createMemoryRouter,createRoutesFromElements,- Outlet,Route,RouterProvider,} from 'react-router-dom';import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';+import { MinimalMetadataGate } from '@/metadata-store/components/MinimalMetadataGate';import { ApolloCoreClientMockedProvider } from '@/object-metadata/hooks/__mocks__/ApolloCoreClientMockedProvider';import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';-import { MinimalMetadataGater } from '@/metadata-store/components/MinimalMetadataGater';import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';+import { UserContextProvider } from '@/users/components/UserContextProvider';import { MockedMetadataLoadEffect } from '~/testing/decorators/MockedMetadataLoadEffect';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { type JSX, useState } from 'react';@@ -95,14 +95,14 @@ const Providers = () => {<UserMetadataProviderInitialEffect /><MockedMetadataLoadEffect /><WorkspaceProviderEffect />- <MinimalMetadataGater>+ <UserContextProvider><ApolloCoreClientMockedProvider><PreComputedChipGeneratorsProvider><FullHeightStorybookLayout><HelmetProvider><IconsProvider><RecordComponentInstanceContextsWrapper componentInstanceId="storybook-test-record">- <Outlet />+ <MinimalMetadataGate /></RecordComponentInstanceContextsWrapper></IconsProvider></HelmetProvider>@@ -110,7 +110,7 @@ const Providers = () => {</PreComputedChipGeneratorsProvider><MainContextStoreProvider /></ApolloCoreClientMockedProvider>- </MinimalMetadataGater>+ </UserContextProvider></ClientConfigProvider></I18nProvider></ApolloProvider>diff --git a/packages/twenty-front/src/utils/title-utils.ts b/packages/twenty-front/src/utils/title-utils.tsindex 649005b1759..14e614f1d48 100644--- a/packages/twenty-front/src/utils/title-utils.ts+++ b/packages/twenty-front/src/utils/title-utils.ts@@ -28,15 +28,12 @@ export const getPageTitleFromPath = (pathname: string): string => {const pathnameOrPrefix = getPathnameOrPrefix(pathname);switch (pathnameOrPrefix) {case AppPath.Verify:- case AppPath.VerifyV2:return t`Verify`;case AppPath.SignInUp:- case AppPath.SignInUpV2:return t`Sign in or Create an account`;case AppPath.Invite:return t`Invite`;case AppPath.WorkspaceActivation:- case AppPath.WorkspaceActivationV2:return t`Create Workspace`;case AppPath.CreateProfile:return t`Create Profile`;diff --git a/packages/twenty-shared/src/types/AppPath.ts b/packages/twenty-shared/src/types/AppPath.tsindex 41faebc1434..caad30d48c8 100644--- a/packages/twenty-shared/src/types/AppPath.ts+++ b/packages/twenty-shared/src/types/AppPath.ts@@ -1,25 +1,18 @@export enum AppPath {// Not logged-inVerify = '/verify',- VerifyV2 = '/verify-v2',VerifyEmail = '/verify-email',SignInUp = '/welcome',- SignInUpV2 = '/welcome-v2',Invite = '/invite/:workspaceInviteHash',ResetPassword = '/reset-password/:passwordResetToken',// OnboardingWorkspaceActivation = '/workspace-activation',- WorkspaceActivationV2 = '/workspace-activation-v2',CreateProfile = '/create/profile',- CreateProfileV2 = '/create/profile-v2',SyncEmails = '/sync/emails',- SyncEmailsV2 = '/sync/emails-v2',- InstallAppsV2 = '/install-apps-v2',+ InstallApps = '/install-apps',InviteTeam = '/invite-team',- InviteTeamV2 = '/invite-team-v2',PlanRequired = '/plan-required',- PlanRequiredV2 = '/plan-required-v2',PlanRequiredSuccess = '/plan-required/payment-success',BookCallDecision = '/book-call-decision',BookCall = '/book-call',diff --git a/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss b/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scssindex a34d225baaf..2d689bd6ae5 100644--- a/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss+++ b/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss@@ -20,6 +20,10 @@border-radius: 50%;}+ &[data-clickable] {+ cursor: pointer;+ }+&[data-clickable]:hover {box-shadow: 0 0 0 4px var(--t-background-transparent-light);}diff --git a/packages/twenty-ui/src/input/IconButton/IconButton.tsx b/packages/twenty-ui/src/input/IconButton/IconButton.tsxindex cd6d69f30c1..bf670abb1d8 100644--- a/packages/twenty-ui/src/input/IconButton/IconButton.tsx+++ b/packages/twenty-ui/src/input/IconButton/IconButton.tsx@@ -24,6 +24,7 @@ export type IconButtonProps = {ariaLabel?: string;onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;to?: string;+ children?: React.ReactNode;};export const IconButton = ({@@ -39,6 +40,7 @@ export const IconButton = ({ariaLabel,onClick,to,+ children,}: IconButtonProps) => {const theme = useTheme();@@ -59,6 +61,7 @@ export const IconButton = ({{...{ to }}>{Icon && <Icon size={theme.icon.size.md} aria-hidden={!!ariaLabel} />}+ {children}</button>);};