Merge branch 'master' into checkbox-component

f2/src/Home.js

@@ -22,6 +22,7 @@ import { FinalFeedbackThanksPage } from './FinalFeedbackThanksPage'
 import { StartPage } from './StartPage'
 import { ConfirmCancelPage } from './ConfirmCancelPage'
 import { CancelPage } from './CancelPage'
+import { TermsAndConditions } from './TermsAndConditions'
 
 export const Home = () => (
   <Router>

f2/src/forms/HowDidItStartForm.js

@@ -22,13 +22,6 @@ export const HowDidItStartForm = props => {
   const [data] = useStateValue()
   const howdiditstart = {
     howDidTheyReachYou: [],
-    email: '',
-    phone: '',
-    online: '',
-    application: '',
-    others: '',
-    whenDidItStart: '',
-    howManyTimes: '',
     ...data.formData.howdiditstart,
   }
   //TODO: Move this form data to some sort of a schema file instead?

f2/src/forms/InformationForm.js

@@ -28,9 +28,7 @@ export const InformationForm = props => {
   const [data] = useStateValue()
   const information = {
     typeOfInfoReq: [],
-    infoReqOther: '',
     typeOfInfoObtained: [],
-    infoObtainedOther: '',
     tellUsMore: '',
     ...data.formData.personalInformation,
   }
@@ -180,28 +178,6 @@ export const InformationForm = props => {
                 </FormControl>
               )}
             </Field>
-            <Alert status="success" backgroundColor="blue.100">
-              <AlertIcon name="info-outline" color="blue.800" />
-              <Trans id="informationPage.tip">
-              <A
-                        href={
-                          i18n.locale === 'en'
-                            ? 'https://www.consumer.equifax.ca/personal/'
-                            : 'https://www.consumer.equifax.ca/personnel/'
-                        }
-                        isExternal // Opens new tab
-                      />
-
-                      <A
-                        href={
-                          i18n.locale === 'en'
-                            ? 'https://www.transunion.ca/'
-                            : 'https://www.transunion.ca/fr'
-                        }
-                        isExternal // Opens new tab
-                      />
-                </Trans>
-            </Alert>
             <NextAndCancelButtons
               next={<Trans id="informationPage.nextStep" />}
               button={<Trans id="informationPage.nextButton" />}

f2/src/forms/WhatWasAffectedForm.js

@@ -40,7 +40,6 @@ export const WhatWasAffectedForm = props => {
   const [data] = useStateValue()
   const whatWasAffected = {
     affectedOptions: [],
-    optionOther: '',
     ...data.formData.whatWasAffected,
   }