diff --git a/packages/twenty-chrome-extension/src/generated/graphql.tsx b/packages/twenty-chrome-extension/src/generated/graphql.tsx
index 33b20dd3498..2ced7aaa8fd 100644
--- a/packages/twenty-chrome-extension/src/generated/graphql.tsx
+++ b/packages/twenty-chrome-extension/src/generated/graphql.tsx
@@ -74,7 +74,7 @@ export type ActivityActivityTargetsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityTargetOrderByInput>>>;
 };
 
 
@@ -86,7 +86,7 @@ export type ActivityAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -98,7 +98,7 @@ export type ActivityCommentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CommentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CommentOrderByInput>>>;
 };
 
 /** An activity */
@@ -397,6 +397,10 @@ export type Analytics = {
   success: Scalars['Boolean'];
 };
 
+export type ApiConfig = {
+  mutationMaximumAffectedRecords: Scalars['Float'];
+};
+
 /** An api key */
 export type ApiKey = {
   /** Creation date */
@@ -853,8 +857,8 @@ export type Billing = {
 
 export type BillingSubscription = {
   id: Scalars['UUID'];
-  interval?: Maybe<Scalars['String']>;
-  status: Scalars['String'];
+  interval?: Maybe<SubscriptionInterval>;
+  status: SubscriptionStatus;
 };
 
 export type BillingSubscriptionFilter = {
@@ -992,6 +996,12 @@ export type CalendarChannel = {
   isSyncEnabled?: Maybe<Scalars['Boolean']>;
   /** Sync Cursor. Used for syncing events from the calendar provider */
   syncCursor?: Maybe<Scalars['String']>;
+  /** Sync stage */
+  syncStage?: Maybe<CalendarChannelSyncStageEnum>;
+  /** Sync stage started at */
+  syncStageStartedAt?: Maybe<Scalars['DateTime']>;
+  /** Sync status */
+  syncStatus?: Maybe<CalendarChannelSyncStatusEnum>;
   /** Throttle Failure Count */
   throttleFailureCount?: Maybe<Scalars['Float']>;
   /** Update date */
@@ -1009,7 +1019,7 @@ export type CalendarChannelCalendarChannelEventAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarChannelEventAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarChannelEventAssociationOrderByInput>>>;
 };
 
 /** Calendar Channels */
@@ -1036,6 +1046,12 @@ export type CalendarChannelCreateInput = {
   isSyncEnabled?: InputMaybe<Scalars['Boolean']>;
   /** Sync Cursor. Used for syncing events from the calendar provider */
   syncCursor?: InputMaybe<Scalars['String']>;
+  /** Sync stage */
+  syncStage?: InputMaybe<CalendarChannelSyncStageEnum>;
+  /** Sync stage started at */
+  syncStageStartedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Sync status */
+  syncStatus?: InputMaybe<CalendarChannelSyncStatusEnum>;
   /** Throttle Failure Count */
   throttleFailureCount?: InputMaybe<Scalars['Float']>;
   /** Update date */
@@ -1170,6 +1186,12 @@ export type CalendarChannelFilterInput = {
   or?: InputMaybe<Array<InputMaybe<CalendarChannelFilterInput>>>;
   /** Sync Cursor. Used for syncing events from the calendar provider */
   syncCursor?: InputMaybe<StringFilter>;
+  /** Sync stage */
+  syncStage?: InputMaybe<CalendarChannelSyncStageEnumFilter>;
+  /** Sync stage started at */
+  syncStageStartedAt?: InputMaybe<DateFilter>;
+  /** Sync status */
+  syncStatus?: InputMaybe<CalendarChannelSyncStatusEnumFilter>;
   /** Throttle Failure Count */
   throttleFailureCount?: InputMaybe<FloatFilter>;
   /** Update date */
@@ -1194,6 +1216,12 @@ export type CalendarChannelOrderByInput = {
   isSyncEnabled?: InputMaybe<OrderByDirection>;
   /** Sync Cursor. Used for syncing events from the calendar provider */
   syncCursor?: InputMaybe<OrderByDirection>;
+  /** Sync stage */
+  syncStage?: InputMaybe<OrderByDirection>;
+  /** Sync stage started at */
+  syncStageStartedAt?: InputMaybe<OrderByDirection>;
+  /** Sync status */
+  syncStatus?: InputMaybe<OrderByDirection>;
   /** Throttle Failure Count */
   throttleFailureCount?: InputMaybe<OrderByDirection>;
   /** Update date */
@@ -1202,6 +1230,50 @@ export type CalendarChannelOrderByInput = {
   visibility?: InputMaybe<OrderByDirection>;
 };
 
+/** Sync stage */
+export enum CalendarChannelSyncStageEnum {
+  /** Calendar events import ongoing */
+  CalendarEventsImportOngoing = 'CALENDAR_EVENTS_IMPORT_ONGOING',
+  /** Calendar events import pending */
+  CalendarEventsImportPending = 'CALENDAR_EVENTS_IMPORT_PENDING',
+  /** Calendar event list fetch ongoing */
+  CalendarEventListFetchOngoing = 'CALENDAR_EVENT_LIST_FETCH_ONGOING',
+  /** Failed */
+  Failed = 'FAILED',
+  /** Full calendar event list fetch pending */
+  FullCalendarEventListFetchPending = 'FULL_CALENDAR_EVENT_LIST_FETCH_PENDING',
+  /** Partial calendar event list fetch pending */
+  PartialCalendarEventListFetchPending = 'PARTIAL_CALENDAR_EVENT_LIST_FETCH_PENDING'
+}
+
+export type CalendarChannelSyncStageEnumFilter = {
+  eq?: InputMaybe<CalendarChannelSyncStageEnum>;
+  in?: InputMaybe<Array<InputMaybe<CalendarChannelSyncStageEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<CalendarChannelSyncStageEnum>;
+};
+
+/** Sync status */
+export enum CalendarChannelSyncStatusEnum {
+  /** Active */
+  Active = 'ACTIVE',
+  /** Failed Insufficient Permissions */
+  FailedInsufficientPermissions = 'FAILED_INSUFFICIENT_PERMISSIONS',
+  /** Failed Unknown */
+  FailedUnknown = 'FAILED_UNKNOWN',
+  /** Not Synced */
+  NotSynced = 'NOT_SYNCED',
+  /** Ongoing */
+  Ongoing = 'ONGOING'
+}
+
+export type CalendarChannelSyncStatusEnumFilter = {
+  eq?: InputMaybe<CalendarChannelSyncStatusEnum>;
+  in?: InputMaybe<Array<InputMaybe<CalendarChannelSyncStatusEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<CalendarChannelSyncStatusEnum>;
+};
+
 /** Calendar Channels */
 export type CalendarChannelUpdateInput = {
   /** Connected Account id foreign key */
@@ -1218,6 +1290,12 @@ export type CalendarChannelUpdateInput = {
   isSyncEnabled?: InputMaybe<Scalars['Boolean']>;
   /** Sync Cursor. Used for syncing events from the calendar provider */
   syncCursor?: InputMaybe<Scalars['String']>;
+  /** Sync stage */
+  syncStage?: InputMaybe<CalendarChannelSyncStageEnum>;
+  /** Sync stage started at */
+  syncStageStartedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Sync status */
+  syncStatus?: InputMaybe<CalendarChannelSyncStatusEnum>;
   /** Throttle Failure Count */
   throttleFailureCount?: InputMaybe<Scalars['Float']>;
   /** Update date */
@@ -1296,7 +1374,7 @@ export type CalendarEventCalendarChannelEventAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarChannelEventAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarChannelEventAssociationOrderByInput>>>;
 };
 
 
@@ -1308,7 +1386,7 @@ export type CalendarEventCalendarEventParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarEventParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarEventParticipantOrderByInput>>>;
 };
 
 /** Calendar events */
@@ -1645,6 +1723,7 @@ export enum CaptchaDriverType {
 }
 
 export type ClientConfig = {
+  api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
   captcha: Captcha;
@@ -1811,7 +1890,7 @@ export type CompanyActivityTargetsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityTargetOrderByInput>>>;
 };
 
 
@@ -1823,7 +1902,7 @@ export type CompanyAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -1835,7 +1914,7 @@ export type CompanyFavoritesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<FavoriteOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<FavoriteOrderByInput>>>;
 };
 
 
@@ -1847,7 +1926,7 @@ export type CompanyOpportunitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<OpportunityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<OpportunityOrderByInput>>>;
 };
 
 
@@ -1859,7 +1938,7 @@ export type CompanyPeopleArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<PersonOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<PersonOrderByInput>>>;
 };
 
 
@@ -1871,7 +1950,7 @@ export type CompanyTimelineActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<TimelineActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<TimelineActivityOrderByInput>>>;
 };
 
 /** A company */
@@ -2050,7 +2129,7 @@ export type ConnectedAccountCalendarChannelsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarChannelOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarChannelOrderByInput>>>;
 };
 
 
@@ -2062,7 +2141,7 @@ export type ConnectedAccountMessageChannelsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelOrderByInput>>>;
 };
 
 /** A connected account */
@@ -2597,7 +2676,7 @@ export type MessageMessageChannelMessageAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationOrderByInput>>>;
 };
 
 
@@ -2609,7 +2688,7 @@ export type MessageMessageParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageParticipantOrderByInput>>>;
 };
 
 /** Message Channels */
@@ -2659,7 +2738,7 @@ export type MessageChannelMessageChannelMessageAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationOrderByInput>>>;
 };
 
 /** Message Channels */
@@ -3300,7 +3379,7 @@ export type MessageThreadMessageChannelMessageAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationOrderByInput>>>;
 };
 
 
@@ -3312,7 +3391,7 @@ export type MessageThreadMessagesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageOrderByInput>>>;
 };
 
 /** Message Thread */
