Update setup_number to use fetchSearchEnginesAsync value for other dr…

…opdown list

app/dawn-hub/Views/OnboardingView/OnboardingConstants.js

@@ -19,3 +19,6 @@ export const BLOCK_SETTINGS = '2';
 export const CHOOSE_DEFAULT_SEARCH = '3';
 export const CHOOSE_PLAN = '4';
 export const SUCCESS = '5';
+export const SIGN_IN_SUCCESSFUL = '1';
+export const CREATE_ACCOUNT_SUCCESSFUL = '2';
+export const SKIP_ACCOUNT_CREATION = '3';

app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx

@@ -21,16 +21,6 @@ import {
 	SEARCH_BING,
 	SEARCH_YAHOO,
 	SEARCH_STARTPAGE,
-	SEARCH_DUCKDUCK_GO,
-	SEARCH_ECOSIA,
-	SEARCH_EKORU,
-	SEARCH_GIBIRU,
-	SEARCH_GOOGLE,
-	SEARCH_ONESEARCH,
-	SEARCH_PRIVADO,
-	SEARCH_QWANT,
-	SEARCH_ENCRYPT,
-	SEARCH_TAILCAT,
 	SEARCH_OTHER
 } from './ChooseDefaultSearchConstants';
 import { Modal } from '../../../../shared-components';
@@ -51,6 +41,7 @@ const mapSearchToSetupNumber = {
 	'Search Encrypt': 14,
 	Tailcat: 15,
 };
+
 class ChooseDefaultSearchView extends Component {
 	constructor(props) {
 		super(props);
@@ -68,6 +59,16 @@ class ChooseDefaultSearchView extends Component {
 		this.fetchSearchEnginesAsync = this.fetchSearchEnginesAsync.bind(this);
 	}
 
+	componentDidMount() {
+		document.addEventListener('click', this.handleClickAway);
+
+		this.fetchSearchEnginesAsync();
+	}
+
+	componentWillUnmount() {
+		document.removeEventListener('click', this.handleClickAway);
+	}
+
 	async fetchSearchEnginesAsync() {
 		// eslint-disable-next-line no-undef
 		if (typeof browser === 'undefined') { // we are not in Dawn (or Firefox)
@@ -95,16 +96,6 @@ class ChooseDefaultSearchView extends Component {
 		}));
 	}
 
-	componentDidMount() {
-		document.addEventListener('click', this.handleClickAway);
-
-		this.fetchSearchEnginesAsync();
-	}
-
-	componentWillUnmount() {
-		document.removeEventListener('click', this.handleClickAway);
-	}
-
 	updateSelection = () => this.setState(prevState => (
 		{
 			chosenSearch: prevState.searchBeingConsidered,
@@ -166,7 +157,7 @@ class ChooseDefaultSearchView extends Component {
 		setDefaultSearch(chosenSearch);
 		setSetupStep({
 			setup_step: CHOOSE_PLAN,
-			setup_number: mapSearchToSetupNumber[chosenSearch],
+			setup_number: mapSearchToSetupNumber[chosenSearchName],
 			origin: ONBOARDING
 		});
 		history.push(`/${ONBOARDING}/${CHOOSE_PLAN}`);