Display the task components regardless of woocommerce_task_list_hidden value (https://github.com/woocommerce/woocommerce-admin/pull/6026)
This commit is contained in:
parent
3338c273c2
commit
aa602e66cf
|
@ -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 && (
|
||||
<WelcomeModal
|
||||
onClose={ () => {
|
||||
|
|
|
@ -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 && (
|
||||
<TaskList
|
||||
dismissedTasks={ dismissedTasks || [] }
|
||||
isTaskListComplete={ isTaskListComplete }
|
||||
|
|
Loading…
Reference in New Issue