diff --git a/Composer/packages/client/src/components/AppComponents/Assistant.tsx b/Composer/packages/client/src/components/AppComponents/Assistant.tsx index 7b4e82b786..491a3740a4 100644 --- a/Composer/packages/client/src/components/AppComponents/Assistant.tsx +++ b/Composer/packages/client/src/components/AppComponents/Assistant.tsx @@ -7,6 +7,7 @@ import { Suspense, Fragment } from 'react'; import React from 'react'; import { onboardingDisabled } from '../../constants'; +import { useLocation } from '../../utils/hooks'; import { isElectron } from './../../utils/electronUtil'; import { appUpdateState, userSettingsState, onboardingState } from './../../recoilModel'; @@ -20,10 +21,23 @@ export const Assistant = () => { const onboarding = useRecoilValue(onboardingState); const { showing: appUpdaterDialogShowing } = useRecoilValue(appUpdateState); + const { + location: { pathname }, + } = useLocation(); + + const isShowingPVAorCreationFlow = + pathname === '/projects/import' || pathname === '/projects/create' || pathname === '/v2/projects/create'; const renderDataCollectionDialog = - isElectron() && !appUpdaterDialogShowing && typeof telemetry.allowDataCollection === 'undefined'; + isElectron() && + !isShowingPVAorCreationFlow && + !appUpdaterDialogShowing && + typeof telemetry.allowDataCollection === 'undefined'; const renderOnboarding = - !onboardingDisabled && !renderDataCollectionDialog && !appUpdaterDialogShowing && !onboarding.complete; + !isShowingPVAorCreationFlow && + !onboardingDisabled && + !renderDataCollectionDialog && + !appUpdaterDialogShowing && + !onboarding.complete; const renderAppUpdater = isElectron(); return ( diff --git a/Composer/packages/client/src/components/DataCollectionDialog.tsx b/Composer/packages/client/src/components/DataCollectionDialog.tsx index 00a6eca482..a1ce1a1ef5 100644 --- a/Composer/packages/client/src/components/DataCollectionDialog.tsx +++ b/Composer/packages/client/src/components/DataCollectionDialog.tsx @@ -26,6 +26,7 @@ const DataCollectionDialog: React.FC = () => { hidden={false} modalProps={{ isBlocking: true, + isDarkOverlay: false, }} title={formatMessage('Help us improve?')} onDismiss={handleDataCollectionChange(false)}