Fix the loading state between installation and activation

Automattic · Oct 1, 2024 · 02cc08a · 02cc08a
1 parent a039baa
commit 02cc08a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/client/state/themes/actions/install-theme.js b/client/state/themes/actions/install-theme.js
@@ -30,11 +30,6 @@ export function installTheme( themeId, siteId ) {
 			.post( `/sites/${ siteId }/themes/${ themeId }/install` )
 			.then( ( theme ) => {
 				dispatch( receiveTheme( theme, siteId ) );
-				dispatch( {
-					type: THEME_INSTALL_SUCCESS,
-					siteId,
-					themeId,
-				} );
 
 				// Install parent theme if theme requires one
 				if ( themeId.endsWith( '-wpcom' ) ) {
@@ -48,6 +43,13 @@ export function installTheme( themeId, siteId ) {
 				}
 			} )
 			.then( () => dispatch( requestThemes( siteId, {} ) ) )
+			.then( () => {
+				dispatch( {
+					type: THEME_INSTALL_SUCCESS,
+					siteId,
+					themeId,
+				} );
+			} )
 			.catch( ( error ) => {
 				dispatch( {
 					type: THEME_INSTALL_FAILURE,