From ded2a7fa30cc506951e5ff653214d9079ae3a43a Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Fri, 1 Nov 2024 00:21:57 -0300
Subject: [PATCH] My Jetpack: fix step while assignment is loading

---
 .../my-jetpack/_inc/components/welcome-flow/index.tsx       | 6 +-----
 1 file changed, 1 insertion(+), 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
index a781e37da7ebb..754612efc01ff 100644
--- 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';
 		}