diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx index 0b43ec9b39..e80586defd 100644 --- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx +++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx @@ -1,7 +1,7 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useState } from 'react'; -import { useRecoilValue } from 'recoil'; +import { useRecoilState, useRecoilValue } from 'recoil'; import { Key } from 'ts-key-enum'; import { SubTitle } from '@/auth/components/SubTitle'; @@ -27,6 +27,8 @@ import { MessageChannelVisibility, useSkipSyncEmailOnboardingStepMutation, } from '~/generated-metadata/graphql'; +import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState'; +import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum'; const StyledSyncEmailsContainer = styled.div` display: flex; @@ -56,6 +58,9 @@ export const SyncEmails = () => { const [visibility, setVisibility] = useState( MessageChannelVisibility.SHARE_EVERYTHING, ); + const [lastAuthenticatedMethod] = useRecoilState( + lastAuthenticatedMethodState, + ); const [skipSyncEmailOnboardingStatusMutation] = useSkipSyncEmailOnboardingStepMutation(); @@ -78,6 +83,9 @@ export const SyncEmails = () => { setNextOnboardingStatus(); }; + const userAuthenticatedWithSSO = + lastAuthenticatedMethod === AuthenticatedMethod.SSO; + const isGoogleMessagingEnabled = useRecoilValue( isGoogleMessagingEnabledState, ); @@ -118,7 +126,7 @@ export const SyncEmails = () => { /> - {isGoogleProviderEnabled && ( + {!userAuthenticatedWithSSO && isGoogleProviderEnabled && ( handleButtonClick(ConnectedAccountProvider.GOOGLE)} @@ -126,7 +134,7 @@ export const SyncEmails = () => { Icon={() => } /> )} - {isMicrosoftProviderEnabled && ( + {!userAuthenticatedWithSSO && isMicrosoftProviderEnabled && ( @@ -143,6 +151,22 @@ export const SyncEmails = () => { width={144} /> )} + {userAuthenticatedWithSSO && isMicrosoftProviderEnabled && ( + + handleButtonClick(ConnectedAccountProvider.MICROSOFT) + } + width={144} + /> + )} + {userAuthenticatedWithSSO && isGoogleProviderEnabled && ( + handleButtonClick(ConnectedAccountProvider.GOOGLE)} + width={144} + /> + )}