diff --git a/packages/js/data/src/onboarding/actions.js b/packages/js/data/src/onboarding/actions.js index 5ee1161493e..df387990ad2 100644 --- a/packages/js/data/src/onboarding/actions.js +++ b/packages/js/data/src/onboarding/actions.js @@ -169,6 +169,7 @@ export function hideTaskListSuccess( taskList ) { return { type: TYPES.HIDE_TASK_LIST_SUCCESS, taskList, + taskListId: taskList.id, }; } @@ -191,6 +192,7 @@ export function unhideTaskListSuccess( taskList ) { return { type: TYPES.UNHIDE_TASK_LIST_SUCCESS, taskList, + taskListId: taskList.id, }; } diff --git a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js index 139f556325a..75773d87858 100644 --- a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js +++ b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js @@ -246,7 +246,10 @@ export const ActivityPanel = ( { isEmbedded, query } ) => { if ( currentLocation !== homescreenLocation ) { // Ensure that if the user is trying to get to the task list they can see it even if // it was dismissed. - if ( setupTaskListHidden === 'no' ) { + if ( + setupTaskListHidden === 'no' || + setupTaskListHidden === false + ) { redirectToHomeScreen(); } else { unhideTaskList( 'setup' ).then( redirectToHomeScreen );