diff --git a/plugins/woocommerce-admin/client/homescreen/layout.js b/plugins/woocommerce-admin/client/homescreen/layout.js index 7f1c7ba5560..0126f32b878 100644 --- a/plugins/woocommerce-admin/client/homescreen/layout.js +++ b/plugins/woocommerce-admin/client/homescreen/layout.js @@ -60,7 +60,7 @@ export const Layout = ( { const [ showInbox, setShowInbox ] = useState( true ); const isTaskListEnabled = taskListHidden === false; - const isDashboardShown = ! isTaskListEnabled || ! query.task; + const isDashboardShown = ! query.task; if ( isBatchUpdating && ! showInbox ) { setShowInbox( true ); @@ -129,9 +129,7 @@ export const Layout = ( { 'two-columns': twoColumns, } ) } > - { isDashboardShown - ? renderColumns() - : isTaskListEnabled && renderTaskList() } + { isDashboardShown ? renderColumns() : renderTaskList() } { shouldShowWelcomeModal && ( { diff --git a/plugins/woocommerce-admin/client/task-list/index.js b/plugins/woocommerce-admin/client/task-list/index.js index 2c9d7295108..a656fc6bf4d 100644 --- a/plugins/woocommerce-admin/client/task-list/index.js +++ b/plugins/woocommerce-admin/client/task-list/index.js @@ -116,7 +116,6 @@ export class TaskDashboard extends Component { dismissedTasks, isExtendedTaskListComplete, isExtendedTaskListHidden, - isSetupTaskListHidden, isTaskListComplete, query, trackedCompletedTasks, @@ -127,7 +126,7 @@ export class TaskDashboard extends Component { return ( <> - { setupTasks && ! isSetupTaskListHidden && ( + { setupTasks && (