@@ -3517,7 +3596,9 @@ export type Mutation = {
   deleteWebhooks?: Maybe<Array<Webhook>>;
   deleteWorkspaceMember?: Maybe<WorkspaceMember>;
   deleteWorkspaceMembers?: Maybe<Array<WorkspaceMember>>;
+  disablePostgresProxy: PostgresCredentials;
   emailPasswordResetLink: EmailPasswordResetLink;
+  enablePostgresProxy: PostgresCredentials;
   exchangeAuthorizationCode: ExchangeAuthCode;
   executeQuickActionOnActivity?: Maybe<Activity>;
   executeQuickActionOnActivityTarget?: Maybe<ActivityTarget>;
@@ -3649,288 +3730,344 @@ export type MutationChallengeArgs = {
 
 
 export type MutationCheckoutSessionArgs = {
-  recurringInterval: Scalars['String'];
+  recurringInterval: SubscriptionInterval;
   successUrlPath?: InputMaybe<Scalars['String']>;
 };
 
 
 export type MutationCreateActivitiesArgs = {
   data?: InputMaybe<Array<ActivityCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateActivityArgs = {
   data?: InputMaybe<ActivityCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateActivityTargetArgs = {
   data?: InputMaybe<ActivityTargetCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateActivityTargetsArgs = {
   data?: InputMaybe<Array<ActivityTargetCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateApiKeyArgs = {
   data?: InputMaybe<ApiKeyCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateApiKeysArgs = {
   data?: InputMaybe<Array<ApiKeyCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateAttachmentArgs = {
   data?: InputMaybe<AttachmentCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateAttachmentsArgs = {
   data?: InputMaybe<Array<AttachmentCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateAuditLogArgs = {
   data?: InputMaybe<AuditLogCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateAuditLogsArgs = {
   data?: InputMaybe<Array<AuditLogCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateBlocklistArgs = {
   data?: InputMaybe<BlocklistCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateBlocklistsArgs = {
   data?: InputMaybe<Array<BlocklistCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarChannelArgs = {
   data?: InputMaybe<CalendarChannelCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarChannelEventAssociationArgs = {
   data?: InputMaybe<CalendarChannelEventAssociationCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarChannelEventAssociationsArgs = {
   data?: InputMaybe<Array<CalendarChannelEventAssociationCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarChannelsArgs = {
   data?: InputMaybe<Array<CalendarChannelCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarEventArgs = {
   data?: InputMaybe<CalendarEventCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarEventParticipantArgs = {
   data?: InputMaybe<CalendarEventParticipantCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarEventParticipantsArgs = {
   data?: InputMaybe<Array<CalendarEventParticipantCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCalendarEventsArgs = {
   data?: InputMaybe<Array<CalendarEventCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCommentArgs = {
   data?: InputMaybe<CommentCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCommentsArgs = {
   data?: InputMaybe<Array<CommentCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCompaniesArgs = {
   data?: InputMaybe<Array<CompanyCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateCompanyArgs = {
   data?: InputMaybe<CompanyCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateConnectedAccountArgs = {
   data?: InputMaybe<ConnectedAccountCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateConnectedAccountsArgs = {
   data?: InputMaybe<Array<ConnectedAccountCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateFavoriteArgs = {
   data?: InputMaybe<FavoriteCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateFavoritesArgs = {
   data?: InputMaybe<Array<FavoriteCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageArgs = {
   data?: InputMaybe<MessageCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageChannelArgs = {
   data?: InputMaybe<MessageChannelCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageChannelMessageAssociationArgs = {
   data?: InputMaybe<MessageChannelMessageAssociationCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageChannelMessageAssociationsArgs = {
   data?: InputMaybe<Array<MessageChannelMessageAssociationCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageChannelsArgs = {
   data?: InputMaybe<Array<MessageChannelCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageParticipantArgs = {
   data?: InputMaybe<MessageParticipantCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageParticipantsArgs = {
   data?: InputMaybe<Array<MessageParticipantCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageThreadArgs = {
   data?: InputMaybe<MessageThreadCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessageThreadsArgs = {
   data?: InputMaybe<Array<MessageThreadCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateMessagesArgs = {
   data?: InputMaybe<Array<MessageCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateOpportunitiesArgs = {
   data?: InputMaybe<Array<OpportunityCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateOpportunityArgs = {
   data?: InputMaybe<OpportunityCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreatePeopleArgs = {
   data?: InputMaybe<Array<PersonCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreatePersonArgs = {
   data?: InputMaybe<PersonCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateTimelineActivitiesArgs = {
   data?: InputMaybe<Array<TimelineActivityCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateTimelineActivityArgs = {
   data?: InputMaybe<TimelineActivityCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewArgs = {
   data?: InputMaybe<ViewCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewFieldArgs = {
   data?: InputMaybe<ViewFieldCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewFieldsArgs = {
   data?: InputMaybe<Array<ViewFieldCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewFilterArgs = {
   data?: InputMaybe<ViewFilterCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewFiltersArgs = {
   data?: InputMaybe<Array<ViewFilterCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewSortArgs = {
   data?: InputMaybe<ViewSortCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewSortsArgs = {
   data?: InputMaybe<Array<ViewSortCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateViewsArgs = {
   data?: InputMaybe<Array<ViewCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateWebhookArgs = {
   data?: InputMaybe<WebhookCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateWebhooksArgs = {
   data?: InputMaybe<Array<WebhookCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateWorkspaceMemberArgs = {
   data?: InputMaybe<WorkspaceMemberCreateInput>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
 export type MutationCreateWorkspaceMembersArgs = {
   data?: InputMaybe<Array<WorkspaceMemberCreateInput>>;
+  upsert?: InputMaybe<Scalars['Boolean']>;
 };
 
 
@@ -4803,10 +4940,14 @@ export type ObjectFieldsConnection = {
   pageInfo: PageInfo;
 };
 
-/** Onboarding step */
-export enum OnboardingStep {
+/** Onboarding status */
+export enum OnboardingStatus {
+  Completed = 'COMPLETED',
   InviteTeam = 'INVITE_TEAM',
-  SyncEmail = 'SYNC_EMAIL'
+  PlanRequired = 'PLAN_REQUIRED',
+  ProfileCreation = 'PROFILE_CREATION',
+  SyncEmail = 'SYNC_EMAIL',
+  WorkspaceActivation = 'WORKSPACE_ACTIVATION'
 }
 
 export type OnboardingStepSuccess = {
@@ -4861,7 +5002,7 @@ export type OpportunityActivityTargetsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityTargetOrderByInput>>>;
 };
 
 
@@ -4873,7 +5014,7 @@ export type OpportunityAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -4885,7 +5026,7 @@ export type OpportunityFavoritesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<FavoriteOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<FavoriteOrderByInput>>>;
 };
 
 
@@ -4897,7 +5038,7 @@ export type OpportunityTimelineActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<TimelineActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<TimelineActivityOrderByInput>>>;
 };
 
 /** An opportunity */
@@ -5120,7 +5261,7 @@ export type PersonActivityTargetsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityTargetOrderByInput>>>;
 };
 
 
@@ -5132,7 +5273,7 @@ export type PersonAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -5144,7 +5285,7 @@ export type PersonCalendarEventParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarEventParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarEventParticipantOrderByInput>>>;
 };
 
 
@@ -5156,7 +5297,7 @@ export type PersonFavoritesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<FavoriteOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<FavoriteOrderByInput>>>;
 };
 
 
@@ -5168,7 +5309,7 @@ export type PersonMessageParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageParticipantOrderByInput>>>;
 };
 
 
@@ -5180,7 +5321,7 @@ export type PersonPointOfContactForOpportunitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<OpportunityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<OpportunityOrderByInput>>>;
 };
 
 
@@ -5192,7 +5333,7 @@ export type PersonTimelineActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<TimelineActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<TimelineActivityOrderByInput>>>;
 };
 
 /** A person */
@@ -5332,9 +5473,16 @@ export type PersonUpdateInput = {
   xLink?: InputMaybe<LinkUpdateInput>;
 };
 
+export type PostgresCredentials = {
+  id: Scalars['UUID'];
+  password: Scalars['String'];
+  user: Scalars['String'];
+  workspaceId: Scalars['String'];
+};
+
 export type ProductPriceEntity = {
   created: Scalars['Float'];
-  recurringInterval: Scalars['String'];
+  recurringInterval: SubscriptionInterval;
   stripePriceId: Scalars['String'];
   unitAmount: Scalars['Float'];
 };
@@ -5347,53 +5495,54 @@ export type ProductPricesEntity = {
 export type Query = {
   activities?: Maybe<ActivityConnection>;
   activity?: Maybe<Activity>;
-  activityDuplicates?: Maybe<ActivityConnection>;
+  activityDuplicates?: Maybe<Array<ActivityConnection>>;
   activityTarget?: Maybe<ActivityTarget>;
-  activityTargetDuplicates?: Maybe<ActivityTargetConnection>;
+  activityTargetDuplicates?: Maybe<Array<ActivityTargetConnection>>;
   activityTargets?: Maybe<ActivityTargetConnection>;
   apiKey?: Maybe<ApiKey>;
-  apiKeyDuplicates?: Maybe<ApiKeyConnection>;
+  apiKeyDuplicates?: Maybe<Array<ApiKeyConnection>>;
   apiKeys?: Maybe<ApiKeyConnection>;
   attachment?: Maybe<Attachment>;
-  attachmentDuplicates?: Maybe<AttachmentConnection>;
+  attachmentDuplicates?: Maybe<Array<AttachmentConnection>>;
   attachments?: Maybe<AttachmentConnection>;
   auditLog?: Maybe<AuditLog>;
-  auditLogDuplicates?: Maybe<AuditLogConnection>;
+  auditLogDuplicates?: Maybe<Array<AuditLogConnection>>;
   auditLogs?: Maybe<AuditLogConnection>;
   billingPortalSession: SessionEntity;
   blocklist?: Maybe<Blocklist>;
-  blocklistDuplicates?: Maybe<BlocklistConnection>;
+  blocklistDuplicates?: Maybe<Array<BlocklistConnection>>;
   blocklists?: Maybe<BlocklistConnection>;
   calendarChannel?: Maybe<CalendarChannel>;
-  calendarChannelDuplicates?: Maybe<CalendarChannelConnection>;
+  calendarChannelDuplicates?: Maybe<Array<CalendarChannelConnection>>;
   calendarChannelEventAssociation?: Maybe<CalendarChannelEventAssociation>;
-  calendarChannelEventAssociationDuplicates?: Maybe<CalendarChannelEventAssociationConnection>;
+  calendarChannelEventAssociationDuplicates?: Maybe<Array<CalendarChannelEventAssociationConnection>>;
   calendarChannelEventAssociations?: Maybe<CalendarChannelEventAssociationConnection>;
   calendarChannels?: Maybe<CalendarChannelConnection>;
   calendarEvent?: Maybe<CalendarEvent>;
-  calendarEventDuplicates?: Maybe<CalendarEventConnection>;
+  calendarEventDuplicates?: Maybe<Array<CalendarEventConnection>>;
   calendarEventParticipant?: Maybe<CalendarEventParticipant>;
-  calendarEventParticipantDuplicates?: Maybe<CalendarEventParticipantConnection>;
+  calendarEventParticipantDuplicates?: Maybe<Array<CalendarEventParticipantConnection>>;
   calendarEventParticipants?: Maybe<CalendarEventParticipantConnection>;
   calendarEvents?: Maybe<CalendarEventConnection>;
   checkUserExists: UserExists;
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
   clientConfig: ClientConfig;
   comment?: Maybe<Comment>;
-  commentDuplicates?: Maybe<CommentConnection>;
+  commentDuplicates?: Maybe<Array<CommentConnection>>;
   comments?: Maybe<CommentConnection>;
   companies?: Maybe<CompanyConnection>;
   company?: Maybe<Company>;
-  companyDuplicates?: Maybe<CompanyConnection>;
+  companyDuplicates?: Maybe<Array<CompanyConnection>>;
   connectedAccount?: Maybe<ConnectedAccount>;
-  connectedAccountDuplicates?: Maybe<ConnectedAccountConnection>;
+  connectedAccountDuplicates?: Maybe<Array<ConnectedAccountConnection>>;
   connectedAccounts?: Maybe<ConnectedAccountConnection>;
   currentUser: User;
   currentWorkspace: Workspace;
   favorite?: Maybe<Favorite>;
-  favoriteDuplicates?: Maybe<FavoriteConnection>;
+  favoriteDuplicates?: Maybe<Array<FavoriteConnection>>;
   favorites?: Maybe<FavoriteConnection>;
   findWorkspaceFromInviteHash: Workspace;
+  getPostgresCredentials?: Maybe<PostgresCredentials>;
   getProductPrices: ProductPricesEntity;
   getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
   getTimelineCalendarEventsFromPersonId: TimelineCalendarEventsWithTotal;
@@ -5401,48 +5550,48 @@ export type Query = {
   getTimelineThreadsFromPersonId: TimelineThreadsWithTotal;
   message?: Maybe<Message>;
   messageChannel?: Maybe<MessageChannel>;
-  messageChannelDuplicates?: Maybe<MessageChannelConnection>;
+  messageChannelDuplicates?: Maybe<Array<MessageChannelConnection>>;
   messageChannelMessageAssociation?: Maybe<MessageChannelMessageAssociation>;
-  messageChannelMessageAssociationDuplicates?: Maybe<MessageChannelMessageAssociationConnection>;
+  messageChannelMessageAssociationDuplicates?: Maybe<Array<MessageChannelMessageAssociationConnection>>;
   messageChannelMessageAssociations?: Maybe<MessageChannelMessageAssociationConnection>;
   messageChannels?: Maybe<MessageChannelConnection>;
-  messageDuplicates?: Maybe<MessageConnection>;
+  messageDuplicates?: Maybe<Array<MessageConnection>>;
   messageParticipant?: Maybe<MessageParticipant>;
-  messageParticipantDuplicates?: Maybe<MessageParticipantConnection>;
+  messageParticipantDuplicates?: Maybe<Array<MessageParticipantConnection>>;
   messageParticipants?: Maybe<MessageParticipantConnection>;
   messageThread?: Maybe<MessageThread>;
-  messageThreadDuplicates?: Maybe<MessageThreadConnection>;
+  messageThreadDuplicates?: Maybe<Array<MessageThreadConnection>>;
   messageThreads?: Maybe<MessageThreadConnection>;
   messages?: Maybe<MessageConnection>;
   object: Object;
   objects: ObjectConnection;
   opportunities?: Maybe<OpportunityConnection>;
   opportunity?: Maybe<Opportunity>;
-  opportunityDuplicates?: Maybe<OpportunityConnection>;
+  opportunityDuplicates?: Maybe<Array<OpportunityConnection>>;
   people?: Maybe<PersonConnection>;
   person?: Maybe<Person>;
-  personDuplicates?: Maybe<PersonConnection>;
+  personDuplicates?: Maybe<Array<PersonConnection>>;
   timelineActivities?: Maybe<TimelineActivityConnection>;
   timelineActivity?: Maybe<TimelineActivity>;
-  timelineActivityDuplicates?: Maybe<TimelineActivityConnection>;
+  timelineActivityDuplicates?: Maybe<Array<TimelineActivityConnection>>;
   validatePasswordResetToken: ValidatePasswordResetToken;
   view?: Maybe<View>;
-  viewDuplicates?: Maybe<ViewConnection>;
+  viewDuplicates?: Maybe<Array<ViewConnection>>;
   viewField?: Maybe<ViewField>;
-  viewFieldDuplicates?: Maybe<ViewFieldConnection>;
+  viewFieldDuplicates?: Maybe<Array<ViewFieldConnection>>;
   viewFields?: Maybe<ViewFieldConnection>;
   viewFilter?: Maybe<ViewFilter>;
-  viewFilterDuplicates?: Maybe<ViewFilterConnection>;
+  viewFilterDuplicates?: Maybe<Array<ViewFilterConnection>>;
   viewFilters?: Maybe<ViewFilterConnection>;
   viewSort?: Maybe<ViewSort>;
-  viewSortDuplicates?: Maybe<ViewSortConnection>;
+  viewSortDuplicates?: Maybe<Array<ViewSortConnection>>;
   viewSorts?: Maybe<ViewSortConnection>;
   views?: Maybe<ViewConnection>;
   webhook?: Maybe<Webhook>;
-  webhookDuplicates?: Maybe<WebhookConnection>;
+  webhookDuplicates?: Maybe<Array<WebhookConnection>>;
   webhooks?: Maybe<WebhookConnection>;
   workspaceMember?: Maybe<WorkspaceMember>;
-  workspaceMemberDuplicates?: Maybe<WorkspaceMemberConnection>;
+  workspaceMemberDuplicates?: Maybe<Array<WorkspaceMemberConnection>>;
   workspaceMembers?: Maybe<WorkspaceMemberConnection>;
 };
 
@@ -5454,7 +5603,7 @@ export type QueryActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityOrderByInput>>>;
 };
 
 
@@ -5464,8 +5613,8 @@ export type QueryActivityArgs = {
 
 
 export type QueryActivityDuplicatesArgs = {
-  data?: InputMaybe<ActivityCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ActivityCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5475,8 +5624,8 @@ export type QueryActivityTargetArgs = {
 
 
 export type QueryActivityTargetDuplicatesArgs = {
-  data?: InputMaybe<ActivityTargetCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ActivityTargetCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5487,7 +5636,7 @@ export type QueryActivityTargetsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityTargetOrderByInput>>>;
 };
 
 
@@ -5497,8 +5646,8 @@ export type QueryApiKeyArgs = {
 
 
 export type QueryApiKeyDuplicatesArgs = {
-  data?: InputMaybe<ApiKeyCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ApiKeyCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5509,7 +5658,7 @@ export type QueryApiKeysArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ApiKeyOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ApiKeyOrderByInput>>>;
 };
 
 
@@ -5519,8 +5668,8 @@ export type QueryAttachmentArgs = {
 
 
 export type QueryAttachmentDuplicatesArgs = {
-  data?: InputMaybe<AttachmentCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<AttachmentCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5531,7 +5680,7 @@ export type QueryAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -5541,8 +5690,8 @@ export type QueryAuditLogArgs = {
 
 
 export type QueryAuditLogDuplicatesArgs = {
-  data?: InputMaybe<AuditLogCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<AuditLogCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5553,7 +5702,7 @@ export type QueryAuditLogsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AuditLogOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AuditLogOrderByInput>>>;
 };
 
 
@@ -5568,8 +5717,8 @@ export type QueryBlocklistArgs = {
 
 
 export type QueryBlocklistDuplicatesArgs = {
-  data?: InputMaybe<BlocklistCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<BlocklistCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5580,7 +5729,7 @@ export type QueryBlocklistsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<BlocklistOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<BlocklistOrderByInput>>>;
 };
 
 
@@ -5590,8 +5739,8 @@ export type QueryCalendarChannelArgs = {
 
 
 export type QueryCalendarChannelDuplicatesArgs = {
-  data?: InputMaybe<CalendarChannelCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CalendarChannelCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5601,8 +5750,8 @@ export type QueryCalendarChannelEventAssociationArgs = {
 
 
 export type QueryCalendarChannelEventAssociationDuplicatesArgs = {
-  data?: InputMaybe<CalendarChannelEventAssociationCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CalendarChannelEventAssociationCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5613,7 +5762,7 @@ export type QueryCalendarChannelEventAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarChannelEventAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarChannelEventAssociationOrderByInput>>>;
 };
 
 
@@ -5624,7 +5773,7 @@ export type QueryCalendarChannelsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarChannelOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarChannelOrderByInput>>>;
 };
 
 
@@ -5634,8 +5783,8 @@ export type QueryCalendarEventArgs = {
 
 
 export type QueryCalendarEventDuplicatesArgs = {
-  data?: InputMaybe<CalendarEventCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CalendarEventCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5645,8 +5794,8 @@ export type QueryCalendarEventParticipantArgs = {
 
 
 export type QueryCalendarEventParticipantDuplicatesArgs = {
-  data?: InputMaybe<CalendarEventParticipantCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CalendarEventParticipantCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5657,7 +5806,7 @@ export type QueryCalendarEventParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarEventParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarEventParticipantOrderByInput>>>;
 };
 
 
@@ -5668,7 +5817,7 @@ export type QueryCalendarEventsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarEventOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarEventOrderByInput>>>;
 };
 
 
@@ -5689,8 +5838,8 @@ export type QueryCommentArgs = {
 
 
 export type QueryCommentDuplicatesArgs = {
-  data?: InputMaybe<CommentCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CommentCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5701,7 +5850,7 @@ export type QueryCommentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CommentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CommentOrderByInput>>>;
 };
 
 
@@ -5712,7 +5861,7 @@ export type QueryCompaniesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CompanyOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CompanyOrderByInput>>>;
 };
 
 
@@ -5722,8 +5871,8 @@ export type QueryCompanyArgs = {
 
 
 export type QueryCompanyDuplicatesArgs = {
-  data?: InputMaybe<CompanyCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<CompanyCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5733,8 +5882,8 @@ export type QueryConnectedAccountArgs = {
 
 
 export type QueryConnectedAccountDuplicatesArgs = {
-  data?: InputMaybe<ConnectedAccountCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ConnectedAccountCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5745,7 +5894,7 @@ export type QueryConnectedAccountsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ConnectedAccountOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ConnectedAccountOrderByInput>>>;
 };
 
 
@@ -5755,8 +5904,8 @@ export type QueryFavoriteArgs = {
 
 
 export type QueryFavoriteDuplicatesArgs = {
-  data?: InputMaybe<FavoriteCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<FavoriteCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5767,7 +5916,7 @@ export type QueryFavoritesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<FavoriteOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<FavoriteOrderByInput>>>;
 };
 
 
@@ -5820,8 +5969,8 @@ export type QueryMessageChannelArgs = {
 
 
 export type QueryMessageChannelDuplicatesArgs = {
-  data?: InputMaybe<MessageChannelCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<MessageChannelCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5831,8 +5980,8 @@ export type QueryMessageChannelMessageAssociationArgs = {
 
 
 export type QueryMessageChannelMessageAssociationDuplicatesArgs = {
-  data?: InputMaybe<MessageChannelMessageAssociationCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5843,7 +5992,7 @@ export type QueryMessageChannelMessageAssociationsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationOrderByInput>>>;
 };
 
 
@@ -5854,13 +6003,13 @@ export type QueryMessageChannelsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageChannelOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageChannelOrderByInput>>>;
 };
 
 
 export type QueryMessageDuplicatesArgs = {
-  data?: InputMaybe<MessageCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<MessageCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5870,8 +6019,8 @@ export type QueryMessageParticipantArgs = {
 
 
 export type QueryMessageParticipantDuplicatesArgs = {
-  data?: InputMaybe<MessageParticipantCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<MessageParticipantCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5882,7 +6031,7 @@ export type QueryMessageParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageParticipantOrderByInput>>>;
 };
 
 
@@ -5892,8 +6041,8 @@ export type QueryMessageThreadArgs = {
 
 
 export type QueryMessageThreadDuplicatesArgs = {
-  data?: InputMaybe<MessageThreadCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<MessageThreadCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5904,7 +6053,7 @@ export type QueryMessageThreadsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageThreadOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageThreadOrderByInput>>>;
 };
 
 
@@ -5915,7 +6064,7 @@ export type QueryMessagesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageOrderByInput>>>;
 };
 
 
@@ -5926,7 +6075,7 @@ export type QueryOpportunitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<OpportunityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<OpportunityOrderByInput>>>;
 };
 
 
@@ -5936,8 +6085,8 @@ export type QueryOpportunityArgs = {
 
 
 export type QueryOpportunityDuplicatesArgs = {
-  data?: InputMaybe<OpportunityCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<OpportunityCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5948,7 +6097,7 @@ export type QueryPeopleArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<PersonOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<PersonOrderByInput>>>;
 };
 
 
@@ -5958,8 +6107,8 @@ export type QueryPersonArgs = {
 
 
 export type QueryPersonDuplicatesArgs = {
-  data?: InputMaybe<PersonCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<PersonCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5970,7 +6119,7 @@ export type QueryTimelineActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<TimelineActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<TimelineActivityOrderByInput>>>;
 };
 
 
@@ -5980,8 +6129,8 @@ export type QueryTimelineActivityArgs = {
 
 
 export type QueryTimelineActivityDuplicatesArgs = {
-  data?: InputMaybe<TimelineActivityCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<TimelineActivityCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -5996,8 +6145,8 @@ export type QueryViewArgs = {
 
 
 export type QueryViewDuplicatesArgs = {
-  data?: InputMaybe<ViewCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ViewCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6007,8 +6156,8 @@ export type QueryViewFieldArgs = {
 
 
 export type QueryViewFieldDuplicatesArgs = {
-  data?: InputMaybe<ViewFieldCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ViewFieldCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6019,7 +6168,7 @@ export type QueryViewFieldsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewFieldOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewFieldOrderByInput>>>;
 };
 
 
@@ -6029,8 +6178,8 @@ export type QueryViewFilterArgs = {
 
 
 export type QueryViewFilterDuplicatesArgs = {
-  data?: InputMaybe<ViewFilterCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ViewFilterCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6041,7 +6190,7 @@ export type QueryViewFiltersArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewFilterOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewFilterOrderByInput>>>;
 };
 
 
@@ -6051,8 +6200,8 @@ export type QueryViewSortArgs = {
 
 
 export type QueryViewSortDuplicatesArgs = {
-  data?: InputMaybe<ViewSortCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<ViewSortCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6063,7 +6212,7 @@ export type QueryViewSortsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewSortOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewSortOrderByInput>>>;
 };
 
 
@@ -6074,7 +6223,7 @@ export type QueryViewsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewOrderByInput>>>;
 };
 
 
@@ -6084,8 +6233,8 @@ export type QueryWebhookArgs = {
 
 
 export type QueryWebhookDuplicatesArgs = {
-  data?: InputMaybe<WebhookCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<WebhookCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6096,7 +6245,7 @@ export type QueryWebhooksArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<WebhookOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<WebhookOrderByInput>>>;
 };
 
 
@@ -6106,8 +6255,8 @@ export type QueryWorkspaceMemberArgs = {
 
 
 export type QueryWorkspaceMemberDuplicatesArgs = {
-  data?: InputMaybe<WorkspaceMemberCreateInput>;
-  id?: InputMaybe<Scalars['ID']>;
+  data?: InputMaybe<Array<InputMaybe<WorkspaceMemberCreateInput>>>;
+  ids?: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
 };
 
 
@@ -6118,7 +6267,7 @@ export type QueryWorkspaceMembersArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<WorkspaceMemberOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<WorkspaceMemberOrderByInput>>>;
 };
 
 export type RawJsonFilter = {
@@ -6226,13 +6375,30 @@ export type StringFilter = {
   startsWith?: InputMaybe<Scalars['String']>;
 };
 
+export enum SubscriptionInterval {
+  Day = 'Day',
+  Month = 'Month',
+  Week = 'Week',
+  Year = 'Year'
+}
+
+export enum SubscriptionStatus {
+  Active = 'Active',
+  Canceled = 'Canceled',
+  Incomplete = 'Incomplete',
+  IncompleteExpired = 'IncompleteExpired',
+  PastDue = 'PastDue',
+  Paused = 'Paused',
+  Trialing = 'Trialing',
+  Unpaid = 'Unpaid'
+}
+
 export type Support = {
   supportDriver: Scalars['String'];
   supportFrontChatId?: Maybe<Scalars['String']>;
 };
 
 export type Telemetry = {
-  anonymizationEnabled: Scalars['Boolean'];
   enabled: Scalars['Boolean'];
 };
 
@@ -6534,7 +6700,7 @@ export type User = {
   firstName: Scalars['String'];
   id: Scalars['UUID'];
   lastName: Scalars['String'];
-  onboardingStep?: Maybe<OnboardingStep>;
+  onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']>;
   /** @deprecated field migrated into the AppTokens Table ref: https://github.com/twentyhq/twenty/issues/5021 */
   passwordResetToken?: Maybe<Scalars['String']>;
@@ -6623,7 +6789,7 @@ export type ViewViewFieldsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewFieldOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewFieldOrderByInput>>>;
 };
 
 
@@ -6635,7 +6801,7 @@ export type ViewViewFiltersArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewFilterOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewFilterOrderByInput>>>;
 };
 
 
@@ -6647,7 +6813,7 @@ export type ViewViewSortsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ViewSortOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ViewSortOrderByInput>>>;
 };
 
 /** (System) Views */
@@ -7222,7 +7388,6 @@ export type Workspace = {
   id: Scalars['UUID'];
   inviteHash?: Maybe<Scalars['String']>;
   logo?: Maybe<Scalars['String']>;
-  subscriptionStatus: Scalars['String'];
   updatedAt: Scalars['DateTime'];
 };
 
@@ -7304,7 +7469,7 @@ export type WorkspaceMemberAccountOwnerForCompaniesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CompanyOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CompanyOrderByInput>>>;
 };
 
 
@@ -7316,7 +7481,7 @@ export type WorkspaceMemberAssignedActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityOrderByInput>>>;
 };
 
 
@@ -7328,7 +7493,7 @@ export type WorkspaceMemberAuditLogsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AuditLogOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AuditLogOrderByInput>>>;
 };
 
 
@@ -7340,7 +7505,7 @@ export type WorkspaceMemberAuthoredActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ActivityOrderByInput>>>;
 };
 
 
@@ -7352,7 +7517,7 @@ export type WorkspaceMemberAuthoredAttachmentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<AttachmentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<AttachmentOrderByInput>>>;
 };
 
 
@@ -7364,7 +7529,7 @@ export type WorkspaceMemberAuthoredCommentsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CommentOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CommentOrderByInput>>>;
 };
 
 
@@ -7376,7 +7541,7 @@ export type WorkspaceMemberBlocklistArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<BlocklistOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<BlocklistOrderByInput>>>;
 };
 
 
@@ -7388,7 +7553,7 @@ export type WorkspaceMemberCalendarEventParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<CalendarEventParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<CalendarEventParticipantOrderByInput>>>;
 };
 
 
@@ -7400,7 +7565,7 @@ export type WorkspaceMemberConnectedAccountsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<ConnectedAccountOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<ConnectedAccountOrderByInput>>>;
 };
 
 
@@ -7412,7 +7577,7 @@ export type WorkspaceMemberFavoritesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<FavoriteOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<FavoriteOrderByInput>>>;
 };
 
 
@@ -7424,7 +7589,7 @@ export type WorkspaceMemberMessageParticipantsArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<MessageParticipantOrderByInput>>>;
 };
 
 
@@ -7436,7 +7601,7 @@ export type WorkspaceMemberTimelineActivitiesArgs = {
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   limit?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<TimelineActivityOrderByInput>;
+  orderBy?: InputMaybe<Array<InputMaybe<TimelineActivityOrderByInput>>>;
 };
 
 /** A workspace member */
diff --git a/packages/twenty-front/src/__stories__/App.stories.tsx b/packages/twenty-front/src/__stories__/App.stories.tsx
index 761c64f3bb8..c5314b5652a 100644
--- a/packages/twenty-front/src/__stories__/App.stories.tsx
+++ b/packages/twenty-front/src/__stories__/App.stories.tsx
@@ -13,7 +13,7 @@ import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/Sn
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
 import { App } from '~/App';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedUsersData } from '~/testing/mock-data/users';
+import { mockedUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<typeof App> = {
   title: 'App/App',
@@ -67,9 +67,9 @@ export const DarkMode: Story = {
           return HttpResponse.json({
             data: {
               currentUser: {
-                ...mockedUsersData[0],
+                ...mockedUserData,
                 workspaceMember: {
-                  ...mockedUsersData[0].workspaceMember,
+                  ...mockedUserData.workspaceMember,
                   colorScheme: 'Dark',
                 },
               },
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 7f5c5c4dded..8098afa1420 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -36,6 +36,11 @@ export type Analytics = {
   success: Scalars['Boolean']['output'];
 };
 
+export type ApiConfig = {
+  __typename?: 'ApiConfig';
+  mutationMaximumAffectedRecords: Scalars['Float']['output'];
+};
+
 export type ApiKeyToken = {
   __typename?: 'ApiKeyToken';
   token: Scalars['String']['output'];
@@ -98,8 +103,8 @@ export type Billing = {
 export type BillingSubscription = {
   __typename?: 'BillingSubscription';
   id: Scalars['UUID']['output'];
-  interval?: Maybe<Scalars['String']['output']>;
-  status: Scalars['String']['output'];
+  interval?: Maybe<SubscriptionInterval>;
+  status: SubscriptionStatus;
 };
 
 export type BillingSubscriptionFilter = {
@@ -142,6 +147,7 @@ export enum CaptchaDriverType {
 
 export type ClientConfig = {
   __typename?: 'ClientConfig';
+  api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
   captcha: Captcha;
@@ -398,7 +404,9 @@ export type Mutation = {
   deleteOneRelation: Relation;
   deleteOneRemoteServer: RemoteServer;
   deleteUser: User;
+  disablePostgresProxy: PostgresCredentials;
   emailPasswordResetLink: EmailPasswordResetLink;
+  enablePostgresProxy: PostgresCredentials;
   exchangeAuthorizationCode: ExchangeAuthCode;
   generateApiKeyToken: ApiKeyToken;
   generateJWT: AuthTokens;
@@ -451,7 +459,7 @@ export type MutationChallengeArgs = {
 
 
 export type MutationCheckoutSessionArgs = {
-  recurringInterval: Scalars['String']['input'];
+  recurringInterval: SubscriptionInterval;
   successUrlPath?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -636,10 +644,14 @@ export type ObjectFieldsConnection = {
   pageInfo: PageInfo;
 };
 
-/** Onboarding step */
-export enum OnboardingStep {
+/** Onboarding status */
+export enum OnboardingStatus {
+  Completed = 'COMPLETED',
   InviteTeam = 'INVITE_TEAM',
-  SyncEmail = 'SYNC_EMAIL'
+  PlanRequired = 'PLAN_REQUIRED',
+  ProfileCreation = 'PROFILE_CREATION',
+  SyncEmail = 'SYNC_EMAIL',
+  WorkspaceActivation = 'WORKSPACE_ACTIVATION'
 }
 
 export type OnboardingStepSuccess = {
@@ -660,10 +672,18 @@ export type PageInfo = {
   startCursor?: Maybe<Scalars['ConnectionCursor']['output']>;
 };
 
+export type PostgresCredentials = {
+  __typename?: 'PostgresCredentials';
+  id: Scalars['UUID']['output'];
+  password: Scalars['String']['output'];
+  user: Scalars['String']['output'];
+  workspaceId: Scalars['String']['output'];
+};
+
 export type ProductPriceEntity = {
   __typename?: 'ProductPriceEntity';
   created: Scalars['Float']['output'];
-  recurringInterval: Scalars['String']['output'];
+  recurringInterval: SubscriptionInterval;
   stripePriceId: Scalars['String']['output'];
   unitAmount: Scalars['Float']['output'];
 };
@@ -688,6 +708,7 @@ export type Query = {
   findManyRemoteServersByType: Array<RemoteServer>;
   findOneRemoteServerById: RemoteServer;
   findWorkspaceFromInviteHash: Workspace;
+  getPostgresCredentials?: Maybe<PostgresCredentials>;
   getProductPrices: ProductPricesEntity;
   getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
   getTimelineCalendarEventsFromPersonId: TimelineCalendarEventsWithTotal;
@@ -912,6 +933,24 @@ export enum SortNulls {
   NullsLast = 'NULLS_LAST'
 }
 
+export enum SubscriptionInterval {
+  Day = 'Day',
+  Month = 'Month',
+  Week = 'Week',
+  Year = 'Year'
+}
+
+export enum SubscriptionStatus {
+  Active = 'Active',
+  Canceled = 'Canceled',
+  Incomplete = 'Incomplete',
+  IncompleteExpired = 'IncompleteExpired',
+  PastDue = 'PastDue',
+  Paused = 'Paused',
+  Trialing = 'Trialing',
+  Unpaid = 'Unpaid'
+}
+
 export type Support = {
   __typename?: 'Support';
   supportDriver: Scalars['String']['output'];
@@ -1084,7 +1123,7 @@ export type User = {
   firstName: Scalars['String']['output'];
   id: Scalars['UUID']['output'];
   lastName: Scalars['String']['output'];
-  onboardingStep?: Maybe<OnboardingStep>;
+  onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']['output']>;
   /** @deprecated field migrated into the AppTokens Table ref: https://github.com/twentyhq/twenty/issues/5021 */
   passwordResetToken?: Maybe<Scalars['String']['output']>;
@@ -1163,7 +1202,6 @@ export type Workspace = {
   id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   logo?: Maybe<Scalars['String']['output']>;
-  subscriptionStatus: Scalars['String']['output'];
   updatedAt: Scalars['DateTime']['output'];
 };
 
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index 6b9b154ce7a..124daad290d 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -97,8 +97,8 @@ export type Billing = {
 export type BillingSubscription = {
   __typename?: 'BillingSubscription';
   id: Scalars['UUID'];
-  interval?: Maybe<Scalars['String']>;
-  status: Scalars['String'];
+  interval?: Maybe<SubscriptionInterval>;
+  status: SubscriptionStatus;
 };
 
 export type BillingSubscriptionFilter = {
@@ -347,7 +347,7 @@ export type MutationChallengeArgs = {
 
 
 export type MutationCheckoutSessionArgs = {
-  recurringInterval: Scalars['String'];
+  recurringInterval: SubscriptionInterval;
   successUrlPath?: InputMaybe<Scalars['String']>;
 };
 
@@ -467,10 +467,14 @@ export type ObjectFieldsConnection = {
   pageInfo: PageInfo;
 };
 
-/** Onboarding step */
-export enum OnboardingStep {
+/** Onboarding status */
+export enum OnboardingStatus {
+  Completed = 'COMPLETED',
   InviteTeam = 'INVITE_TEAM',
-  SyncEmail = 'SYNC_EMAIL'
+  PlanRequired = 'PLAN_REQUIRED',
+  ProfileCreation = 'PROFILE_CREATION',
+  SyncEmail = 'SYNC_EMAIL',
+  WorkspaceActivation = 'WORKSPACE_ACTIVATION'
 }
 
 export type OnboardingStepSuccess = {
@@ -502,7 +506,7 @@ export type PostgresCredentials = {
 export type ProductPriceEntity = {
   __typename?: 'ProductPriceEntity';
   created: Scalars['Float'];
-  recurringInterval: Scalars['String'];
+  recurringInterval: SubscriptionInterval;
   stripePriceId: Scalars['String'];
   unitAmount: Scalars['Float'];
 };
@@ -684,6 +688,24 @@ export enum SortNulls {
   NullsLast = 'NULLS_LAST'
 }
 
+export enum SubscriptionInterval {
+  Day = 'Day',
+  Month = 'Month',
+  Week = 'Week',
+  Year = 'Year'
+}
+
+export enum SubscriptionStatus {
+  Active = 'Active',
+  Canceled = 'Canceled',
+  Incomplete = 'Incomplete',
+  IncompleteExpired = 'IncompleteExpired',
+  PastDue = 'PastDue',
+  Paused = 'Paused',
+  Trialing = 'Trialing',
+  Unpaid = 'Unpaid'
+}
+
 export type Support = {
   __typename?: 'Support';
   supportDriver: Scalars['String'];
@@ -827,7 +849,7 @@ export type User = {
   firstName: Scalars['String'];
   id: Scalars['UUID'];
   lastName: Scalars['String'];
-  onboardingStep?: Maybe<OnboardingStep>;
+  onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']>;
   /** @deprecated field migrated into the AppTokens Table ref: https://github.com/twentyhq/twenty/issues/5021 */
   passwordResetToken?: Maybe<Scalars['String']>;
@@ -896,7 +918,6 @@ export type Workspace = {
   id: Scalars['UUID'];
   inviteHash?: Maybe<Scalars['String']>;
   logo?: Maybe<Scalars['String']>;
-  subscriptionStatus: Scalars['String'];
   updatedAt: Scalars['DateTime'];
 };
 
@@ -1156,7 +1177,7 @@ export type ImpersonateMutationVariables = Exact<{
 }>;
 
 
-export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStep?: OnboardingStep | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: string, interval?: string | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type RenewTokenMutationVariables = Exact<{
   appToken: Scalars['String'];
@@ -1188,7 +1209,7 @@ export type VerifyMutationVariables = Exact<{
 }>;
 
 
-export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStep?: OnboardingStep | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: string, interval?: string | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type CheckUserExistsQueryVariables = Exact<{
   email: Scalars['String'];
@@ -1213,7 +1234,7 @@ export type BillingPortalSessionQueryVariables = Exact<{
 export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'SessionEntity', url?: string | null } };
 
 export type CheckoutSessionMutationVariables = Exact<{
-  recurringInterval: Scalars['String'];
+  recurringInterval: SubscriptionInterval;
   successUrlPath?: InputMaybe<Scalars['String']>;
 }>;
 
@@ -1225,7 +1246,7 @@ export type GetProductPricesQueryVariables = Exact<{
 }>;
 
 
-export type GetProductPricesQuery = { __typename?: 'Query', getProductPrices: { __typename?: 'ProductPricesEntity', productPrices: Array<{ __typename?: 'ProductPriceEntity', created: number, recurringInterval: string, stripePriceId: string, unitAmount: number }> } };
+export type GetProductPricesQuery = { __typename?: 'Query', getProductPrices: { __typename?: 'ProductPricesEntity', productPrices: Array<{ __typename?: 'ProductPriceEntity', created: number, recurringInterval: SubscriptionInterval, stripePriceId: string, unitAmount: number }> } };
 
 export type UpdateBillingSubscriptionMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -1242,7 +1263,7 @@ export type SkipSyncEmailOnboardingStepMutationVariables = Exact<{ [key: string]
 
 export type SkipSyncEmailOnboardingStepMutation = { __typename?: 'Mutation', skipSyncEmailOnboardingStep: { __typename?: 'OnboardingStepSuccess', success: boolean } };
 
-export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStep?: OnboardingStep | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: string, interval?: string | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
 
 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -1259,7 +1280,7 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStep?: OnboardingStep | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: string, interval?: string | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
 
 export type AddUserToWorkspaceMutationVariables = Exact<{
   inviteHash: Scalars['String'];
@@ -1292,7 +1313,7 @@ export type UpdateWorkspaceMutationVariables = Exact<{
 }>;
 
 
-export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: any, domainName?: string | null, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, subscriptionStatus: string } };
+export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: any, domainName?: string | null, displayName?: string | null, logo?: string | null, allowImpersonation: boolean } };
 
 export type UploadWorkspaceLogoMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -1403,7 +1424,7 @@ export const UserQueryFragmentFragmentDoc = gql`
   email
   canImpersonate
   supportUserHash
-  onboardingStep
+  onboardingStatus
   workspaceMember {
     id
     name {
@@ -1421,7 +1442,6 @@ export const UserQueryFragmentFragmentDoc = gql`
     domainName
     inviteHash
     allowImpersonation
-    subscriptionStatus
     activationStatus
     featureFlags {
       id
@@ -2221,7 +2241,7 @@ export type BillingPortalSessionQueryHookResult = ReturnType<typeof useBillingPo
 export type BillingPortalSessionLazyQueryHookResult = ReturnType<typeof useBillingPortalSessionLazyQuery>;
 export type BillingPortalSessionQueryResult = Apollo.QueryResult<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>;
 export const CheckoutSessionDocument = gql`
-    mutation CheckoutSession($recurringInterval: String!, $successUrlPath: String) {
+    mutation CheckoutSession($recurringInterval: SubscriptionInterval!, $successUrlPath: String) {
   checkoutSession(
     recurringInterval: $recurringInterval
     successUrlPath: $successUrlPath
@@ -2663,7 +2683,6 @@ export const UpdateWorkspaceDocument = gql`
     displayName
     logo
     allowImpersonation
-    subscriptionStatus
   }
 }
     `;
diff --git a/packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts b/packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts
index 1d2834937e3..709c071cce7 100644
--- a/packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts
+++ b/packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts
@@ -7,7 +7,7 @@ import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMet
 import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
 import { AppPath } from '@/types/AppPath';
 import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
-import { mockedUsersData } from '~/testing/mock-data/users';
+import { mockedUserData } from '~/testing/mock-data/users';
 
 const objectMetadataItem = getObjectMetadataItemsMock()[0];
 jest.mock('@/object-metadata/hooks/useObjectMetadataItem');
@@ -36,7 +36,7 @@ const renderHooks = (withCurrentUser: boolean) => {
     () => {
       const setCurrentUser = useSetRecoilState(currentUserState);
       if (withCurrentUser) {
-        setCurrentUser(mockedUsersData[0]);
+        setCurrentUser(mockedUserData);
       }
       return useDefaultHomePagePath();
     },
diff --git a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
index cf9a7730cd9..327e940ac3a 100644
--- a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
+++ b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
@@ -1,15 +1,26 @@
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
+import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
 import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 
-jest.mock('@/auth/hooks/useOnboardingStatus');
-const setupMockOnboardingStatus = (onboardingStatus: OnboardingStatus) => {
+jest.mock('@/onboarding/hooks/useOnboardingStatus');
+const setupMockOnboardingStatus = (
+  onboardingStatus: OnboardingStatus | undefined,
+) => {
   jest.mocked(useOnboardingStatus).mockReturnValueOnce(onboardingStatus);
 };
 
+jest.mock('@/workspace/hooks/useSubscriptionStatus');
+const setupMockSubscriptionStatus = (
+  subscriptionStatus: SubscriptionStatus | undefined,
+) => {
+  jest.mocked(useSubscriptionStatus).mockReturnValueOnce(subscriptionStatus);
+};
+
 jest.mock('~/hooks/useIsMatchingLocation');
 const mockUseIsMatchingLocation = jest.mocked(useIsMatchingLocation);
 
@@ -19,281 +30,276 @@ const setupMockIsMatchingLocation = (pathname: string) => {
   );
 };
 
+jest.mock('@/auth/hooks/useIsLogged');
+const setupMockIsLogged = (isLogged: boolean) => {
+  jest.mocked(useIsLogged).mockReturnValueOnce(isLogged);
+};
+
 const defaultHomePagePath = '/objects/companies';
 
 jest.mock('~/hooks/useDefaultHomePagePath');
 jest.mocked(useDefaultHomePagePath).mockReturnValue({
-  defaultHomePagePath: '/objects/companies',
+  defaultHomePagePath,
 });
 
 // prettier-ignore
 const testCases = [
-  { loc: AppPath.Verify, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.Verify, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.Verify, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.Verify, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Verify, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.Verify, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.Verify, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.SignInUp, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.Invite, status: OnboardingStatus.Incomplete, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.Unpaid, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingProfileCreation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingSyncEmail, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingInviteTeam, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Incomplete, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Unpaid, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingProfileCreation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingSyncEmail, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingInviteTeam, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingProfileCreation, res: undefined },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.CreateProfile, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingSyncEmail, res: undefined },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.SyncEmails, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingInviteTeam, res: undefined },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.InviteTeam, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Incomplete, res: undefined },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Unpaid, res: undefined },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.PlanRequired, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.Index, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.Index, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.Index, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.Index, status: OnboardingStatus.PastDue, res: defaultHomePagePath },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Index, status: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.Index, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
+  { loc: AppPath.Index, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
 
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.TasksPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.RecordShowPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Unpaid, res: undefined },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Impersonate, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.Impersonate, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.Authorize, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.Authorize, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Authorize, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Authorize, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 
-  { loc: AppPath.NotFound, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Canceled, res: '/settings/billing' },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
-  { loc: AppPath.NotFound, status: OnboardingStatus.PastDue, res: undefined },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingUserCreation, res: AppPath.SignInUp },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.NotFound, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.NotFound, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
 ];
 
 describe('usePageChangeEffectNavigateLocation', () => {
   testCases.forEach((testCase) => {
-    it(`with location ${testCase.loc} and onboardingStatus ${testCase.status} should return ${testCase.res}`, () => {
+    it(`with location ${testCase.loc} and onboardingStatus ${testCase.onboardingStatus} and subscriptionStatus ${testCase.subscriptionStatus} should return ${testCase.res}`, () => {
       setupMockIsMatchingLocation(testCase.loc);
-      setupMockOnboardingStatus(testCase.status);
+      setupMockOnboardingStatus(testCase.onboardingStatus);
+      setupMockSubscriptionStatus(testCase.subscriptionStatus);
+      setupMockIsLogged(testCase.isLoggedIn);
       expect(usePageChangeEffectNavigateLocation()).toEqual(testCase.res);
     });
   });
 
   describe('tests should be exhaustive', () => {
     it('all location and onboarding status should be tested', () => {
+      const untestedSubscriptionStatus = [
+        SubscriptionStatus.Incomplete,
+        SubscriptionStatus.IncompleteExpired,
+        SubscriptionStatus.Paused,
+        SubscriptionStatus.Trialing,
+      ];
       expect(testCases.length).toEqual(
-        Object.keys(AppPath).length * Object.keys(OnboardingStatus).length,
+        Object.keys(AppPath).length *
+          (Object.keys(OnboardingStatus).length +
+            (Object.keys(SubscriptionStatus).length -
+              untestedSubscriptionStatus.length)),
       );
     });
   });
diff --git a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
index 5b34f0771ed..5492b7b988a 100644
--- a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
+++ b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
@@ -1,14 +1,18 @@
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
+import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
 import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { isDefined } from '~/utils/isDefined';
 
 export const usePageChangeEffectNavigateLocation = () => {
   const isMatchingLocation = useIsMatchingLocation();
+  const isLoggedIn = useIsLogged();
   const onboardingStatus = useOnboardingStatus();
+  const subscriptionStatus = useSubscriptionStatus();
   const { defaultHomePagePath } = useDefaultHomePagePath();
 
   const isMatchingOpenRoute =
@@ -33,25 +37,28 @@ export const usePageChangeEffectNavigateLocation = () => {
     return;
   }
 
-  if (
-    onboardingStatus === OnboardingStatus.OngoingUserCreation &&
-    !isMatchingOngoingUserCreationRoute
-  ) {
+  if (!isLoggedIn && !isMatchingOngoingUserCreationRoute) {
     return AppPath.SignInUp;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.Incomplete &&
+    onboardingStatus === OnboardingStatus.PlanRequired &&
     !isMatchingLocation(AppPath.PlanRequired)
   ) {
     return AppPath.PlanRequired;
   }
 
   if (
-    isDefined(onboardingStatus) &&
-    [OnboardingStatus.Unpaid, OnboardingStatus.Canceled].includes(
-      onboardingStatus,
-    ) &&
+    subscriptionStatus === SubscriptionStatus.Unpaid &&
+    !isMatchingLocation(AppPath.SettingsCatchAll)
+  ) {
+    return `${AppPath.SettingsCatchAll.replace('/*', '')}/${
+      SettingsPath.Billing
+    }`;
+  }
+
+  if (
+    subscriptionStatus === SubscriptionStatus.Canceled &&
     !(
       isMatchingLocation(AppPath.SettingsCatchAll) ||
       isMatchingLocation(AppPath.PlanRequired)
@@ -63,7 +70,7 @@ export const usePageChangeEffectNavigateLocation = () => {
   }
 
   if (
-    onboardingStatus === OnboardingStatus.OngoingWorkspaceActivation &&
+    onboardingStatus === OnboardingStatus.WorkspaceActivation &&
     !isMatchingLocation(AppPath.CreateWorkspace) &&
     !isMatchingLocation(AppPath.PlanRequiredSuccess)
   ) {
@@ -71,21 +78,21 @@ export const usePageChangeEffectNavigateLocation = () => {
   }
 
   if (
-    onboardingStatus === OnboardingStatus.OngoingProfileCreation &&
+    onboardingStatus === OnboardingStatus.ProfileCreation &&
     !isMatchingLocation(AppPath.CreateProfile)
   ) {
     return AppPath.CreateProfile;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.OngoingSyncEmail &&
+    onboardingStatus === OnboardingStatus.SyncEmail &&
     !isMatchingLocation(AppPath.SyncEmails)
   ) {
     return AppPath.SyncEmails;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.OngoingInviteTeam &&
+    onboardingStatus === OnboardingStatus.InviteTeam &&
     !isMatchingLocation(AppPath.InviteTeam)
   ) {
     return AppPath.InviteTeam;
@@ -93,15 +100,9 @@ export const usePageChangeEffectNavigateLocation = () => {
 
   if (
     onboardingStatus === OnboardingStatus.Completed &&
-    isMatchingOnboardingRoute
-  ) {
-    return defaultHomePagePath;
-  }
-
-  if (
-    onboardingStatus === OnboardingStatus.CompletedWithoutSubscription &&
     isMatchingOnboardingRoute &&
-    !isMatchingLocation(AppPath.PlanRequired)
+    subscriptionStatus !== SubscriptionStatus.Canceled &&
+    (isDefined(subscriptionStatus) || !isMatchingLocation(AppPath.PlanRequired))
   ) {
     return defaultHomePagePath;
   }
diff --git a/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx b/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
index 15c18390f69..ac5a371869b 100644
--- a/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
+++ b/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
@@ -14,7 +14,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks, metadataGraphql } from '~/testing/graphqlMocks';
 import { mockedClientConfig } from '~/testing/mock-data/config';
-import { mockedUsersData } from '~/testing/mock-data/users';
+import { mockedUserData } from '~/testing/mock-data/users';
 
 const userMetadataLoaderMocks = {
   msw: {
@@ -22,7 +22,7 @@ const userMetadataLoaderMocks = {
       graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
         return HttpResponse.json({
           data: {
-            currentUser: mockedUsersData[0],
+            currentUser: mockedUserData,
           },
         });
       }),
diff --git a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
deleted file mode 100644
index 13d8e23fdaf..00000000000
--- a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
+++ /dev/null
@@ -1,373 +0,0 @@
-import { act } from 'react-dom/test-utils';
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot, useSetRecoilState } from 'recoil';
-
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { CurrentUser, currentUserState } from '@/auth/states/currentUserState';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import {
-  CurrentWorkspace,
-  currentWorkspaceState,
-} from '@/auth/states/currentWorkspaceState';
-import { isVerifyPendingState } from '@/auth/states/isVerifyPendingState';
-import { tokenPairState } from '@/auth/states/tokenPairState';
-import { billingState } from '@/client-config/states/billingState';
-import { OnboardingStep } from '~/generated/graphql';
-
-const tokenPair = {
-  accessToken: { token: 'accessToken', expiresAt: 'expiresAt' },
-  refreshToken: { token: 'refreshToken', expiresAt: 'expiresAt' },
-};
-const billing = {
-  billingUrl: 'testing.com',
-  isBillingEnabled: true,
-};
-const currentUser = {
-  id: '1',
-  email: 'test@test',
-  supportUserHash: '1',
-  canImpersonate: false,
-  onboardingStep: null,
-} as CurrentUser;
-const currentWorkspace = {
-  activationStatus: 'active',
-  id: '1',
-  allowImpersonation: true,
-  currentBillingSubscription: {
-    status: 'trialing',
-  },
-} as CurrentWorkspace;
-const currentWorkspaceMember = {
-  id: '1',
-  locale: '',
-  name: {
-    firstName: '',
-    lastName: '',
-  },
-};
-
-const renderHooks = () => {
-  const { result } = renderHook(
-    () => {
-      const onboardingStatus = useOnboardingStatus();
-      const setBilling = useSetRecoilState(billingState);
-      const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
-      const setCurrentWorkspaceMember = useSetRecoilState(
-        currentWorkspaceMemberState,
-      );
-      const setCurrentUser = useSetRecoilState(currentUserState);
-      const setTokenPair = useSetRecoilState(tokenPairState);
-      const setVerifyPending = useSetRecoilState(isVerifyPendingState);
-
-      return {
-        onboardingStatus,
-        setBilling,
-        setCurrentUser,
-        setCurrentWorkspace,
-        setCurrentWorkspaceMember,
-        setTokenPair,
-        setVerifyPending,
-      };
-    },
-    {
-      wrapper: RecoilRoot,
-    },
-  );
-  return { result };
-};
-
-describe('useOnboardingStatus', () => {
-  it('should return "ongoing_user_creation" when user is not logged in', async () => {
-    const { result } = renderHooks();
-
-    expect(result.current.onboardingStatus).toBe('ongoing_user_creation');
-  });
-
-  it('should return "incomplete"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'incomplete',
-      });
-      setCurrentWorkspaceMember(currentWorkspaceMember);
-    });
-
-    expect(result.current.onboardingStatus).toBe('incomplete');
-  });
-
-  it('should return "canceled"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'canceled',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('canceled');
-  });
-
-  it('should return "ongoing_workspace_activation"', async () => {
-    const { result } = renderHooks();
-    const { setTokenPair, setBilling, setCurrentUser, setCurrentWorkspace } =
-      result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        activationStatus: 'inactive',
-        subscriptionStatus: 'active',
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe(
-      'ongoing_workspace_activation',
-    );
-  });
-
-  it('should return "ongoing_profile_creation"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'active',
-      });
-      setCurrentWorkspaceMember(currentWorkspaceMember);
-    });
-
-    expect(result.current.onboardingStatus).toBe('ongoing_profile_creation');
-  });
-
-  it('should return "ongoing_sync_email"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser({
-        ...currentUser,
-        onboardingStep: OnboardingStep.SyncEmail,
-      });
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'active',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('ongoing_sync_email');
-  });
-
-  it('should return "ongoing_invite_team"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser({
-        ...currentUser,
-        onboardingStep: OnboardingStep.InviteTeam,
-      });
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'active',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('ongoing_invite_team');
-  });
-
-  it('should return "completed"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'active',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('completed');
-  });
-
-  it('should return "past_due"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'past_due',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('past_due');
-  });
-
-  it('should return "unpaid"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'unpaid',
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe('unpaid');
-  });
-
-  it('should return "completed_without_subscription"', async () => {
-    const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentUser,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
-
-    act(() => {
-      setTokenPair(tokenPair);
-      setBilling(billing);
-      setCurrentUser(currentUser);
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subscriptionStatus: 'trialing',
-        currentBillingSubscription: null,
-      });
-      setCurrentWorkspaceMember({
-        ...currentWorkspaceMember,
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      });
-    });
-
-    expect(result.current.onboardingStatus).toBe(
-      'completed_without_subscription',
-    );
-  });
-});
diff --git a/packages/twenty-front/src/modules/auth/hooks/useOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/hooks/useOnboardingStatus.ts
deleted file mode 100644
index b638b19da85..00000000000
--- a/packages/twenty-front/src/modules/auth/hooks/useOnboardingStatus.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { currentUserState } from '@/auth/states/currentUserState';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { billingState } from '@/client-config/states/billingState';
-
-import { useIsLogged } from '../hooks/useIsLogged';
-import {
-  getOnboardingStatus,
-  OnboardingStatus,
-} from '../utils/getOnboardingStatus';
-
-export const useOnboardingStatus = (): OnboardingStatus | undefined => {
-  const billing = useRecoilValue(billingState);
-  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-  const currentUser = useRecoilValue(currentUserState);
-  const isLoggedIn = useIsLogged();
-
-  return getOnboardingStatus({
-    isLoggedIn,
-    currentWorkspaceMember,
-    currentWorkspace,
-    currentUser,
-    isBillingEnabled: billing?.isBillingEnabled || false,
-  });
-};
diff --git a/packages/twenty-front/src/modules/auth/states/currentUserState.ts b/packages/twenty-front/src/modules/auth/states/currentUserState.ts
index 07efc7dfb1e..2aab02507ff 100644
--- a/packages/twenty-front/src/modules/auth/states/currentUserState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentUserState.ts
@@ -4,7 +4,7 @@ import { User } from '~/generated/graphql';
 
 export type CurrentUser = Pick<
   User,
-  'id' | 'email' | 'supportUserHash' | 'canImpersonate' | 'onboardingStep'
+  'id' | 'email' | 'supportUserHash' | 'canImpersonate' | 'onboardingStatus'
 >;
 
 export const currentUserState = createState<CurrentUser | null>({
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
index c9187c3ea69..239dfc79304 100644
--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
@@ -10,7 +10,6 @@ export type CurrentWorkspace = Pick<
   | 'displayName'
   | 'allowImpersonation'
   | 'featureFlags'
-  | 'subscriptionStatus'
   | 'activationStatus'
   | 'currentBillingSubscription'
   | 'currentCacheVersion'
diff --git a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
deleted file mode 100644
index 813e9b38299..00000000000
--- a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { CurrentUser } from '@/auth/states/currentUserState';
-import { CurrentWorkspace } from '@/auth/states/currentWorkspaceState';
-import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
-import { OnboardingStep } from '~/generated/graphql';
-
-import { getOnboardingStatus } from '../getOnboardingStatus';
-
-describe('getOnboardingStatus', () => {
-  it('should return the correct status', () => {
-    const ongoingUserCreation = getOnboardingStatus({
-      isLoggedIn: false,
-      currentWorkspaceMember: null,
-      currentWorkspace: null,
-      currentUser: null,
-      isBillingEnabled: false,
-    });
-
-    const ongoingWorkspaceActivation = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: null,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'inactive',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const ongoingProfileCreation = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {},
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const ongoingSyncEmail = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: OnboardingStep.SyncEmail,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const ongoingInviteTeam = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: OnboardingStep.InviteTeam,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const completed = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const incomplete = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-        subscriptionStatus: 'incomplete',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: true,
-    });
-
-    const incompleteButBillingDisabled = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-        subscriptionStatus: 'incomplete',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: false,
-    });
-
-    const canceled = getOnboardingStatus({
-      isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
-      currentWorkspace: {
-        id: '1',
-        activationStatus: 'active',
-        subscriptionStatus: 'canceled',
-      } as CurrentWorkspace,
-      currentUser: {
-        onboardingStep: null,
-      } as CurrentUser,
-      isBillingEnabled: true,
-    });
-
-    expect(ongoingUserCreation).toBe('ongoing_user_creation');
-    expect(ongoingWorkspaceActivation).toBe('ongoing_workspace_activation');
-    expect(ongoingProfileCreation).toBe('ongoing_profile_creation');
-    expect(ongoingSyncEmail).toBe('ongoing_sync_email');
-    expect(ongoingInviteTeam).toBe('ongoing_invite_team');
-    expect(completed).toBe('completed');
-    expect(incomplete).toBe('incomplete');
-    expect(canceled).toBe('canceled');
-    expect(incompleteButBillingDisabled).toBe('completed');
-  });
-});
diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
deleted file mode 100644
index 0dc25470522..00000000000
--- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { CurrentUser } from '@/auth/states/currentUserState';
-import { CurrentWorkspace } from '@/auth/states/currentWorkspaceState';
-import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
-import { OnboardingStep } from '~/generated/graphql';
-
-export enum OnboardingStatus {
-  Incomplete = 'incomplete',
-  Canceled = 'canceled',
-  Unpaid = 'unpaid',
-  PastDue = 'past_due',
-  OngoingUserCreation = 'ongoing_user_creation',
-  OngoingWorkspaceActivation = 'ongoing_workspace_activation',
-  OngoingProfileCreation = 'ongoing_profile_creation',
-  OngoingSyncEmail = 'ongoing_sync_email',
-  OngoingInviteTeam = 'ongoing_invite_team',
-  Completed = 'completed',
-  CompletedWithoutSubscription = 'completed_without_subscription',
-}
-
-export const getOnboardingStatus = ({
-  isLoggedIn,
-  currentWorkspaceMember,
-  currentWorkspace,
-  currentUser,
-  isBillingEnabled,
-}: {
-  isLoggedIn: boolean;
-  currentWorkspaceMember: Omit<
-    WorkspaceMember,
-    'createdAt' | 'updatedAt' | 'userId' | 'userEmail' | '__typename'
-  > | null;
-  currentWorkspace: CurrentWorkspace | null;
-  currentUser: CurrentUser | null;
-  isBillingEnabled: boolean;
-}) => {
-  if (!isLoggedIn) {
-    return OnboardingStatus.OngoingUserCreation;
-  }
-
-  // After SignInUp, the user should have a current workspace assigned.
-  // If not, it indicates that the data is still being requested.
-  if (!currentWorkspace || !currentUser) {
-    return undefined;
-  }
-
-  if (
-    isBillingEnabled &&
-    currentWorkspace.subscriptionStatus === 'incomplete'
-  ) {
-    return OnboardingStatus.Incomplete;
-  }
-
-  if (currentWorkspace.activationStatus !== 'active') {
-    return OnboardingStatus.OngoingWorkspaceActivation;
-  }
-
-  if (
-    !currentWorkspaceMember?.name.firstName ||
-    !currentWorkspaceMember?.name.lastName
-  ) {
-    return OnboardingStatus.OngoingProfileCreation;
-  }
-
-  if (currentUser.onboardingStep === OnboardingStep.SyncEmail) {
-    return OnboardingStatus.OngoingSyncEmail;
-  }
-
-  if (currentUser.onboardingStep === OnboardingStep.InviteTeam) {
-    return OnboardingStatus.OngoingInviteTeam;
-  }
-
-  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'canceled') {
-    return OnboardingStatus.Canceled;
-  }
-
-  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'past_due') {
-    return OnboardingStatus.PastDue;
-  }
-
-  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'unpaid') {
-    return OnboardingStatus.Unpaid;
-  }
-
-  if (isBillingEnabled && !currentWorkspace.currentBillingSubscription) {
-    return OnboardingStatus.CompletedWithoutSubscription;
-  }
-
-  return OnboardingStatus.Completed;
-};
diff --git a/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts b/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts
index bff619a82f8..53821543cef 100644
--- a/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts
+++ b/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts
@@ -2,7 +2,7 @@ import { gql } from '@apollo/client';
 
 export const CHECKOUT_SESSION = gql`
   mutation CheckoutSession(
-    $recurringInterval: String!
+    $recurringInterval: SubscriptionInterval!
     $successUrlPath: String
   ) {
     checkoutSession(
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useOnboardingStatus.test.ts b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useOnboardingStatus.test.ts
new file mode 100644
index 00000000000..3aaf6449502
--- /dev/null
+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useOnboardingStatus.test.ts
@@ -0,0 +1,61 @@
+import { act } from 'react-dom/test-utils';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { CurrentUser, currentUserState } from '@/auth/states/currentUserState';
+import { tokenPairState } from '@/auth/states/tokenPairState';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
+import { OnboardingStatus } from '~/generated/graphql';
+
+const tokenPair = {
+  accessToken: { token: 'accessToken', expiresAt: 'expiresAt' },
+  refreshToken: { token: 'refreshToken', expiresAt: 'expiresAt' },
+};
+const currentUser = {
+  id: '1',
+  onboardingStatus: null,
+} as CurrentUser;
+
+const renderHooks = () => {
+  const { result } = renderHook(
+    () => {
+      const onboardingStatus = useOnboardingStatus();
+      const setCurrentUser = useSetRecoilState(currentUserState);
+      const setTokenPair = useSetRecoilState(tokenPairState);
+
+      return {
+        onboardingStatus,
+        setCurrentUser,
+        setTokenPair,
+      };
+    },
+    {
+      wrapper: RecoilRoot,
+    },
+  );
+  return { result };
+};
+
+describe('useOnboardingStatus', () => {
+  it(`should return "undefined" when user is not logged in`, async () => {
+    const { result } = renderHooks();
+    expect(result.current.onboardingStatus).toBe(undefined);
+  });
+
+  Object.values(OnboardingStatus).forEach((onboardingStatus) => {
+    it(`should return "${onboardingStatus}"`, async () => {
+      const { result } = renderHooks();
+      const { setTokenPair, setCurrentUser } = result.current;
+
+      act(() => {
+        setTokenPair(tokenPair);
+        setCurrentUser({
+          ...currentUser,
+          onboardingStatus,
+        });
+      });
+
+      expect(result.current.onboardingStatus).toBe(onboardingStatus);
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts
new file mode 100644
index 00000000000..223370bce72
--- /dev/null
+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts
@@ -0,0 +1,87 @@
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useRecoilState, useSetRecoilState } from 'recoil';
+import { v4 } from 'uuid';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
+import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
+import {
+  mockDefaultWorkspace,
+  mockedUserData,
+} from '~/testing/mock-data/users';
+
+jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
+  useFindManyRecords: jest.fn(),
+}));
+const setupMockWorkspaceMembers = (withManyWorkspaceMembers = false) => {
+  jest
+    .requireMock('@/object-record/hooks/useFindManyRecords')
+    .useFindManyRecords.mockReturnValue({
+      records: withManyWorkspaceMembers ? [{}, {}] : [{}],
+    });
+};
+
+const renderHooks = (
+  onboardingStatus: OnboardingStatus,
+  withCurrentBillingSubscription: boolean,
+) => {
+  const { result } = renderHook(
+    () => {
+      const [currentUser, setCurrentUser] = useRecoilState(currentUserState);
+      const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+      const setNextOnboardingStatus = useSetNextOnboardingStatus();
+      return {
+        currentUser,
+        setCurrentUser,
+        setCurrentWorkspace,
+        setNextOnboardingStatus,
+      };
+    },
+    {
+      wrapper: RecoilRoot,
+    },
+  );
+  act(() => {
+    result.current.setCurrentUser({ ...mockedUserData, onboardingStatus });
+    result.current.setCurrentWorkspace({
+      ...mockDefaultWorkspace,
+      currentBillingSubscription: withCurrentBillingSubscription
+        ? { id: v4(), status: SubscriptionStatus.Active }
+        : undefined,
+    });
+  });
+  act(() => {
+    result.current.setNextOnboardingStatus();
+  });
+  return result.current.currentUser?.onboardingStatus;
+};
+
+describe('useSetNextOnboardingStatus', () => {
+  it('should set next onboarding status for ProfileCreation', () => {
+    setupMockWorkspaceMembers();
+    const nextOnboardingStatus = renderHooks(
+      OnboardingStatus.ProfileCreation,
+      false,
+    );
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.SyncEmail);
+  });
+
+  it('should set next onboarding status for SyncEmail', () => {
+    setupMockWorkspaceMembers();
+    const nextOnboardingStatus = renderHooks(OnboardingStatus.SyncEmail, false);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.InviteTeam);
+  });
+
+  it('should skip invite when workspaceMembers exist', () => {
+    setupMockWorkspaceMembers(true);
+    const nextOnboardingStatus = renderHooks(OnboardingStatus.SyncEmail, true);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.Completed);
+  });
+
+  it('should set next onboarding status for Completed', () => {
+    setupMockWorkspaceMembers();
+    const nextOnboardingStatus = renderHooks(OnboardingStatus.InviteTeam, true);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.Completed);
+  });
+});
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStatus.ts b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStatus.ts
new file mode 100644
index 00000000000..28bef7fd4a5
--- /dev/null
+++ b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStatus.ts
@@ -0,0 +1,9 @@
+import { useRecoilValue } from 'recoil';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { OnboardingStatus } from '~/generated/graphql';
+
+export const useOnboardingStatus = (): OnboardingStatus | null | undefined => {
+  const currentUser = useRecoilValue(currentUserState);
+  return currentUser?.onboardingStatus;
+};
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts
new file mode 100644
index 00000000000..30a5f2fae8d
--- /dev/null
+++ b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts
@@ -0,0 +1,51 @@
+import { useRecoilCallback, useRecoilValue } from 'recoil';
+
+import { CurrentUser, currentUserState } from '@/auth/states/currentUserState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
+import { OnboardingStatus } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+const getNextOnboardingStatus = (
+  currentUser: CurrentUser | null,
+  workspaceMembers: WorkspaceMember[],
+) => {
+  if (currentUser?.onboardingStatus === OnboardingStatus.ProfileCreation) {
+    return OnboardingStatus.SyncEmail;
+  }
+  if (
+    currentUser?.onboardingStatus === OnboardingStatus.SyncEmail &&
+    workspaceMembers.length === 1
+  ) {
+    return OnboardingStatus.InviteTeam;
+  }
+  return OnboardingStatus.Completed;
+};
+
+export const useSetNextOnboardingStatus = () => {
+  const { records: workspaceMembers } = useFindManyRecords<WorkspaceMember>({
+    objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
+  });
+  const currentUser = useRecoilValue(currentUserState);
+
+  return useRecoilCallback(
+    ({ set }) =>
+      () => {
+        const nextOnboardingStatus = getNextOnboardingStatus(
+          currentUser,
+          workspaceMembers,
+        );
+        set(currentUserState, (current) => {
+          if (isDefined(current)) {
+            return {
+              ...current,
+              onboardingStatus: nextOnboardingStatus,
+            };
+          }
+          return current;
+        });
+      },
+    [workspaceMembers, currentUser],
+  );
+};
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStep.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStep.ts
deleted file mode 100644
index 42acf8feb0a..00000000000
--- a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStep.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useRecoilCallback, useSetRecoilState } from 'recoil';
-
-import { currentUserState } from '@/auth/states/currentUserState';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
-import { OnboardingStep } from '~/generated/graphql';
-
-const getNextOnboardingStep = (
-  currentOnboardingStep: OnboardingStep,
-  workspaceMembers: WorkspaceMember[],
-) => {
-  if (currentOnboardingStep === OnboardingStep.SyncEmail) {
-    return workspaceMembers && workspaceMembers.length > 1
-      ? null
-      : OnboardingStep.InviteTeam;
-  }
-  return null;
-};
-
-export const useSetNextOnboardingStep = () => {
-  const setCurrentUser = useSetRecoilState(currentUserState);
-  const { records: workspaceMembers } = useFindManyRecords<WorkspaceMember>({
-    objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
-  });
-  return useRecoilCallback(
-    () => (currentOnboardingStep: OnboardingStep) => {
-      setCurrentUser(
-        (current) =>
-          ({
-            ...current,
-            onboardingStep: getNextOnboardingStep(
-              currentOnboardingStep,
-              workspaceMembers,
-            ),
-          }) as any,
-      );
-    },
-    [setCurrentUser, workspaceMembers],
-  );
-};
diff --git a/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx b/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
index 7da02230650..da0c12334d1 100644
--- a/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
+++ b/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
@@ -10,7 +10,7 @@ import { supportChatState } from '@/client-config/states/supportChatState';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import {
   mockDefaultWorkspace,
-  mockedUsersData,
+  mockedUserData,
   mockedWorkspaceMemberData,
 } from '~/testing/mock-data/users';
 
@@ -30,7 +30,7 @@ const meta: Meta<typeof SupportChat> = {
 
       setCurrentWorkspace(mockDefaultWorkspace);
       setCurrentWorkspaceMember(mockedWorkspaceMemberData);
-      setCurrentUser(mockedUsersData[0]);
+      setCurrentUser(mockedUserData);
       setSupportChat({ supportDriver: 'front', supportFrontChatId: '1234' });
 
       return <Story />;
diff --git a/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx b/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
index 822c193e8d1..e97dbbb4388 100644
--- a/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
+++ b/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import { Link } from 'react-router-dom';
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { IconInfoCircle } from 'twenty-ui';
 
+import { AppPath } from '@/types/AppPath';
 import { Button } from '@/ui/input/button/components/Button';
 
 export type InfoAccent = 'blue' | 'danger';
@@ -11,6 +13,7 @@ export type InfoProps = {
   text: string;
   buttonTitle?: string;
   onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  to?: AppPath;
 };
 
 const StyledTextContainer = styled.div`
@@ -30,6 +33,7 @@ const StyledInfo = styled.div<Pick<InfoProps, 'accent'>>`
   font-weight: ${({ theme }) => theme.font.weight.medium};
   justify-content: space-between;
   max-width: 512px;
+  gap: ${({ theme }) => theme.spacing(2)};
   padding: ${({ theme }) => theme.spacing(2)};
   ${({ theme, accent }) => {
     switch (accent) {
@@ -46,11 +50,17 @@ const StyledInfo = styled.div<Pick<InfoProps, 'accent'>>`
     }
   }}
 `;
+
+const StyledLink = styled(Link)`
+  text-decoration: none;
+`;
+
 export const Info = ({
   accent = 'blue',
   text,
   buttonTitle,
   onClick,
+  to,
 }: InfoProps) => {
   const theme = useTheme();
   return (
@@ -59,12 +69,23 @@ export const Info = ({
         <StyledIconInfoCircle size={theme.icon.size.md} />
         {text}
       </StyledTextContainer>
-      {buttonTitle && onClick && (
+      {buttonTitle && to && (
+        <StyledLink to={to}>
+          <Button
+            title={buttonTitle}
+            size={'small'}
+            variant={'secondary'}
+            accent={accent}
+          />
+        </StyledLink>
+      )}
+      {buttonTitle && onClick && !to && (
         <Button
           title={buttonTitle}
           onClick={onClick}
           size={'small'}
           variant={'secondary'}
+          accent={accent}
         />
       )}
     </StyledInfo>
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.tsx
index 375a5b7ff49..270ab80b1aa 100644
--- 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.tsx
@@ -1,18 +1,34 @@
 import { renderHook } from '@testing-library/react';
 import { RecoilRoot, useSetRecoilState } from 'recoil';
 
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
+import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
 import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';
 import { isDefaultLayoutAuthModalVisibleState } from '@/ui/layout/states/isDefaultLayoutAuthModalVisibleState';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 
-jest.mock('@/auth/hooks/useOnboardingStatus');
-const setupMockOnboardingStatus = (onboardingStatus: OnboardingStatus) => {
+jest.mock('@/onboarding/hooks/useOnboardingStatus');
+const setupMockOnboardingStatus = (
+  onboardingStatus: OnboardingStatus | undefined,
+) => {
   jest.mocked(useOnboardingStatus).mockReturnValueOnce(onboardingStatus);
 };
 
+jest.mock('@/workspace/hooks/useSubscriptionStatus');
+const setupMockSubscriptionStatus = (
+  subscriptionStatus: SubscriptionStatus | undefined,
+) => {
+  jest.mocked(useSubscriptionStatus).mockReturnValueOnce(subscriptionStatus);
+};
+
+jest.mock('@/auth/hooks/useIsLogged');
+const setupMockIsLogged = (isLogged: boolean) => {
+  jest.mocked(useIsLogged).mockReturnValueOnce(isLogged);
+};
+
 jest.mock('~/hooks/useIsMatchingLocation');
 const mockUseIsMatchingLocation = jest.mocked(useIsMatchingLocation);
 
@@ -39,264 +55,245 @@ const getResult = (isDefaultLayoutAuthModalVisible = true) =>
 
 // prettier-ignore
 const testCases = [
-  { loc: AppPath.Verify, status: OnboardingStatus.Incomplete, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingUserCreation, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingWorkspaceActivation, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingProfileCreation, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingSyncEmail, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.OngoingInviteTeam, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Verify, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SignInUp, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.Invite, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.Canceled, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.Unpaid, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.PastDue, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.Invite, status: OnboardingStatus.CompletedWithoutSubscription, res: true },
-
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Canceled, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Unpaid, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.PastDue, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.CompletedWithoutSubscription, res: true },
-
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateWorkspace, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateProfile, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SyncEmails, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.InviteTeam, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Canceled, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.PlanRequired, status: OnboardingStatus.CompletedWithoutSubscription, res: true },
-
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.PlanRequiredSuccess, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.Index, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.Index, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.Index, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.Index, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Index, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.TasksPage, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.OpportunitiesPage, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordIndexPage, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordShowPage, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SettingsCatchAll, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.DevelopersCatchAll, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Impersonate, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.Authorize, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.Authorize, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.Authorize, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Authorize, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFoundWildcard, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
-
-  { loc: AppPath.NotFound, status: OnboardingStatus.Incomplete, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Canceled, res: false },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Unpaid, res: false },
-  { loc: AppPath.NotFound, status: OnboardingStatus.PastDue, res: false },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingUserCreation, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingWorkspaceActivation, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingProfileCreation, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingSyncEmail, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.OngoingInviteTeam, res: true },
-  { loc: AppPath.NotFound, status: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFound, status: OnboardingStatus.CompletedWithoutSubscription, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Verify, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SignInUp, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.Invite, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: true },
+
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.ResetPassword, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: true },
+
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateProfile, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SyncEmails, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.InviteTeam, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequired, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Index, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.TasksPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Impersonate, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.Impersonate, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Authorize, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFound, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
 ];
 
 describe('useShowAuthModal', () => {
   testCases.forEach((testCase) => {
-    it(`testCase for location ${testCase.loc} with onboardingStatus ${testCase.status} should return ${testCase.res}`, () => {
-      setupMockOnboardingStatus(testCase.status);
+    it(`testCase for location ${testCase.loc} with onboardingStatus ${testCase.onboardingStatus} should return ${testCase.res}`, () => {
+      setupMockOnboardingStatus(testCase.onboardingStatus);
+      setupMockSubscriptionStatus(testCase.subscriptionStatus);
       setupMockIsMatchingLocation(testCase.loc);
+      setupMockIsLogged(testCase.isLogged);
       const { result } = getResult();
       if (testCase.res) {
         expect(result.current).toBeTruthy();
@@ -309,13 +306,17 @@ describe('useShowAuthModal', () => {
   describe('test with token validation loading', () => {
     it(`with appPath ${AppPath.Invite} and isDefaultLayoutAuthModalVisible=false`, () => {
       setupMockOnboardingStatus(OnboardingStatus.Completed);
+      setupMockSubscriptionStatus(SubscriptionStatus.Active);
       setupMockIsMatchingLocation(AppPath.Invite);
+      setupMockIsLogged(true);
       const { result } = getResult(false);
       expect(result.current).toBeFalsy();
     });
     it(`with appPath ${AppPath.ResetPassword} and isDefaultLayoutAuthModalVisible=false`, () => {
       setupMockOnboardingStatus(OnboardingStatus.Completed);
+      setupMockSubscriptionStatus(SubscriptionStatus.Active);
       setupMockIsMatchingLocation(AppPath.ResetPassword);
+      setupMockIsLogged(true);
       const { result } = getResult(false);
       expect(result.current).toBeFalsy();
     });
@@ -323,8 +324,17 @@ describe('useShowAuthModal', () => {
 
   describe('tests should be exhaustive', () => {
     it('all location and onboarding status should be tested', () => {
+      const untestedSubscriptionStatus = [
+        SubscriptionStatus.Active,
+        SubscriptionStatus.IncompleteExpired,
+        SubscriptionStatus.Paused,
+        SubscriptionStatus.Trialing,
+      ];
       expect(testCases.length).toEqual(
-        Object.keys(AppPath).length * Object.keys(OnboardingStatus).length,
+        Object.keys(AppPath).length *
+          (Object.keys(OnboardingStatus).length +
+            (Object.keys(SubscriptionStatus).length -
+              untestedSubscriptionStatus.length)),
       );
     });
   });
diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts b/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
index 47a59bc29b8..fc241a6655f 100644
--- a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
+++ b/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
@@ -1,15 +1,20 @@
 import { useMemo } from 'react';
 import { useRecoilValue } from 'recoil';
 
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
+import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
 import { isDefaultLayoutAuthModalVisibleState } from '@/ui/layout/states/isDefaultLayoutAuthModalVisibleState';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
+import { isDefined } from '~/utils/isDefined';
 
 export const useShowAuthModal = () => {
   const isMatchingLocation = useIsMatchingLocation();
+  const isLoggedIn = useIsLogged();
   const onboardingStatus = useOnboardingStatus();
+  const subscriptionStatus = useSubscriptionStatus();
   const isDefaultLayoutAuthModalVisible = useRecoilValue(
     isDefaultLayoutAuthModalVisibleState,
   );
@@ -24,21 +29,28 @@ export const useShowAuthModal = () => {
       return isDefaultLayoutAuthModalVisible;
     }
     if (
-      OnboardingStatus.Incomplete === onboardingStatus ||
-      OnboardingStatus.OngoingUserCreation === onboardingStatus ||
-      OnboardingStatus.OngoingProfileCreation === onboardingStatus ||
-      OnboardingStatus.OngoingWorkspaceActivation === onboardingStatus ||
-      OnboardingStatus.OngoingSyncEmail === onboardingStatus ||
-      OnboardingStatus.OngoingInviteTeam === onboardingStatus
+      !isLoggedIn ||
+      onboardingStatus === OnboardingStatus.PlanRequired ||
+      onboardingStatus === OnboardingStatus.ProfileCreation ||
+      onboardingStatus === OnboardingStatus.WorkspaceActivation ||
+      onboardingStatus === OnboardingStatus.SyncEmail ||
+      onboardingStatus === OnboardingStatus.InviteTeam
     ) {
       return true;
     }
     if (isMatchingLocation(AppPath.PlanRequired)) {
       return (
-        OnboardingStatus.CompletedWithoutSubscription === onboardingStatus ||
-        OnboardingStatus.Canceled === onboardingStatus
+        (onboardingStatus === OnboardingStatus.Completed &&
+          !isDefined(subscriptionStatus)) ||
+        subscriptionStatus === SubscriptionStatus.Canceled
       );
     }
     return false;
-  }, [isDefaultLayoutAuthModalVisible, isMatchingLocation, onboardingStatus]);
+  }, [
+    isLoggedIn,
+    isDefaultLayoutAuthModalVisible,
+    isMatchingLocation,
+    onboardingStatus,
+    subscriptionStatus,
+  ]);
 };
diff --git a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
index 32d358c6457..7b46e794f71 100644
--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
@@ -8,7 +8,7 @@ export const USER_QUERY_FRAGMENT = gql`
     email
     canImpersonate
     supportUserHash
-    onboardingStep
+    onboardingStatus
     workspaceMember {
       id
       name {
@@ -26,7 +26,6 @@ export const USER_QUERY_FRAGMENT = gql`
       domainName
       inviteHash
       allowImpersonation
-      subscriptionStatus
       activationStatus
       featureFlags {
         id
diff --git a/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts b/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts
index c244ce04109..1d9a9b9fbed 100644
--- a/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts
+++ b/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts
@@ -8,7 +8,6 @@ export const UPDATE_WORKSPACE = gql`
       displayName
       logo
       allowImpersonation
-      subscriptionStatus
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts b/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts
new file mode 100644
index 00000000000..3ba84ddb77d
--- /dev/null
+++ b/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts
@@ -0,0 +1,57 @@
+import { act } from 'react-dom/test-utils';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+import { v4 } from 'uuid';
+
+import {
+  CurrentWorkspace,
+  currentWorkspaceState,
+} from '@/auth/states/currentWorkspaceState';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import { SubscriptionStatus } from '~/generated/graphql';
+
+const currentWorkspace = {
+  id: '1',
+  currentBillingSubscription: { status: SubscriptionStatus.Incomplete },
+  activationStatus: 'active',
+  allowImpersonation: true,
+} as CurrentWorkspace;
+
+const renderHooks = () => {
+  const { result } = renderHook(
+    () => {
+      const subscriptionStatus = useSubscriptionStatus();
+      const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+
+      return {
+        subscriptionStatus,
+        setCurrentWorkspace,
+      };
+    },
+    {
+      wrapper: RecoilRoot,
+    },
+  );
+  return { result };
+};
+
+describe('useSubscriptionStatus', () => {
+  Object.values(SubscriptionStatus).forEach((subscriptionStatus) => {
+    it(`should return "${subscriptionStatus}"`, async () => {
+      const { result } = renderHooks();
+      const { setCurrentWorkspace } = result.current;
+
+      act(() => {
+        setCurrentWorkspace({
+          ...currentWorkspace,
+          currentBillingSubscription: {
+            id: v4(),
+            status: subscriptionStatus,
+          },
+        });
+      });
+
+      expect(result.current.subscriptionStatus).toBe(subscriptionStatus);
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/workspace/hooks/useSubscriptionStatus.ts b/packages/twenty-front/src/modules/workspace/hooks/useSubscriptionStatus.ts
new file mode 100644
index 00000000000..332675639a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/workspace/hooks/useSubscriptionStatus.ts
@@ -0,0 +1,9 @@
+import { useRecoilValue } from 'recoil';
+
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { SubscriptionStatus } from '~/generated/graphql';
+
+export const useSubscriptionStatus = (): SubscriptionStatus | undefined => {
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  return currentWorkspace?.currentBillingSubscription?.status;
+};
diff --git a/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
index 234b06e795d..ea98157a1e4 100644
--- a/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
+++ b/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
@@ -4,14 +4,21 @@ import { within } from '@storybook/test';
 import { graphql, HttpResponse } from 'msw';
 
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
-import { ValidatePasswordResetTokenDocument } from '~/generated/graphql';
+import {
+  OnboardingStatus,
+  ValidatePasswordResetTokenDocument,
+} from '~/generated/graphql';
 import { PasswordReset } from '~/pages/auth/PasswordReset';
 import {
   PageDecorator,
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
+
+const mockedOnboardingUsersData = mockedOnboardingUserData(
+  OnboardingStatus.Completed,
+);
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Auth/PasswordReset',
@@ -30,8 +37,8 @@ const meta: Meta<PageDecoratorArgs> = {
             return HttpResponse.json({
               data: {
                 validatePasswordResetToken: {
-                  id: mockedOnboardingUsersData[0].id,
-                  email: mockedOnboardingUsersData[0].email,
+                  id: mockedOnboardingUsersData.id,
+                  email: mockedOnboardingUsersData.email,
                 },
               },
             });
@@ -40,7 +47,7 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUsersData[0],
+              currentUser: mockedOnboardingUsersData,
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
index cd65b729f9d..02fc25fbb99 100644
--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
+++ b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
@@ -19,6 +19,7 @@ import { ActionLink } from '@/ui/navigation/link/components/ActionLink';
 import { CAL_LINK } from '@/ui/navigation/link/constants/Cal';
 import {
   ProductPriceEntity,
+  SubscriptionInterval,
   useCheckoutSessionMutation,
   useGetProductPricesQuery,
 } from '~/generated/graphql';
@@ -75,7 +76,7 @@ const benefits = [
 export const ChooseYourPlan = () => {
   const billing = useRecoilValue(billingState);
 
-  const [planSelected, setPlanSelected] = useState('month');
+  const [planSelected, setPlanSelected] = useState(SubscriptionInterval.Month);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
 
@@ -87,7 +88,7 @@ export const ChooseYourPlan = () => {
 
   const [checkoutSession] = useCheckoutSessionMutation();
 
-  const handlePlanChange = (type?: string) => {
+  const handlePlanChange = (type?: SubscriptionInterval) => {
     return () => {
       if (isNonEmptyString(type) && planSelected !== type) {
         setPlanSelected(type);
@@ -101,11 +102,11 @@ export const ChooseYourPlan = () => {
     price: ProductPriceEntity,
     prices: ProductPriceEntity[],
   ): string => {
-    if (price.recurringInterval !== 'year') {
+    if (price.recurringInterval !== SubscriptionInterval.Year) {
       return 'Cancel anytime';
     }
     const monthPrice = prices.filter(
-      (price) => price.recurringInterval === 'month',
+      (price) => price.recurringInterval === SubscriptionInterval.Month,
     )?.[0];
     if (
       isDefined(monthPrice) &&
diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
index fa588b34ee9..f5faa4ff4b1 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
@@ -9,11 +9,11 @@ import { z } from 'zod';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
+import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
 import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
@@ -22,6 +22,8 @@ import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
+import { OnboardingStatus } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledContentContainer = styled.div`
   width: 100%;
@@ -55,11 +57,11 @@ type Form = z.infer<typeof validationSchema>;
 
 export const CreateProfile = () => {
   const onboardingStatus = useOnboardingStatus();
+  const setNextOnboardingStatus = useSetNextOnboardingStatus();
   const { enqueueSnackBar } = useSnackBar();
   const [currentWorkspaceMember, setCurrentWorkspaceMember] = useRecoilState(
     currentWorkspaceMemberState,
   );
-
   const { updateOneRecord } = useUpdateOneRecord<WorkspaceMember>({
     objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
   });
@@ -100,17 +102,20 @@ export const CreateProfile = () => {
           },
         });
 
-        setCurrentWorkspaceMember(
-          (current) =>
-            ({
+        setCurrentWorkspaceMember((current) => {
+          if (isDefined(current)) {
+            return {
               ...current,
               name: {
                 firstName: data.firstName,
                 lastName: data.lastName,
               },
               colorScheme: 'System',
-            }) as any,
-        );
+            };
+          }
+          return current;
+        });
+        setNextOnboardingStatus();
       } catch (error: any) {
         enqueueSnackBar(error?.message, {
           variant: SnackBarVariant.Error,
@@ -119,6 +124,7 @@ export const CreateProfile = () => {
     },
     [
       currentWorkspaceMember?.id,
+      setNextOnboardingStatus,
       enqueueSnackBar,
       setCurrentWorkspaceMember,
       updateOneRecord,
@@ -137,7 +143,7 @@ export const CreateProfile = () => {
     PageHotkeyScope.CreateProfile,
   );
 
-  if (onboardingStatus !== OnboardingStatus.OngoingProfileCreation) {
+  if (onboardingStatus !== OnboardingStatus.ProfileCreation) {
     return null;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
index 5d37f13d27c..b703ef13b0f 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
@@ -9,18 +9,20 @@ import { z } from 'zod';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
 import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
 import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
 import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
 import { Loader } from '@/ui/feedback/loader/components/Loader';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
-import { useActivateWorkspaceMutation } from '~/generated/graphql';
+import {
+  OnboardingStatus,
+  useActivateWorkspaceMutation,
+} from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 const StyledContentContainer = styled.div`
@@ -105,7 +107,7 @@ export const CreateWorkspace = () => {
     }
   };
 
-  if (onboardingStatus !== OnboardingStatus.OngoingWorkspaceActivation) {
+  if (onboardingStatus !== OnboardingStatus.WorkspaceActivation) {
     return null;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index 2395c4bb27d..53a7b212494 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -17,7 +17,7 @@ import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { useSetNextOnboardingStep } from '@/onboarding/hooks/useSetNextOnboardingStep';
+import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SeparatorLineText } from '@/ui/display/text/components/SeparatorLineText';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
@@ -27,7 +27,10 @@ import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
 import { AnimatedTranslation } from '@/ui/utilities/animation/components/AnimatedTranslation';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { OnboardingStep, useSendInviteLinkMutation } from '~/generated/graphql';
+import {
+  OnboardingStatus,
+  useSendInviteLinkMutation,
+} from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 const StyledAnimatedContainer = styled.div`
@@ -63,7 +66,7 @@ export const InviteTeam = () => {
   const theme = useTheme();
   const { enqueueSnackBar } = useSnackBar();
   const [sendInviteLink] = useSendInviteLinkMutation();
-  const setNextOnboardingStep = useSetNextOnboardingStep();
+  const setNextOnboardingStatus = useSetNextOnboardingStatus();
   const currentUser = useRecoilValue(currentUserState);
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const {
@@ -133,7 +136,7 @@ export const InviteTeam = () => {
       );
       const result = await sendInviteLink({ variables: { emails } });
 
-      setNextOnboardingStep(OnboardingStep.InviteTeam);
+      setNextOnboardingStatus();
 
       if (isDefined(result.errors)) {
         throw result.errors;
@@ -145,7 +148,7 @@ export const InviteTeam = () => {
         });
       }
     },
-    [enqueueSnackBar, sendInviteLink, setNextOnboardingStep],
+    [enqueueSnackBar, sendInviteLink, setNextOnboardingStatus],
   );
 
   useScopedHotkeys(
@@ -157,7 +160,7 @@ export const InviteTeam = () => {
     [handleSubmit],
   );
 
-  if (currentUser?.onboardingStep !== OnboardingStep.InviteTeam) {
+  if (currentUser?.onboardingStatus !== OnboardingStatus.InviteTeam) {
     return <></>;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
index f77d7360e65..ce57c50795a 100644
--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -1,14 +1,17 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 import { IconCheck, RGBA } from 'twenty-ui';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
+import { currentUserState } from '@/auth/states/currentUserState';
 import { AppPath } from '@/types/AppPath';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink';
 import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn';
+import { OnboardingStatus } from '~/generated/graphql';
 
 const StyledCheckContainer = styled.div`
   align-items: center;
@@ -29,8 +32,14 @@ const StyledButtonContainer = styled.div`
 
 export const PaymentSuccess = () => {
   const theme = useTheme();
+  const currentUser = useRecoilValue(currentUserState);
   const color =
     theme.name === 'light' ? theme.grayScale.gray90 : theme.grayScale.gray10;
+
+  if (currentUser?.onboardingStatus === OnboardingStatus.Completed) {
+    return <></>;
+  }
+
   return (
     <>
       <AnimatedEaseIn>
diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
index a52654701f3..c6ddb99c82d 100644
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -9,7 +9,7 @@ import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { OnboardingSyncEmailsSettingsCard } from '@/onboarding/components/OnboardingSyncEmailsSettingsCard';
-import { useSetNextOnboardingStep } from '@/onboarding/hooks/useSetNextOnboardingStep';
+import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
 import { useTriggerGoogleApisOAuth } from '@/settings/accounts/hooks/useTriggerGoogleApisOAuth';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
@@ -19,7 +19,7 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import {
   CalendarChannelVisibility,
   MessageChannelVisibility,
-  OnboardingStep,
+  OnboardingStatus,
   useSkipSyncEmailOnboardingStepMutation,
 } from '~/generated/graphql';
 
@@ -40,12 +40,12 @@ const StyledActionLinkContainer = styled.div`
 export const SyncEmails = () => {
   const theme = useTheme();
   const { triggerGoogleApisOAuth } = useTriggerGoogleApisOAuth();
-  const setNextOnboardingStep = useSetNextOnboardingStep();
+  const setNextOnboardingStatus = useSetNextOnboardingStatus();
   const currentUser = useRecoilValue(currentUserState);
   const [visibility, setVisibility] = useState<MessageChannelVisibility>(
     MessageChannelVisibility.ShareEverything,
   );
-  const [skipSyncEmailOnboardingStepMutation] =
+  const [skipSyncEmailOnboardingStatusMutation] =
     useSkipSyncEmailOnboardingStepMutation();
 
   const handleButtonClick = async () => {
@@ -62,8 +62,8 @@ export const SyncEmails = () => {
   };
 
   const continueWithoutSync = async () => {
-    await skipSyncEmailOnboardingStepMutation();
-    setNextOnboardingStep(OnboardingStep.SyncEmail);
+    await skipSyncEmailOnboardingStatusMutation();
+    setNextOnboardingStatus();
   };
 
   useScopedHotkeys(
@@ -75,7 +75,7 @@ export const SyncEmails = () => {
     [continueWithoutSync],
   );
 
-  if (currentUser?.onboardingStep !== OnboardingStep.SyncEmail) {
+  if (currentUser?.onboardingStatus !== OnboardingStatus.SyncEmail) {
     return <></>;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
index 7325383bfd5..b42177fedd0 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
@@ -5,13 +5,14 @@ import { graphql, HttpResponse } from 'msw';
 
 import { AppPath } from '@/types/AppPath';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import { OnboardingStatus } from '~/generated/graphql';
 import { ChooseYourPlan } from '~/pages/onboarding/ChooseYourPlan';
 import {
   PageDecorator,
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
@@ -25,7 +26,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUsersData[0],
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.PlanRequired,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
index 026ef4c6033..19512ebe183 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
@@ -5,13 +5,14 @@ import { graphql, HttpResponse } from 'msw';
 
 import { AppPath } from '@/types/AppPath';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import { OnboardingStatus } from '~/generated/graphql';
 import { CreateProfile } from '~/pages/onboarding/CreateProfile';
 import {
   PageDecorator,
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/CreateProfile',
@@ -24,7 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUsersData[0],
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.ProfileCreation,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
index f881ef40ab3..baccc13b2c8 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
@@ -2,30 +2,22 @@ import { getOperationName } from '@apollo/client/utilities';
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 import { graphql, HttpResponse } from 'msw';
-import { useSetRecoilState } from 'recoil';
 
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { AppPath } from '@/types/AppPath';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import { OnboardingStatus } from '~/generated/graphql';
 import { CreateWorkspace } from '~/pages/onboarding/CreateWorkspace';
 import {
   PageDecorator,
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/CreateWorkspace',
   component: CreateWorkspace,
-  decorators: [
-    (Story) => {
-      const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
-      setCurrentWorkspace(mockedOnboardingUsersData[1].defaultWorkspace);
-      return <Story />;
-    },
-    PageDecorator,
-  ],
+  decorators: [PageDecorator],
   args: { routePath: AppPath.CreateWorkspace },
   parameters: {
     msw: {
@@ -33,7 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUsersData[1],
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.WorkspaceActivation,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
index 799daa50737..e174fc51707 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 import { graphql, HttpResponse } from 'msw';
 
-import { OnboardingStep } from '~/generated/graphql';
+import { OnboardingStatus } from '~/generated/graphql';
 import { AppPath } from '~/modules/types/AppPath';
 import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';
 import { InviteTeam } from '~/pages/onboarding/InviteTeam';
@@ -12,7 +12,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/InviteTeam',
@@ -25,10 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: {
-                ...mockedOnboardingUsersData[0],
-                onboardingStep: OnboardingStep.InviteTeam,
-              },
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.InviteTeam,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
index 79ad41ee12a..fccb1e3c64e 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
@@ -5,13 +5,14 @@ import { graphql, HttpResponse } from 'msw';
 
 import { AppPath } from '@/types/AppPath';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import { OnboardingStatus } from '~/generated/graphql';
 import { PaymentSuccess } from '~/pages/onboarding/PaymentSuccess';
 import {
   PageDecorator,
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/PaymentSuccess',
@@ -24,7 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUsersData[0],
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.WorkspaceActivation,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
index d6f7ba36dd8..8d9b4261ef0 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 import { graphql, HttpResponse } from 'msw';
 
-import { OnboardingStep } from '~/generated/graphql';
+import { OnboardingStatus } from '~/generated/graphql';
 import { AppPath } from '~/modules/types/AppPath';
 import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';
 import { SyncEmails } from '~/pages/onboarding/SyncEmails';
@@ -12,7 +12,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/SyncEmails',
@@ -25,10 +25,7 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: {
-                ...mockedOnboardingUsersData[0],
-                onboardingStep: OnboardingStep.SyncEmail,
-              },
+              currentUser: mockedOnboardingUserData(OnboardingStatus.SyncEmail),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
index 77763f68bce..2e738952b37 100644
--- a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
@@ -10,10 +10,9 @@ import {
   IconCurrencyDollar,
 } from 'twenty-ui';
 
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
 import { SettingsBillingCoverImage } from '@/billing/components/SettingsBillingCoverImage';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SupportChat } from '@/support/components/SupportChat';
 import { AppPath } from '@/types/AppPath';
@@ -24,8 +23,11 @@ import { Button } from '@/ui/input/button/components/Button';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
-import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
 import {
+  OnboardingStatus,
+  SubscriptionInterval,
+  SubscriptionStatus,
   useBillingPortalSessionQuery,
   useUpdateBillingSubscriptionMutation,
 } from '~/generated/graphql';
@@ -40,21 +42,21 @@ const StyledInvisibleChat = styled.div`
 `;
 
 type SwitchInfo = {
-  newInterval: string;
+  newInterval: SubscriptionInterval;
   to: string;
   from: string;
   impact: string;
 };
 
 const MONTHLY_SWITCH_INFO: SwitchInfo = {
-  newInterval: 'year',
+  newInterval: SubscriptionInterval.Year,
   to: 'to yearly',
   from: 'from monthly to yearly',
   impact: 'You will be charged immediately for the full year.',
 };
 
 const YEARLY_SWITCH_INFO: SwitchInfo = {
-  newInterval: 'month',
+  newInterval: SubscriptionInterval.Month,
   to: 'to monthly',
   from: 'from yearly to monthly',
   impact: 'Your credit balance will be used to pay the monthly bills.',
@@ -68,10 +70,12 @@ const SWITCH_INFOS = {
 export const SettingsBilling = () => {
   const { enqueueSnackBar } = useSnackBar();
   const onboardingStatus = useOnboardingStatus();
+  const subscriptionStatus = useSubscriptionStatus();
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const switchingInfo =
-    currentWorkspace?.currentBillingSubscription?.interval === 'year'
+    currentWorkspace?.currentBillingSubscription?.interval ===
+    SubscriptionInterval.Year
       ? SWITCH_INFOS.year
       : SWITCH_INFOS.month;
   const [isSwitchingIntervalModalOpen, setIsSwitchingIntervalModalOpen] =
@@ -94,14 +98,15 @@ export const SettingsBilling = () => {
     onboardingStatus !== OnboardingStatus.Completed;
 
   const displayPaymentFailInfo =
-    onboardingStatus === OnboardingStatus.PastDue ||
-    onboardingStatus === OnboardingStatus.Unpaid;
+    subscriptionStatus === SubscriptionStatus.PastDue ||
+    subscriptionStatus === SubscriptionStatus.Unpaid;
 
   const displaySubscriptionCanceledInfo =
-    onboardingStatus === OnboardingStatus.Canceled;
+    subscriptionStatus === SubscriptionStatus.Canceled;
 
   const displaySubscribeInfo =
-    onboardingStatus === OnboardingStatus.CompletedWithoutSubscription;
+    onboardingStatus === OnboardingStatus.Completed &&
+    !isDefined(subscriptionStatus);
 
   const openBillingPortal = () => {
     if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
@@ -153,22 +158,20 @@ export const SettingsBilling = () => {
           />
         )}
         {displaySubscriptionCanceledInfo && (
-          <UndecoratedLink to={AppPath.PlanRequired}>
-            <Info
-              text={'Subscription canceled. Please start a new one'}
-              buttonTitle={'Subscribe'}
-              accent={'danger'}
-            />
-          </UndecoratedLink>
+          <Info
+            text={'Subscription canceled. Please start a new one'}
+            buttonTitle={'Subscribe'}
+            accent={'danger'}
+            to={AppPath.PlanRequired}
+          />
         )}
         {displaySubscribeInfo ? (
-          <UndecoratedLink to={AppPath.PlanRequired}>
-            <Info
-              text={'Your workspace does not have an active subscription'}
-              buttonTitle={'Subscribe'}
-              accent={'danger'}
-            />
-          </UndecoratedLink>
+          <Info
+            text={'Your workspace does not have an active subscription'}
+            buttonTitle={'Subscribe'}
+            accent={'danger'}
+            to={AppPath.PlanRequired}
+          />
         ) : (
           <>
             <Section>
diff --git a/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx b/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
index 9c27a82e354..1bf08a190ff 100644
--- a/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
@@ -8,7 +8,7 @@ import { ObjectMetadataItemsLoadEffect } from '@/object-metadata/components/Obje
 import { PreComputedChipGeneratorsContext } from '@/object-metadata/context/PreComputedChipGeneratorsContext';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { getRecordChipGeneratorPerObjectPerField } from '@/object-record/utils/getRecordChipGeneratorPerObjectPerField';
-import { mockedUsersData } from '~/testing/mock-data/users';
+import { mockedUserData } from '~/testing/mock-data/users';
 import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
 
 export const ObjectMetadataItemsDecorator: Decorator = (Story) => {
@@ -20,7 +20,7 @@ export const ObjectMetadataItemsDecorator: Decorator = (Story) => {
 
   useEffect(() => {
     setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
-    setCurrentUser(mockedUsersData[0]);
+    setCurrentUser(mockedUserData);
   }, [setCurrentUser, setCurrentWorkspaceMember]);
 
   const chipGeneratorPerObjectPerField = useMemo(() => {
diff --git a/packages/twenty-front/src/testing/graphqlMocks.ts b/packages/twenty-front/src/testing/graphqlMocks.ts
index 5df3fe5816c..6ad062e8952 100644
--- a/packages/twenty-front/src/testing/graphqlMocks.ts
+++ b/packages/twenty-front/src/testing/graphqlMocks.ts
@@ -15,7 +15,7 @@ import { mockedClientConfig } from '~/testing/mock-data/config';
 import { mockedObjectMetadataItemsQueryResult } from '~/testing/mock-data/metadata';
 import { getPeopleMock } from '~/testing/mock-data/people';
 import { mockedRemoteTables } from '~/testing/mock-data/remote-tables';
-import { mockedUsersData } from '~/testing/mock-data/users';
+import { mockedUserData } from '~/testing/mock-data/users';
 import { mockedViewsData } from '~/testing/mock-data/views';
 import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
 
@@ -35,7 +35,7 @@ export const graphqlMocks = {
     graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
       return HttpResponse.json({
         data: {
-          currentUser: mockedUsersData[0],
+          currentUser: mockedUserData,
         },
       });
     }),
diff --git a/packages/twenty-front/src/testing/mock-data/config.ts b/packages/twenty-front/src/testing/mock-data/config.ts
index d85622bd190..a14ea35bf85 100644
--- a/packages/twenty-front/src/testing/mock-data/config.ts
+++ b/packages/twenty-front/src/testing/mock-data/config.ts
@@ -38,4 +38,5 @@ export const mockedClientConfig: ClientConfig = {
     siteKey: 'MOCKED_SITE_KEY',
     __typename: 'Captcha',
   },
+  api: { mutationMaximumAffectedRecords: 100 },
 };
diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts
index 525919166aa..1afd532d260 100644
--- a/packages/twenty-front/src/testing/mock-data/users.ts
+++ b/packages/twenty-front/src/testing/mock-data/users.ts
@@ -1,5 +1,11 @@
 import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
-import { User, Workspace } from '~/generated/graphql';
+import {
+  OnboardingStatus,
+  SubscriptionInterval,
+  SubscriptionStatus,
+  User,
+  Workspace,
+} from '~/generated/graphql';
 
 type MockedUser = Pick<
   User,
@@ -10,7 +16,7 @@ type MockedUser = Pick<
   | 'canImpersonate'
   | '__typename'
   | 'supportUserHash'
-  | 'onboardingStep'
+  | 'onboardingStatus'
 > & {
   workspaceMember: WorkspaceMember | null;
   locale: string;
@@ -30,7 +36,6 @@ export const mockDefaultWorkspace: Workspace = {
   inviteHash: 'twenty.com-invite-hash',
   logo: workspaceLogoUrl,
   allowImpersonation: true,
-  subscriptionStatus: 'active',
   activationStatus: 'active',
   featureFlags: [
     {
@@ -58,8 +63,8 @@ export const mockDefaultWorkspace: Workspace = {
   currentBillingSubscription: {
     __typename: 'BillingSubscription',
     id: '7efbc3f7-6e5e-4128-957e-8d86808cdf6a',
-    interval: 'month',
-    status: 'active',
+    interval: SubscriptionInterval.Month,
+    status: SubscriptionStatus.Active,
   },
 };
 
@@ -79,49 +84,26 @@ export const mockedWorkspaceMemberData: WorkspaceMember = {
   userEmail: 'charles@test.com',
 };
 
-export const mockedUsersData: Array<MockedUser> = [
-  {
-    id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6d',
-    __typename: 'User',
-    email: 'charles@test.com',
-    firstName: 'Charles',
-    lastName: 'Test',
-    canImpersonate: false,
-    supportUserHash:
-      'a95afad9ff6f0b364e2a3fd3e246a1a852c22b6e55a3ca33745a86c201f9c10d',
-    workspaceMember: mockedWorkspaceMemberData,
-    defaultWorkspace: mockDefaultWorkspace,
-    locale: 'en',
-    workspaces: [{ workspace: mockDefaultWorkspace }],
-    onboardingStep: null,
-  },
-  {
-    id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6c',
-    __typename: 'User',
-    email: 'felix@test.com',
-    firstName: 'Felix',
-    lastName: 'Test',
-    canImpersonate: false,
-    supportUserHash:
-      '54ac3986035961724cdb9a7a30c70e6463a4b68f0ecd2014c727171a82144b74',
-    workspaceMember: {
-      ...mockedWorkspaceMemberData,
-      id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6c',
-      name: {
-        firstName: 'Felix',
-        lastName: 'Test',
-      },
-      userId: '81aeb270-d689-4515-bd5d-35dbe956da3b',
-    },
-    defaultWorkspace: mockDefaultWorkspace,
-    locale: 'en',
-    workspaces: [{ workspace: mockDefaultWorkspace }],
-    onboardingStep: null,
-  },
-];
+export const mockedUserData: MockedUser = {
+  id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6d',
+  __typename: 'User',
+  email: 'charles@test.com',
+  firstName: 'Charles',
+  lastName: 'Test',
+  canImpersonate: false,
+  supportUserHash:
+    'a95afad9ff6f0b364e2a3fd3e246a1a852c22b6e55a3ca33745a86c201f9c10d',
+  workspaceMember: mockedWorkspaceMemberData,
+  defaultWorkspace: mockDefaultWorkspace,
+  locale: 'en',
+  workspaces: [{ workspace: mockDefaultWorkspace }],
+  onboardingStatus: OnboardingStatus.Completed,
+};
 
-export const mockedOnboardingUsersData: Array<MockedUser> = [
-  {
+export const mockedOnboardingUserData = (
+  onboardingStatus?: OnboardingStatus,
+) => {
+  return {
     id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6d',
     __typename: 'User',
     email: 'workspace-onboarding@test.com',
@@ -130,35 +112,10 @@ export const mockedOnboardingUsersData: Array<MockedUser> = [
     canImpersonate: false,
     supportUserHash:
       '4fb61d34ed3a4aeda2476d4b308b5162db9e1809b2b8277e6fdc6efc4a609254',
-    workspaceMember: {
-      ...mockedWorkspaceMemberData,
-      id: 'd454f075-c72f-4ebe-bac7-d28e75e74a23',
-      name: {
-        firstName: '',
-        lastName: '',
-      },
-
-      userId: '7f793378-b939-43b7-8642-292c9510754c',
-    },
-    defaultWorkspace: mockDefaultWorkspace,
-    locale: 'en',
-    workspaces: [{ workspace: mockDefaultWorkspace }],
-    onboardingStep: null,
-  },
-  {
-    id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6d',
-    __typename: 'User',
-    email: 'profile-onboarding@test.com',
-    firstName: '',
-    lastName: '',
-    canImpersonate: false,
     workspaceMember: null,
-    defaultWorkspace: {
-      ...mockDefaultWorkspace,
-      activationStatus: 'inactive',
-    },
+    defaultWorkspace: mockDefaultWorkspace,
     locale: 'en',
     workspaces: [{ workspace: mockDefaultWorkspace }],
-    onboardingStep: null,
-  },
-];
+    onboardingStatus: onboardingStatus || null,
+  };
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
index 1ebe78147c1..71fcea2d4bb 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
@@ -15,12 +15,7 @@ export const seedWorkspaces = async (
   const workspaces: {
     [key: string]: Pick<
       Workspace,
-      | 'id'
-      | 'displayName'
-      | 'domainName'
-      | 'inviteHash'
-      | 'logo'
-      | 'subscriptionStatus'
+      'id' | 'displayName' | 'domainName' | 'inviteHash' | 'logo'
     >;
   } = {
     [SEED_APPLE_WORKSPACE_ID]: {
@@ -29,7 +24,6 @@ export const seedWorkspaces = async (
       domainName: 'apple.dev',
       inviteHash: 'apple.dev-invite-hash',
       logo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAELpJREFUeF7tnXnwr3MVx1+WS5Hthoss1R0lNSTUKGQdt6EscVVCKVPKUqmUKcu0WJI2ppJUt0kNwmRN0dBCtolKpqIVIdl3qXnX8xs/1+937/d5vp/lnOc5n3++/zyfzznnfc77+zyf7ZxFiBYIBALTIrBIYBMIBALTIxAEiegIBBaAQBAkwiMQCIJEDIyJgP5IlwRmAreOOZar7vEGceWuYsrOBg4E5gKzgMlxMqiYGZSxxcLLnyDFwU7AF4A1FqL+osB//JnYTeMgSDfc+tLrhcBZwHotDFoMeLLF864fDYK4dl9n5XcBTm3mFW0HWRz4d9tOXp8Pgnj1XDe9d2+Ioc+kri3eIF2Ri35mEdgAuLzjG2N+o2IOYtbNoVhbBGYA1wPrtO24gOcH9dUxKGMTBomHofYE5iVWVKtX43yeJVYn/3BBkPwY15BwXcuVqVF1fBB4zqgP9+G5IEgfvPiUDSsAdwBaacrRrgY2zjGw1TGDIFY9016vjYCr2ndr1eMQ4NhWPZw/HARx7sBG/Z2BMwuY8nzgLwXkmBERBDHjis6KaG/je517t+s4uHgZnMHt4sH809sCFxXS8l5g+UKyzIgJgphxRWtFdI7qpta9unc4Ejiie3efPYMgPv2muxmPFFZdy7ta5h1UC4L4dPcDwNIFVX8YWKqgPDOigiBmXDGyIhcAc0Z+Os2D+wFfSTOUr1GCIL78tTXw4woqD+qA4mR8gyAVoq2jSAVpjXsY2l95Y0ed3XcLgvhx4S+BV1ZQdwng8QpyTYgMgphww0KVeDFw40KfSv/AD4Ad0w/rZ8QgiA9fPQQ8u4Kqg7o9OBW+QZAKUddSpLKNKLFC6XYocFRpodbkBUGseeSZ+uj7P9fx9ems1yZkjTeWOW8EQcy55GkKab9D+x6l2+rALaWFWpQXBLHolad0Kr1jLsknAAfYhqWcdkGQcli3lbQKcFvbTmM+fxew4phj9Kp7EMSuOy8Btiys3qD3PKbCOghSOAJbiCud//alwA0t9BvEo0EQm25+GfDrgqrtC5xcUJ4bUUEQm666ENiukGrK6P6+QrLciQmC2HTZE4B2sXO305saILnluB0/CGLPdSKGCJK7nQu8PrcQ7+MHQex5cENACdpytu8Cb8kpoC9jB0HsefI44OCMaul8lc5ZRRsBgSDICCAVfuQ3gJZcczQVzqlx8DGHLUXGDIIUgbmVEGUOSZ0gQSXTdL6q9M58K8MtPhwEsecVBXNKvyjTuwrolN54tIdsB41SOqKD+OgyBQIpA/kNwDmBcncEgiDdscvVMwVBzmuWcFOMlctOF+MGQey5aZyg/hWwGaBj8tESIBAESQBi4iG6EOQ0YO8K6UgTm25vuCCIPZ+MMkkXiZQGSBebcm8q2kOooEZBkIJgjyhKV11nNitZIoI+l/4O/Aw4A7gCeHTEscZ5TLExcRdeeihpXZe32zg6VO87ZILoctDzgPWbZdC1gdWAZRqv3An8Dris+bfWHkLfAkQEWA94E7A9oJIKz1pIVAoDJXX4M/DTZuNRNdhVP6R3bSgEUSAor+37m0ls1404ff4ogdvnmqpO3ibDKpugNKIfbXbrU/tfxPkRcHTzphNerltqgCyBMQs4vjnOnSttjv5N9S8q4l1ryfhJumgHXee7di10hH4yDDoVINnHACqh4K71jSAigv69dAGoxH2K+R3+W+Cdzb9nzWBYFfgqsEPiXflxbBJZDgJO8fSp2heCKCBUFmDdcTyYuO9PgL2aCXbioaccTnOHTzVBWOPPoY2Nyvk7t9BiQxu9nvGsd4JoUq3a4Pq12rT6oznLYRk+M0QEvbH0GaMSad6aVua2sUwUrwTRZPPKZgXGU1BoUi+iKDlb15ICqhOiVSeRbmVPxi9A1283b1tz5ngkyKebVRhzYLZUSGTRP/9nRzgaoiXpPZv5VV8Tu2nBQyuN+jQ10zwRRP+WWnvvY1JlBYdWwU5s5lLaU9ClKS02KLu7CDKUphMCm1iZyHshyOFDrNE9FEZMYafmbWtZSKBtnSDS7w/A7AEHy5BNf3OzIVsNA8sEWRZQMuVcm3zVQA/BrRComtjOKkFq1eRr5bl4uBgC1SrtWiTIps3xjWLohyAXCFQpKGqNIFtYW+ZzETrDUfIbwD4lzbVEkI2aXfGS9ocsfwh8oNkkLaK5FYLoXoYuBUULBEZBQH+m14zy4LjPWCCINsF0j8CCLuPiGf3LIaDDmdlvVloIyvudHrQrFwohaSoE7m6uJmdFpzZBdERd52+iBQJtECh2bqsmQXYEzm6DSjwbCDQ5ArTaWSQ/QC2CzAAeC3cHAi0R0N2Ri1v2GevxWgS5qcmgMZby0XkwCNwDKMdA8T/VGgSZA1wwGNeGoeMioDeG3hxVWg2CjJI5sAoYIdQcAp8EPl5Tq9IE+Vpzh7qmzSHbBwLKNTyvtqolCaINwewbO7UBDflJEFByO53grd5KEuRSYPPqFocC1hHYAzjVipKlCKJjAS4z61lx1ED00HxD8w4zrRRBLgS2M2N1KGIRgfObBNqmdCtBEOVx0iX8aIHAdAgUOVfVBf4SBImMJF08M6w+SgRYfBNwFIhLEOSJSomkR7E/nqmPwM6Wz+TlJojS9fyxvg9CA6MI3Gw9pVNugig58WuMOifUqo+AsmTqspzZlpsgRY4km0U3FFsQAqoT8g7rEOUkyDpNjT/rGIR+dRDQ6qb5P9CcBDnX4rp2nVgIqfMhoOpX7/aASk6CxOqVhwioo6PSybrYG8tFkDiYWCfwPEi9vim97UHXbKl2VDzyHBcIhJKlEVDe5d+XFtpVXq43iG6BbdVVqejXWwQ0Kdfk3E3LRRCtbev4QLRAYDICKq/m6o8zF0HML99F3FZBYGPg6iqSOwrNQZBlgPs66hPd+o2Ai72PyS7IQZAtgUv67eewrgMCOq3r7rM7B0FU2vjgDgBGl34j8HNAxZFctRwE0Tfmhq5QCGVLILB/U+a6hKxkMnIQRFnwlkumYQzUFwRe1FQsdmVPDoLoCIGrtW5XHvOrbJF6HqnhyUGQWOJN7aV+jJcj1rIjk0PpIEh2t7kUkCPWsgORWunFAJ3ijRYITEbA3RGTCeVTE0Tr3KavUEbcVkFACcv15+mupSZI7KK7C4EiCuurQkWT3LXUBFkJuMMdCqFwbgSCIA3CqwK35kY7xneHQHxiNS5bDbjFnftC4dwIxCS9QXgV4LbcaMf4LhFI/TlfBITUSsccpIjbXApxd9RdKKcmyLLAvS7dF0rnRsB8FsWpAEhNkCiUkzvM/I7vKlnDBMypCRI76X4DOLfm7wG+nFtI6vFTE0TjaUkvWiAwPwKXAa/1Bktqgsj+OKzoLQrK6KsKx/oEd9VyEERvkBzjugI2lJ0SAXcrWTkCOXJiBTumQ2Bdbxn/cxBEO+naUY8WCMyPwBnAbp5gyUGQSDvqKQLK6qrr2Mrs7qblIMhhwJFuEAhFSyOg0xb/LC20q7wcBNkcuLSrQtGv9wicDaiyrYuWgyDLAyoMHy0QmA6BHHGXBe0cisZmYRZX9WrQvYF5HizKQRDZHXshHrxfT0c3NwxzEUR3QnQ3JFogMB0CmodoPmK65SLIyR5qYJv2TP+Vc3ENNxdBYiWr/wGewsKjgENTDJRrjFwEifxYuTzWv3GXAh62alYugsjeONVr1eu29Lrd8nw1J0H+BqxuyxehjVEEjrB6+iInQQ4HZHi0QGAUBEzWD8lJkEgiN0pYxDMTCOiTXHPXxy1BkpMgMQ+x5Gkfumiyrkm7mZabIP8AZpmxNhTxgIA2mc3cJ8pNkA8Cn/HgldDRFAI3A7MtaJSbIJFIzoKXfeqgVdA1a6uemyCyL4p61vayX/m6NvHcmntqJQhyEbCtXx+F5pUR0Mlf3TF6sIYeJQjyEuCGGsaFzF4h8Grg8tIWlSBILPeW9mp/5emU+L4lzStFkGuBDUoaFrJ6i8ADzeS9yLXuUgTZCLiqty4Lw2ogcBLwrtyCSxEkPrNye3KY4+t4ylxACemytJIEUXbvzbJYEYMOHQGd3xJRkl/hLUmQFwDaIY0WCORCQG8UbU5rnpKklSSIFI5NwyRui0GmQSB5tpTSBDkOODjcGwhkQuD41PFVmiBLACqkEi0QyIFA8kKhpQkiUP4KrJEDnRhz0AhoX2RmagRqEOQVwDWpDYnxBo/ALsBZqVGoQRDZoMmUKuJGCwRSIZAllrMMOoLFHwaOGeG5eCQQGAWBC4HXjfJg22dqESQywLf1VDy/IARWAO7JAVEtgsiW07zVq8vhgBhzbAT+1VyqGnugqQaoSZBY8s3i0sENmvWeSE2CyJO/ADYZnEvD4FQIJN85n1+x2gRZOuW5mVSoxzhuEHgr8J2c2tYmiGy7Gtgwp5Exdi8R0MHERXNbZoEg8RbJ7eV+jr8/cGJu0ywQRDaqbLSK7kQLBEZBoMjbQ4pYIcgM4LFRkIlnAoGmvN8pJZCwQhDZKoPfXsLokOEagewrV5PRsUQQ6RVVqVzHbhHltwYuKSLJ0CfWhL17Ad8qZXzIcYdA1l3zqdCw9gaRjvcBy7hzXShcAgGVRVB5hGLNIkGiMlUx97sSpM8qfV4VbRYJIgB08WWnokiEMOsI6P7Qk6WVtEoQ4RAZUEpHg115ewCn1lDPMkEiXWmNiLAns2pJNssEkasuBray57PQqCACKuqp4p5VmnWCCJS4v14lNEwIPQA4oaYmHggSKUtrRkg92UoPtVY98f+X7IEg0lOVclUxN9pwEND5PH09VG1eCCKQ7gBWqopWCC+FwBbNCe9S8qaV44kgceK3ergUUeB8YPsikkYQ4okgMkf313WPPVo/EdBqlVatzDRvBBFw3wT2NoNgKJISgeWas3gpxxxrLI8EkcG3AyuPZXl0tobA7k2uNFN6eSWIzuWo7JZX/U0FgQFlTM07JuPhOcBif8RAZCdQQSlDlTrUZPNMEAGquYjmJNF8IqAbpEs2XwMmLfBOEIGqG4i6iRjNHwKzrRd27QNBFBbXAev5i49Ba7wr8H3rCPSFIML5TmBF64CHfv9D4CjgUA9Y9IkgskX1sU1tNHkIgsI6ng7MLSyzs7g+EUQgKFfrQ83ErzMo0TEbAlXulY9jTd8IMkGS++NNMk5YZOn7Q2BOlpEzDtpHgggu2XUrsEpG7HIMraQE+kzUfEqnlx9shCwLzGpOM6sWuDe/nQzsmwOw3GN6A7otHio3rbLTFpvyf50JnARcCzzaUkltru0AvBfYuEQpgJb6TTx+EPDFjn2rd+s7QQTw5wE5qXbT2+Ec4CPAjRmU0YabNk4/Yeic2vrA9RlsLTbkEAgiMF8FXFEM1acLOq/5vCiZEVCLFfs0fw6qv1K6/QlYu0ndVFp2UnlDIYhAU9Dok+vlSRGcerC7AJUHU/3u2k2fYvOaz7HcuujoyG4eNgBHBWJIBJnARK/9ywFNdlM23Z/+UrMB9kjKgROOtQ3wdWDNhGNODHUscEiGcasOOUSCTAC+aTMnWH4MD2hirYD7GHD3GOOU7iq/K8/tcc0Rna5xoIWG/WplPSwBWldgSuhWSoZ23j8EHAjMXIhQXQm9DDi+qVFRPetGIpA0T9EexdsA1R3XZ9lUsaFN2Csb+y+wkHUkkf3TDhMEeSY0izcBoqDRypM2HfVPqVzBQ2yKkcEWNgqCDDHkw+aREQiCjAxVPDhEBIIgQ/R62DwyAkGQkaGKB4eIwH8BiW3y2J/F45oAAAAASUVORK5CYII=',
-      subscriptionStatus: 'incomplete',
     },
     [SEED_TWENTY_WORKSPACE_ID]: {
       id: workspaceId,
@@ -37,7 +31,6 @@ export const seedWorkspaces = async (
       domainName: 'twenty.dev',
       inviteHash: 'twenty.dev-invite-hash',
       logo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACb0lEQVR4nO2VO4taQRTHr3AblbjxEVlwCwVhg7BoqqCIjy/gAyyFWNlYBOxsfH0KuxgQGwXRUkGuL2S7i1barGAgiwbdW93SnGOc4BonPiKahf3DwXFmuP/fPM4ZlvmlTxAhCBdzHnEQWYiv7Mr4C3NeuVYhQYDPzOUUQgDLBQGcLHNhvQK8DACPx8PTxiqVyvISG43GbyaT6Qfpn06n0m63e/tPAPF4vJ1MJu8kEsnWTCkWi1yr1RKGw+GDRqPBOTfr44vFQvD7/Q/lcpmaaVQAr9fLp1IpO22c47hGOBz+MB6PH+Vy+VYDAL8qlUoGtVotzOfzq4MAgsHgE/6KojiQyWR/bKVSqbSszHFM8Pl8z1YK48JsNltCOBwOnrYLO+8AAIjb+nHbycoTiUQfDJ7tFq4YAHiVSmXBxcD41u8flQU8z7fhzO0r83atVns3Go3u9Xr9x0O/RQXo9/tsIBBg6vX606a52Wz+bZ7P5/WwG29gxSJzhKgA6XTaDoFNF+krFAocmC//4yWEcSf2wTm7mCO19xFgSsKOLI16vV7b7XY7mRNoLwA0JymJ5uQIzgIAuX5PzDElT2m+E8BqtQ4ymcx7Yq7T6a6ZE4sKgOadTucaCwkxp1UzlEKh0GDxIXOwDWHAdi6Xe3swQDQa/Q7mywoolUpvsaptymazDWKxmBHTlWXZm405BFZoNpuGgwEmk4mE2SGtVivii4f1AO7J3ZopkQCQj7Ar1FeRChCJRJzVapX6DKNIfSc1Ax+wtQWQ55h6bH8FWDfYV4fO3wlwDr0C/BcADYiTPCxHqIEA2QsCZAkAKnRGkMbKN/sTX5YHPQ1e7SkAAAAASUVORK5CYII=',
-      subscriptionStatus: 'incomplete',
     },
   };
 
@@ -50,7 +43,6 @@ export const seedWorkspaces = async (
       'domainName',
       'inviteHash',
       'logo',
-      'subscriptionStatus',
     ])
     .orIgnore()
     .values(workspaces[workspaceId])
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1719327438923-useEnumForSubscriptionStatusInterval.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1719327438923-useEnumForSubscriptionStatusInterval.ts
new file mode 100644
index 00000000000..c2894f0fd48
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1719327438923-useEnumForSubscriptionStatusInterval.ts
@@ -0,0 +1,61 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UseEnumForSubscriptionStatusInterval1719327438923
+  implements MigrationInterface
+{
+  name = 'UseEnumForSubscriptionStatusInterval1719327438923';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TYPE "core"."billingSubscription_status_enum" AS ENUM('active', 'canceled', 'incomplete', 'incomplete_expired', 'past_due', 'paused', 'trialing', 'unpaid')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "status" TYPE "core"."billingSubscription_status_enum" USING "status"::"core"."billingSubscription_status_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "status" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "core"."billingSubscription_interval_enum" AS ENUM('day', 'month', 'week', 'year')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "interval" TYPE "core"."billingSubscription_interval_enum" USING "interval"::"core"."billingSubscription_interval_enum"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "core"."workspace_subscriptionstatus_enum" AS ENUM('active', 'canceled', 'incomplete', 'incomplete_expired', 'past_due', 'paused', 'trialing', 'unpaid')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" DROP DEFAULT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" TYPE "core"."workspace_subscriptionstatus_enum" USING "subscriptionStatus"::"core"."workspace_subscriptionstatus_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" SET DEFAULT 'incomplete'::"core"."workspace_subscriptionstatus_enum"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" TYPE text`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."workspace_subscriptionstatus_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "interval" TYPE text`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."billingSubscription_interval_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "status" TYPE text`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."billingSubscription_status_enum"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1719494707738-removeSubscriptionStatusFromCoreWorkspace.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1719494707738-removeSubscriptionStatusFromCoreWorkspace.ts
new file mode 100644
index 00000000000..85e64b408c4
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1719494707738-removeSubscriptionStatusFromCoreWorkspace.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveSubscriptionStatusFromCoreWorkspace1719494707738
+  implements MigrationInterface
+{
+  name = 'RemoveSubscriptionStatusFromCoreWorkspace1719494707738';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" DROP COLUMN "subscriptionStatus"`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."workspace_subscriptionstatus_enum"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TYPE "core"."workspace_subscriptionstatus_enum" AS ENUM('active', 'canceled', 'incomplete', 'incomplete_expired', 'past_due', 'paused', 'trialing', 'unpaid')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ADD "subscriptionStatus" "core"."workspace_subscriptionstatus_enum" NOT NULL DEFAULT 'incomplete'`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
index 6a4d1c9d267..53953bc94b2 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -30,6 +30,7 @@ import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/stan
 import { OnboardingModule } from 'src/engine/core-modules/onboarding/onboarding.module';
 import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 
 import { AuthResolver } from './auth.resolver';
 
@@ -65,6 +66,7 @@ const jwtModule = JwtModule.registerAsync({
     ]),
     HttpModule,
     UserWorkspaceModule,
+    WorkspaceModule,
     OnboardingModule,
     TwentyORMModule.forFeature([CalendarChannelWorkspaceEntity]),
     WorkspaceDataSourceModule,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
index 370bfeee898..b6b381ec0d1 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
@@ -8,6 +8,7 @@ import { EnvironmentService } from 'src/engine/integrations/environment/environm
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
 
 describe('SignInUpService', () => {
   let service: SignInUpService;
@@ -40,6 +41,10 @@ describe('SignInUpService', () => {
           provide: HttpService,
           useValue: {},
         },
+        {
+          provide: WorkspaceService,
+          useValue: {},
+        },
       ],
     }).compile();
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
index 3397f260336..4dafcf12666 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
@@ -24,6 +24,7 @@ import { FileUploadService } from 'src/engine/core-modules/file/file-upload/serv
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { getImageBufferFromUrl } from 'src/utils/image';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
 
 export type SignInUpServiceInput = {
   email: string;
@@ -44,6 +45,7 @@ export class SignInUpService {
     @InjectRepository(User, 'core')
     private readonly userRepository: Repository<User>,
     private readonly userWorkspaceService: UserWorkspaceService,
+    private readonly workspaceService: WorkspaceService,
     private readonly httpService: HttpService,
     private readonly environmentService: EnvironmentService,
   ) {}
@@ -142,10 +144,12 @@ export class SignInUpService {
       ForbiddenException,
     );
 
+    const isWorkspaceActivated =
+      await this.workspaceService.isWorkspaceActivated(workspace.id);
+
     assert(
-      !this.environmentService.get('IS_BILLING_ENABLED') ||
-        workspace.subscriptionStatus !== 'incomplete',
-      'Workspace subscription status is incomplete',
+      isWorkspaceActivated,
+      'Workspace is not ready to welcome new members',
       ForbiddenException,
     );
 
@@ -199,7 +203,6 @@ export class SignInUpService {
       displayName: '',
       domainName: '',
       inviteHash: v4(),
-      subscriptionStatus: 'incomplete',
     });
 
     const workspace = await this.workspaceRepository.save(workspaceToCreate);
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
index 4be921b78c0..491faaec7e2 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
@@ -10,13 +10,19 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { BillingResolver } from 'src/engine/core-modules/billing/billing.resolver';
 import { BillingWorkspaceMemberListener } from 'src/engine/core-modules/billing/listeners/billing-workspace-member.listener';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 
 @Module({
   imports: [
     StripeModule,
     UserWorkspaceModule,
     TypeOrmModule.forFeature(
-      [BillingSubscription, BillingSubscriptionItem, Workspace],
+      [
+        BillingSubscription,
+        BillingSubscriptionItem,
+        Workspace,
+        FeatureFlagEntity,
+      ],
       'core',
     ),
   ],
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts
index f4494c0eaa4..8a391b06c61 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts
@@ -2,17 +2,25 @@ import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import Stripe from 'stripe';
-import { Not, Repository } from 'typeorm';
+import { In, Not, Repository } from 'typeorm';
 
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
-import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import {
+  BillingSubscription,
+  SubscriptionInterval,
+  SubscriptionStatus,
+} from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { assert } from 'src/utils/assert';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 
 export enum AvailableProduct {
   BasePlan = 'base-plan',
@@ -34,12 +42,45 @@ export class BillingService {
     private readonly environmentService: EnvironmentService,
     @InjectRepository(BillingSubscription, 'core')
     private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
     @InjectRepository(BillingSubscriptionItem, 'core')
     private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
     @InjectRepository(Workspace, 'core')
     private readonly workspaceRepository: Repository<Workspace>,
   ) {}
 
+  async getActiveSubscriptionWorkspaceIds() {
+    return (
+      await this.workspaceRepository.find({
+        where: this.environmentService.get('IS_BILLING_ENABLED')
+          ? {
+              currentBillingSubscription: {
+                status: In([
+                  SubscriptionStatus.Active,
+                  SubscriptionStatus.Trialing,
+                  SubscriptionStatus.PastDue,
+                ]),
+              },
+            }
+          : {},
+        select: ['id'],
+      })
+    ).map((workspace) => workspace.id);
+  }
+
+  async isBillingEnabledForWorkspace(workspaceId: string) {
+    const isFreeAccessEnabled = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key: FeatureFlagKeys.IsFreeAccessEnabled,
+      value: true,
+    });
+
+    return (
+      !isFreeAccessEnabled && this.environmentService.get('IS_BILLING_ENABLED')
+    );
+  }
+
   getProductStripeId(product: AvailableProduct) {
     if (product === AvailableProduct.BasePlan) {
       return this.environmentService.get('BILLING_STRIPE_BASE_PLAN_PRODUCT_ID');
@@ -84,13 +125,13 @@ export class BillingService {
   }) {
     const notCanceledSubscriptions =
       await this.billingSubscriptionRepository.find({
-        where: { ...criteria, status: Not('canceled') },
+        where: { ...criteria, status: Not(SubscriptionStatus.Canceled) },
         relations: ['billingSubscriptionItems'],
       });
 
     assert(
       notCanceledSubscriptions.length <= 1,
-      `More than on not canceled subscription for workspace ${criteria.workspaceId}`,
+      `More than one not canceled subscription for workspace ${criteria.workspaceId}`,
     );
 
     return notCanceledSubscriptions?.[0];
@@ -171,7 +212,9 @@ export class BillingService {
       workspaceId: user.defaultWorkspaceId,
     });
     const newInterval =
-      billingSubscription?.interval === 'year' ? 'month' : 'year';
+      billingSubscription?.interval === SubscriptionInterval.Year
+        ? SubscriptionInterval.Month
+        : SubscriptionInterval.Year;
     const billingSubscriptionItem = await this.getBillingSubscriptionItem(
       user.defaultWorkspaceId,
     );
@@ -265,10 +308,6 @@ export class BillingService {
       return;
     }
 
-    await this.workspaceRepository.update(workspaceId, {
-      subscriptionStatus: data.object.status,
-    });
-
     await this.billingSubscriptionRepository.upsert(
       {
         workspaceId: workspaceId,
@@ -302,5 +341,10 @@ export class BillingService {
         skipUpdateIfNoValuesChanged: true,
       },
     );
+
+    await this.featureFlagRepository.delete({
+      workspaceId,
+      key: FeatureFlagKeys.IsFreeAccessEnabled,
+    });
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
index 778f0671ee6..48738b85f8d 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
@@ -3,9 +3,11 @@ import { ArgsType, Field } from '@nestjs/graphql';
 import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import Stripe from 'stripe';
 
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+
 @ArgsType()
 export class CheckoutSessionInput {
-  @Field(() => String)
+  @Field(() => SubscriptionInterval)
   @IsString()
   @IsNotEmpty()
   recurringInterval: Stripe.Price.Recurring.Interval;
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
index 69fc80011f3..d8c2d6d434f 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
@@ -2,9 +2,11 @@ import { Field, ObjectType } from '@nestjs/graphql';
 
 import Stripe from 'stripe';
 
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+
 @ObjectType()
 export class ProductPriceEntity {
-  @Field(() => String)
+  @Field(() => SubscriptionInterval)
   recurringInterval: Stripe.Price.Recurring.Interval;
 
   @Field(() => Number)
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
index 4da2b3ef568..509d5250b26 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
@@ -1,4 +1,4 @@
-import { Field, ObjectType } from '@nestjs/graphql';
+import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
 import {
   Column,
@@ -18,6 +18,27 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 
+export enum SubscriptionStatus {
+  Active = 'active',
+  Canceled = 'canceled',
+  Incomplete = 'incomplete',
+  IncompleteExpired = 'incomplete_expired',
+  PastDue = 'past_due',
+  Paused = 'paused',
+  Trialing = 'trialing',
+  Unpaid = 'unpaid',
+}
+
+export enum SubscriptionInterval {
+  Day = 'day',
+  Month = 'month',
+  Week = 'week',
+  Year = 'year',
+}
+
+registerEnumType(SubscriptionStatus, { name: 'SubscriptionStatus' });
+registerEnumType(SubscriptionInterval, { name: 'SubscriptionInterval' });
+
 @Entity({ name: 'billingSubscription', schema: 'core' })
 @ObjectType('BillingSubscription')
 export class BillingSubscription {
@@ -49,12 +70,20 @@ export class BillingSubscription {
   @Column({ unique: true, nullable: false })
   stripeSubscriptionId: string;
 
-  @Field(() => String)
-  @Column({ type: 'text', nullable: false })
+  @Field(() => SubscriptionStatus)
+  @Column({
+    type: 'enum',
+    enum: Object.values(SubscriptionStatus),
+    nullable: false,
+  })
   status: Stripe.Subscription.Status;
 
-  @Field(() => String, { nullable: true })
-  @Column({ type: 'text', nullable: true })
+  @Field(() => SubscriptionInterval, { nullable: true })
+  @Column({
+    type: 'enum',
+    enum: Object.values(SubscriptionInterval),
+    nullable: true,
+  })
   interval: Stripe.Price.Recurring.Interval;
 
   @OneToMany(
diff --git a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
index ae945d309b8..32f70758f4a 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
@@ -9,15 +9,15 @@ import {
   UpdateSubscriptionJob,
   UpdateSubscriptionJobData,
 } from 'src/engine/core-modules/billing/jobs/update-subscription.job';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Injectable()
 export class BillingWorkspaceMemberListener {
   constructor(
     @InjectMessageQueue(MessageQueue.billingQueue)
     private readonly messageQueueService: MessageQueueService,
-    private readonly environmentService: EnvironmentService,
+    private readonly billingService: BillingService,
   ) {}
 
   @OnEvent('workspaceMember.created')
@@ -25,7 +25,12 @@ export class BillingWorkspaceMemberListener {
   async handleCreateOrDeleteEvent(
     payload: ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>,
   ) {
-    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+    const isBillingEnabledForWorkspace =
+      await this.billingService.isBillingEnabledForWorkspace(
+        payload.workspaceId,
+      );
+
+    if (!isBillingEnabledForWorkspace) {
       return;
     }
 
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
index 6214f0f7a84..4f3264baa09 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
@@ -23,6 +23,7 @@ export enum FeatureFlagKeys {
   IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED',
   IsContactCreationForSentAndReceivedEmailsEnabled = 'IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED',
   IsGoogleCalendarSyncV2Enabled = 'IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED',
+  IsFreeAccessEnabled = 'IS_FREE_ACCESS_ENABLED',
 }
 
 @Entity({ name: 'featureFlag', schema: 'core' })
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-status.enum.ts b/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-status.enum.ts
new file mode 100644
index 00000000000..8370714f2b7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-status.enum.ts
@@ -0,0 +1,8 @@
+export enum OnboardingStatus {
+  PLAN_REQUIRED = 'PLAN_REQUIRED',
+  WORKSPACE_ACTIVATION = 'WORKSPACE_ACTIVATION',
+  PROFILE_CREATION = 'PROFILE_CREATION',
+  SYNC_EMAIL = 'SYNC_EMAIL',
+  INVITE_TEAM = 'INVITE_TEAM',
+  COMPLETED = 'COMPLETED',
+}
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-step.enum.ts b/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-step.enum.ts
deleted file mode 100644
index 55087ce5aad..00000000000
--- a/packages/twenty-server/src/engine/core-modules/onboarding/enums/onboarding-step.enum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum OnboardingStep {
-  SYNC_EMAIL = 'SYNC_EMAIL',
-  INVITE_TEAM = 'INVITE_TEAM',
-}
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.module.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.module.ts
index 65f0156d3dd..a036cafee61 100644
--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.module.ts
@@ -5,9 +5,19 @@ import { OnboardingResolver } from 'src/engine/core-modules/onboarding/onboardin
 import { KeyValuePairModule } from 'src/engine/core-modules/key-value-pair/key-value-pair.module';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 
 @Module({
-  imports: [DataSourceModule, UserWorkspaceModule, KeyValuePairModule],
+  imports: [
+    DataSourceModule,
+    WorkspaceManagerModule,
+    UserWorkspaceModule,
+    KeyValuePairModule,
+    EnvironmentModule,
+    BillingModule,
+  ],
   exports: [OnboardingService],
   providers: [OnboardingService, OnboardingResolver],
 })
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
index 2b6fa3674b0..9832b41c6d6 100644
--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
@@ -1,13 +1,20 @@
 import { Injectable } from '@nestjs/common';
 
 import { KeyValuePairService } from 'src/engine/core-modules/key-value-pair/key-value-pair.service';
-import { OnboardingStep } from 'src/engine/core-modules/onboarding/enums/onboarding-step.enum';
+import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
+import { InjectWorkspaceRepository } from 'src/engine/twenty-orm/decorators/inject-workspace-repository.decorator';
+import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
+import { SubscriptionStatus } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { isDefined } from 'src/utils/is-defined';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 enum OnboardingStepValues {
   SKIPPED = 'SKIPPED',
@@ -26,29 +33,71 @@ type OnboardingKeyValueType = {
 @Injectable()
 export class OnboardingService {
   constructor(
+    private readonly billingService: BillingService,
+    private readonly workspaceManagerService: WorkspaceManagerService,
     private readonly userWorkspaceService: UserWorkspaceService,
     private readonly keyValuePairService: KeyValuePairService<OnboardingKeyValueType>,
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectWorkspaceRepository(WorkspaceMemberWorkspaceEntity)
+    private readonly workspaceMemberRepository: WorkspaceRepository<WorkspaceMemberWorkspaceEntity>,
   ) {}
 
-  private async isSyncEmailOnboardingStep(user: User, workspace: Workspace) {
+  private async isSubscriptionIncompleteOnboardingStatus(user: User) {
+    const isBillingEnabledForWorkspace =
+      await this.billingService.isBillingEnabledForWorkspace(
+        user.defaultWorkspaceId,
+      );
+
+    if (!isBillingEnabledForWorkspace) {
+      return false;
+    }
+
+    const currentBillingSubscription =
+      await this.billingService.getCurrentBillingSubscription({
+        workspaceId: user.defaultWorkspaceId,
+      });
+
+    return (
+      !isDefined(currentBillingSubscription) ||
+      currentBillingSubscription?.status === SubscriptionStatus.Incomplete
+    );
+  }
+
+  private async isWorkspaceActivationOnboardingStatus(user: User) {
+    return !(await this.workspaceManagerService.doesDataSourceExist(
+      user.defaultWorkspaceId,
+    ));
+  }
+
+  private async isProfileCreationOnboardingStatus(user: User) {
+    const workspaceMember = await this.workspaceMemberRepository.findOneBy({
+      userId: user.id,
+    });
+
+    return (
+      workspaceMember &&
+      (!workspaceMember.name.firstName || !workspaceMember.name.lastName)
+    );
+  }
+
+  private async isSyncEmailOnboardingStatus(user: User) {
     const syncEmailValue = await this.keyValuePairService.get({
       userId: user.id,
-      workspaceId: workspace.id,
+      workspaceId: user.defaultWorkspaceId,
       key: OnboardingStepKeys.SYNC_EMAIL_ONBOARDING_STEP,
     });
     const isSyncEmailSkipped = syncEmailValue === OnboardingStepValues.SKIPPED;
     const connectedAccounts =
       await this.connectedAccountRepository.getAllByUserId(
         user.id,
-        workspace.id,
+        user.defaultWorkspaceId,
       );
 
     return !isSyncEmailSkipped && !connectedAccounts?.length;
   }
 
-  private async isInviteTeamOnboardingStep(workspace: Workspace) {
+  private async isInviteTeamOnboardingStatus(workspace: Workspace) {
     const inviteTeamValue = await this.keyValuePairService.get({
       workspaceId: workspace.id,
       key: OnboardingStepKeys.INVITE_TEAM_ONBOARDING_STEP,
@@ -64,19 +113,28 @@ export class OnboardingService {
     );
   }
 
-  async getOnboardingStep(
-    user: User,
-    workspace: Workspace,
-  ): Promise<OnboardingStep | null> {
-    if (await this.isSyncEmailOnboardingStep(user, workspace)) {
-      return OnboardingStep.SYNC_EMAIL;
+  async getOnboardingStatus(user: User) {
+    if (await this.isSubscriptionIncompleteOnboardingStatus(user)) {
+      return OnboardingStatus.PLAN_REQUIRED;
+    }
+
+    if (await this.isWorkspaceActivationOnboardingStatus(user)) {
+      return OnboardingStatus.WORKSPACE_ACTIVATION;
+    }
+
+    if (await this.isProfileCreationOnboardingStatus(user)) {
+      return OnboardingStatus.PROFILE_CREATION;
+    }
+
+    if (await this.isSyncEmailOnboardingStatus(user)) {
+      return OnboardingStatus.SYNC_EMAIL;
     }
 
-    if (await this.isInviteTeamOnboardingStep(workspace)) {
-      return OnboardingStep.INVITE_TEAM;
+    if (await this.isInviteTeamOnboardingStatus(user.defaultWorkspace)) {
+      return OnboardingStatus.INVITE_TEAM;
     }
 
-    return null;
+    return OnboardingStatus.COMPLETED;
   }
 
   async skipInviteTeamOnboardingStep(workspaceId: string) {
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 56135730437..99c68f81ddd 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -107,9 +107,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
       return undefined;
     }
 
-    const workspaceMemberCount = await this.workspaceMemberRepository.count();
-
-    return workspaceMemberCount;
+    return await this.workspaceMemberRepository.count();
   }
 
   async checkUserWorkspaceExists(
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
index 4a855db1035..54c37148193 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -18,11 +18,11 @@ import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-mem
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
-import { OnboardingStep } from 'src/engine/core-modules/onboarding/enums/onboarding-step.enum';
+import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';
 
-registerEnumType(OnboardingStep, {
-  name: 'OnboardingStep',
-  description: 'Onboarding step',
+registerEnumType(OnboardingStatus, {
+  name: 'OnboardingStatus',
+  description: 'Onboarding status',
 });
 
 @Entity({ name: 'user', schema: 'core' })
@@ -119,6 +119,6 @@ export class User {
   @OneToMany(() => UserWorkspace, (userWorkspace) => userWorkspace.user)
   workspaces: Relation<UserWorkspace[]>;
 
-  @Field(() => OnboardingStep, { nullable: true })
-  onboardingStep: OnboardingStep;
+  @Field(() => OnboardingStatus, { nullable: true })
+  onboardingStatus: OnboardingStatus;
 }
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 154405d8eed..93008f2502e 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -27,7 +27,7 @@ import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
 import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
-import { OnboardingStep } from 'src/engine/core-modules/onboarding/enums/onboarding-step.enum';
+import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
 
@@ -118,17 +118,13 @@ export class UserResolver {
     return this.userService.deleteUser(userId);
   }
 
-  @ResolveField(() => OnboardingStep)
-  async onboardingStep(@Parent() user: User): Promise<OnboardingStep | null> {
-    if (!user) {
-      return null;
-    }
-
+  @ResolveField(() => OnboardingStatus)
+  async onboardingStatus(@Parent() user: User): Promise<OnboardingStatus> {
     const contextInstance = await this.loadServiceWithWorkspaceContext.load(
       this.onboardingService,
       user.defaultWorkspaceId,
     );
 
-    return contextInstance.getOnboardingStep(user, user.defaultWorkspace);
+    return contextInstance.getOnboardingStatus(user);
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
index edc141b5580..bccb5f2cf62 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
@@ -10,7 +10,6 @@ import {
   Relation,
   UpdateDateColumn,
 } from 'typeorm';
-import Stripe from 'stripe';
 
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
@@ -85,10 +84,6 @@ export class Workspace {
   @OneToMany(() => FeatureFlagEntity, (featureFlag) => featureFlag.workspace)
   featureFlags: Relation<FeatureFlagEntity[]>;
 
-  @Field(() => String)
-  @Column({ type: 'text', default: 'incomplete' })
-  subscriptionStatus: Stripe.Subscription.Status;
-
   @Field({ nullable: true })
   currentBillingSubscription: BillingSubscription;
 
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
index 30c980c4e0c..fb5faa313a1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
@@ -8,6 +8,7 @@ import { WorkspaceService } from 'src/engine/core-modules/workspace/services/wor
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { SubscriptionStatus } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 
 type DeleteIncompleteWorkspacesCommandOptions = {
   dryRun?: boolean;
@@ -52,7 +53,7 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
     options: DeleteIncompleteWorkspacesCommandOptions,
   ): Promise<void> {
     const where: FindOptionsWhere<Workspace> = {
-      subscriptionStatus: 'incomplete',
+      currentBillingSubscription: { status: SubscriptionStatus.Incomplete },
     };
 
     if (options.workspaceIds) {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
index d89a8357ce4..804759f55eb 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
@@ -60,6 +60,7 @@ export class AddStandardIdCommand extends CommandRunner {
             IS_STRIPE_INTEGRATION_ENABLED: false,
             IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
             IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
+            IS_FREE_ACCESS_ENABLED: false,
           },
         );
       const standardFieldMetadataCollection = this.standardFieldFactory.create(
@@ -76,6 +77,7 @@ export class AddStandardIdCommand extends CommandRunner {
           IS_STRIPE_INTEGRATION_ENABLED: false,
           IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
           IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
+          IS_FREE_ACCESS_ENABLED: false,
         },
       );
 
diff --git a/packages/twenty-server/src/modules/calendar/crons/jobs/calendar-cron-job.module.ts b/packages/twenty-server/src/modules/calendar/crons/jobs/calendar-cron-job.module.ts
index 2545118d5d7..38be6456d4f 100644
--- a/packages/twenty-server/src/modules/calendar/crons/jobs/calendar-cron-job.module.ts
+++ b/packages/twenty-server/src/modules/calendar/crons/jobs/calendar-cron-job.module.ts
@@ -2,16 +2,17 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/crons/jobs/google-calendar-sync.cron.job';
 import { WorkspaceGoogleCalendarSyncModule } from 'src/modules/calendar/services/workspace-google-calendar-sync/workspace-google-calendar-sync.module';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
     TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
     WorkspaceGoogleCalendarSyncModule,
+    BillingModule,
   ],
   providers: [GoogleCalendarSyncCronJob],
 })
diff --git a/packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts b/packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts
index b2c6e43da7f..40b56c1b4f8 100644
--- a/packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts
@@ -3,13 +3,12 @@ import { Scope } from '@nestjs/common';
 
 import { Repository, In } from 'typeorm';
 
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { WorkspaceGoogleCalendarSyncService } from 'src/modules/calendar/services/workspace-google-calendar-sync/workspace-google-calendar-sync.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Processor({
   queueName: MessageQueue.cronQueue,
@@ -17,26 +16,16 @@ import { Process } from 'src/engine/integrations/message-queue/decorators/proces
 })
 export class GoogleCalendarSyncCronJob {
   constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(DataSourceEntity, 'metadata')
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
     private readonly workspaceGoogleCalendarSyncService: WorkspaceGoogleCalendarSyncService,
-    private readonly environmentService: EnvironmentService,
+    private readonly billingService: BillingService,
   ) {}
 
   @Process(GoogleCalendarSyncCronJob.name)
   async handle(): Promise<void> {
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: this.environmentService.get('IS_BILLING_ENABLED')
-          ? {
-              subscriptionStatus: In(['active', 'trialing', 'past_due']),
-            }
-          : {},
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
+    const workspaceIds =
+      await this.billingService.getActiveSubscriptionWorkspaceIds();
 
     const dataSources = await this.dataSourceRepository.find({
       where: {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
index 9a3adfa50bf..0e8811b6b14 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
@@ -3,12 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository, In } from 'typeorm';
 
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import {
   MessageChannelSyncStage,
@@ -21,35 +19,26 @@ import {
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Processor(MessageQueue.cronQueue)
 export class MessagingMessageListFetchCronJob {
   private readonly logger = new Logger(MessagingMessageListFetchCronJob.name);
 
   constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(DataSourceEntity, 'metadata')
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
     @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
     private readonly messageChannelRepository: MessageChannelRepository,
-    private readonly environmentService: EnvironmentService,
+    private readonly billingService: BillingService,
   ) {}
 
   @Process(MessagingMessageListFetchCronJob.name)
   async handle(): Promise<void> {
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: this.environmentService.get('IS_BILLING_ENABLED')
-          ? {
-              subscriptionStatus: In(['active', 'trialing', 'past_due']),
-            }
-          : {},
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
+    const workspaceIds =
+      await this.billingService.getActiveSubscriptionWorkspaceIds();
 
     const dataSources = await this.dataSourceRepository.find({
       where: {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
index 53c9d86d90b..4be6ce2e121 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
@@ -3,9 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository, In } from 'typeorm';
 
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import {
@@ -21,35 +19,26 @@ import {
   MessageChannelSyncStage,
   MessageChannelWorkspaceEntity,
 } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Processor(MessageQueue.cronQueue)
 export class MessagingMessagesImportCronJob {
   private readonly logger = new Logger(MessagingMessagesImportCronJob.name);
 
   constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(DataSourceEntity, 'metadata')
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
-    private readonly environmentService: EnvironmentService,
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
     @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
     private readonly messageChannelRepository: MessageChannelRepository,
+    private readonly billingService: BillingService,
   ) {}
 
   @Process(MessagingMessagesImportCronJob.name)
   async handle(): Promise<void> {
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: this.environmentService.get('IS_BILLING_ENABLED')
-          ? {
-              subscriptionStatus: In(['active', 'trialing', 'past_due']),
-            }
-          : {},
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
+    const workspaceIds =
+      await this.billingService.getActiveSubscriptionWorkspaceIds();
 
     const dataSources = await this.dataSourceRepository.find({
       where: {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
index b9666c5ec56..bc1bce31ce1 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
@@ -2,9 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository, In } from 'typeorm';
 
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
@@ -14,31 +12,22 @@ import {
   MessagingOngoingStaleJobData,
   MessagingOngoingStaleJob,
 } from 'src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Processor(MessageQueue.cronQueue)
 export class MessagingOngoingStaleCronJob {
   constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(DataSourceEntity, 'metadata')
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
-    private readonly environmentService: EnvironmentService,
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
+    private readonly billingService: BillingService,
   ) {}
 
   @Process(MessagingOngoingStaleCronJob.name)
   async handle(): Promise<void> {
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: this.environmentService.get('IS_BILLING_ENABLED')
-          ? {
-              subscriptionStatus: In(['active', 'trialing', 'past_due']),
-            }
-          : {},
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
+    const workspaceIds =
+      await this.billingService.getActiveSubscriptionWorkspaceIds();
 
     const dataSources = await this.dataSourceRepository.find({
       where: {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
index 11800472aa6..4eea3c0d454 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
@@ -20,6 +20,7 @@ import { MessagingMessageListFetchJob } from 'src/modules/messaging/message-impo
 import { MessagingMessagesImportJob } from 'src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job';
 import { MessagingOngoingStaleJob } from 'src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job';
 import { MessagingMessageImportManagerMessageChannelListener } from 'src/modules/messaging/message-import-manager/listeners/messaging-import-manager-message-channel.listener';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 
 @Module({
   imports: [
@@ -28,6 +29,7 @@ import { MessagingMessageImportManagerMessageChannelListener } from 'src/modules
     TypeOrmModule.forFeature([Workspace], 'core'),
     TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
     TwentyORMModule.forFeature([MessageChannelWorkspaceEntity]),
+    BillingModule,
   ],
   providers: [
     MessagingMessageListFetchCronCommand,
diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
index 584792ac4f2..a0384d52829 100644
--- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
+++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
@@ -8,12 +8,12 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
 import { MessagingTelemetryService } from 'src/modules/messaging/common/services/messaging-telemetry.service';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 
 @Processor(MessageQueue.cronQueue)
 export class MessagingMessageChannelSyncStatusMonitoringCronJob {
@@ -28,7 +28,7 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
     @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
     private readonly messageChannelRepository: MessageChannelRepository,
-    private readonly environmentService: EnvironmentService,
+    private readonly billingService: BillingService,
     private readonly messagingTelemetryService: MessagingTelemetryService,
   ) {}
 
@@ -41,16 +41,8 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
       message: 'Starting message channel sync status monitoring',
     });
 
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: this.environmentService.get('IS_BILLING_ENABLED')
-          ? {
-              subscriptionStatus: In(['active', 'trialing', 'past_due']),
-            }
-          : {},
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
+    const workspaceIds =
+      await this.billingService.getActiveSubscriptionWorkspaceIds();
 
     const dataSources = await this.dataSourceRepository.find({
       where: {
diff --git a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts
index 2d6c04c7544..d41ed75e413 100644
--- a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts
+++ b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts
@@ -6,10 +6,12 @@ import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-s
 import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';
 import { MessagingMessageChannelSyncStatusMonitoringCronCommand } from 'src/modules/messaging/monitoring/crons/commands/messaging-message-channel-sync-status-monitoring.cron.command';
 import { MessagingMessageChannelSyncStatusMonitoringCronJob } from 'src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 
 @Module({
   imports: [
     MessagingCommonModule,
+    BillingModule,
     TypeOrmModule.forFeature([Workspace], 'core'),
     TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
   ],
diff --git a/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts b/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts
index 115ab85f3a7..0d3b5acc3ba 100644
--- a/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts
+++ b/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts
@@ -11,22 +11,6 @@ export class WorkspaceMemberRepository {
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
   ) {}
 
-  public async getByIds(
-    userIds: string[],
-    workspaceId: string,
-  ): Promise<WorkspaceMemberWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const result = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = ANY($1)`,
-      [userIds],
-      workspaceId,
-    );
-
-    return result;
-  }
-
   public async find(workspaceMemberId: string, workspaceId: string) {
     const dataSourceSchema =
       this.workspaceDataSourceService.getSchemaName(workspaceId);