fix: correct option type for duplicate payment method dismissed notices (#11336)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: rtio

changelog/woopmnt-5707-duplicate-payment-method-inline-warning-persists-after-the

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed duplicate payment method dismissed notices option type from bool to array, allowing notice dismissals to persist across page refreshes.

includes/admin/class-wc-rest-payments-settings-option-controller.php

@@ -27,7 +27,7 @@ class WC_REST_Payments_Settings_Option_Controller extends WC_Payments_REST_Contr
 		'wcpay_onboarding_eligibility_modal_dismissed'     => 'bool',
 		'wcpay_connection_success_modal_dismissed'         => 'bool',
 		'wcpay_next_deposit_notice_dismissed'              => 'bool',
-		'wcpay_duplicate_payment_method_notices_dismissed' => 'bool',
+		'wcpay_duplicate_payment_method_notices_dismissed' => 'array',
 		'wcpay_instant_deposit_notice_dismissed'           => 'bool',
 		'wcpay_exit_survey_last_shown'                     => 'string',
 	];

tests/unit/admin/test-class-wc-rest-payments-settings-option-controller.php

@@ -83,12 +83,16 @@ public function test_validate_option_name( string $option, bool $expected_result
 	 */
 	public function provider_valid_values(): array {
 		return [
-			'bool option with true'          => [ 'wcpay_multi_currency_setup_completed', true ],
-			'bool option with false'         => [ 'wcpay_multi_currency_setup_completed', false ],
-			'array option with empty array'  => [ 'woocommerce_dismissed_todo_tasks', [] ],
-			'array option with array'        => [ 'woocommerce_dismissed_todo_tasks', [ 'key' => 'value' ] ],
-			'array option with nested array' => [ 'woocommerce_dismissed_todo_tasks', [ 'key' => [ 'nested' => 'value' ] ] ],
-			'string option with string'      => [ 'wcpay_exit_survey_last_shown', '2026-01-09T09:23:30.444Z' ],
+			'bool option with true'                        => [ 'wcpay_multi_currency_setup_completed', true ],
+			'bool option with false'                       => [ 'wcpay_multi_currency_setup_completed', false ],
+			'array option with empty array'                => [ 'woocommerce_dismissed_todo_tasks', [] ],
+			'array option with array'                      => [ 'woocommerce_dismissed_todo_tasks', [ 'key' => 'value' ] ],
+			'array option with nested array'               => [ 'woocommerce_dismissed_todo_tasks', [ 'key' => [ 'nested' => 'value' ] ] ],
+			'string option with string'                    => [ 'wcpay_exit_survey_last_shown', '2026-01-09T09:23:30.444Z' ],
+			'array option for dismissed duplicate notices' => [
+				'wcpay_duplicate_payment_method_notices_dismissed',
+				[ 'card' => [ 'woocommerce_payments', 'stripe' ] ],
+			],
 		];
 	}
 
@@ -110,14 +114,15 @@ public function test_validate_value_with_valid_values( string $option_name, $val
 	 */
 	public function provider_invalid_values(): array {
 		return [
-			'bool option with string'  => [ 'wcpay_multi_currency_setup_completed', 'string' ],
-			'bool option with array'   => [ 'wcpay_multi_currency_setup_completed', [] ],
-			'bool option with int'     => [ 'wcpay_multi_currency_setup_completed', 123 ],
-			'array option with bool'   => [ 'woocommerce_dismissed_todo_tasks', true ],
-			'array option with string' => [ 'woocommerce_dismissed_todo_tasks', 'string' ],
-			'string option with bool'  => [ 'wcpay_exit_survey_last_shown', true ],
-			'string option with array' => [ 'wcpay_exit_survey_last_shown', [] ],
-			'string option with int'   => [ 'wcpay_exit_survey_last_shown', 123 ],
+			'bool option with string'                    => [ 'wcpay_multi_currency_setup_completed', 'string' ],
+			'bool option with array'                     => [ 'wcpay_multi_currency_setup_completed', [] ],
+			'bool option with int'                       => [ 'wcpay_multi_currency_setup_completed', 123 ],
+			'array option with bool'                     => [ 'woocommerce_dismissed_todo_tasks', true ],
+			'array option with string'                   => [ 'woocommerce_dismissed_todo_tasks', 'string' ],
+			'string option with bool'                    => [ 'wcpay_exit_survey_last_shown', true ],
+			'string option with array'                   => [ 'wcpay_exit_survey_last_shown', [] ],
+			'string option with int'                     => [ 'wcpay_exit_survey_last_shown', 123 ],
+			'array option (dismissed notices) with bool' => [ 'wcpay_duplicate_payment_method_notices_dismissed', true ],
 		];
 	}
 

tests/unit/duplicate-detection/test-class-duplicates-detection-service.php

@@ -116,6 +116,22 @@ public function test_two_prbs_enabled() {
 		$this->assertEquals( 'apple_pay_google_pay', array_keys( $result )[0] );
 	}
 
+	public function test_prb_detection_excludes_disabled_stripe_gateway() {
+		// WCPay gateway enabled with PRB.
+		$this->woopayments_gateway->id                               = 'woocommerce_payments';
+		$this->woopayments_gateway->enabled                          = 'yes';
+		$this->woopayments_gateway->is_payment_request_enabled_value = true;
+
+		// Stripe gateway disabled but with payment_request still enabled in settings.
+		$this->gateway_from_another_plugin->id       = 'stripe';
+		$this->gateway_from_another_plugin->enabled  = 'no';
+		$this->gateway_from_another_plugin->settings = [ 'payment_request' => 'yes' ];
+
+		$result = $this->service->find_duplicates();
+
+		$this->assertEmpty( $result );
+	}
+
 	public function test_duplicate_not_enabled_in_woopayments() {
 		$this->set_duplicates( CC_Payment_Method::PAYMENT_METHOD_STRIPE_ID, 'yes', 'yes' );
 		$this->woopayments_gateway->id = 'not_woopayments_card';