fixes

woocommerce · Jun 5, 2020 · e62280e · e62280e
1 parent 05fee9f
commit e62280e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/client/dashboard/customizable.js b/client/dashboard/customizable.js
@@ -302,12 +302,15 @@ class CustomizableDashboard extends Component {
 	}
 
 	render() {
-		const { query, taskListHidden, taskListComplete } = this.props;
+		const {
+			query,
+			taskListHidden,
+			taskListComplete,
+			homepageEnabled,
+		} = this.props;
 
 		const isTaskListEnabled =
-			isOnboardingEnabled() &&
-			! taskListHidden &&
-			! window.wcAdminFeatures.homepage;
+			isOnboardingEnabled() && ! taskListHidden && ! homepageEnabled;
 
 		const isDashboardShown =
 			! isTaskListEnabled || ( ! query.task && taskListComplete );
@@ -340,6 +343,9 @@ export default compose(
 		};
 
 		if ( isOnboardingEnabled() ) {
+			withSelectData.homepageEnabled =
+				window.wcAdminFeatures.homepage &&
+				getOption( 'woocommerce_homescreen_enabled' ) === 'yes';
 			withSelectData.taskListHidden =
 				getOption( 'woocommerce_task_list_hidden' ) === 'yes';
 			withSelectData.taskListComplete =

diff --git a/client/dashboard/utils.js b/client/dashboard/utils.js
@@ -51,14 +51,14 @@ export function getProductIdsForCart(
 	installedPlugins
 ) {
 	const onboarding = getSetting( 'onboarding', {} );
+	const productIds = [];
 
 	// The population of onboarding.productTypes only happens if the task list should be shown
 	// so bail early if it isn't present.
 	if ( ! onboarding.productTypes ) {
 		return productIds;
 	}
 
-	const productIds = [];
 	const productTypes = profileItems.product_types || [];
 
 	productTypes.forEach( ( productType ) => {