Check for valid deadline when setting Update Business Details task (#5154)

* adds a check to the client to ensure we have a valid deadline and use a more generic message if not.

* Update changelog

* Fixes to the logic, and also fixed a bug discovered in the process.

* Update to the logic for showing the task to use a transient

* Update to make the account status data task check on every fetch of the account

* Fixing accidental merge issue

* Updating to use a bool rather than a string

* Updating to use a bool rather than a string

Author: dmallory42

changelog/4846-update-by-jan-1970

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fix for an issue where a timestamp in the past could be displayed on the update business details task card.

client/overview/task-list/tasks.js

@@ -27,7 +27,7 @@ export const getTasks = ( {
 
 	const isDisputeTaskVisible = 0 < numDisputesNeedingResponse;
 
-	if ( accountRestrictedSoon ) {
+	if ( accountRestrictedSoon && currentDeadline ) {
 		accountDetailsTaskDescription = sprintf(
 			/* translators: %s - formatted requirements current deadline (date) */
 			__(
@@ -50,7 +50,7 @@ export const getTasks = ( {
 
 	return [
 		isAccountOverviewTasksEnabled &&
-			'yes' === showUpdateDetailsTask && {
+			showUpdateDetailsTask && {
 				key: 'update-business-details',
 				level: 1,
 				title: __(

client/overview/task-list/test/tasks.js

@@ -14,7 +14,7 @@ describe( 'getTasks()', () => {
 				pastDue: false,
 				accountLink: 'http://example.com',
 			},
-			showUpdateDetailsTask: 'yes',
+			showUpdateDetailsTask: true,
 			isAccountOverviewTasksEnabled: true,
 		} );
 
@@ -36,7 +36,7 @@ describe( 'getTasks()', () => {
 				pastDue: true,
 				accountLink: 'http://example.com',
 			},
-			showUpdateDetailsTask: 'no',
+			showUpdateDetailsTask: false,
 			isAccountOverviewTasksEnabled: true,
 		} );
 
@@ -57,7 +57,7 @@ describe( 'getTasks()', () => {
 				pastDue: false,
 				accountLink: 'http://example.com',
 			},
-			showUpdateDetailsTask: 'yes',
+			showUpdateDetailsTask: true,
 			isAccountOverviewTasksEnabled: true,
 		} );
 
@@ -111,7 +111,7 @@ describe( 'getTasks()', () => {
 	it( 'returns the expected keys when the account overview flag is enabled', () => {
 		const tasks = getTasks( {
 			isAccountOverviewTasksEnabled: true,
-			showUpdateDetailsTask: 'yes',
+			showUpdateDetailsTask: true,
 			wpcomReconnectUrl: 'http://example.com',
 			accountStatus: {},
 		} );
@@ -126,7 +126,7 @@ describe( 'getTasks()', () => {
 
 	it( 'returns the expected keys when the account overview flag is disabled', () => {
 		const tasks = getTasks( {
-			showUpdateDetailsTask: 'yes',
+			showUpdateDetailsTask: true,
 			wpcomReconnectUrl: 'http://example.com',
 			accountStatus: {},
 		} );

includes/admin/class-wc-payments-admin.php

@@ -210,7 +210,6 @@ public function add_payments_menu_for_treatment() {
 		);
 
 		$this->add_menu_notification_badge();
-		$this->add_update_business_details_task();
 	}
 
 	/**
@@ -419,7 +418,6 @@ public function add_payments_menu() {
 		);
 
 		$this->add_menu_notification_badge();
-		$this->add_update_business_details_task();
 		$this->add_disputes_notification_badge();
 		if ( \WC_Payments_Features::is_auth_and_capture_enabled() && $this->wcpay_gateway->get_option( 'manual_capture' ) === 'yes' ) {
 			$this->add_transactions_notification_badge();
@@ -478,6 +476,8 @@ public function register_payments_scripts() {
 			];
 		}
 
+		$account_status_data = $this->account->get_account_status_data();
+
 		$wcpay_settings = [
 			'connectUrl'                 => WC_Payments_Account::get_connect_url(),
 			'connect'                    => [
@@ -496,11 +496,11 @@ public function register_payments_scripts() {
 			'fraudServices'              => $this->account->get_fraud_services_config(),
 			'isJetpackConnected'         => $this->payments_api_client->is_server_connected(),
 			'isJetpackIdcActive'         => Jetpack_Identity_Crisis::has_identity_crisis(),
-			'accountStatus'              => $this->account->get_account_status_data(),
+			'accountStatus'              => $account_status_data,
 			'accountFees'                => $this->account->get_fees(),
 			'accountLoans'               => $this->account->get_capital(),
 			'accountEmail'               => $this->account->get_account_email(),
-			'showUpdateDetailsTask'      => get_option( 'wcpay_show_update_business_details_task', 'no' ),
+			'showUpdateDetailsTask'      => $this->get_should_show_update_business_details_task( $account_status_data ),
 			'wpcomReconnectUrl'          => $this->payments_api_client->is_server_connected() && ! $this->payments_api_client->has_server_connection_owner() ? WC_Payments_Account::get_wpcom_reconnect_url() : null,
 			'additionalMethodsSetup'     => [
 				'isUpeEnabled' => WC_Payments_Features::is_upe_enabled(),
@@ -809,21 +809,24 @@ public function add_menu_notification_badge() {
 	}
 
 	/**
-	 * Attempts to add a setup task to remind the user to update
-	 * their business details when the account is facing restriction.
+	 * Check whether a setup task needs to be displayed prompting the user to update
+	 * their business details.
+	 *
+	 * @param array $account_status_data An array containing the account status data.
+	 *
+	 * @return bool True if we should show the task, false otherwise.
 	 */
-	public function add_update_business_details_task() {
-		if ( 'yes' === get_option( 'wcpay_show_update_business_details_task', 'no' ) ) {
-			return;
+	public function get_should_show_update_business_details_task( array $account_status_data ) {
+		$status           = $account_status_data['status'] ?? '';
+		$current_deadline = $account_status_data['currentDeadline'] ?? false;
+		$past_due         = $account_status_data['pastDue'] ?? false;
+
+		// If the account is restricted_soon, but there's no current deadline, no action is needed.
+		if ( ( 'restricted_soon' === $status && $current_deadline ) || ( 'restricted' === $status && $past_due ) ) {
+			return true;
 		}
 
-		$account  = $this->account->get_account_status_data();
-		$status   = $account['status'] ?? '';
-		$past_due = $account['has_overdue_requirements'] ?? false;
-
-		if ( 'restricted_soon' === $status || ( 'restricted' === $status && $past_due ) ) {
-			update_option( 'wcpay_show_update_business_details_task', 'yes' );
-		}
+		return false;
 	}
 
 	/**

includes/class-wc-payments-account.php

@@ -194,8 +194,8 @@ public function get_account_status_data() {
 			'paymentsEnabled'     => $account['payments_enabled'],
 			'deposits'            => $account['deposits'] ?? [],
 			'depositsStatus'      => $account['deposits']['status'] ?? $account['deposits_status'] ?? '',
-			'currentDeadline'     => isset( $account['current_deadline'] ) ? $account['current_deadline'] : false,
-			'pastDue'             => isset( $account['has_overdue_requirements'] ) ? $account['has_overdue_requirements'] : false,
+			'currentDeadline'     => $account['current_deadline'] ?? false,
+			'pastDue'             => $account['has_overdue_requirements'] ?? false,
 			'accountLink'         => $this->get_login_url(),
 			'hasSubmittedVatData' => $account['has_submitted_vat_data'] ?? false,
 		];