From d77397b53f9c1ba21493c57229eb4d9e0c9b2744 Mon Sep 17 00:00:00 2001
From: Bouncey <staylor1012@gmail.com>
Date: Sat, 25 Aug 2018 00:36:22 +0100
Subject: [PATCH] fix(ascceptTerms): Navigate to /welcome on PP & ToS accept

---
 src/pages/accept-privacy-terms.js | 12 +++++-------
 src/redux/accept-terms-saga.js    | 21 +++++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/pages/accept-privacy-terms.js b/src/pages/accept-privacy-terms.js
index 738f77d528c..c741ab970f6 100644
--- a/src/pages/accept-privacy-terms.js
+++ b/src/pages/accept-privacy-terms.js
@@ -15,7 +15,7 @@ import Helmet from 'react-helmet';
 
 import Layout from '../components/layout';
 import { ButtonSpacer, Spacer } from '../components/helpers';
-import { acceptTerms, isSignedInSelector, userSelector } from '../redux';
+import { acceptTerms, userSelector } from '../redux';
 import { createSelector } from 'reselect';
 import { navigateTo } from 'gatsby';
 
@@ -26,10 +26,8 @@ const propTypes = {
 };
 
 const mapStateToProps = createSelector(
-  isSignedInSelector,
   userSelector,
-  (isSignedIn, { acceptedPrivacyTerms }) => ({
-    isSignedIn,
+  ({ acceptedPrivacyTerms }) => ({
     acceptedPrivacyTerms
   })
 );
@@ -66,9 +64,9 @@ class AcceptPrivacyTerms extends Component {
   }
 
   render() {
-    const { isSignedIn, acceptedPrivacyTerms } = this.props;
-    if (!isSignedIn || acceptedPrivacyTerms) {
-      navigateTo(isSignedIn ? '/welcome' : '/');
+    const { acceptedPrivacyTerms } = this.props;
+    if (acceptedPrivacyTerms) {
+      navigateTo('/welcome');
       return null;
     }
     const { privacyPolicy, termsOfService, quincyEmail } = this.state;
diff --git a/src/redux/accept-terms-saga.js b/src/redux/accept-terms-saga.js
index 30ae490e0d0..586757c9015 100644
--- a/src/redux/accept-terms-saga.js
+++ b/src/redux/accept-terms-saga.js
@@ -1,16 +1,14 @@
 import { call, put, takeEvery } from 'redux-saga/effects';
+import { navigateTo } from 'gatsby';
 
 import { acceptTermsComplete, acceptTermsError } from './';
-
-import { putUserAcceptsTerms } from '../utils/ajax';
 import { createFlashMessage } from '../components/Flash/redux';
 
+import { putUserAcceptsTerms } from '../utils/ajax';
+
 function* acceptTermsSaga({ payload: quincyEmails }) {
-  console.log('hello?');
   try {
-    const {
-      data: response
-    } = yield call(putUserAcceptsTerms, quincyEmails);
+    const { data: response } = yield call(putUserAcceptsTerms, quincyEmails);
 
     yield put(acceptTermsComplete());
     yield put(createFlashMessage(response));
@@ -19,6 +17,13 @@ function* acceptTermsSaga({ payload: quincyEmails }) {
   }
 }
 
-export function createAcceptTermsSaga(types) {
-  return [takeEvery(types.acceptTerms, acceptTermsSaga)];
+function* acceptCompleteSaga() {
+  yield call(navigateTo, '/welcome');
+}
+
+export function createAcceptTermsSaga(types) {
+  return [
+    takeEvery(types.acceptTerms, acceptTermsSaga),
+    takeEvery(types.acceptTermsComplete, acceptCompleteSaga)
+  ];
 }