Don't consider user lifecycle status when repeating evaluation

projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx

@@ -23,7 +23,8 @@ export type WelcomeFlowExperiment = {
 const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
 	const { recordEvent } = useAnalytics();
 	const { dismissWelcomeBanner } = useWelcomeBanner();
-	const { submitEvaluation, saveEvaluationResult } = useEvaluationRecommendations();
+	const { recommendedModules, submitEvaluation, saveEvaluationResult } =
+		useEvaluationRecommendations();
 	const {
 		siteIsRegistered,
 		siteIsRegistering,
@@ -44,15 +45,27 @@ const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
 		if ( ! siteIsRegistered || welcomeFlowExperiment.isLoading ) {
 			return 'connection';
 		} else if ( ! isProcessingEvaluation ) {
-			if ( ! isJetpackUserNew() || welcomeFlowExperiment.variation !== 'treatment' ) {
-				// If the user is not new, we don't show the evaluation step
+			if (
+				! recommendedModules &&
+				( welcomeFlowExperiment.variation === 'control' || ! isJetpackUserNew() )
+			) {
+				// If user is not new but doesn't have recommendations, we skip evaluation
+				// If user has recommendations, it means they were already in treatment group and they redo the evaluation
 				return null;
 			}
+
+			// Otherwise, it means user is either new or just repeats the recommendation
 			return 'evaluation';
 		}
 
 		return 'evaluation-processing';
-	}, [ isProcessingEvaluation, siteIsRegistered, welcomeFlowExperiment ] );
+	}, [
+		isProcessingEvaluation,
+		recommendedModules,
+		siteIsRegistered,
+		welcomeFlowExperiment.isLoading,
+		welcomeFlowExperiment.variation,
+	] );
 
 	useEffect( () => {
 		if ( prevStep !== currentStep ) {

projects/packages/my-jetpack/changelog/fix-welcome-flow-redo

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Don't consider user lifecycle status when repeating evaluation