privacy-policy and term of use update (#66)

Author: Wolfjawan

src/Components/forms/Acknowledgement.js

@@ -1,17 +1,16 @@
 import React, { Fragment } from 'react'
 import { FormGroup, Label, Input } from 'reactstrap'
 
-export default ({
-  onChange,
-  agreeToTOU,
-  agreeToReceiveEmails,
-  agreeToReceivePhoneCall,
-  agreeToReceiveCYFNews
-}) => {
+export default ({ onChange, agreeToTOU, agreeToReceiveCommunication }) => {
   return (
     <Fragment>
       <div className="form-acknowledgement-header mt-4">Acknowledgement:</div>
       <hr className="mt-0" />
+      <p>
+        Code Your Future may call you, send you SMS or email you as part of your
+        volunteering process with us. Your data is protected in accordance with
+        our privacy policy.
+      </p>
       <FormGroup check>
         <Label check htmlFor="agreeToTOU">
           <Input
@@ -22,7 +21,7 @@ export default ({
             id="agreeToTOU"
             checked={agreeToTOU}
           />
-          I have read and accepted to the{' '}
+          Yes, I have read and accepted the{' '}
           <a
             href="https://codeyourfuture.io/terms/"
             target="_blank"
@@ -41,49 +40,20 @@ export default ({
           <strong className="text-danger">*</strong>
         </Label>
       </FormGroup>
-      <p className="mt-2 mb-0">CodeYourFuture can:</p>
-      <ul>
-        <FormGroup check>
-          <Label check htmlFor="agreeToReceiveEmails">
-            <Input
-              className={`form-check-input`}
-              type="checkbox"
-              name="agreeToReceiveEmails"
-              id="agreeToReceiveEmails"
-              onChange={onChange}
-              checked={agreeToReceiveEmails}
-            />
-            Send me emails relevant to my volunteering{' '}
-            <strong className="text-danger">*</strong>
-          </Label>
-        </FormGroup>
-        <FormGroup check>
-          <Label check htmlFor="agreeToReceivePhoneCall">
-            <Input
-              className={`form-check-input`}
-              type="checkbox"
-              name="agreeToReceivePhoneCall"
-              id="agreeToReceivePhoneCall"
-              onChange={onChange}
-              checked={agreeToReceivePhoneCall}
-            />
-            Contact me via telephone in regards to volunteering
-          </Label>
-        </FormGroup>
-        <FormGroup check>
-          <Label check htmlFor="agreeToReceiveCYFNews">
-            <Input
-              className={`form-check-input`}
-              type="checkbox"
-              name="agreeToReceiveCYFNews"
-              id="agreeToReceiveCYFNews"
-              onChange={onChange}
-              checked={agreeToReceiveCYFNews}
-            />
-            Contact me via email about events and other CYF news
-          </Label>
-        </FormGroup>
-      </ul>
+      <FormGroup check>
+        <Label check htmlFor="agreeToReceiveCommunication">
+          <Input
+            className={`form-check-input`}
+            type="checkbox"
+            name="agreeToReceiveCommunication"
+            id="agreeToReceiveCommunication"
+            onChange={onChange}
+            checked={agreeToReceiveCommunication}
+          />
+          Yes, contact me about volunteering activities and related events{' '}
+          <strong className="text-danger">*</strong>
+        </Label>
+      </FormGroup>
     </Fragment>
   )
 }

src/Components/forms/helper.js

@@ -22,9 +22,7 @@ export const initialState = {
   userId: '',
   dashboardUrl: '',
   agreeToTOU: false,
-  agreeToReceiveEmails: false,
-  agreeToReceivePhoneCall: false,
-  agreeToReceiveCYFNews: false,
+  agreeToReceiveCommunication: false,
   errors: {
     firstName: false,
     lastName: false,
@@ -34,9 +32,7 @@ export const initialState = {
     interestedInVolunteer: false,
     interestedInCYF: false,
     agreeToTOU: false,
-    agreeToReceiveEmails: false,
-    agreeToReceivePhoneCall: false,
-    agreeToReceiveCYFNews: false
+    agreeToReceiveCommunication: false
   }
 }
 

src/Components/forms/index.js

@@ -95,9 +95,7 @@ class Forms extends Component {
       otherSkill,
       userId,
       agreeToTOU,
-      agreeToReceiveEmails,
-      agreeToReceivePhoneCall,
-      agreeToReceiveCYFNews
+      agreeToReceiveCommunication
     } = this.state
 
     const validatedInputs = this.validateForm({
@@ -108,8 +106,8 @@ class Forms extends Component {
       interestedInVolunteer,
       tel,
       agreeToTOU,
-      agreeToReceiveEmails,
-      interestedInCYF
+      interestedInCYF,
+      agreeToReceiveCommunication
     })
     await this.validateArray({ guidePeople, techSkill, otherSkill })
     const emptyValues = validatedInputs.includes(true)
@@ -134,9 +132,7 @@ class Forms extends Component {
         otherSkill: filterEmptyValue(otherSkill),
         userId,
         agreeToTOU,
-        agreeToReceiveEmails,
-        agreeToReceivePhoneCall,
-        agreeToReceiveCYFNews
+        agreeToReceiveCommunication
       })
     }
   }
@@ -168,10 +164,10 @@ class Forms extends Component {
     const {
       disabled,
       agreeToTOU,
-      agreeToReceiveEmails,
       formInComplete,
       userId,
-      dashboardUrl
+      dashboardUrl,
+      agreeToReceiveCommunication
     } = this.state
     if (volunteer && volunteer._id) {
       return (
@@ -212,7 +208,7 @@ class Forms extends Component {
           <button
             className="btn volunteer-submit-btn"
             type="submit"
-            disabled={disabled || !agreeToTOU || !agreeToReceiveEmails}
+            disabled={disabled || !agreeToTOU || !agreeToReceiveCommunication}
           >
             Submit
           </button>