Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2220: Onboarding - Telemetry #650

Merged
merged 7 commits into from Jan 4, 2021

History not working

  • Loading branch information
benstrumeyer committed Dec 30, 2020
commit 97fdf24ac4d346267f633d9e9b241bb8d612b607
@@ -65,9 +65,12 @@ class BlockSettingsView extends Component {

// Will only change user settings if all questions are answered
if (blockAds !== null && kindsOfTrackers !== null && antiTracking !== null && smartBrowsing !== null) {
const { actions } = this.props;
const {
setAdBlock, setAntiTracking, setSmartBlocking, setBlockingPolicy
} = this.props;
setAdBlock, setAntiTracking, setSmartBlocking, setBlockingPolicy, setSetupStep
} = actions;
// const { context } = this;
// const { history } = context;

setAdBlock(blockAds);
setAntiTracking(antiTracking);
@@ -88,6 +91,8 @@ class BlockSettingsView extends Component {
break;
}
setBlockingPolicy({ blockingPolicy });
setSetupStep({ setup_step: 3 });
// history.push('/onboarding/3');
} else {
const { setToast } = this.props;

@@ -16,13 +16,15 @@ import { buildReduxHOC } from '../../../../shared-hub/utils';
import { setAntiTracking, setAdBlock, setSmartBlocking } from '../../../../shared-hub/actions/AntiSuiteActions';
import setBlockingPolicy from '../../../../shared-hub/actions/BlockingPolicyActions';
import setToast from '../../../../shared-hub/actions/ToastActions';
import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';

const actionCreators = {
setAntiTracking,
setAdBlock,
setSmartBlocking,
setBlockingPolicy,
setToast,
setSetupStep,
};

export default buildReduxHOC(null, actionCreators, BlockSettingsView);
ProTip! Use n and p to navigate between commits in a pull request.