My Jetpack: fix step while assignment is loading

Automattic · Nov 1, 2024 · ded2a7f · ded2a7f
1 parent 9406561
commit ded2a7f
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx b/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
@@ -47,7 +47,7 @@ const WelcomeFlow: FC< Props > = ( {
 	const [ prevStep, setPrevStep ] = useState( '' );
 
 	const currentStep = useMemo( () => {
-		if ( ! siteIsRegistered ) {
+		if ( ! siteIsRegistered || welcomeFlowExperiment.isLoading ) {
 			return 'connection';
 		} else if ( ! isProcessingEvaluation ) {
 			if ( ! recommendedModules && ! isJetpackUserNew() ) {
@@ -56,10 +56,6 @@ const WelcomeFlow: FC< Props > = ( {
 				return null;
 			}
 
-			if ( welcomeFlowExperiment.isLoading ) {
-				return 'evaluation-processing';
-			}
-
 			// Otherwise, it means user is either new or just repeats the recommendation
 			return 'evaluation';
 		}