Exit early

Automattic · May 3, 2024 · f030830 · f030830
1 parent eaa8669
commit f030830
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/client/settings/fraud-protection/advanced-settings/index.tsx b/client/settings/fraud-protection/advanced-settings/index.tsx
@@ -170,16 +170,22 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 
 	const handleSaveSettings = () => {
 		if ( validateSettings( protectionSettingsUI ) ) {
+			const settings = writeRuleset( protectionSettingsUI );
+
 			if ( ! checkAnyRuleFilterEnabled( protectionSettingsUI ) ) {
 				if ( ProtectionLevel.BASIC !== currentProtectionLevel ) {
 					updateProtectionLevel( ProtectionLevel.BASIC );
+					updateAdvancedFraudProtectionSettings( settings );
+					saveSettings();
 				}
 				dispatch( 'core/notices' ).createErrorNotice(
 					__(
 						'At least one risk filter needs to be enabled for advanced protection.',
 						'woocommerce-payments'
 					)
 				);
+
+				return;
 			} else if ( ProtectionLevel.ADVANCED !== currentProtectionLevel ) {
 				updateProtectionLevel( ProtectionLevel.ADVANCED );
 				dispatch( 'core/notices' ).createSuccessNotice(
@@ -190,8 +196,6 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 				);
 			}
 
-			const settings = writeRuleset( protectionSettingsUI );
-
 			// Persist the AVS verification setting until the account cache is updated locally.
 			if (
 				wcpaySettings?.accountStatus?.fraudProtection