diff --git a/packages/twenty-front/src/modules/settings/roles/hooks/useHasSettingsPermission.ts b/packages/twenty-front/src/modules/settings/roles/hooks/useHasSettingsPermission.ts index adee35628..a3ab2da41 100644 --- a/packages/twenty-front/src/modules/settings/roles/hooks/useHasSettingsPermission.ts +++ b/packages/twenty-front/src/modules/settings/roles/hooks/useHasSettingsPermission.ts @@ -1,16 +1,27 @@ import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState'; +import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState'; import { useRecoilValue } from 'recoil'; +import { WorkspaceActivationStatus } from 'twenty-shared'; import { SettingsPermissions } from '~/generated/graphql'; export const useHasSettingsPermission = ( settingsPermission?: SettingsPermissions, ) => { + const currentWorkspace = useRecoilValue(currentWorkspaceState); const currentUserWorkspace = useRecoilValue(currentUserWorkspaceState); if (!settingsPermission) { return true; } + if ( + settingsPermission === SettingsPermissions.WORKSPACE && + currentWorkspace?.activationStatus === + WorkspaceActivationStatus.PENDING_CREATION + ) { + return true; + } + const currentUserWorkspaceSettingsPermissions = currentUserWorkspace?.settingsPermissions;