bhl-forms 0.0.74 → 0.0.76

package/dist/forms/generalLegal.es.js

@@ -34,17 +34,18 @@ function formProps(updates) {
 }
 
 const metaDefaults = {
-  type: 'meta',
-  data: {
-    tcpaLanguage: TCPA_LANGUAGE
-  }
+  tcpaLanguage: TCPA_LANGUAGE
 };
 
 function metaProps(updates) {
-  return merge(
+  const data = merge(
     metaDefaults,
     updates
-  )
+  );
+  return {
+    type: 'meta',
+    data
+  }
 }
 
 const formAnchorDefaults = {
@@ -88,7 +89,7 @@ function headline(updates) {
 const subHeadlineDefaults = {
   $el: 'h3',
   attrs: {
-    class: 't-flex t-justify-center t-text-center !t-text-base t-font-medium t-text-blue-500 t-px-10'
+    class: 't-flex t-justify-center t-text-center !t-text-[1.2rem] t-font-medium t-text-blue-500 t-px-10'
   }
 };
 
@@ -100,11 +101,11 @@ function subHeadline(updates) {
   )
 }
 
-const privacyIconsDefault = {
+const secureIconDefault = {
   $el: 'div',
   if: '$activeStep === $lastStep()',
   attrs: {
-    class: 't-flex t-justify-center'
+    class: 't-flex t-justify-center t-items-center t-text-sm t-text-gray-500'
   },
   children: [
     {
@@ -112,18 +113,28 @@ const privacyIconsDefault = {
       attrs: {
         loading: 'lazy',
         alt: '',
-        style: { border: 0 },
-        src: 'https://d27hmee62k45vz.cloudfront.net/form-secure-privacy.png',
-        width: '320',
-        height: '100'
+        style: {
+          border: 0
+        },
+        width: '25',
+        height: '25',
+        src: 'https://d27hmee62k45vz.cloudfront.net/lock_icon_1.jpeg',
+      }
+    },
+    {
+      $el: 'span',
+      children: 'Secure & Encrypted',
+      attrs: {
+        class: 't-pl-2 t-pt-1 t-font-medium'
       }
     }
   ]
 };
 
-function privacyIcons(updates) {
+
+function secureIcon(updates) {
   return merge(
-    privacyIconsDefault,
+    secureIconDefault,
     updates
   )
 }
@@ -245,6 +256,163 @@ const legalCivilValueOverrideMap = {
   }
 };
 
+
+const TOLPCommentsPlaceholders = {
+  'Adoption': 'Example: "I need help with adoption forms"',
+  'Asbestos and Mesothelioma': 'Example: "I was exposed to asbestos at work and would like to file a claim"',
+  'Auto and Car Accidents': 'Example: "A truck crashed into my car on the highway" or "I\'ve been involved in a hit and run accident"',
+  'Bankruptcy': 'Example: "I need help filing for bankruptcy"',
+  'Birth Certificate and Name Change': 'Example: "Just married and would like to change my last name"',
+  'Business Lawyers': 'Example: "I need help incorporating a business" or "I would like a legal contract reviewed"',
+  'Child Custody and Support': 'Example: "Need help getting custody" or "Issues with child support payments"',
+  'Civil Rights and Discrimination': 'Example: "Police brutality" or "Coworker keeps harassing me"',
+  'Civil Lawsuit': 'Example: "A contractor took my money and never completed the job" or "I am being sued by a neighbor"',
+  'Consumer Lawyers': 'Example: "Someone committed fraud against me" or "A contractor took my money and never completed the job"',
+  'Copyrights and Trademarks': 'Example: "I would like to register a trademark or copyright a name"',
+  'Criminal and Felony': 'Example: "I was arrested for DUI and need legal defense" or "I am being charged with assault"',
+  'Debt and Collections': 'Example: "I would like to consolidate my debt" or "A collection agency is harassing me"',
+  'Divorce and Separation': 'Example: "I would like to file for an uncontested divorce"',
+  'DUI and DWI': 'Example: "I was arrested for DUI and need legal defense"',
+  'Elder Law': 'Example: "I would like help with Estate Planning" or "I need help with a guardianship"',
+  'Employment and Workplace': 'Example: "I was injured while on the job" or "My company is discriminating against me"',
+  'Expungement': 'Example: "I would like to file for an expungement and clear my record"',
+  'Family Issues': 'Example: "I need help with guardianship" or "I need a simple will created"',
+  'Foreclosure': 'Example: "I need help to avoid foreclosure on my house"',
+  'Guardianship': 'Example: "I need help with guardianship documents"',
+  'Harassment and Discrimination': 'Example: "I am being discriminated at work" or "My neighbor is harassing me"',
+  'Identity Theft': 'Example: "Someone stole my identity and I need help fixing the issue"',
+  'Immigration and Visas': 'Example: "I need help filing for a visa" or "Help with a green card"',
+  'Insurance': 'Example: "I need help filing an insurance claim for damage to my house"',
+  'Landlord and Tenant': 'Example: "I need help to fight an eviction" or "I would like a lawyer to review a rental contract"',
+  'Lemon Law': 'Example: "I purchased a new vehicle that broke down already and seller will not assist"',
+  'Long Term Disability': 'Example: "I was injured on the job and would like to file for benefits" or "I need help filing for disability benefits"',
+  'Medical Malpractice': 'Example: "A doctor performed surgery on the wrong limb and I would like to file a lawsuit"',
+  'Nursing Home Abuse': 'Example: "My mother\'s nursing home is physically abusing her"',
+  'Patents and Intellectual Property': 'Example: "I would like to file for a patent" or "I need to copyright a name"',
+  'Personal Injury': 'Example: "I was bit by the neighbor\'s dog" or "I fell in the icy grocery store parking lot"',
+  'Power of Attorney': 'Example: "I need help with a limited or general power of attorney"',
+  'Probate and Estates': 'Example: "I need help with planning for my estate" or "A family member passed without a will in place"',
+  'Product Liability': 'Example: "My car battery caught on fire" or "I purchased a faulty product"',
+  'Property Damage': 'Example: "The neighbor\'s tree fell on my fence" or "My car was hit in the parking lot"',
+  'Real Estate': 'Example: "I need help with a quitclaim deed" or "I need a lawyer to review a purchase and sales agreement"',
+  'Social Security Disability and Insurance': 'Example: "I would like help filing for disability benefits" or "I\'ve been denied for SSDI and would like to appeal"',
+  'Tax and IRS': 'Example: "I need help fighting an IRS tax claim" or "I need audit defense"',
+  'Traffic and Tickets': 'Example: "I need help reinstating a supsended license" or "I would like to fight a traffic ticket"',
+  'Unemployment': 'Example: "I need help filing for unemployment benefits"',
+  'Vaccination Injury': 'Example: "I was injured after receiving a vaccine and would like to file a lawsuit"',
+  'Veteran\'s Disability': 'Example: "I would like help filing for disability benefits"',
+  'Victim of a Crime': 'Example: "I was assaulted in the store" or "I am being discriminated against at work"',
+  'Wills and Trusts': 'Example: "I need a simple will created" or "I would like guidance on creating a trust fund"',
+  'Workers Compensation': 'Example: "I was injured at work and would like to file for workers compensation benefits"',
+  'Wrongful Death': 'Example: "A family member was killed on the job and we need legal representation"',
+  'Wrongful Termination': 'Example: "I was fired by my employer without cause"',
+  'Not Sure or Other': 'Example: "I was involved in a car accident" or "I need help setting up power of attorney"'
+};
+
+const TOLPFinalHeadlines = {
+  // 'Adoption': '',
+  // 'Asbestos and Mesothelioma': '',
+  // 'Auto and Car Accidents': '',
+  // 'Bankruptcy': '',
+  // 'Birth Certificate and Name Change': '',
+  // 'Business Lawyers': '',
+  // 'Child Custody and Support': '',
+  // 'Civil Rights and Discrimination': '',
+  // 'Civil Lawsuit': '',
+  // 'Consumer Lawyers': '',
+  // 'Copyrights and Trademarks': '',
+  // 'Criminal and Felony': '',
+  // 'Debt and Collections': '',
+  // 'Divorce and Separation': '',
+  // 'DUI and DWI': '',
+  // 'Elder Law': '',
+  // 'Employment and Workplace': '',
+  // 'Expungement': '',
+  // 'Family Issues': '',
+  // 'Foreclosure': '',
+  // 'Guardianship': '',
+  // 'Harassment and Discrimination': '',
+  // 'Identity Theft': '',
+  // 'Immigration and Visas': '',
+  // 'Insurance': '',
+  // 'Landlord and Tenant': '',
+  // 'Lemon Law': '',
+  // 'Long Term Disability': '',
+  // 'Medical Malpractice': '',
+  // 'Nursing Home Abuse': '',
+  // 'Patents and Intellectual Property': '',
+  // 'Personal Injury': '',
+  // 'Power of Attorney': '',
+  // 'Probate and Estates': '',
+  // 'Product Liability': '',
+  // 'Property Damage': '',
+  // 'Real Estate': '',
+  // 'Social Security Disability and Insurance': '',
+  // 'Tax and IRS': '',
+  // 'Traffic and Tickets': '',
+  // 'Unemployment': '',
+  // 'Vaccination Injury': '',
+  // 'Veteran\'s Disability': '',
+  // 'Victim of a Crime': '',
+  // 'Wills and Trusts': '',
+  // 'Workers Compensation': '',
+  // 'Wrongful Death': '',
+  // 'Wrongful Termination': '',
+  // 'Not Sure or Other': ''
+};
+
+const TOLPFinalSubHeadlines = {
+  'Adoption': 'You may benefit from speaking with an adoption professional. Please verify your contact information.',
+  // 'Asbestos and Mesothelioma': '',
+  'Auto and Car Accidents': 'You may benefit from speaking with an accident professional. Please verify your contact information.',
+  'Bankruptcy': 'You may benefit from speaking with a bankruptcy professional. Please verify your contact information.',
+  // 'Birth Certificate and Name Change': '',
+  // 'Business Lawyers': '',
+  // 'Child Custody and Support': '',
+  // 'Civil Rights and Discrimination': '',
+  // 'Civil Lawsuit': '',
+  // 'Consumer Lawyers': '',
+  'Copyrights and Trademarks': 'You may benefit from speaking with a copyright and trademark professional. Please verify your contact information.',
+  // 'Criminal and Felony': '',
+  // 'Debt and Collections': '',
+  'Divorce and Separation': 'You may benefit from speaking with a divorce professional. Please verify your contact information.',
+  'DUI and DWI': 'You may benefit from speaking with a DUI professional. Please verify your contact information.',
+  'Elder Law': 'You may benefit from speaking with an elder law professional. Please verify your contact information.',
+  // 'Employment and Workplace': '',
+  // 'Expungement': '',
+  // 'Family Issues': '',
+  'Foreclosure': 'You may benefit from speaking with a foreclosure professional. Please verify your contact information.',
+  'Guardianship': 'You may benefit from speaking with a guardianship professional. Please verify your contact information.',
+  // 'Harassment and Discrimination': '',
+  // 'Identity Theft': '',
+  'Immigration and Visas': 'You may benefit from speaking with a immigration professional. Please verify your contact information.',
+  // 'Insurance': '',
+  'Landlord and Tenant': 'You may benefit from speaking with a landlord and tenant legal professional. Please verify your contact information.',
+  // 'Lemon Law': '',
+  'Long Term Disability': 'You may benefit from speaking with a disability legal professional. Please verify your contact information.',
+  'Medical Malpractice': 'You may benefit from speaking with a malpractice professional. Please verify your contact information.',
+  // 'Nursing Home Abuse': '',
+  'Patents and Intellectual Property': 'You may benefit from speaking with a patent professional. Please verify your contact information.',
+  'Personal Injury': 'You may benefit from speaking with a personal injury professional. Please verify your contact information.',
+  // 'Power of Attorney': '',
+  'Probate and Estates': 'You may benefit from speaking with a probate and estate professional. Please verify your contact information.',
+  // 'Product Liability': '',
+  // 'Property Damage': '',
+  'Real Estate': 'You may benefit from speaking with a real estate professional. Please verify your contact information.',
+  'Social Security Disability and Insurance': 'You may benefit from speaking with an SSDI professional. Please verify your contact information.',
+  'Tax and IRS': 'You may benefit from speaking with a tax professional. Please verify your contact information.',
+  // 'Traffic and Tickets': '',
+  'Unemployment': 'You may benefit from speaking with an unemployment professional. Please verify your contact information.',
+  // 'Vaccination Injury': '',
+  'Veteran\'s Disability': 'You may benefit from speaking with a disability legal professional. Please verify your contact information.',
+  // 'Victim of a Crime': '',
+  // 'Wills and Trusts': '',
+  'Workers Compensation': 'You may benefit from speaking with a workers compensation professional. Please verify your contact information.',
+  // 'Wrongful Death': '',
+  // 'Wrongful Termination': '',
+  // 'Not Sure or Other': ''
+};
+
 // ------ Common Base Settings
 
 const checkbox = (updates) => {
@@ -2316,6 +2484,9 @@ const findLastInput = (n) => {
     return n
   }
   for (var i = n.children.length - 1; i >= 0; i--) {
+    if (typeof n.children === 'string') {
+      continue
+    }
     const child = n.children[i];
     if (isInput(child)) {
       return child
@@ -2378,15 +2549,23 @@ function generalLegalTOLPAndZip(updates = {}) {
 }
 
 const DEFAULT_COMMENTS_PLACEHOLDER = 'For Example: "I\'ve been involved in an auto accident" or "I need Power of Attorney"';
+const DEFAULT_COMMENTS_PLACEHOLDER_V2 = '$getKey($meta, "commentsPlaceholders." + $get(Type_Of_Legal_Problem).value, $meta.defaultCommentsPlaceholder)';
 const DEFAULT_COMMENTS_LABEL = 'Please briefly describe your legal issue in a few words:';
 
-function commentsWithBankruptcy(updates = {}) {
+function commentsWithBankruptcyV2(updates = {}) {
   return step(
     'commentsWithBankruptcy',
     [
+      {
+        $el: 'h3',
+        children: 'Additional Case Details',
+        attrs: {
+          class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-3'
+        }
+      },
       comments({
         label: updates.label || DEFAULT_COMMENTS_LABEL,
-        placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER
+        placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER_V2
       }),
       bankruptcyCrossSell()
     ],
@@ -2394,32 +2573,51 @@ function commentsWithBankruptcy(updates = {}) {
   )
 }
 
-const DEFAULT_LAST_STEP_HEADLINE = "Based on your input, you may benefit from speaking with a legal professional. Please verify your contact information.";
+const DEFAULT_FINAL_HEADLINE_V2 = 'We Found Matches For Your Case!';
+// const DEFAULT_FINAL_HEADLINE_V2_a = "Please Verify Your Contact Info"
+const DEFAULT_FINAL_HEADLINE_V2_b = '$getKey($meta, "finalHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalHeadline)';
+// const DEFAULT_FINAL_SUBHEADLINE_V2_a = "Your case may benefit from speaking with a legal professional."
+const DEFAULT_FINAL_SUBHEADLINE_V2 = 'You may benefit from speaking with a legal professional. Please verify your contact information.';
+const DEFAULT_FINAL_SUBHEADLINE_V2_b = '$getKey($meta, "finalSubHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalSubHeadline)';
 
-function contactInfo(updates = {}) {
+function contactInfoV2(updates = {}) {
   return step(
     'contactInfo',
     [
       {
         $el: 'h3',
-        children: updates.headline || DEFAULT_LAST_STEP_HEADLINE,
+        children: updates.headline || DEFAULT_FINAL_HEADLINE_V2_b,
         attrs: {
-          class: 't-flex t-justify-center t-text-center t-text-lg t-font-bold t-pb-5 t-pt-0 t-px-3'
+          class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-3 t-pt-0 t-px-3'
+        }
+      },
+      {
+        $el: 'h5',
+        children: updates.subheadline || DEFAULT_FINAL_SUBHEADLINE_V2_b,
+        attrs: {
+          class: 't-flex t-justify-center t-text-center !t-text-lg t-font-semibold t-pb-7 t-pt-0 t-px-3'
         }
       },
       email(),
       phone(),
       TCPAConsent(),
-      privacyIcons()
+      secureIcon()
     ],
     updates.nextOnEnter
   )
 }
 
-function firstAndLast(updates = {}) {
+function firstAndLastV2(updates = {}) {
   return step(
     'firstAndLast',
     [
+      {
+        $el: 'h3',
+        children: 'Please Provide a Contact Name',
+        attrs: {
+          class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-3'
+        }
+      },
       firstName(),
       lastName()
     ],
@@ -2427,74 +2625,81 @@ function firstAndLast(updates = {}) {
   )
 }
 
+const AllTOLPQuestions = () => {
+  return [
+    AdoptionQuestions(),
+    AsbestosAndMesotheliomaQuestions(),
+    AutoAndCarAccidentsQuestions(),
+    BankruptcyQuestions(),
+    BirthCertificateAndNameChangeQuestions(),
+    BusinessLawyersQuestions(),
+    ChildCustodyAndSupportQuestions(),
+    CivilRightsAndDiscriminationQuestions(),
+    CivilLawsuitQuestions(),
+    ConsumerLawyersQuestions(),
+    CopyrightsAndTrademarksQuestions(),
+    CriminalAndFelonyQuestions(),
+    DebtAndCollectionsQuestions(),
+    DivorceQuestions(),
+    DUIAndDWIQuestions(),
+    ElderLawQuestions(),
+    EmploymentAndWorkplaceQuestions(),
+    ExpungementQuestions(),
+    FamilyIssuesQuestions(),
+    ForeclosureQuestions(),
+    GuardianshipQuestions(),
+    HarassmentAndDiscriminationQuestions(),
+    IdentityTheftQuestions(),
+    ImmigrationAndVisasQuestions(),
+    InsuranceQuestions(),
+    LandlordAndTenantQuestions(),
+    LemonLawQuestions(),
+    LongTermDisabilityQuestions(),
+    MedicalMalpracticeQuestions(),
+    NursingHomeAbuseQuestions(),
+    PatentsAndIntellectualPropertyQuestions(),
+    PersonalInjuryQuestions(),
+    PowerofAttorneyQuestions(),
+    ProbateAndEstatesQuestions(),
+    ProductLiabilityQuestions(),
+    PropertyDamageQuestions(),
+    RealEstateQuestions(),
+    SocialSecurityDisabilityAndInsuranceQuestions(),
+    TaxAndIRSQuestions(),
+    TrafficAndTicketsQuestions(),
+    UnemploymentQuestions(),
+    VaccinationInjuryQuestions(),
+    VeteransDisabilityQuestions(),
+    VictimOfACrimeQuestions(),
+    WillsAndTrustsQuestions(),
+    WorkersCompensationQuestions(),
+    WrongfulDeathQuestions(),
+    WrongfulTerminationQuestions(),
+    NotSureOrOtherQuestions()
+  ]
+};
+
 function generalLegalTOLPQuestions(updates = {}) {
+  var questions = AllTOLPQuestions();
+
+  questions.unshift(
+    {
+      $el: 'h3',
+      children: updates.headline || "Please Complete the Following:",
+      attrs: {
+        class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-3'
+      }
+    },
+  );
+
   return step(
     'TOLPQuestions',
-    [
-      {
-        $el: 'h3',
-        children: 'Please Complete the Following:',
-        attrs: {
-          class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-3'
-        }
-      },
-      AdoptionQuestions(),
-      AsbestosAndMesotheliomaQuestions(),
-      AutoAndCarAccidentsQuestions(),
-      BankruptcyQuestions(),
-      BirthCertificateAndNameChangeQuestions(),
-      BusinessLawyersQuestions(),
-      ChildCustodyAndSupportQuestions(),
-      CivilRightsAndDiscriminationQuestions(),
-      CivilLawsuitQuestions(),
-      ConsumerLawyersQuestions(),
-      CopyrightsAndTrademarksQuestions(),
-      CriminalAndFelonyQuestions(),
-      DebtAndCollectionsQuestions(),
-      DivorceQuestions(),
-      DUIAndDWIQuestions(),
-      ElderLawQuestions(),
-      EmploymentAndWorkplaceQuestions(),
-      ExpungementQuestions(),
-      FamilyIssuesQuestions(),
-      ForeclosureQuestions(),
-      GuardianshipQuestions(),
-      HarassmentAndDiscriminationQuestions(),
-      IdentityTheftQuestions(),
-      ImmigrationAndVisasQuestions(),
-      InsuranceQuestions(),
-      LandlordAndTenantQuestions(),
-      LemonLawQuestions(),
-      LongTermDisabilityQuestions(),
-      MedicalMalpracticeQuestions(),
-      NursingHomeAbuseQuestions(),
-      PatentsAndIntellectualPropertyQuestions(),
-      PersonalInjuryQuestions(),
-      PowerofAttorneyQuestions(),
-      ProbateAndEstatesQuestions(),
-      ProductLiabilityQuestions(),
-      PropertyDamageQuestions(),
-      RealEstateQuestions(),
-      SocialSecurityDisabilityAndInsuranceQuestions(),
-      TaxAndIRSQuestions(),
-      TrafficAndTicketsQuestions(),
-      UnemploymentQuestions(),
-      VaccinationInjuryQuestions(),
-      VeteransDisabilityQuestions(),
-      VictimOfACrimeQuestions(),
-      WillsAndTrustsQuestions(),
-      WorkersCompensationQuestions(),
-      WrongfulDeathQuestions(),
-      WrongfulTerminationQuestions(),
-      NotSureOrOtherQuestions()
-    ],
+    questions,
     updates.nextOnEnter
   )
 }
 
-// ------ Utilities
-
-const formNavigation = () => ({
+const formNavigationV2 = () => ({
   $el: 'div',
   attrs: {
     class: 'step-nav'
@@ -2514,7 +2719,16 @@ const formNavigation = () => ({
       $formkit: 'button',
       name: 'next_button',
       onClick: '$setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form)))',
-      children: 'Next',
+      children: {
+        if: '$activeStep === $firstStep()',
+        then: 'Get Help',
+        else: 'Next'
+      },
+      outerClass: {
+        if: '$activeStep === $lastStep()',
+        then: 't-hidden',
+        else: ''
+      },
       style: {
         if: '$activeStep === $lastStep()',
         then: 'display: none;'
@@ -2573,7 +2787,14 @@ const formDetails = () => ({
 });
 
 const schema = [
-  metaProps(),
+  metaProps({
+    defaultCommentsPlaceholder: DEFAULT_COMMENTS_PLACEHOLDER,
+    commentsPlaceholders: TOLPCommentsPlaceholders,
+    defaultFinalHeadline: DEFAULT_FINAL_HEADLINE_V2,
+    finalHeadlines: TOLPFinalHeadlines,
+    defaultFinalSubHeadline: DEFAULT_FINAL_SUBHEADLINE_V2,
+    finalSubHeadlines: TOLPFinalSubHeadlines
+  }),
   formAnchor(),
   {
     $cmp: 'FormKit',
@@ -2586,11 +2807,11 @@ const schema = [
     }),
     children: [
       headline({
-        children: 'Need Legal Help? Start Here!',
+        children: '$urlParam("hl", "Need Legal Help? Start Here!")',
         if: '$activeStep === $firstStep()'
       }),
       subHeadline({
-        children: 'Get Your Questions Answered Today!',
+        children: '$urlParam("shl", "Our Service is Fast, Easy, and Free!")',
         if: '$activeStep === $firstStep()'
       }),
       ...hiddenInputs,
@@ -2601,15 +2822,17 @@ const schema = [
         },
         children: [
           generalLegalTOLPAndZip(),
-          generalLegalTOLPQuestions(),
-          commentsWithBankruptcy({
+          generalLegalTOLPQuestions({
+            headline: 'Tell Us More About Your Case'
+          }),
+          commentsWithBankruptcyV2({
             nextOnEnter: false
           }),
-          firstAndLast(),
-          contactInfo({
+          firstAndLastV2(),
+          contactInfoV2({
             nextOnEnter: false
           }),
-          formNavigation(),
+          formNavigationV2(),
           formDetails()
         ]
       }