Address CR feedback.

Author: ankitrox

assets/js/components/setup/ModuleSetup.js

@@ -55,6 +55,11 @@ export default function ModuleSetup( { moduleSlug } ) {
 	const setupFlowRefreshEnabled = useFeature( 'setupFlowRefresh' );
 	const [ showProgress ] = useQueryArg( 'showProgress' );
 
+	const isInitialSetupFlow =
+		setupFlowRefreshEnabled &&
+		moduleSlug === MODULE_SLUG_ANALYTICS_4 &&
+		showProgress === 'true';
+
 	const module = useSelect( ( select ) =>
 		select( CORE_MODULES ).getModule( moduleSlug )
 	);
@@ -97,7 +102,7 @@ export default function ModuleSetup( { moduleSlug } ) {
 			);
 			navigateTo( adminURL );
 		},
-		[ registry, navigateTo, moduleSlug ]
+		[ registry, navigateTo, moduleSlug, viewContext, isInitialSetupFlow ]
 	);
 
 	const onCompleteSetup = module?.onCompleteSetup;
@@ -110,11 +115,6 @@ export default function ModuleSetup( { moduleSlug } ) {
 		await trackEvent( 'moduleSetup', 'cancel_module_setup', moduleSlug );
 	}, [ moduleSlug ] );
 
-	const isInitialSetupFlow =
-		setupFlowRefreshEnabled &&
-		moduleSlug === MODULE_SLUG_ANALYTICS_4 &&
-		showProgress === 'true';
-
 	useMount( () => {
 		if ( isInitialSetupFlow ) {
 			trackEvent(

assets/js/modules/analytics-4/components/common/AccountCreate/index.test.js

@@ -325,7 +325,7 @@ describe( 'AccountCreate', () => {
 				cleanup();
 			} );
 
-			it( 'should track initial setup flow create account event when showProgress=true', async () => {
+			it( 'should track create account event during initial setup flow', async () => {
 				global.location.href =
 					'http://example.com/wp-admin/admin.php?page=googlesitekit-dashboard&slug=analytics-4&reAuth=true&showProgress=true';
 
@@ -357,7 +357,7 @@ describe( 'AccountCreate', () => {
 				expect( genericCreateAccountCall ).toBeUndefined();
 			} );
 
-			it( 'should track generic create account event when showProgress is not true', async () => {
+			it( 'should track generic create account event during non-initial setup flow', async () => {
 				global.location.href =
 					'http://example.com/wp-admin/admin.php?page=googlesitekit-dashboard&slug=analytics-4&reAuth=true';
 				( { getByRole, waitForRegistry, rerender } = render(