bhl-forms 0.11.10 → 0.11.12

package/dist/forms/willsAndTrusts.es.js

@@ -372,14 +372,11 @@ const verticalDate = (updates) => {
   return date(updates)
 };
 
-const email = (scope, vertical, updates = {}) => {
-  const func = vertical ? verticalText : sbsText;
-  const label = vertical ? updates.label : "Email Address:";
-  return func({
-    $formkit: "email",
+const emailFL = (scope, updates = {}) => {
+  return text({
+    $formkit: "FloatingLabelText",
     name: scope ? scope + ":" + "Email" : "Email",
-    label,
-    placeholder: "email@domain.com",
+    placeholder: "Email Address",
     autocomplete: "email",
     "data-tf-sensitive": "false",
     validation: "required|email",
@@ -387,64 +384,77 @@ const email = (scope, vertical, updates = {}) => {
       required: "Email is required",
       email: "Invalid Email",
     },
+    inputClass: "t-text-center",
+    wrapperClass: "t-flex t-justify-center",
     ...updates,
   })
 };
 
-const firstName = (scope, vertical, updates = {}) => {
-  const func = vertical ? verticalText : sbsText;
-  const label = vertical ? updates.label : "First Name:";
-  return func({
-    label,
+const firstNameFL = (scope, updates = {}) => {
+  return text({
+    $formkit: "FloatingLabelText",
     placeholder: "First Name",
     name: scope ? scope + ":" + "First_Name" : "First_Name",
     autocomplete: "given-name",
     validationMessages: {
       required: "First Name is required",
     },
+    inputClass: "t-text-center",
     ...updates,
   })
 };
 
-const lastName = (scope, vertical, updates = {}) => {
-  const func = vertical ? verticalText : sbsText;
-  const label = vertical ? updates.label : "Last Name:";
-  return func({
-    label,
+const lastNameFL = (scope, updates = {}) => {
+  return text({
+    $formkit: "FloatingLabelText",
     placeholder: "Last Name",
     name: scope ? scope + ":" + "Last_Name" : "Last_Name",
     autocomplete: "family-name",
     validationMessages: {
       required: "Last Name is required",
     },
+    inputClass: "t-text-center",
     ...updates,
   })
 };
 
-const phone = (scope, vertical, updates = {}) => {
-  const func = vertical ? verticalText : sbsText;
-  const label = vertical ? updates.label : "Phone Number:";
-  return func({
-    $formkit: "tel",
+const fullNameFLMobileCol = (scope, updates = {}) => {
+  return {
+    $el: "div",
+    attrs: {
+      class: "t-flex t-flex-col sm:t-flex-row t-flex-wrap t-gap-x-[2%] t-justify-center  sm:!t-max-w-[70%]",
+    },
+    children: [
+      firstNameFL(scope, { outerClass: "sm:!t-max-w-[49%]", ...updates }),
+      lastNameFL(scope, { outerClass: "sm:!t-max-w-[49%]", ...updates }),
+    ],
+  }
+};
+
+const phoneFL = (scope, updates = {}) => {
+  return text({
+    $formkit: "FloatingLabelText",
+    datatype: "tel",
     name: scope ? scope + ":" + "Primary_Phone" : "Primary_Phone",
-    label,
-    placeholder: updates.placeholder || "###-###-####",
-    maxlength: 12,
-    help: updates.help || "10-digit phone number, hyphens optional",
+    placeholder: updates.placeholder || "Phone Number",
+    maxlength: 14,
+    help: updates.help || null,
     autocomplete: "tel-national",
     "data-tf-sensitive": "false",
-    validation: "required|matches:/^[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/|valid_phone",
+    validation: "required|matches:/^[0-9]{3}[0-9]{3}[0-9]{4}$/|valid_phone",
     validationMessages: {
       required: "Phone Number is required",
-      matches: "Invalid Phone Format, use ###-###-####",
+      matches: "Invalid Phone Format, use (XXX) YYY-ZZZZ",
       valid_phone: "Invalid Phone Number",
     },
     helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]",
+    inputClass: "t-text-center",
+    wrapperClass: "t-flex t-justify-center",
     ...updates,
   })
 };
 
-const zipcode = (scope, vertical, updates = {}) => {
+const zipcode$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalText : sbsText;
   const label = vertical ? updates.label : "Zip Code:";
   const help = vertical ? updates.help ?? "We try to match you with local help" : null;
@@ -558,7 +568,7 @@ const causeOfInjury = (scope, vertical, updates = {}) => {
   )
 };
 
-const causeOfDeath = (scope, vertical, updates = {}) => {
+const causeOfDeath$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "What was the Cause of the Victim's Death?";
   return func(
@@ -647,7 +657,7 @@ const comments = (scope, vertical, updates) =>
     )
   );
 
-const criminalChargesFiled = (scope, vertical, updates = {}) => {
+const criminalChargesFiled$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalRadio : sbsRadio;
   const label = vertical ? updates.label : "Were Criminal Charges Filed?";
   return func(
@@ -662,7 +672,7 @@ const criminalChargesFiled = (scope, vertical, updates = {}) => {
   )
 };
 
-const degreeOfInterest = (scope, vertical, updates = {}) => {
+const degreeOfInterest$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "How Likely Are You to Pay if Your Issue Could be Resolved?";
   const help = vertical ? updates.help : "No payment necessary to speak with lawyers.";
@@ -681,7 +691,7 @@ const degreeOfInterest = (scope, vertical, updates = {}) => {
 };
 
 const degreeOfInterestHelp = (scope, vertical, updates = {}) =>
-  degreeOfInterest(scope, vertical, merge(updates, { help: "No payment necessary to speak with lawyers." }));
+  degreeOfInterest$1(scope, vertical, merge(updates, { help: "No payment necessary to speak with lawyers." }));
 
 const disabilityConditionStopWork = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalYesNoRadio : sbsYesNoRadio;
@@ -727,7 +737,7 @@ const doctorTreatment = (scope, vertical, updates = {}) => {
   )
 };
 
-const estateLegalServicesNeeded = (scope, vertical, updates = {}) => {
+const estateLegalServicesNeeded$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "Legal Services Needed for Your Estate:";
   return func(
@@ -749,7 +759,7 @@ const estateLegalServicesNeeded = (scope, vertical, updates = {}) => {
   )
 };
 
-const haveAttorney = (scope, vertical, updates = {}) => {
+const haveAttorney$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalYesNoRadio : sbsYesNoRadio;
   const label = vertical ? updates.label : "Already Working with An Attorney?";
   return func(
@@ -777,7 +787,7 @@ const haveChildren = (scope, vertical, updates = {}) => {
   )
 };
 
-const incidentDate = (scope, vertical, updates = {}) => {
+const incidentDate$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalDate : sbsDate;
   const label = vertical ? updates.label : "Date of Incident:";
   return func(
@@ -917,7 +927,7 @@ const policeReportFiled = (scope, vertical, updates = {}) => {
   )
 };
 
-const relationshipToVictim = (scope, vertical, updates = {}) => {
+const relationshipToVictim$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "Relationship to the Victim:";
   return func(
@@ -932,7 +942,7 @@ const relationshipToVictim = (scope, vertical, updates = {}) => {
   )
 };
 
-const roleInMatterProbate = (scope, vertical, updates = {}) => {
+const roleInMatterProbate$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "What is Your Role in this Matter?";
   return func(
@@ -1002,7 +1012,7 @@ const typeOfAlcoholTest = (scope, vertical, updates = {}) => {
   )
 };
 
-const typeOfAssets = (scope, vertical, updates = {}) => {
+const typeOfAssets$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalCol2Checkbox : col2Checkbox;
   const label = vertical ? updates.label : "Type of Assets:";
   return func(
@@ -1025,7 +1035,7 @@ const typeOfAssets = (scope, vertical, updates = {}) => {
   )
 };
 
-const valueOfAssets = (scope, vertical, updates = {}) => {
+const valueOfAssets$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : sbsSelect;
   const label = vertical ? updates.label : "Value of Your Assets?";
   return func(
@@ -1040,7 +1050,7 @@ const valueOfAssets = (scope, vertical, updates = {}) => {
   )
 };
 
-const willsAndTrustsTOLP = (scope, vertical, updates = {}) => {
+const willsAndTrustsTOLP$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? col2RadioCenter : col2Radio;
   const label = vertical ? updates.label : "Type of Help Needed:";
   return func(
@@ -1084,8 +1094,8 @@ const AutoAndCarAccidentsQuestions = (condition, scope) =>
   group("AutoAndCarAccidentsQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Auto and Car Accidents"',
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
       atFault(scope),
       primaryInjury(scope),
       doctorTreatment(scope),
@@ -1097,11 +1107,11 @@ const ChildCustodyQuestions = (condition, scope) =>
   group("ChildCustodyQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Child Custody"',
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       childRelationship(scope),
       childHome(scope),
       childPrimaryCaregiver(scope),
-      degreeOfInterest(scope),
+      degreeOfInterest$1(scope),
       lawyerPaymentMethod(scope),
     ],
   });
@@ -1110,10 +1120,10 @@ const DivorceQuestions = (condition, scope) =>
   group("DivorceQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Divorce and Separation"',
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       maritalStatus(scope),
       haveChildren(scope),
-      degreeOfInterest(scope),
+      degreeOfInterest$1(scope),
       lawyerPaymentMethod(scope),
     ],
   });
@@ -1122,8 +1132,8 @@ const DUIAndDWIQuestions = (condition, scope) =>
   group("DUIAndDWIQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "DUI and DWI"',
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
       priorAlcoholOffenses(scope),
       typeOfAlcoholTest(scope),
       bloodContentAlcoholTest(scope),
@@ -1132,24 +1142,12 @@ const DUIAndDWIQuestions = (condition, scope) =>
     ],
   });
 
-const FamilyIssuesQuestions = (condition, scope) =>
-  group("FamilyIssuesQuestions", {
-    if: condition || '$get(Type_Of_Legal_Problem).value == "Family Issues"',
-    children: [
-      haveAttorney(scope),
-      maritalStatus(scope),
-      haveChildren(scope),
-      degreeOfInterest(scope),
-      lawyerPaymentMethod(scope),
-    ],
-  });
-
 const PersonalInjuryQuestions = (condition, scope) =>
   group("PersonalInjuryQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Personal Injury"',
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
       claimStatus(scope),
       atFault(scope),
       primaryInjury(scope),
@@ -1160,27 +1158,14 @@ const PersonalInjuryQuestions = (condition, scope) =>
 const PowerofAttorneyQuestions = (condition, scope) =>
   group("PowerofAttorneyQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Power of Attorney"',
-    children: [haveAttorney(scope), degreeOfInterestHelp(scope)],
-  });
-
-const ProbateAndEstatesQuestions = (condition, scope) =>
-  group("ProbateAndEstatesQuestions", {
-    if: condition || '$get(Type_Of_Legal_Problem).value == "Probate and Estates"',
-    children: [
-      haveAttorney(scope),
-      valueOfAssets(scope),
-      typeOfAssets(scope),
-      roleInMatterProbate(scope),
-      estateLegalServicesNeeded(scope),
-      degreeOfInterestHelp(scope),
-    ],
+    children: [haveAttorney$1(scope), degreeOfInterestHelp(scope)],
   });
 
 const SocialSecurityDisabilityAndInsuranceQuestions = (condition, scope) =>
   group("SocialSecurityDisabilityAndInsuranceQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Social Security Disability and Insurance"',
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       applicantAge(scope),
       disabilityConditionStopWork(scope),
       disabilityWorkHistory(scope),
@@ -1193,11 +1178,11 @@ const WillsAndTrustsQuestions = (condition, scope) =>
   group("WillsAndTrustsQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Wills and Trusts"',
     children: [
-      haveAttorney(scope),
-      valueOfAssets(scope),
-      typeOfAssets(scope),
-      roleInMatterProbate(scope),
-      estateLegalServicesNeeded(scope),
+      haveAttorney$1(scope),
+      valueOfAssets$1(scope),
+      typeOfAssets$1(scope),
+      roleInMatterProbate$1(scope),
+      estateLegalServicesNeeded$1(scope),
       degreeOfInterestHelp(scope),
     ],
   });
@@ -1206,8 +1191,8 @@ const WorkersCompensationQuestions = (condition, scope) =>
   group("WorkersCompensationQuestions", {
     if: condition || '$get(Type_Of_Legal_Problem).value == "Workers Compensation"',
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
       claimStatus(scope),
       primaryInjury(scope),
       causeOfInjury(scope),
@@ -1215,24 +1200,6 @@ const WorkersCompensationQuestions = (condition, scope) =>
     ],
   });
 
-const WrongfulDeathQuestions = (condition, scope) =>
-  group("WrongfulDeathQuestions", {
-    if: condition || '$get(Type_Of_Legal_Problem).value == "Wrongful Death"',
-    children: [
-      haveAttorney(scope),
-      incidentDate(scope),
-      relationshipToVictim(scope),
-      criminalChargesFiled(scope),
-      causeOfDeath(scope),
-    ],
-  });
-
-const NotSureOrOtherQuestions = (condition, scope) =>
-  group("NotSureOrOtherQuestions", {
-    if: condition || '$get(Type_Of_Legal_Problem).value == "Not Sure or Other"',
-    children: [haveAttorney(scope), degreeOfInterestHelp(scope)],
-  });
-
 const NEXT_ON_ENTER = "$onEnter($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))";
 const NEXT_ON_INPUT = "$onInput($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))";
 
@@ -1294,13 +1261,21 @@ function secureIcon(updates = {}) {
   return merge(secureIconDefault, updates)
 }
 
-function questionsStepHeadline(updates) {
+function secureIconStandalone(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-1",
+    if: "$activeStep === $lastStep()",
+    style: {
+      if: "$activeStep !== $lastStep()",
+      then: "display: none;",
     },
+    children: [
+      secureIcon({
+        attrs: {
+          class: "t-flex t-justify-center t-items-center t-text-sm t-text-gray-500 t-pb-6 sm:t-pb-8",
+        },
+        ...updates,
+      }),
+    ],
   }
 }
 
@@ -1324,6 +1299,19 @@ function crossSellQuestionsStepSubHeadline(updates) {
   }
 }
 
+function verticalStepHeadline(updates) {
+  return {
+    $el: "h3",
+    children: updates.headline || "Tell Us About Your Situation",
+    attrs: {
+      class:
+        "t-flex t-justify-center t-text-center t-text-lg sm:t-text-xl t-font-bold t-text-dark t-pb-5 t-pt-0 t-px-1" +
+        " " +
+        (updates.headlineClass || ""),
+    },
+  }
+}
+
 function commentsStepHeadline(updates) {
   return {
     $el: "h3",
@@ -1466,6 +1454,25 @@ function step(name, inputs, updates = {}) {
   })
 }
 
+// Single question step
+function sqstep(name, input, defaultHeadline, updates = {}) {
+  if (typeof updates.nextOnInput === "undefined") {
+    updates.nextOnInput = true;
+  }
+
+  return step(
+    name,
+    [
+      verticalStepHeadline({
+        headline: updates.headline ?? defaultHeadline,
+        headlineClass: updates.headlineClass,
+      }),
+      ...(Array.isArray(input) ? input : [input]),
+    ],
+    updates
+  )
+}
+
 function commentsWithBankruptcy(updates = {}) {
   return step(
     "commentsWithBankruptcy",
@@ -1474,6 +1481,7 @@ function commentsWithBankruptcy(updates = {}) {
       comments(updates.scope, false, {
         label: typeof updates.label === "undefined" ? DEFAULT_COMMENTS_LABEL_LEGAL : updates.label,
         placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC_LEGAL,
+        // TODO: this is a mess
         inputClass: typeof updates.inputClass === "undefined" ? "!t-h-32" : updates.inputClass,
       }),
       // TODO: needs scope support
@@ -1494,30 +1502,63 @@ function commentsWithBankruptcy(updates = {}) {
   )
 }
 
-function contactInfo(updates = {}) {
+function contactInfoV2(updates = {}) {
   return step(
     "contactInfo",
     [
       contactStepHeadline(updates),
       contactStepSubHeadline(updates),
       trustedFormScript(),
-      email(updates.scope),
-      phone(updates.scope),
-      TCPAConsent(updates.scope),
-      secureIcon(),
+      {
+        $el: "div",
+        attrs: {
+          class: "t-flex t-flex-col t-justify-center t-items-center",
+        },
+        children: [
+          emailFL(updates.scope, {
+            outerClass: "!t-max-w-[95%] !t-w-[96%] sm:!t-w-[70%]",
+            innerClass: "!t-w-[98%] !t-max-w-[98%] sm:!t-w-[100%] sm:!t-max-w-[100%]",
+          }),
+          phoneFL(updates.scope, {
+            outerClass: "!t-max-w-[95%] !t-w-[96%] sm:!t-w-[70%]",
+            innerClass: "!t-w-[98%] !t-max-w-[98%] sm:!t-w-[100%] sm:!t-max-w-[100%]",
+          }),
+        ],
+      },
+      TCPAConsent(updates.scope, {
+        outerClass: "!t-flex !t-flex-col !t-justify-center !t-items-center",
+        wrapperClass: "t-w-[95%] sm:t-w-[80%]",
+        messagesClass: "t-w-[95%] sm:t-w-[80%]",
+      }),
     ],
     { nextOnEnter: false }
   )
 }
 
-function firstAndLastV2(updates = {}) {
+function firstAndLastV4(updates = {}) {
   return step(
     "firstAndLast",
-    [firstAndLastStepHeadline(updates), firstName(updates.scope), lastName(updates.scope)],
+    [
+      firstAndLastStepHeadline({
+        headline: updates.headline ?? "Who is looking for help?",
+        headlineClass: updates.headlineClass,
+      }),
+      {
+        $el: "div",
+        attrs: {
+          class: "t-flex t-flex-col t-justify-center t-items-center t-pt-3",
+        },
+        children: [fullNameFLMobileCol(updates.scope)],
+      },
+    ],
     updates
   )
 }
 
+function zipcode(updates = {}) {
+  return sqstep("zipcode", zipcode$1(updates.scope, true, updates.input), "Please verify your Zip Code", updates)
+}
+
 function autoAndCarAccidentCrossSellQuestions(updates = {}) {
   return step(
     "autoAndCarAccidentCrossSellQuestions",
@@ -1692,33 +1733,114 @@ function legalCrossSells(updates = {}) {
   return step("legalCrossSells", [legalCrossSellsStepHeadline(updates), legalCrossSells$1()], updates)
 }
 
-function willsAndTrustsTOLPAndZip(updates = {}) {
-  return step("willsAndTrustsTOLPAndZip", [willsAndTrustsTOLP(updates.scope), zipcode(updates.scope)], updates)
+function haveAttorney(updates = {}) {
+  return sqstep(
+    "haveAttorney",
+    haveAttorney$1(updates.scope, true, updates.input),
+    "Already working with an attorney?",
+    updates
+  )
 }
 
-function willsAndTrustsTOLPQuestions(updates = {}) {
-  return step(
-    "TOLPQuestions",
-    [
-      questionsStepHeadline(updates),
-      WillsAndTrustsQuestions(),
-      ProbateAndEstatesQuestions(),
-      PowerofAttorneyQuestions(),
-      WrongfulDeathQuestions(),
-      FamilyIssuesQuestions(),
-      NotSureOrOtherQuestions(),
-    ],
+function degreeOfInterest(updates = {}) {
+  return sqstep(
+    "degreeOfInterest",
+    degreeOfInterest$1(updates.scope, true, updates.input),
+    "Could you pay if your issue could be resolved?",
+    updates
+  )
+}
+
+function incidentDate(updates = {}) {
+  return sqstep(
+    "incidentDate",
+    incidentDate$1(updates.scope, true, updates.input),
+    "When did the incident occur?",
+    updates
+  )
+}
+
+function valueOfAssets(updates = {}) {
+  return sqstep(
+    "valueOfAssets",
+    valueOfAssets$1(updates.scope, true, updates.input),
+    "What is the value of your assets?",
+    updates
+  )
+}
+
+function typeOfAssets(updates = {}) {
+  if (typeof updates.nextOnInput === "undefined") {
+    updates.nextOnInput = false;
+  }
+  return sqstep(
+    "typeOfAssets",
+    typeOfAssets$1(updates.scope, true, updates.input),
+    "What type of assets are involved?",
+    updates
+  )
+}
+
+function roleInMatterProbate(updates = {}) {
+  return sqstep(
+    "roleInMatterProbate",
+    roleInMatterProbate$1(updates.scope, true, updates.input),
+    "What is your role in this matter?",
+    updates
+  )
+}
+
+function estateLegalServicesNeeded(updates = {}) {
+  return sqstep(
+    "estateLegalServicesNeeded",
+    estateLegalServicesNeeded$1(updates.scope, true, updates.input),
+    "What legal services are needed?",
+    updates
+  )
+}
+
+function causeOfDeath(updates = {}) {
+  return sqstep(
+    "causeOfDeath",
+    causeOfDeath$1(updates.scope, true, updates.input),
+    "What was the cause of death?",
+    updates
+  )
+}
+
+function relationshipToVictim(updates = {}) {
+  return sqstep(
+    "relationshipToVictim",
+    relationshipToVictim$1(updates.scope, true, updates.input),
+    "What is your relationship to the victim?",
+    updates
+  )
+}
+
+function criminalChargesFiled(updates = {}) {
+  return sqstep(
+    "criminalChargesFiled",
+    criminalChargesFiled$1(updates.scope, true, updates.input),
+    "Have criminal charges been filed?",
     updates
   )
 }
 
-const formNavigation = (updates = {}) => ({
+function willsAndTrustsTOLP(updates = {}) {
+  return step("willsAndTrustsTOLP", [willsAndTrustsTOLP$1(updates.scope, true, updates.input)], updates)
+}
+
+const formNavigationNoFinalBack = (updates = {}) => ({
   $el: "div",
   attrs: {
     class: {
       if: "$activeStep === $firstStep()",
       then: "step-nav " + (updates.firstStepButtonClass || "!t-justify-center sm:!t-justify-between"),
-      else: "step-nav !t-justify-between",
+      else: {
+        if: "$activeStep === $lastStep()",
+        then: "step-nav !t-justify-center ",
+        else: "step-nav !t-justify-between",
+      },
     },
   },
   children: [
@@ -1728,12 +1850,12 @@ const formNavigation = (updates = {}) => ({
       onClick: "$setPreviousStep($prevStepFunc($get(form)))",
       children: "Back",
       outerClass: {
-        if: "$activeStep === $firstStep()",
+        if: "$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())",
         then: "t-hidden sm:t-block",
         else: "",
       },
       style: {
-        if: "$activeStep === $firstStep()",
+        if: "$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())",
         then: "display: none;",
       },
       classes: {
@@ -1772,7 +1894,8 @@ const formNavigation = (updates = {}) => ({
         then: "display: none;",
       },
       classes: {
-        input: (updates.inputClass || "") + " !t-ml-2 sm:!t-ml-auto f-navigation-input",
+        input: (updates.inputClass || "") + " f-navigation-input !t-w-60",
+        outer: "!t-mt-0 !t-mb-0",
       },
     },
   ],
@@ -1926,6 +2049,58 @@ function formAnchor(updates) {
   return merge(formAnchorDefaults, updates)
 }
 
+const progressBarDefaults = {
+  $el: "div",
+  attrs: {
+    class: "t-mt-7 t-mb-5 t-w-full t-flex t-flex-col t-justify-center t-items-center",
+    style: {
+      if: "$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())",
+      then: "display: none",
+    },
+  },
+  children: [
+    {
+      $el: "div",
+      attrs: {
+        class: "t-flex t-justify-center",
+      },
+      children: [
+        {
+          $el: "span",
+          attrs: {
+            id: "progress-bar-text",
+            class: "t-text-sm t-mb-1",
+          },
+          children: ["0% Complete"],
+        },
+      ],
+    },
+    {
+      $el: "div",
+      attrs: {
+        class: "t-bg-gray-100 t-w-9/12 t-rounded",
+      },
+      children: [
+        {
+          $el: "div",
+          attrs: {
+            id: "progress-bar",
+            class:
+              "t-flex t-flex-col t-justify-center t-text-center t-whitespace-nowrap t-w-[10%] t-h-1.5 t-rounded t-text-white t-bg-[#007bff]",
+            style: {
+              transition: "width 0.5s ease",
+            },
+          },
+        },
+      ],
+    },
+  ],
+};
+
+function progressBar(updates) {
+  return merge(progressBarDefaults, updates)
+}
+
 function headlineDefaults(updates = {}) {
   return {
     $el: "h1",
@@ -2352,7 +2527,7 @@ const nextStepsMapGeneralLegal = {
         "estateLegalServicesNeeded",
         ...nextStepsLegalDefault,
       ],
-      "Property Damage": ["realEstateArea", "wouldLikeLawyerTo", ...nextStepsLegalDefault],
+      "Property Damage": ["wouldLikeLawyerTo", ...nextStepsLegalDefault],
       "Real Estate": ["realEstateTOLPDisplay", "realEstateArea", "wouldLikeLawyerTo", ...nextStepsLegalDefault],
       "Social Security Disability and Insurance": [
         "applicantAge",
@@ -2436,12 +2611,6 @@ filterNextStepsMap(nextStepsMapGeneralLegal, ["legalCrossSells"], {
   commentsWithBankruptcy: "comments",
 });
 
-const nextStepsMapLegalLegacy = {
-  values: {
-    "*": ["TOLPQuestions", "commentsWithBankruptcy", "legalCrossSells", "firstAndLast", "contactInfo"],
-  },
-};
-
 const TOLPNextSteps = nextStepsMapGeneralLegal["values"]["Type_Of_Legal_Problem"];
 
 ({
@@ -2491,7 +2660,7 @@ const TOLPNextSteps = nextStepsMapGeneralLegal["values"]["Type_Of_Legal_Problem"
   },
 });
 
-({
+const nextStepsMapCivilTolp = {
   values: {
     Type_Of_Legal_Problem: {
       "Defend a Lawsuit": TOLPNextSteps["Defend a Lawsuit"],
@@ -2499,6 +2668,10 @@ const TOLPNextSteps = nextStepsMapGeneralLegal["values"]["Type_Of_Legal_Problem"
     },
     "*": ["lawsuitOtherParty", ...nextStepsLegalDefault],
   },
+};
+
+filterNextStepsMap(nextStepsMapCivilTolp, ["legalCrossSells"], {
+  commentsWithBankruptcy: "comments",
 });
 
 const nextStepsMapCivilTOLPDisplay = {
@@ -2570,6 +2743,27 @@ filterNextStepsMap(
   },
 });
 
+({
+  values: {
+    Type_Of_Legal_Problem: {
+      "Workplace Harassment": TOLPNextSteps["Workplace Harassment"],
+      "Workplace Discrimination": TOLPNextSteps["Workplace Discrimination"],
+    },
+    "*": [...nextStepsLegalDefault],
+  },
+});
+
+const nextStepsMapWillsAndTrusts = {
+  values: {
+    Type_Of_Legal_Problem: {
+      "Probate and Estates": TOLPNextSteps["Probate and Estates"],
+      "Wills and Trusts": TOLPNextSteps["Wills and Trusts"],
+      "Wrongful Death": TOLPNextSteps["Wrongful Death"],
+    },
+    "*": [...nextStepsLegalDefault],
+  },
+};
+
 ({
   values: {
     Type_Of_Legal_Problem_Display: {
@@ -2630,10 +2824,25 @@ const legalCrossSellOptionMap = CROSS_SELL_OPTION_MAP_LEGAL;
 const meta = defaultMetaPropsLegal();
 
 meta.data.dynamicSchema = [
-  willsAndTrustsTOLPQuestions(),
-  commentsWithBankruptcy(),
+  valueOfAssets(),
+  typeOfAssets(),
+  roleInMatterProbate(),
+  estateLegalServicesNeeded(),
+  incidentDate({
+    nextOnInput: false,
+  }),
+  relationshipToVictim(),
+  criminalChargesFiled(),
+  causeOfDeath(),
+  degreeOfInterest(),
+  haveAttorney(),
+  commentsWithBankruptcy({
+    label: null,
+    headline: "Please briefly describe your situation:",
+    headlineClass: "!t-text-dark",
+  }),
   legalCrossSells({
-    headlineClass: '!t-text-dark',
+    headlineClass: "!t-text-dark",
     nextStepMap: nextStepsMapLegalCrossSells,
   }),
   autoAndCarAccidentCrossSellQuestions(),
@@ -2645,41 +2854,53 @@ meta.data.dynamicSchema = [
   willsAndTrustsCrossSellQuestions(),
   divorceAndSeparationCrossSellQuestions(),
   childCustodyCrossSellQuestions(),
-  firstAndLastV2(),
+  firstAndLastV4({
+    headlineClass: "!t-text-dark",
+  }),
 ];
 
 const schema = [
   meta,
   formAnchor(),
   {
-    $cmp: 'FormKit',
+    $cmp: "FormKit",
     props: formProps({
-      formId: 'willsAndTrusts',
+      formId: "willsAndTrusts",
       redirectMap: legalRedirectMap(),
-      crossSellOptionMap: legalCrossSellOptionMap
-
+      crossSellOptionMap: legalCrossSellOptionMap,
     }),
     children: [
+      progressBar(),
       defaultHeadline(),
       defaultSubHeadline(),
       ...hiddenInputsLegal,
       {
-        $el: 'div',
+        $el: "div",
         attrs: {
-          class: 'form-body'
+          class: "form-body",
         },
         children: [
-          willsAndTrustsTOLPAndZip({
-            nextStepMap: nextStepsMapLegalLegacy
+          willsAndTrustsTOLP({
+            nextOnInput: false,
+            nextStepMap: nextStepsMapWillsAndTrusts,
           }),
           dynamicSchemaNode(),
-          contactInfo(),
-          formNavigation(),
-          formDetails()
-        ]
-      }
-    ]
-  }
+          zipcode(),
+          contactInfoV2({
+            subheadlineClass: "!t-text-base",
+          }),
+          formNavigationNoFinalBack({
+            startText: "Start Now",
+            submitLabel: "Get Help Now",
+            inputClass: "!t-font-extrabold",
+            firstStepButtonClass: "!t-justify-center",
+          }),
+          secureIconStandalone(),
+          formDetails(),
+        ],
+      },
+    ],
+  },
 ];
 
 export { schema as default };