From ec362d8b6f078bbfe624dac5bd8c1be2159cba94 Mon Sep 17 00:00:00 2001
From: arthur791004 <arthur.chu@automattic.com>
Date: Wed, 2 Oct 2024 18:25:57 +0900
Subject: [PATCH] Theme: Redirect back to the Theme Details page after the
 checkout of the Partner themes (#95058)

---
 .../marketplace/use-themes-thank-you-data.tsx | 57 ++++++++++++-------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/client/my-sites/checkout/checkout-thank-you/marketplace/use-themes-thank-you-data.tsx b/client/my-sites/checkout/checkout-thank-you/marketplace/use-themes-thank-you-data.tsx
index 99d8e1f8833165..756a23b8ad3806 100644
--- a/client/my-sites/checkout/checkout-thank-you/marketplace/use-themes-thank-you-data.tsx
+++ b/client/my-sites/checkout/checkout-thank-you/marketplace/use-themes-thank-you-data.tsx
@@ -52,6 +52,8 @@ export function useThemesThankYouData(
 	);
 	const allThemesFetched = themesList.every( ( theme ) => !! theme );
 
+	const firstTheme = themesList[ 0 ] ?? null;
+
 	const isActive = themesList.some(
 		( theme ) => theme?.stylesheet === themeSlug || theme?.id === themeSlug
 	);
@@ -69,21 +71,6 @@ export function useThemesThankYouData(
 	useQueryThemes( 'wpcom', themeSlugs );
 	useQueryThemes( 'wporg', themeSlugs );
 
-	// Clear completed activated theme request state to avoid displaying the Thanks modal
-	useEffect( () => {
-		return () => {
-			dispatch( clearActivated( siteId || 0 ) );
-		};
-	}, [ dispatch, siteId ] );
-
-	useEffect( () => {
-		if ( isActive && continueWithPluginBundle ) {
-			page(
-				`/setup/plugin-bundle/getCurrentThemeSoftwareSets?siteId=${ siteId }&siteSlug=${ siteSlug }`
-			);
-		}
-	}, [ isActive, continueWithPluginBundle, siteId, siteSlug ] );
-
 	const themesSection = themesList
 		.filter( ( theme ) => theme )
 		.map( ( theme: any ) => {
@@ -122,18 +109,43 @@ export function useThemesThankYouData(
 
 	// DotOrg (if not also Dotcom) and Externay managed themes
 	// needs an atomic site to be installed.
-	type Theme = { id: string } | undefined;
 	const hasDotOrgThemes = dotOrgThemes.some(
-		( theme: Theme ) =>
-			!! theme && ! dotComThemes.find( ( dotComTheme: Theme ) => dotComTheme?.id === theme.id )
+		( theme: { id: string } | undefined ) =>
+			!! theme &&
+			! dotComThemes.find(
+				( dotComTheme: { id: string } | undefined ) => dotComTheme?.id === theme.id
+			)
 	);
 	const hasExternallyManagedThemes = useSelector( ( state ) =>
 		getHasExternallyManagedThemes( state, themeSlugs )
 	);
 	const isAtomicNeeded = hasDotOrgThemes || hasExternallyManagedThemes;
 
+	// Clear completed activated theme request state to avoid displaying the Thanks modal
+	useEffect( () => {
+		return () => {
+			dispatch( clearActivated( siteId || 0 ) );
+		};
+	}, [ dispatch, siteId ] );
+
+	// Redirect to the plugin bundle flow after the activation.
+	useEffect( () => {
+		if ( isActive && continueWithPluginBundle ) {
+			page(
+				`/setup/plugin-bundle/getCurrentThemeSoftwareSets?siteId=${ siteId }&siteSlug=${ siteSlug }`
+			);
+		}
+	}, [ isActive, continueWithPluginBundle, siteId, siteSlug ] );
+
+	// Redirect to the Theme Details page after the atomic transfer.
+	useEffect( () => {
+		if ( firstTheme && isAtomicNeeded && isJetpack ) {
+			page( `/theme/${ firstTheme.id }/${ siteSlug }` );
+		}
+	}, [ firstTheme, isAtomicNeeded, isJetpack ] );
+
 	return [
-		themesList[ 0 ] ?? null,
+		firstTheme,
 		themesSection,
 		allThemesFetched,
 		goBackSection,
@@ -142,8 +154,9 @@ export function useThemesThankYouData(
 		thankyouSteps,
 		isAtomicNeeded,
 		null,
-		// Always display the loading screen if the theme has plugin bundle because the page will
-		// be redirected to the plugin-bundle flow immediately after the theme is activated.
-		! continueWithPluginBundle,
+		// Always display the loading screen for the following situations:
+		// - Redirect to the plugin-bundle flow after the theme is activated for Woo themes.
+		// - Redirect to the Theme Details page after the atomic transfer if it's required.
+		! ( continueWithPluginBundle || isAtomicNeeded ),
 	];
 }