From ea433e4f09010620bc9013691430d30571116bd2 Mon Sep 17 00:00:00 2001
From: Joshua Flowers <joshuatf@gmail.com>
Date: Tue, 19 Oct 2021 12:55:45 -0400
Subject: [PATCH] Remove complete task option check

---
 client/header/activity-panel/index.js      | 19 ++++++++++++++-----
 client/header/activity-panel/test/index.js |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/client/header/activity-panel/index.js b/client/header/activity-panel/index.js
index 9a575bdbf7b..c38b5c4b753 100644
--- a/client/header/activity-panel/index.js
+++ b/client/header/activity-panel/index.js
@@ -121,11 +121,11 @@ export const ActivityPanel = ( { isEmbedded, query, userPreferencesData } ) => {
 	const {
 		hasUnreadNotes,
 		hasAbbreviatedNotifications,
+		isCompletedTask,
 		thingsToDoNextCount,
 		requestingTaskListOptions,
 		setupTaskListComplete,
 		setupTaskListHidden,
-		trackedCompletedTasks,
 		previewSiteBtnTrackData,
 	} = useSelect( ( select ) => {
 		const { getOption } = select( OPTIONS_STORE_NAME );
@@ -154,9 +154,18 @@ export const ActivityPanel = ( { isEmbedded, query, userPreferencesData } ) => {
 				( list ) => list.id === 'setup' && list.isComplete
 			),
 			setupTaskListHidden: isSetupTaskListHidden,
-			trackedCompletedTasks:
-				getOption( 'woocommerce_task_list_tracked_completed_tasks' ) ||
-				[],
+			isCompletedTask: Boolean(
+				query.task &&
+					taskLists.reduce( ( value, list ) => {
+						return (
+							value ||
+							list.tasks.find(
+								( task ) =>
+									task.id === query.task && task.isComplete
+							)
+						);
+					}, false )
+			),
 			previewSiteBtnTrackData: getPreviewSiteBtnTrackData(
 				select,
 				getOption
@@ -343,7 +352,7 @@ export const ActivityPanel = ( { isEmbedded, query, userPreferencesData } ) => {
 			task &&
 			highlightShown !== 'yes' &&
 			( startedTasks || {} )[ task ] > 1 &&
-			! trackedCompletedTasks.includes( task )
+			! isCompletedTask
 		) {
 			return true;
 		}
diff --git a/client/header/activity-panel/test/index.js b/client/header/activity-panel/test/index.js
index 7c7fbb42bac..ae236f5c075 100644
--- a/client/header/activity-panel/test/index.js
+++ b/client/header/activity-panel/test/index.js
@@ -264,7 +264,7 @@ describe( 'Activity Panel', () => {
 				requestingTaskListOptions: false,
 				setupTaskListComplete: false,
 				setupTaskListHidden: false,
-				trackedCompletedTasks: [ 'payment' ],
+				isCompletedTask: true,
 			} ) );
 
 			const { queryByText } = render(