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 index f5209481ac..77d5431ab1 100644 --- a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts +++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts @@ -16,7 +16,6 @@ import { import { OnboardingStatus, - PermissionFlagType, SubscriptionStatus, } from '~/generated-metadata/graphql'; import { @@ -31,7 +30,6 @@ const renderHooks = ( onboardingStatus: OnboardingStatus, withCurrentBillingSubscription: boolean, withOneWorkspaceMember = true, - permissionFlags = mockedUserData.currentUserWorkspace.permissionFlags, ) => { const { result } = renderHook( () => { @@ -55,10 +53,7 @@ const renderHooks = ( ); act(() => { result.current.setCurrentUser({ ...mockedUserData, onboardingStatus }); - result.current.setCurrentUserWorkspace({ - ...mockedUserData.currentUserWorkspace, - permissionFlags, - }); + result.current.setCurrentUserWorkspace(mockedUserData.currentUserWorkspace); result.current.setCurrentWorkspace({ ...mockCurrentWorkspace, currentBillingSubscription: withCurrentBillingSubscription @@ -92,16 +87,6 @@ describe('useSetNextOnboardingStatus', () => { expect(nextOnboardingStatus).toEqual(OnboardingStatus.SYNC_EMAIL); }); - it('should skip SyncEmail when account sync is disabled', () => { - const nextOnboardingStatus = renderHooks( - OnboardingStatus.WORKSPACE_ACTIVATION, - false, - true, - [PermissionFlagType.WORKSPACE_MEMBERS], - ); - expect(nextOnboardingStatus).toEqual(OnboardingStatus.PROFILE_CREATION); - }); - it('should create profile after syncing emails', () => { const nextOnboardingStatus = renderHooks( OnboardingStatus.SYNC_EMAIL, diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts index a3a5ea1bac..0ea27cbaad 100644 --- a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts +++ b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts @@ -9,33 +9,25 @@ import { currentWorkspaceState, } from '@/auth/states/currentWorkspaceState'; import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState'; -import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap'; import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue'; import { useCallback } from 'react'; -import { - OnboardingStatus, - PermissionFlagType, -} from '~/generated-metadata/graphql'; +import { OnboardingStatus } from '~/generated-metadata/graphql'; import { useStore } from 'jotai'; type GetNextOnboardingStatusArgs = { currentUser: CurrentUser | null; currentWorkspace: CurrentWorkspace | null; calendarBookingPageId: string | null; - isAccountSyncEnabled: boolean; }; const getNextOnboardingStatus = ({ currentUser, currentWorkspace, calendarBookingPageId, - isAccountSyncEnabled, }: GetNextOnboardingStatusArgs) => { if (currentUser?.onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION) { - return isAccountSyncEnabled - ? OnboardingStatus.SYNC_EMAIL - : OnboardingStatus.PROFILE_CREATION; + return OnboardingStatus.SYNC_EMAIL; } if (currentUser?.onboardingStatus === OnboardingStatus.SYNC_EMAIL) { @@ -63,16 +55,12 @@ export const useSetNextOnboardingStatus = () => { const currentUser = useAtomStateValue(currentUserState); const currentWorkspace = useAtomStateValue(currentWorkspaceState); const calendarBookingPageId = useAtomStateValue(calendarBookingPageIdState); - const permissionMap = usePermissionFlagMap(); - const isAccountSyncEnabled = - permissionMap[PermissionFlagType.CONNECTED_ACCOUNTS]; return useCallback(() => { const nextOnboardingStatus = getNextOnboardingStatus({ currentUser, currentWorkspace, calendarBookingPageId, - isAccountSyncEnabled, }); store.set(currentUserState.atom, (current) => { if (isDefined(current)) { @@ -83,11 +71,5 @@ export const useSetNextOnboardingStatus = () => { } return current; }); - }, [ - currentUser, - currentWorkspace, - calendarBookingPageId, - isAccountSyncEnabled, - store, - ]); + }, [currentUser, currentWorkspace, calendarBookingPageId, store]); };