CYS - Core: fix wp-admin page visible when click on start designing

plugins/woocommerce-admin/client/customize-store/intro/index.tsx

@@ -224,6 +224,9 @@ export const Intro: CustomizeStoreComponent = ( { sendEvent, context } ) => {
 						setOpenDesignChangeWarningModal={
 							setOpenDesignChangeWarningModal
 						}
+						redirectToCYSFlow={ () =>
+							sendEvent( 'DESIGN_WITHOUT_AI' )
+						}
 						sendEvent={ sendEvent }
 					/>
 

plugins/woocommerce-admin/client/customize-store/intro/intro-banners.tsx

@@ -219,7 +219,11 @@ export const ThemeHasModsBanner = ( {
 	);
 };
 
-export const NoAIBanner = () => {
+export const NoAIBanner = ( {
+	redirectToCYSFlow,
+}: {
+	redirectToCYSFlow: () => void;
+} ) => {
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
 	interface Theme {
 		stylesheet?: string;
@@ -230,10 +234,6 @@ export const NoAIBanner = () => {
 	}, [] );
 
 	const isDefaultTheme = currentTheme?.stylesheet === 'twentytwentyfour';
-	const customizeStoreDesignUrl = addQueryArgs( `${ ADMIN_URL }admin.php`, {
-		page: 'wc-admin',
-		path: '/customize-store/design',
-	} );
 
 	return (
 		<>
@@ -249,15 +249,15 @@ export const NoAIBanner = () => {
 					if ( ! isDefaultTheme ) {
 						setIsModalOpen( true );
 					} else {
-						window.location.href = customizeStoreDesignUrl;
+						redirectToCYSFlow();
 					}
 				} }
 				showAIDisclaimer={ false }
 			/>
 			{ isModalOpen && (
 				<ThemeSwitchWarningModal
 					setIsModalOpen={ setIsModalOpen }
-					customizeStoreDesignUrl={ customizeStoreDesignUrl }
+					redirectToCYSFlow={ redirectToCYSFlow }
 				/>
 			) }
 		</>

plugins/woocommerce-admin/client/customize-store/intro/warning-modals.tsx

@@ -197,10 +197,10 @@ export const StartOverWarningModal = ( {
 
 export const ThemeSwitchWarningModal = ( {
 	setIsModalOpen,
-	customizeStoreDesignUrl,
+	redirectToCYSFlow,
 }: {
 	setIsModalOpen: ( arg0: boolean ) => void;
-	customizeStoreDesignUrl: string;
+	redirectToCYSFlow: () => void;
 } ) => {
 	return (
 		<Modal
@@ -231,11 +231,11 @@ export const ThemeSwitchWarningModal = ( {
 				</Button>
 				<Button
 					onClick={ () => {
-						window.location.href = customizeStoreDesignUrl;
 						setIsModalOpen( false );
 						recordEvent(
 							'customize_your_store_agree_to_theme_switch_click'
 						);
+						redirectToCYSFlow();
 					} }
 					variant="primary"
 				>

plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx

@@ -21,6 +21,7 @@ import { Product, ProductType } from '../product-list/types';
 import { appendURLParams } from '../../utils/functions';
 import { ADMIN_URL, getAdminSetting } from '~/utils/admin-settings';
 import { NoAIBanner } from '~/customize-store/intro/intro-banners';
+import { addQueryArgs } from '@wordpress/url';
 
 export default function ProductListContent( props: {
 	products: Product[];
@@ -119,7 +120,22 @@ export default function ProductListContent( props: {
 								} ),
 							} }
 						/>
-						{ index === bannerPosition && <NoAIBanner /> }
+						{ index === bannerPosition && (
+							<NoAIBanner
+								redirectToCYSFlow={ () => {
+									const customizeStoreDesignUrl =
+										addQueryArgs(
+											`${ ADMIN_URL }admin.php`,
+											{
+												page: 'wc-admin',
+												path: '/customize-store/design',
+											}
+										);
+									window.location.href =
+										customizeStoreDesignUrl;
+								} }
+							/>
+						) }
 					</Fragment>
 				) ) }
 			</div>

plugins/woocommerce-admin/client/marketplace/components/products/products.tsx

@@ -161,7 +161,9 @@ export default function Products( props: ProductsProps ) {
 			{ isModalOpen && (
 				<ThemeSwitchWarningModal
 					setIsModalOpen={ setIsModalOpen }
-					customizeStoreDesignUrl={ customizeStoreDesignUrl }
+					redirectToCYSFlow={ () => {
+						window.location.href = customizeStoreDesignUrl;
+					} }
 				/>
 			) }
 			<ProductListContent

plugins/woocommerce/changelog/45586-45542-cys-core-wp-admin-screen-visible-for-a-moment-after-clicking-start-designing-1

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+CYS - Core: fix wp-admin page visible when click on start designing