Merge branch 'ghostery-browser-intro-hub' into setup-number-ping-param

app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -181,24 +181,9 @@ class BlockSettingsView extends Component {
 									</div>
 								</div>
 							</li>
-							<div className="BlockSettingsView_answerBlock">
-								<div className="BlockSettingsView__radioButtonContainer">
-									<RadioButton checked={kindsOfTrackers === 1} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 1)} altDesign />
-								</div>
-								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_all')}</div>
-							</div>
-							<div className="BlockSettingsView_answerBlock">
-								<div className="BlockSettingsView__radioButtonContainer">
-									<RadioButton checked={kindsOfTrackers === 2} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 2)} altDesign />
-								</div>
-								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics')}</div>
-							</div>
-							<div className="BlockSettingsView_answerBlock">
-								<div className="BlockSettingsView__radioButtonContainer">
-									<RadioButton checked={kindsOfTrackers === 3} handleClick={() => this.handleAnswerChange('kindsOfTrackers', 3)} altDesign />
-								</div>
-								<div className="BlockSettingsView_answerText">{t('ghostery_dawn_onboarding_kinds_of_trackers_none')}</div>
-							</div>
+							{this.renderAnswerBlock((kindsOfTrackers === 0), 'kindsOfTrackers', 0, t('ghostery_dawn_onboarding_kinds_of_trackers_all'))}
+							{this.renderAnswerBlock((kindsOfTrackers === 1), 'kindsOfTrackers', 1, t('ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics'))}
+							{this.renderAnswerBlock((kindsOfTrackers === 2), 'kindsOfTrackers', 2, t('ghostery_dawn_onboarding_kinds_of_trackers_none'))}
 							<li className="BlockSettingsView_question">
 								<div className="BlockSettingsView_questionBlock">
 									{t('ghostery_dawn_onboarding_question_anti_tracking')}