Remove antiSuite wrapper, update checkbox

app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -39,13 +39,12 @@ class BlockSettingsView extends Component {
 
 	componentDidMount() {
 		const { setupLifecycle: { blockSetupSeen } } = this.props;
+
 		if (blockSetupSeen) {
 			const {
-				antiSuite: {
-					enable_anti_tracking,
-					enable_ad_block,
-					enable_smart_block,
-				},
+				enable_anti_tracking,
+				enable_ad_block,
+				enable_smart_block,
 				blockingPolicy
 			} = this.props;
 
@@ -60,6 +59,24 @@ class BlockSettingsView extends Component {
 		}
 	}
 
+	componentDidUpdate() {
+		const {
+			recommendedChoices,
+			enable_anti_tracking,
+			enable_ad_block,
+			enable_smart_block,
+			kindsOfTrackers
+		} = this.state;
+
+		if (!recommendedChoices && kindsOfTrackers === 2 && enable_ad_block === true && enable_anti_tracking === true && enable_smart_block === true) {
+			// eslint-disable-next-line react/no-did-update-set-state
+			this.setState({ recommendedChoices: true });
+		} else if (recommendedChoices && (kindsOfTrackers !== 2 || enable_ad_block !== true || enable_anti_tracking !== true || enable_smart_block !== true)) {
+			// eslint-disable-next-line react/no-did-update-set-state
+			this.setState({ recommendedChoices: false });
+		}
+	}
+
 	decodeBlockingPolicy = (blockingPolicy) => {
 		let decodedPolicy;
 		if (typeof blockingPolicy === 'number') {

app/shared-hub/reducers/AntiSuiteReducer.js

@@ -18,26 +18,24 @@ import {
 } from '../constants/AntiSuiteConstants';
 
 const initialState = {
-	antiSuite: {
-		enable_ad_block: false,
-		enable_anti_tracking: false,
-		enable_smart_block: false
-	}
+	enable_ad_block: false,
+	enable_anti_tracking: false,
+	enable_smart_block: false
 };
 
 function AntiSuiteReducer(state = initialState, action) {
 	switch (action.type) {
 		case SET_AD_BLOCK: {
 			const { enable_ad_block } = action.data;
-			return { ...state, antiSuite: { ...state.antiSuite, enable_ad_block } };
+			return { ...state, enable_ad_block };
 		}
 		case SET_ANTI_TRACKING: {
 			const { enable_anti_tracking } = action.data;
-			return { ...state, antiSuite: { ...state.antiSuite, enable_anti_tracking } };
+			return { ...state, enable_anti_tracking };
 		}
 		case SET_SMART_BLOCK: {
 			const { enable_smart_block } = action.data;
-			return { ...state, antiSuite: { ...state.antiSuite, enable_smart_block } };
+			return { ...state, enable_smart_block };
 		}
 
 		default: return state;