bhl-forms 0.2.8 → 0.3.1

package/dist/forms/generalLegal.es.js

@@ -740,16 +740,16 @@ const amountPaymentsPastDue = () => sbsSelect({
   ]
 });
 
-const applicantOccupation = () => sbsText({
+const applicantOccupation = (scope) => sbsText({
+  name: scope ? scope + ':' + 'Applicant_Occupation' : 'Applicant_Occupation',
   label: "What is the Applicant's Occupation?",
-  name: 'Applicant_Occupation',
   placeholder: "Occupation"
 });
 
 
-const applicantAge = () => sbsSelect({
+const applicantAge = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Applicant_Age' : 'Applicant_Age',
   label: 'Age of Applicant?',
-  name: 'Applicant_Age',
   options: [
     "18",
     "19",
@@ -802,9 +802,9 @@ const applicantAge = () => sbsSelect({
   ]
 });
 
-const applicantDisabilityHowObtain = () => sbsSelect({
+const applicantDisabilityHowObtain = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Applicant_Disability_How_Obtain' : 'Applicant_Disability_How_Obtain',
   label: 'How Did Applicant Obtain the Disability Policy?',
-  name: 'Applicant_Disability_How_Obtain',
   options: [
     "Employer",
     "Self",
@@ -812,8 +812,8 @@ const applicantDisabilityHowObtain = () => sbsSelect({
   ]
 });
 
-const applicantPreviouslyAppliedLtdBenefits = () => sbsRadio({
-  name: 'Applicant_Previously_Apply_Ltd_Benefits',
+const applicantPreviouslyAppliedLtdBenefits = (scope) => sbsRadio({
+  name: scope ? scope + ':' + 'Applicant_Previously_Apply_Ltd_Benefits' : 'Applicant_Previously_Apply_Ltd_Benefits',
   label: 'Has Applicant Previously Applied for Long Term Disability Benefits?',
   options: [
     "Yes, claim pending",
@@ -822,9 +822,9 @@ const applicantPreviouslyAppliedLtdBenefits = () => sbsRadio({
   ]
 });
 
-const applicantMonthlySalary = () => sbsSelect({
+const applicantMonthlySalary = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Applicant_Monthly_Salary' : 'Applicant_Monthly_Salary',
   label: "Applicant's Monthly Salary/Pay When Last at Work:",
-  name: 'Applicant_Monthly_Salary',
   options: [
     "< $1,000",
     "$1,000 - $2,000",
@@ -840,8 +840,8 @@ const applicantMonthlySalary = () => sbsSelect({
   ]
 });
 
-const applicantReceivedDisabilityBenefits = () => sbsRadio({
-  name: 'Applicant_Received_Disability_Benefits',
+const applicantReceivedDisabilityBenefits = (scope) => sbsRadio({
+  name: scope ? scope + ':' + 'Applicant_Received_Disability_Benefits' : 'Applicant_Received_Disability_Benefits',
   label: 'Has Applicant Ever Received Long Term Disability Benefits for this Claim?',
   options: [
     "Yes, currently receiving",
@@ -850,13 +850,13 @@ const applicantReceivedDisabilityBenefits = () => sbsRadio({
   ]
 });
 
-const applicantLTDisabilityPolicy = () => sbsYesNoRadio({
-  name: 'Applicant_Lt_Disability_Policy',
+const applicantLTDisabilityPolicy = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Applicant_Lt_Disability_Policy' : 'Applicant_Lt_Disability_Policy',
   label: 'Does Applicant have a Long Term Disability Policy?'
 });
 
-const atFault = () => sbsYesNoRadio({
-  name: 'At_Fault',
+const atFault = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'At_Fault' : 'At_Fault',
   label: 'Were You at Fault?'
 });
 
@@ -869,9 +869,9 @@ const bankruptcyCrossSell = () => sbsCheckbox({
   helpClass: "!t-text-sm"
 });
 
-const bloodContentAlcholTest = () => sbsSelect({
+const bloodContentAlcholTest = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Blood_Alcohol_Content_Test' : 'Blood_Alcohol_Content_Test',
   label: 'Blood Alcohol Content Measured by Test:',
-  name: 'Blood_Alcohol_Content_Test',
   options: [
     "No Test",
     "0.00% - 0.04%",
@@ -908,9 +908,9 @@ const businessType = () => sbs2ColRadio({
   ]
 });
 
-const causeOfInjury = () => sbsSelect({
+const causeOfInjury = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Cause_Of_Injury' : 'Cause_Of_Injury',
   label: 'Cause of Injury:',
-  name: 'Cause_Of_Injury',
   options: [
     "Traumatic Physical Injury (Accident)",
     "Repeated Trauma Injury",
@@ -975,9 +975,9 @@ const civilRightsType = () => sbsSelect({
   ]
 });
 
-const childHome = () => sbsSelect({
+const childHome = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Child_Home' : 'Child_Home',
   label: 'With Whom Do the Children Currently Live?',
-  name: 'Child_Home',
   options: [
     'Mother',
     'Father',
@@ -986,9 +986,9 @@ const childHome = () => sbsSelect({
   ]
 });
 
-const childPrimaryCaregiver = () => sbsSelect({
+const childPrimaryCaregiver = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Child_Primary_Caregiver' : 'Child_Primary_Caregiver',
   label: 'Who is the Primary Caregiver?',
-  name: 'Child_Primary_Caregiver',
   options: [
     'Mother',
     'Father',
@@ -996,9 +996,9 @@ const childPrimaryCaregiver = () => sbsSelect({
   ]
 });
 
-const childRelationship = () => sbsSelect({
+const childRelationship = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Child_Relationship' : 'Child_Relationship',
   label: 'Your Relationship to Child(ren):',
-  name: 'Child_Relationship',
   options: [
     'Father',
     'Mother',
@@ -1008,9 +1008,9 @@ const childRelationship = () => sbsSelect({
   ]
 });
 
-const claimStatus = () => sbsSelect({
+const claimStatus = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Claim_Status' : 'Claim_Status',
   label: "Status of Claim:",
-  name: 'Claim_Status',
   options: [
     "No action taken yet",
     "Demand for compensation made",
@@ -1045,9 +1045,9 @@ const consumerLawyerType = () => sbsSelect({
   ]
 });
 
-const countryOfCitizenship = () => sbsSelect({
+const countryOfCitizenship = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Country_Of_Citizenship' : 'Country_Of_Citizenship',
   label: 'What is Your Current Country of Citizenship?',
-  name: 'Country_Of_Citizenship',
   options: [
     "Afghanistan",
     "Albania",
@@ -1271,10 +1271,10 @@ const criminalChargesFiled = () => sbsRadio({
   ]
 });
 
-const degreeOfInterest = (help) => sbsSelect({
+const degreeOfInterest = (scope, help) => sbsSelect({
+  name: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
+  id: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
   label: 'How Likely Are You to Pay if Your Issue Could be Resolved?',
-  id: 'Degree_Of_Interest',
-  name: 'Degree_Of_Interest',
   help: help,
   options: [
     'Definitely',
@@ -1289,7 +1289,7 @@ const defaultNotice = () => sbsYesNoRadio({
   label: 'Have You Received a Notice of Default from the Lender?'
 });
 
-const degreeOfInterestHelp = () => degreeOfInterest('No payment necessary to speak with lawyers.');
+const degreeOfInterestHelp = (scope) => degreeOfInterest(scope, 'No payment necessary to speak with lawyers.');
 
 const disabilityConditionStopWork = () => sbsYesNoRadio({
   name: 'Disability_Condition_Stop_Work',
@@ -1301,8 +1301,8 @@ const disabilityWorkHistory = () => sbsYesNoRadio({
   label: 'Have You Had a Full-Time Job Within the Past 5 Years?'
 });
 
-const doctorTreatment = () => sbsYesNoRadio({
-  name: 'Doctor_Treatment',
+const doctorTreatment = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Doctor_Treatment' : 'Doctor_Treatment',
   label: 'Have You Recently Been Treated by a Doctor, Hospital or Clinic?'
 });
 
@@ -1359,9 +1359,9 @@ const employmentAndWorkplaceTOLPDisplay = (updates) => col2Radio(merge({
   ]
 }, updates));
 
-const estateLegalServicesNeeded = () => sbsSelect({
+const estateLegalServicesNeeded = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Estate_Legal_Services_Needed' : 'Estate_Legal_Services_Needed',
   label: "Legal Services Needed for Your Estate:",
-  name: 'Estate_Legal_Services_Needed',
   options: [
     "Charitable Giving",
     "Contested Wills",
@@ -1445,13 +1445,13 @@ const generalTOLP = (updates) => sbsSelect(merge({
   ]
 }, updates));
 
-const haveAttorney = () => sbsYesNoRadio({
-  name: 'Have_Attorney',
+const haveAttorney = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Have_Attorney' : 'Have_Attorney',
   label: 'Already Working with An Attorney?'
 });
 
-const haveChildren = () => sbsYesNoRadio({
-  name: 'Have_Children',
+const haveChildren = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Have_Children' : 'Have_Children',
   label: 'Do You Have Children?'
 });
 
@@ -1460,9 +1460,9 @@ const haveCourtDate = () => sbsYesNoRadio({
   label: 'Do You Have a Court Date?'
 });
 
-const immigrationDetails = () => sbsSelect({
+const immigrationDetails = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Immigration_Details' : 'Immigration_Details',
   label: 'Where is the Person Seeking Immigration Located?',
-  name: 'Immigration_Details',
   options: [
     "In the USA with proper documentation",
     "In the USA without proper documentation",
@@ -1474,9 +1474,9 @@ const immigrationDetails = () => sbsSelect({
   ]
 });
 
-const immigrationEntry = () => sbsSelect({
+const immigrationEntry = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Immigration_Entry' : 'Immigration_Entry',
   label: 'How are you Trying to Enter the Country?',
-  name: 'Immigration_Entry',
   options: [
     "With Proper Documents/Visa and Inspection through Customs Border Patrol",
     "Illegally",
@@ -1485,18 +1485,18 @@ const immigrationEntry = () => sbsSelect({
   ]
 });
 
-const immigrationLocation = () => sbsSelect({
+const immigrationLocation = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Immigration_Location' : 'Immigration_Location',
   label: 'Where Are You Migrating To?',
-  name: 'Immigration_Location',
   options: [
     "In the USA",
     "Outside the USA"
   ]
 });
 
-const immigrationType = () => sbsSelect({
+const immigrationType = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Immigration_Type' : 'Immigration_Type',
   label: 'What Type of Immigration Issue?',
-  name: 'Immigration_Type',
   options: [
     "Citizenship (for current green card holders)",
     "Permanent Visa Family Based (green cards)",
@@ -1511,9 +1511,9 @@ const immigrationType = () => sbsSelect({
   ]
 });
 
-const immigrationStatus = () => sbsSelect({
+const immigrationStatus = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Immigration_Status' : 'Immigration_Status',
   label: 'What is the Current Status of the Immigration Case?',
-  name: 'Immigration_Status',
   options: [
     "Out of Status (overstayed my visa)",
     "Current Visa Holder (in status)",
@@ -1523,9 +1523,9 @@ const immigrationStatus = () => sbsSelect({
   ]
 });
 
-const incidentDate = () => sbsDate({
+const incidentDate = (scope) => sbsDate({
+  name: scope ? scope + ':' + 'Incident_Date' : 'Incident_Date',
   label: 'Date of Incident:',
-  name: 'Incident_Date'
 });
 
 const lastName = () => sbsText({
@@ -1576,9 +1576,9 @@ const lawsuitOtherParty = () => sbsSelect({
   ]
 });
 
-const lawyerPaymentMethod = () => sbsSelect({
+const lawyerPaymentMethod = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Lawyer_Payment_Method' : 'Lawyer_Payment_Method',
   label: 'How Will You Pay for Legal Fees if You Hire a Lawyer?',
-  name: 'Lawyer_Payment_Method',
   help: 'No payment necessary to speak with lawyers.',
   options: [
     'Cash',
@@ -1592,7 +1592,8 @@ const lawyerPaymentMethod = () => sbsSelect({
 
 
 const legalCrossSells$1 = () => col2Checkbox({
-  name: 'Legal_Cross_Sells',
+  id: 'Legal_CrossSells',
+  name: 'Legal_CrossSells',
   help: 'Note: just hit "Next" if none apply',
   helpClass: 't-text-center !t-text-sm',
   validation: null,
@@ -1604,7 +1605,7 @@ const legalCrossSells$1 = () => col2Checkbox({
       'Workers Compensation': 'Workplace Injury',
       'Power of Attorney': 'Update Power of Attorney',
       'Divorce and Separation': 'Need a Divorce or Separation',
-      'Immigration and Visas': 'Immigration or Visa Issues'
+      'Child Custody': 'Need help with Child Custody',
     },
     else: {
       if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Personal Injury" || $getVal($get(form), "Type_Of_Legal_Problem") === "Workers Compensation"',
@@ -1614,7 +1615,7 @@ const legalCrossSells$1 = () => col2Checkbox({
         'Power of Attorney': 'Update Power of Attorney',
         'Divorce and Separation': 'Need a Divorce or Separation',
         'Child Custody': 'Need help with Child Custody',
-        'Immigration and Visas': 'Immigration or Visa Issues'
+        // TODO add one more?
       },
       else: {
         if: '$getVal($get(form), "Type_Of_Legal_Problem") === "DUI and DWI"',
@@ -1624,7 +1625,7 @@ const legalCrossSells$1 = () => col2Checkbox({
           'Long Term Disability': 'Interest in Disability Benefits',
           'Power of Attorney': 'Update Power of Attorney',
           'Divorce and Separation': 'Need a Divorce or Separation',
-          'Immigration and Visas': 'Immigration or Visa Issues'
+          'Child Custody': 'Need help with Child Custody',
         },
         else: {
           if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Wills and Trusts" || $getVal($get(form), "Type_Of_Legal_Problem") === "Probate and Estates" || $getVal($get(form), "Type_Of_Legal_Problem") === "Power of Attorney"',
@@ -1633,8 +1634,8 @@ const legalCrossSells$1 = () => col2Checkbox({
             'Personal Injury': 'Personal or Workplace Injury',
             'DUI and DWI': 'Charged with a DUI/DWI',
             'Long Term Disability': 'Interest in Disability Benefits',
+            'Divorce and Separation': 'Need a Divorce or Separation',
             'Child Custody': 'Need help with Child Custody',
-            'Immigration and Visas': 'Immigration or Visa Issues'
           },
           else: {
             if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Long Term Disability" || $getVal($get(form), "Type_Of_Legal_Problem") === "Social Security Disability and Insurance"',
@@ -1644,7 +1645,7 @@ const legalCrossSells$1 = () => col2Checkbox({
               'Wills and Trusts': 'Need a Will or Trust',
               'Power of Attorney': 'Update Power of Attorney',
               'Divorce and Separation': 'Need a Divorce or Separation',
-              'Immigration and Visas': 'Immigration or Visa Issues'
+              'Child Custody': 'Need help with Child Custody',
             },
             else: {
               'Auto and Car Accidents': 'Injured in a Car Accident',
@@ -1678,9 +1679,9 @@ const loanAmount = () => sbsSelect({
   ]
 });
 
-const maritalStatus = () => sbsSelect({
+const maritalStatus = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Marital_Status' : 'Marital_Status',
   label: 'Marital Status:',
-  name: 'Marital_Status',
   options: [
     'Unmarried, Living Together',
     'Unmarried, Do Not Live Together',
@@ -1763,8 +1764,8 @@ const patentFor = () => sbsSelect({
   ]
 });
 
-const pendingCharges = () => sbsYesNoRadio({
-  name: 'Pending_Charges',
+const pendingCharges = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Pending_Charges' : 'Pending_Charges',
   label: 'Do you currently have any pending charges?'
 });
 
@@ -1786,9 +1787,9 @@ const phone = () => sbsText({
   helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]"
 });
 
-const primaryInjury = () => sbs2ColRadio({
+const primaryInjury = (scope) => sbs2ColRadio({
+  name: scope ? scope + ':' + 'Primary_Injury' : 'Primary_Injury',
   label: 'Primary Injury:',
-  name: 'Primary_Injury',
   options: [
     "Anxiety",
     "Back or Neck Pain",
@@ -1801,13 +1802,13 @@ const primaryInjury = () => sbs2ColRadio({
   ]
 });
 
-const priorAlcoholOffenses = () => sbsYesNoRadio({
-  name: 'Prior_Alcohol_Offenses',
+const priorAlcoholOffenses = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Prior_Alcohol_Offenses' : 'Prior_Alcohol_Offenses',
   label: 'Any Prior Alcohol Related Offenses?'
 });
 
-const policeReportFiled = () => sbsYesNoRadio({
-  name: 'Police_Report_Filed',
+const policeReportFiled = (scope) => sbsYesNoRadio({
+  name: scope ? scope + ':' + 'Police_Report_Filed' : 'Police_Report_Filed',
   label: 'Was a Police Report Filed?'
 });
 
@@ -1866,9 +1867,9 @@ const roleInMatterCriminal = () => sbsRadio({
   ]
 });
 
-const roleInMatterProbate = () => sbsSelect({
+const roleInMatterProbate = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Role_In_Matter_Probate' : 'Role_In_Matter_Probate',
   label: "What Is Your Role in this Matter?",
-  name: 'Role_In_Matter_Probate',
   options: [
     "Preparing My Will",
     "Executor",
@@ -1961,9 +1962,9 @@ const TCPAConsent = () => ({
   }
 });
 
-const typeOfAlcoholTest = () => sbsSelect({
+const typeOfAlcoholTest = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Type_Of_Alcohol_Test' : 'Type_Of_Alcohol_Test',
   label: 'Type of Alcohol Test Performed?',
-  name: 'Type_Of_Alcohol_Test',
   options: [
     "No Test",
     "Refused Test",
@@ -1974,9 +1975,9 @@ const typeOfAlcoholTest = () => sbsSelect({
   ]
 });
 
-const typeOfAssets = () => col2Checkbox({
+const typeOfAssets = (scope) => col2Checkbox({
+  name: scope ? scope + ':' + 'Type_Of_Assets' : 'Type_Of_Assets',
   label: 'Type of Assets:',
-  name: 'Type_Of_Assets',
   options: [
     "Business Interests",
     "Cash",
@@ -2025,9 +2026,9 @@ const trafficViolations = () => sbsSelect({
   ]
 });
 
-const valueOfAssets = () => sbsSelect({
+const valueOfAssets = (scope) => sbsSelect({
+  name: scope ? scope + ':' + 'Value_Of_Assets' : 'Value_Of_Assets',
   label: 'Value of Your Assets?',
-  name: 'Value_Of_Assets',
   options: [
     "Less than 50K",
     "50K to 100K",
@@ -2156,17 +2157,17 @@ const AsbestosAndMesotheliomaQuestions = () => group(
   }
 );
 
-const AutoAndCarAccidentsQuestions = () => group(
+const AutoAndCarAccidentsQuestions = (condition, scope) => group(
   'AutoAndCarAccidentsQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Auto and Car Accidents"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Auto and Car Accidents"'),
     children: [
-      haveAttorney(),
-      incidentDate(),
-      atFault(),
-      primaryInjury(),
-      doctorTreatment(),
-      policeReportFiled()
+      haveAttorney(scope),
+      incidentDate(scope),
+      atFault(scope),
+      primaryInjury(scope),
+      doctorTreatment(scope),
+      policeReportFiled(scope)
     ]
   }
 );
@@ -2211,32 +2212,32 @@ const BusinessLawyersQuestions = () => group(
   }
 );
 
-const ChildCustodyAndSupportQuestions = () => group(
+const ChildCustodyAndSupportQuestions = (condition, scope) => group(
   'ChildCustodyAndSupportQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Child Custody and Support"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Child Custody and Support"'),
     children: [
-      haveAttorney(),
-      childRelationship(),
-      childHome(),
-      childPrimaryCaregiver(),
-      degreeOfInterest(),
-      lawyerPaymentMethod()
+      haveAttorney(scope),
+      childRelationship(scope),
+      childHome(scope),
+      childPrimaryCaregiver(scope),
+      degreeOfInterest(scope),
+      lawyerPaymentMethod(scope)
     ]
   }
 );
 
-const ChildCustodyQuestions = () => group(
+const ChildCustodyQuestions = (condition, scope) => group(
   'ChildCustodyQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Child Custody"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Child Custody"'),
     children: [
-      haveAttorney(),
-      childRelationship(),
-      childHome(),
-      childPrimaryCaregiver(),
-      degreeOfInterest(),
-      lawyerPaymentMethod()
+      haveAttorney(scope),
+      childRelationship(scope),
+      childHome(scope),
+      childPrimaryCaregiver(scope),
+      degreeOfInterest(scope),
+      lawyerPaymentMethod(scope)
     ]
   }
 );
@@ -2373,32 +2374,32 @@ const DebtAndCollectionsQuestions = () => group(
   }
 );
 
-const DivorceQuestions = () => group(
+const DivorceQuestions = (condition, scope) => group(
   'DivorceQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Divorce and Separation"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Divorce and Separation"'),
     children: [
-      haveAttorney(),
-      maritalStatus(),
-      haveChildren(),
-      degreeOfInterest(),
-      lawyerPaymentMethod()
+      haveAttorney(scope),
+      maritalStatus(scope),
+      haveChildren(scope),
+      degreeOfInterest(scope),
+      lawyerPaymentMethod(scope)
     ]
   }
 );
 
-const DUIAndDWIQuestions = () => group(
+const DUIAndDWIQuestions = (condition, scope) => group(
   'DUIAndDWIQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "DUI and DWI"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "DUI and DWI"'),
     children: [
-      haveAttorney(),
-      incidentDate(),
-      priorAlcoholOffenses(),
-      typeOfAlcoholTest(),
-      bloodContentAlcholTest(),
-      pendingCharges(),
-      degreeOfInterestHelp()
+      haveAttorney(scope),
+      incidentDate(scope),
+      priorAlcoholOffenses(scope),
+      typeOfAlcoholTest(scope),
+      bloodContentAlcholTest(scope),
+      pendingCharges(scope),
+      degreeOfInterestHelp(scope)
     ]
   }
 );
@@ -2544,19 +2545,19 @@ const IdentityTheftQuestions = () => group(
   }
 );
 
-const ImmigrationAndVisasQuestions = () => group(
+const ImmigrationAndVisasQuestions = (condition, scope) => group(
   'ImmigrationAndVisasQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Immigration and Visas"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Immigration and Visas"'),
     children: [
-      haveAttorney(),
-      countryOfCitizenship(),
-      immigrationLocation(),
-      immigrationEntry(),
-      immigrationType(),
-      immigrationStatus(),
-      immigrationDetails(),
-      degreeOfInterestHelp()
+      haveAttorney(scope),
+      countryOfCitizenship(scope),
+      immigrationLocation(scope),
+      immigrationEntry(scope),
+      immigrationType(scope),
+      immigrationStatus(scope),
+      immigrationDetails(scope),
+      degreeOfInterestHelp(scope)
     ]
   }
 );
@@ -2597,19 +2598,19 @@ const LemonLawQuestions = () => group(
   }
 );
 
-const LongTermDisabilityQuestions = () => group(
+const LongTermDisabilityQuestions = (condition, scope) => group(
   'LongTermDisabilityQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Long Term Disability"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Long Term Disability"'),
     children: [
-      haveAttorney(),
-      applicantOccupation(),
-      applicantAge(),
-      applicantLTDisabilityPolicy(),
-      applicantDisabilityHowObtain(),
-      applicantPreviouslyAppliedLtdBenefits(),
-      applicantReceivedDisabilityBenefits(),
-      applicantMonthlySalary()
+      haveAttorney(scope),
+      applicantOccupation(scope),
+      applicantAge(scope),
+      applicantLTDisabilityPolicy(scope),
+      applicantDisabilityHowObtain(scope),
+      applicantPreviouslyAppliedLtdBenefits(scope),
+      applicantReceivedDisabilityBenefits(scope),
+      applicantMonthlySalary(scope)
     ]
   }
 );
@@ -2654,28 +2655,28 @@ const PatentsAndIntellectualPropertyQuestions = () => group(
   }
 );
 
-const PersonalInjuryQuestions = () => group(
+const PersonalInjuryQuestions = (condition, scope) => group(
   'PersonalInjuryQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Personal Injury"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Personal Injury"'),
     children: [
-      haveAttorney(),
-      incidentDate(),
-      claimStatus(),
-      atFault(),
-      primaryInjury(),
-      doctorTreatment()
+      haveAttorney(scope),
+      incidentDate(scope),
+      claimStatus(scope),
+      atFault(scope),
+      primaryInjury(scope),
+      doctorTreatment(scope)
     ]
   }
 );
 
-const PowerofAttorneyQuestions = () => group(
+const PowerofAttorneyQuestions = (condition, scope) => group(
   'PowerofAttorneyQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Power of Attorney"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Power of Attorney"'),
     children: [
-      haveAttorney(),
-      degreeOfInterestHelp()
+      haveAttorney(scope),
+      degreeOfInterestHelp(scope)
     ]
   }
 );
@@ -2827,32 +2828,32 @@ const VictimOfACrimeQuestions = () => group(
   }
 );
 
-const WillsAndTrustsQuestions = () => group(
+const WillsAndTrustsQuestions = (condition, scope) => group(
   'WillsAndTrustsQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Wills and Trusts"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Wills and Trusts"'),
     children: [
-      haveAttorney(),
-      valueOfAssets(),
-      typeOfAssets(),
-      roleInMatterProbate(),
-      estateLegalServicesNeeded(),
-      degreeOfInterestHelp()
+      haveAttorney(scope),
+      valueOfAssets(scope),
+      typeOfAssets(scope),
+      roleInMatterProbate(scope),
+      estateLegalServicesNeeded(scope),
+      degreeOfInterestHelp(scope)
     ]
   }
 );
 
-const WorkersCompensationQuestions = () => group(
+const WorkersCompensationQuestions = (condition, scope) => group(
   'WorkersCompensationQuestions',
   {
-    if: '$get(Type_Of_Legal_Problem).value == "Workers Compensation"',
+    if: (condition || '$get(Type_Of_Legal_Problem).value == "Workers Compensation"'),
     children: [
-      haveAttorney(),
-      incidentDate(),
-      claimStatus(),
-      primaryInjury(),
-      causeOfInjury(),
-      doctorTreatment()
+      haveAttorney(scope),
+      incidentDate(scope),
+      claimStatus(scope),
+      primaryInjury(scope),
+      causeOfInjury(scope),
+      doctorTreatment(scope)
     ]
   }
 );
@@ -2934,9 +2935,29 @@ const stepDefaults = (step) => ({
 function questionsStepHeadline(updates) {
   return {
     $el: 'h3',
-    children: updates.headline || 'Tell Us About Your Case',
+    children: updates.headline || 'Tell Us About Your Situation',
+    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-1'
+    }
+  }
+}
+
+function crossSellQuestionsStepHeadline(updates) {
+  return {
+    $el: 'h3',
+    children: updates.headline || 'Tell Us About Your Situation',
     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'
+      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-1'
+    }
+  }
+}
+
+function crossSellQuestionsStepSubHeadline(updates) {
+  return {
+    $el: 'h5',
+    children: updates.subheadline || 'Tell us about your situation:',
+    attrs: {
+      class: 't-flex t-justify-center t-text-dark t-text-center !t-text-lg t-font-semibold t-pb-4 t-pt-0 t-px-3'
     }
   }
 }
@@ -2947,7 +2968,7 @@ function commentsStepHeadline(updates) {
     $el: 'h3',
     children: updates.headline || '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' + ' ' + (updates.headlineClass || '')
+      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-1' + ' ' + (updates.headlineClass || '')
     }
   }
 }
@@ -2957,7 +2978,7 @@ function firstAndLastStepHeadline(updates) {
     $el: 'h3',
     children: updates.headline || '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' + ' ' + (updates.headlineClass || '')
+      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-1' + ' ' + (updates.headlineClass || '')
     }
   }
 }
@@ -2967,7 +2988,7 @@ function legalCrossSellsStepHeadline(updates) {
     $el: 'h3',
     children: updates.headline || 'Do any of the following situations apply?',
     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' + ' ' + (updates.headlineClass || '')
+      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-1' + ' ' + (updates.headlineClass || '')
     }
   }
 }
@@ -2977,7 +2998,7 @@ function contactStepHeadline(updates) {
     $el: 'h3',
     children: updates.headline || DEFAULT_FINAL_HEADLINE_DYNAMIC,
     attrs: {
-      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'
+      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-1'
     }
   }
 }
@@ -3024,10 +3045,10 @@ function step(name, inputs, nextOnEnter = true, nextOnInput = false) {
   }
   if (inputs && inputs.length && (nextOnEnter || nextOnInput)) {
     const lastInput = findLastInput(inputs[inputs.length - 1]);
-    if (nextOnEnter === true) {
+    if (lastInput && nextOnEnter === true) {
       lastInput.onKeypress = NEXT_ON_ENTER;
     }
-    if (nextOnInput === true) {
+    if (lastInput && nextOnInput === true) {
       lastInput.onInput = NEXT_ON_INPUT;
     }
   }
@@ -3185,6 +3206,110 @@ function generalLegalTOLPQuestions(updates = {}) {
   )
 }
 
+
+function autoAndCarAccidentCrossSellQuestions(updates = {}) {
+  return step(
+    'autoAndCarAccidentCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'You May Be Entitled To Compensation' }),
+      crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your accident:' }),
+      AutoAndCarAccidentsQuestions("true", 'CrossSell:Auto_and_Car_Accidents'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function childCustodyCrossSellQuestions(updates = {}) {
+  return step(
+    'childCustodyCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'Child Custody Information' }),
+      ChildCustodyQuestions("true", 'CrossSell:Child_Custody'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function divorceAndSeparationCrossSellQuestions(updates = {}) {
+  return step(
+    'divorceAndSeparationCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'Divorce or Separation Information' }),
+      DivorceQuestions("true", 'CrossSell:Divorce_and_Separation'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function duiAndDWICrossSellQuestions(updates = {}) {
+  return step(
+    'duiAndDWICrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'About Your DUI/DWI' }),
+      DUIAndDWIQuestions("true", 'CrossSell:DUI_and_DWI'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function longTermDisabilityCrossSellQuestions(updates = {}) {
+  return step(
+    'longTermDisabilityCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'You May Be Entitled To Benefits' }),
+      crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your disability:' }),
+      LongTermDisabilityQuestions("true", 'CrossSell:Long_Term_Disability'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function personalInjuryCrossSellQuestions(updates = {}) {
+  return step(
+    'personalInjuryCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'You May Be Entitled To Compensation' }),
+      crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your injury:' }),
+      PersonalInjuryQuestions("true", 'CrossSell:Personal_Injury'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function powerOfAttorneyCrossSellQuestions(updates = {}) {
+  return step(
+    'powerOfAttorneyCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'Power of Attorney Information' }),
+      PowerofAttorneyQuestions("true", 'CrossSell:Power_of_Attorney'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function willsAndTrustsCrossSellQuestions(updates = {}) {
+  return step(
+    'willsAndTrustsCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'Will or Trust Information' }),
+      WillsAndTrustsQuestions("true", 'CrossSell:Wills_and_Trusts'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
+function workersCompensationCrossSellQuestions(updates = {}) {
+  return step(
+    'workersCompensationCrossSellQuestions',
+    [
+      crossSellQuestionsStepHeadline({ headline: 'You May Be Entitled To Benefits' }),
+      crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your injury:' }),
+      WorkersCompensationQuestions("true", 'CrossSell:Workers_Compensation'),
+    ],
+    updates.nextOnEnter
+  )
+}
+
 function legalCrossSells(updates = {}) {
   return step(
     'legalCrossSells',
@@ -3312,6 +3437,15 @@ const schema = [
             nextOnEnter: false
           }),
           legalCrossSells(),
+          autoAndCarAccidentCrossSellQuestions(),
+          personalInjuryCrossSellQuestions(),
+          workersCompensationCrossSellQuestions(),
+          duiAndDWICrossSellQuestions(),
+          longTermDisabilityCrossSellQuestions(),
+          powerOfAttorneyCrossSellQuestions(),
+          willsAndTrustsCrossSellQuestions(),
+          divorceAndSeparationCrossSellQuestions(),
+          childCustodyCrossSellQuestions(),
           firstAndLastV2(),
           contactInfoV2({
             nextOnEnter: false