@mychoice/mychoice-sdk-modules 2.2.23 → 2.2.25

package/dist/cjs/index.js

@@ -58,8 +58,8 @@ InputFormBox.defaultProps = {
 };
 
 const InputFormPhoneBox = (props) => {
-    const { className, defaultValue, placeholder, disabled, error, name, title, onChange, errorMessage, hintMessage, } = props;
-    return (jsxRuntime.jsx(Container, { name: name, className: ` ${className} ${error ? 'error' : ''}`, title: title, errorMessage: errorMessage, hintMessage: hintMessage, children: jsxRuntime.jsx(mychoiceSdkComponents.InputFormPhone, { className: "input-form", name: name, type: mychoiceSdkComponents.InputTypes.Text, defaultValue: defaultValue, onChange: onChange, placeholder: placeholder, disabled: disabled, error: error }) }));
+    const { className, defaultValue, placeholder, disabled, error, name, title, onChange, errorMessage, hintMessage, validationStatus, } = props;
+    return (jsxRuntime.jsx(Container, { name: name, className: ` ${className} ${error ? 'error' : ''}`, title: title, errorMessage: errorMessage, hintMessage: hintMessage, children: jsxRuntime.jsx(mychoiceSdkComponents.InputFormPhone, { className: "input-form", name: name, type: mychoiceSdkComponents.InputTypes.Text, defaultValue: defaultValue, onChange: onChange, placeholder: placeholder, disabled: disabled, error: error, validationStatus: validationStatus }) }));
 };
 InputFormPhoneBox.defaultProps = {
     className: '',
@@ -209,9 +209,11 @@ const capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 const BlockVehLinks = () => {
     const { vehicleState: { items: vehicles } } = mychoiceSdkStore.useStoreFormCarVehicle();
     const { driverState: { items: drivers } } = mychoiceSdkStore.useStoreFormCarDriverBase();
-    const { discountState: { vehlinks }, dispatchDiscountState } = mychoiceSdkStore.useStoreFormCarDiscount();
-    const driverOptions = drivers.map((driver, index) => ({ name: driver.firstName, value: index }));
-    const handleDriverChange = (vehicleIndex) => ({ value }) => {
+    const { discountState: { vehlinks, occVehlinks }, dispatchDiscountState } = mychoiceSdkStore.useStoreFormCarDiscount();
+    if (drivers.length <= 1) {
+        return null;
+    }
+    const handlePrimaryDriverChange = (vehicleIndex) => ({ value }) => {
         dispatchDiscountState({
             type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect,
             payload: {
@@ -220,14 +222,41 @@ const BlockVehLinks = () => {
             },
         });
     };
-    if (drivers.length > 1) {
-        return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(LabelFormBox, { title: "Since there are multiple drivers in this quote,\n         please tell us who drives which vehicle the most.\n        Please provide an answer that best suits your situation." }), vehicles.map((vehicle, index) => {
-                    const { year, make, model } = vehicle;
-                    const selectedDriver = vehlinks.find((vehlink) => (vehlink.vehicleIndex === index && vehlink.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn));
-                    return (jsxRuntime.jsx(SelectFormBox, { title: `Who is the principal driver of the ${year} ${make} ${model} ?`, onChange: handleDriverChange(index), options: driverOptions, defaultValue: selectedDriver?.driverIndex || 0, name: `vehlink-${index}` }, `vehlink-${index}`));
-                })] }));
-    }
-    return null;
+    const handleOccDriverChange = (driverIndex) => ({ value }) => {
+        dispatchDiscountState({
+            type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountOccVehlinkSelect,
+            payload: {
+                driverIndex,
+                vehicleIndex: value,
+            },
+        });
+    };
+    // Drivers that are NOT assigned as primary for any vehicle
+    const primaryDriverIndices = vehlinks
+        .filter((l) => l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn)
+        .map((l) => l.driverIndex);
+    const unassignedDrivers = drivers
+        .map((driver, index) => ({ driver, index }))
+        .filter(({ index }) => !primaryDriverIndices.includes(index));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(LabelFormBox, { title: "Since there are multiple drivers in this quote, please tell us who drives which vehicle the most. Please provide an answer that most accurately describes your situation." }), vehicles.map((vehicle, vehicleIndex) => {
+                const { year, make, model } = vehicle;
+                const selectedPrimary = vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
+                const allDriverOptions = drivers
+                    .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }));
+                const filteredOptions = allDriverOptions.filter(({ value }) => {
+                    const assignedVehicle = vehlinks.find((l) => l.driverIndex === value && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
+                    return !assignedVehicle || assignedVehicle.vehicleIndex === vehicleIndex;
+                });
+                const availablePrimaryOptions = filteredOptions.length > 0 ? filteredOptions : allDriverOptions;
+                return (jsxRuntime.jsx(SelectFormBox, { title: `Who drives the ${year} ${make} ${model} the most?`, onChange: handlePrimaryDriverChange(vehicleIndex), options: availablePrimaryOptions, defaultValue: selectedPrimary?.driverIndex ?? 0, name: `vehlink-${vehicleIndex}` }, `vehlink-${vehicleIndex}`));
+            }), drivers.length > vehicles.length && unassignedDrivers.map(({ driver, index: driverIndex }) => {
+                const selectedVehicle = occVehlinks.find((l) => l.driverIndex === driverIndex);
+                const vehicleOptions = vehicles.map((vehicle, vehicleIndex) => ({
+                    name: `${vehicle.year} ${vehicle.make} ${vehicle.model}`,
+                    value: vehicleIndex,
+                }));
+                return (jsxRuntime.jsx(SelectFormBox, { title: `Which vehicle does ${driver.firstName} drive the most?`, onChange: handleOccDriverChange(driverIndex), options: vehicleOptions, defaultValue: selectedVehicle?.vehicleIndex ?? 0, name: `occ-vehlink-${driverIndex}` }, `occ-vehlink-${driverIndex}`));
+            })] }));
 };
 
 const BlockNextPageInfo$2 = () => {
@@ -680,14 +709,22 @@ const getRecommendedRange = (distanceDaily, distanceBusiness) => {
         kmEachDay = +distanceBusiness;
     }
     switch (true) {
+        case kmEachDay === 0:
+            return 5000;
         case kmEachDay === 1:
             return 8000;
-        case ((kmEachDay >= 2) && (kmEachDay <= 10)):
+        case ((kmEachDay >= 2) && (kmEachDay <= 5)):
             return 10000;
-        case ((kmEachDay >= 15) && (kmEachDay <= 20)):
+        case ((kmEachDay >= 6) && (kmEachDay <= 12)):
+            return 10000;
+        case ((kmEachDay >= 13) && (kmEachDay <= 20)):
             return 15000;
+        case ((kmEachDay >= 21) && (kmEachDay <= 29)):
+            return 20000;
         case ((kmEachDay >= 30) && (kmEachDay <= 40)):
             return 20000;
+        case ((kmEachDay >= 41) && (kmEachDay <= 49)):
+            return 30000;
         case ((kmEachDay >= 50) && (kmEachDay <= 80)):
             return 30000;
         case ((kmEachDay >= 90) && (kmEachDay <= 100)):
@@ -793,9 +830,9 @@ const BlockCarConditionInfo = () => {
             });
         }
     };
-    const { year, condition, leased, winterTires, parkingLocation, primaryUse, distanceDaily, distanceBusiness, distanceYearly, purchaseYear, purchaseMonth, purchaseDay, } = vehicleState.items[vehicleState.activeIndex];
+    const { year, condition, leased, winterTires, parkingLocation, primaryUse, distanceDaily, distanceBusiness, distanceYearly, businessUsePercent, purchaseYear, purchaseMonth, purchaseDay, } = vehicleState.items[vehicleState.activeIndex];
     // eslint-disable-next-line max-len
-    const primaryUseHintMessage = primaryUse === 'business' ? 'Please choose "Business" only if your vehicle is used primarily for work (sales representatives, realtors, consultants, etc.). If you drive back and forth to work or use your vehicle occasionally for work, please select "Personal".' : '';
+    const primaryUseHintMessage = primaryUse === 'business' ? 'Please choose "Business" if your vehicle is used for any work purposes (sales representatives, realtors, consultants, etc.). If you only drive back and forth to work, please choose "Personal" and select your commute distance.' : '';
     const defaultPurchaseDate = {
         day: purchaseDay,
         month: purchaseMonth,
@@ -856,33 +893,30 @@ const BlockCarConditionInfo = () => {
             type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarDailyDistanceSelect,
             payload: { distanceDaily: value },
         });
+        const yearlyDefault = `${getRecommendedRange(value, primaryUse === mychoiceSdkComponents.VehiclePrimaryUseTypes.Business ? distanceBusiness : 1)}`;
         dispatchVehicleState({
             type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect,
-            payload: { distanceYearly: `${getRecommendedRange(value, primaryUse === mychoiceSdkComponents.VehiclePrimaryUseTypes.Business ? distanceBusiness : 1)}` },
+            payload: { distanceYearly: yearlyDefault },
         });
     };
-    const handleCarBusinessDailyDistanceChange = ({ value }) => {
-        dispatchVehicleState({
-            type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarBusinessDistanceSelect,
-            payload: { distanceBusiness: value },
-        });
+    const handleCarYearlyDistanceChange = ({ value }) => {
         dispatchVehicleState({
             type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect,
-            payload: { distanceYearly: `${getRecommendedRange(value, primaryUse === mychoiceSdkComponents.VehiclePrimaryUseTypes.Business ? distanceBusiness : 1)}` },
+            payload: { distanceYearly: value },
         });
     };
-    const handleCarYearlyDistanceChange = ({ value }) => {
+    const handleBusinessUsePercentChange = ({ value }) => {
         dispatchVehicleState({
-            type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect,
-            payload: { distanceYearly: value },
+            type: mychoiceSdkStore.StoreFormCarVehicleActionTypes.FormCarBusinessUsePercentSelect,
+            payload: { businessUsePercent: value },
         });
     };
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carCondition, onChange: handleConditionChange, name: "condition", defaultValue: getSelectedOption(mychoiceSdkComponents.carCondition, condition), description: "Used cars are usually cheaper to insure than new ones because of the depreciation. The cost to replace this vehicle is typically less expensive and insurers will account for the condition of the car when giving you a rate.", title: "Was this car new or used when you bought it?" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carStatus, onChange: handleLeasedChange, name: "leased", defaultValue: getSelectedOption(mychoiceSdkComponents.carStatus, leased), description: "You can own or lease a car. Ownership means that you bought the vehicle or are currently financing it. Leasing is renting it under a long-term contract. In this case, the leasing company maintains ownership of the vehicle, which you will see clearly on your insurance policy.", title: "Is this car owned/financed or leased?" }), jsxRuntime.jsx(DateSelectFormBox, { name: "purchaseDate", dateNames: ['purchaseYear', 'purchaseMonth'], onDateChange: handlePurchaseDateChange, defaultValue: defaultPurchaseDate, title: "When did you buy this car?", description: "Car insurers in Ontario ask for your vehicle purchase date because it is a key factor that can affect its value, depreciation, and condition, which can impact the likelihood and cost of repairs or replacement. This information helps insurers assess the level of risk and calculate an appropriate premium.", errorMessage: getDateErrorMessage([
                     purchaseDay || '',
                     purchaseMonth || '',
                     purchaseYear || '',
-                ], vehicleState.inValidation), error: vehicleState.inValidation, minDate: year ? `${Number(year) - 1}-01-01` : mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), maxDate: mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd') }), !(isAlbertaProvince && isTheBig) && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carWinterTiresCheck, onChange: handleWinterTiresChange, name: "winterTires", defaultValue: getSelectedOption(mychoiceSdkComponents.carWinterTiresCheck, winterTires), description: "Snow. Ice. Freezing temperatures. Winter tires protect you from all these winter weather conditions, and more. It also protects your wallet. Investing in winter tires can save you $50 to $100 on your insurance.", title: "Does your car have winter tires?" })), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.carKeepPlace, name: "parkingLocation", onChange: handleCarParkingLocationChange, defaultValue: getSelectedOption(mychoiceSdkComponents.carKeepPlace, parkingLocation), title: "Where do you keep your car overnight?", placeholder: "Select from the list", description: "For many of us, the answer is \u201Cat home.\u201D If you park your car in various locations throughout the year, then select the most frequently parking spot. Be honest\u2014some insurers will use your overnight parking location to calculate a quote, which could affect your claims in the future.", autoSelectIfValueIsOutOfOptions: false, error: !parkingLocation && vehicleState.inValidation, errorMessage: getErrorMessage(parkingLocation, vehicleState.inValidation) }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carUsagePurpose, onChange: handleCarUsageChange, name: "primaryUse", defaultValue: getSelectedOption(mychoiceSdkComponents.carUsagePurpose, primaryUse) || mychoiceSdkComponents.carUsagePurpose[0].value, hintMessage: primaryUseHintMessage, description: "The way you use your vehicle is a primary factor that insurers use in your policy terms and fees, whether it be personal or business.\n                                    \u2022 Personal is driving from work or school to home.\n                                    \u2022 Business considers other uses like sales calls, pick-ups or deliveries, or other business errands.", title: "What do you mainly use your car for?" }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.firstDriveDistanceList, name: "distanceDaily", onChange: handleCarDailyDistanceChange, defaultValue: getSelectedOption(mychoiceSdkComponents.firstDriveDistanceList, distanceDaily), title: "How far is your 1-way commute to work or school?", placeholder: "Select", description: "The distance you drive to work or school would be an example of your daily commute. It is one of the most important factors when determining coverage options since it exposes you to traffic each day. The shorter your commute, the less risk you carry of an accident.", autoSelectIfValueIsOutOfOptions: false, error: !distanceDaily && vehicleState.inValidation, errorMessage: getErrorMessage(distanceDaily, vehicleState.inValidation) }), primaryUse === 'business' && (jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.dailyDriveBusinessDistanceList, name: "distanceBusiness", onChange: handleCarBusinessDailyDistanceChange, defaultValue: getSelectedOption(mychoiceSdkComponents.dailyDriveBusinessDistanceList, distanceBusiness), title: "How many kilometers are driven for business use each day?", placeholder: "Select", autoSelectIfValueIsOutOfOptions: false, error: !distanceBusiness && vehicleState.inValidation, errorMessage: getErrorMessage(distanceBusiness, vehicleState.inValidation) })), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.yearlyDriveDistanceList, name: "distanceYearly", onChange: handleCarYearlyDistanceChange, defaultValue: getSelectedOption(mychoiceSdkComponents.yearlyDriveDistanceList, distanceYearly), title: "How many total kilometers are driven each year?", placeholder: "Select", hintMessage: distanceDaily ? `Based on your daily driven kilometers, we recommend
-                      ${mychoiceSdkComponents.numberWithCommas(getRecommendedRange(distanceDaily, primaryUse === mychoiceSdkComponents.VehiclePrimaryUseTypes.Business ? distanceBusiness : 1))} for your yearly driven kilometers` : '', autoSelectIfValueIsOutOfOptions: false, error: !distanceYearly && vehicleState.inValidation, errorMessage: getErrorMessage(distanceYearly, vehicleState.inValidation) }), showPolicyStartOnVehiclePage && (jsxRuntime.jsx(DateSelectFormBox, { name: "policyStart", dateNames: ['policyStartYear', 'policyStartMonth', 'policyStartDay'], onDateChange: handlePolicyStartDateChange, defaultValue: defaultPolicyStartDate, title: "What is the ideal start date for your new insurance policy?", description: "Select your preferred date for the beginning of your new insurance policy. For instance, you may set the start date for the day that your current insurance expires to ensure that you're continuously covered. Alternatively, select today's date for a quote or new policy.", minDate: mychoiceSdkComponents.addDaysToDate('', 1), maxDate: mychoiceSdkComponents.addDaysToDate('', 90), isDay: true }))] }));
+                ], vehicleState.inValidation), error: vehicleState.inValidation, minDate: year ? `${Number(year) - 1}-01-01` : mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), maxDate: mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd') }), !(isAlbertaProvince && isTheBig) && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carWinterTiresCheck, onChange: handleWinterTiresChange, name: "winterTires", defaultValue: getSelectedOption(mychoiceSdkComponents.carWinterTiresCheck, winterTires), description: "Snow. Ice. Freezing temperatures. Winter tires protect you from all these winter weather conditions, and more. It also protects your wallet. Investing in winter tires can save you $50 to $100 on your insurance.", title: "Does your car have winter tires?" })), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.carKeepPlace, name: "parkingLocation", onChange: handleCarParkingLocationChange, defaultValue: getSelectedOption(mychoiceSdkComponents.carKeepPlace, parkingLocation), title: "Where do you keep your car overnight?", placeholder: "Select from the list", description: "For many of us, the answer is \u201Cat home.\u201D If you park your car in various locations throughout the year, then select the most frequently parking spot. Be honest\u2014some insurers will use your overnight parking location to calculate a quote, which could affect your claims in the future.", autoSelectIfValueIsOutOfOptions: false, error: !parkingLocation && vehicleState.inValidation, errorMessage: getErrorMessage(parkingLocation, vehicleState.inValidation) }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.carUsagePurpose, onChange: handleCarUsageChange, name: "primaryUse", defaultValue: getSelectedOption(mychoiceSdkComponents.carUsagePurpose, primaryUse) || mychoiceSdkComponents.carUsagePurpose[0].value, hintMessage: primaryUseHintMessage, description: "The way you use your vehicle is a primary factor that insurers use in your policy terms and fees, whether it be personal or business.\n                                    \u2022 Personal is driving from work or school to home.\n                                    \u2022 Business considers other uses like sales calls, pick-ups or deliveries, or other business errands.", title: "What do you use your car for?" }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.firstDriveDistanceList, name: "distanceDaily", onChange: handleCarDailyDistanceChange, defaultValue: getSelectedOption(mychoiceSdkComponents.firstDriveDistanceList, distanceDaily), title: "How far is your 1-way commute to work or school?", placeholder: "Select", description: "The distance you drive to work or school would be an example of your daily commute. It is one of the most important factors when determining coverage options since it exposes you to traffic each day. The shorter your commute, the less risk you carry of an accident.", autoSelectIfValueIsOutOfOptions: false, error: distanceDaily === undefined && vehicleState.inValidation, errorMessage: getErrorMessage(distanceDaily, vehicleState.inValidation) }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.yearlyDriveDistanceList, name: "distanceYearly", onChange: handleCarYearlyDistanceChange, defaultValue: getSelectedOption(mychoiceSdkComponents.yearlyDriveDistanceList, distanceYearly), title: "How many total kilometers are driven each year?", placeholder: "Select", hintMessage: distanceDaily !== undefined ? `Based on your daily driven kilometers, we recommend
+                      ${mychoiceSdkComponents.numberWithCommas(getRecommendedRange(distanceDaily, primaryUse === mychoiceSdkComponents.VehiclePrimaryUseTypes.Business ? distanceBusiness : 1))} for your yearly driven kilometers` : '', autoSelectIfValueIsOutOfOptions: false, error: !distanceYearly && vehicleState.inValidation, errorMessage: getErrorMessage(distanceYearly, vehicleState.inValidation) }), primaryUse === 'business' && (jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.businessUsePercentOptions, name: "businessUsePercent", onChange: handleBusinessUsePercentChange, defaultValue: getSelectedOption(mychoiceSdkComponents.businessUsePercentOptions, businessUsePercent), title: "What percentage of your total kilometers are driven for business purposes?", placeholder: "Select", autoSelectIfValueIsOutOfOptions: false, error: !businessUsePercent && vehicleState.inValidation, errorMessage: getErrorMessage(businessUsePercent, vehicleState.inValidation) })), showPolicyStartOnVehiclePage && (jsxRuntime.jsx(DateSelectFormBox, { name: "policyStart", dateNames: ['policyStartYear', 'policyStartMonth', 'policyStartDay'], onDateChange: handlePolicyStartDateChange, defaultValue: defaultPolicyStartDate, title: "What is the ideal start date for your new insurance policy?", description: "Select your preferred date for the beginning of your new insurance policy. For instance, you may set the start date for the day that your current insurance expires to ensure that you're continuously covered. Alternatively, select today's date for a quote or new policy.", minDate: mychoiceSdkComponents.addDaysToDate('', 1), maxDate: mychoiceSdkComponents.addDaysToDate('', 90), isDay: true }))] }));
 };
 
 const VehicleSectionMain = () => {
@@ -1211,96 +1245,174 @@ const SectionDriverInfo = () => {
     return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [mychoiceCls && jsxRuntime.jsx("h2", { className: "section-title", children: "Time for a micro autobiography \u2013 tell us about you." }), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "What is your legal first name?", onChange: handleFirstNameChange, defaultValue: firstName, description: "The name on a policy should match the one on your official driver\u2019s licence.", placeholder: "Driver First Name", error: !firstName && driverState.inValidation, errorMessage: getErrorMessage(firstName, driverState.inValidation) }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.maritalStatusOptions, name: "maritalStatus", onChange: handleMaritalStatusChange, defaultValue: getSelectedOption(mychoiceSdkComponents.maritalStatusOptions, maritalStatus), title: "What is your marital status?", placeholder: "Select from the list", description: "If you are married, it may have a positive effect on your car insurance premiums and coverage. In some provinces, the law now considers same-sex partners to have a common-law marriage, so you will need to check your local regulations. If you are divorced or widowed, select single.", autoSelectIfValueIsOutOfOptions: false, error: !maritalStatus && driverState.inValidation, errorMessage: getErrorMessage(maritalStatus, driverState.inValidation) }), jsxRuntime.jsx(DateSelectFormBox, { name: "dateOfBirth", dateNames: ['birthYear', 'birthMonth', 'birthDay'], onDateChange: handleDateOfBirthChange, defaultValue: defaultDateOfBirth, title: "When were you born?", description: "Insurers generally consider your age and driving experience when calculating a vehicle insurance quote. The safest drivers are often those who are over thirty, but each insurer will have their own parameters. The youngest and oldest drivers have the greatest liability reflected in their premiums due to inexperience or health complications, respectively.", errorMessage: getDateErrorMessage([birthDay || '', birthMonth || '', birthYear || ''], driverState.inValidation), error: driverState.inValidation, maxDate: mychoiceSdkComponents.subYearsFromDate('', configState.licenceConfig.minLicenceAge || 16), isDay: true }), jsxRuntime.jsx(SwitchButtonBox, { name: "occupation", items: mychoiceSdkComponents.occupationOptions, onChange: handleOccupationChange, defaultValue: getSelectedOption(mychoiceSdkComponents.occupationOptions, occupation), title: "Are you currently employed or unemployed?", description: "Your employment status reflects your driving frequency, and insurers consider this in your policy." }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.genderOptions, onChange: handleGenderChange, name: "gender", defaultValue: getSelectedOption(mychoiceSdkComponents.genderOptions, gender), title: "What is your gender?", description: "The gender on the policy should match your official driver\u2019s licence. Some insurers analyze a driver's sex when creating a policy. Men are typically considered higher risk than female drivers, but the statistics supporting this idea vary from province to province. On average, men and women pay roughly the same for insurance, though." }), driverState.activeIndex > 0 && (jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.applicantRelationshipOptions, name: "applicantRelationship", onChange: handleApplicantRelationshipChange, defaultValue: getSelectedOption(mychoiceSdkComponents.applicantRelationshipOptions, applicantRelationship), title: "Relationship to applicant", placeholder: "Select...", autoSelectIfValueIsOutOfOptions: false, error: !applicantRelationship && driverState.inValidation, errorMessage: getErrorMessage(applicantRelationship, driverState.inValidation) }))] }));
 };
 
+// Max months between consecutive Ontario GDL licence classes (spec 1-2 e/f)
+const ON_MAX_MONTHS_BETWEEN_CLASSES = 60;
 const SectionDriverLicence = () => {
     const { appConfigState: { appType }, } = mychoiceSdkStore.useStoreAppConfig();
     const [driverEducation, setDriverEducation] = React.useState(false);
     const { configState } = mychoiceSdkStore.useStoreFormCarConfig();
     const { driverState, dispatchDriverLicenceState } = mychoiceSdkStore.useStoreFormCarDriverLicence();
-    const { isAlbertaProvince } = mychoiceSdkStore.useProvince();
+    const { isAlbertaProvince, isOntarioProvince } = mychoiceSdkStore.useProvince();
     const mychoiceCls = mychoiceSdkComponents.isMyChoiceLike(appType) ? 'mychoice' : '';
-    const { firstName, birthDay, birthMonth, birthYear, licenceInfo: { firstLicenceAge, licenceType, g1LicenceYear, g1LicenceMonth, gLicenceYear, gLicenceMonth, g2LicenceYear, g2LicenceMonth, passedDriverTraining, previousLicence, }, minMaxDates, } = driverState.items[driverState.activeIndex];
+    const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
+    // Ontario flow applies only for MyChoice-like (WL/MC) quoters, not TheBig
+    const useOntarioFlow = isOntarioProvince && !isTheBig;
+    const { firstName, birthDay, birthMonth, birthYear, licenceInfo: { firstLicenceAge, licenceType, g1LicenceYear, g1LicenceMonth, gLicenceYear, gLicenceMonth, g2LicenceYear, g2LicenceMonth, passedDriverTraining, previousLicence, receivedG2, receivedG, }, minMaxDates, } = driverState.items[driverState.activeIndex];
     const { gMax = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), gMin = '1922-01-01', gOneMax = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), gOneMin = '1922-01-01', gTwoMax = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), gTwoMin = '1922-01-01', gBlock = false, gTwoBlock = false, gOneBlock = false, licenceAgeMax = 16, } = minMaxDates ?? {};
     const maxLicenceAge = licenceAgeMax;
     const driverNameDefault = `Driver ${driverState.activeIndex + 1}`;
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
     const defaultMinDate = birthDate && firstLicenceAge ? mychoiceSdkComponents.addYearsToDate(birthDate, +firstLicenceAge) : '';
-    const isOnlyG = mychoiceSdkComponents.checkDateIsSpecial(defaultMinDate, configState.minDates.g.specialDate);
-    const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
+    const getOntarioQ1YearMonth = () => {
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G2)
+            return { year: g2LicenceYear, month: g2LicenceMonth };
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G)
+            return { year: gLicenceYear, month: gLicenceMonth };
+        return { year: g1LicenceYear, month: g1LicenceMonth };
+    };
+    const { year: ontarioQ1Year, month: ontarioQ1Month } = getOntarioQ1YearMonth();
+    const ontarioQ1Date = ontarioQ1Year && ontarioQ1Month ? `${ontarioQ1Year}-${ontarioQ1Month}-01` : '';
+    const isOnlyG = useOntarioFlow
+        ? (!!ontarioQ1Date && mychoiceSdkComponents.checkDateIsSpecial(ontarioQ1Date, configState.minDates.g.specialDate))
+        : mychoiceSdkComponents.checkDateIsSpecial(defaultMinDate, configState.minDates.g.specialDate);
+    const driverName = firstName || driverNameDefault;
+    const today = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
     const { g, g1, g2, minLicenceAge } = configState.licenceConfig;
     const licenceTypeOptions = [
         { value: g.name, name: g.title },
         { value: g1.name, name: g1.title },
         { value: g2.name, name: g2.title },
     ];
+    // Ontario class dropdown options
+    const ontarioFirstClassOptions = [
+        { value: mychoiceSdkComponents.DriverLicenceTypes.G1, name: 'G1 Beginner' },
+        { value: mychoiceSdkComponents.DriverLicenceTypes.G2, name: 'G2 Intermediate' },
+        { value: mychoiceSdkComponents.DriverLicenceTypes.G, name: 'G Full or equivalent' },
+    ];
+    // Ontario "before 1994" — only G available, shown as disabled single option
+    const ontarioOnlyGOptions = [
+        { value: mychoiceSdkComponents.DriverLicenceTypes.G, name: 'G Full or equivalent' },
+    ];
+    // Legacy non-Ontario education effect
     React.useEffect(() => {
-        if (!gOneBlock && !gTwoBlock) {
-            if (licenceType !== mychoiceSdkComponents.DriverLicenceTypes.G1) {
-                const g2Date = mychoiceSdkStore.addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, birthDay ? +birthDay + 1 : 1);
-                if (mychoiceSdkComponents.getDifferenceInYears('', g2Date) <= 3) {
-                    setDriverEducation(true);
+        if (!useOntarioFlow) {
+            if (!gOneBlock && !gTwoBlock) {
+                if (licenceType !== mychoiceSdkComponents.DriverLicenceTypes.G1) {
+                    const g2Date = mychoiceSdkStore.addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, birthDay ? +birthDay + 1 : 1);
+                    if (mychoiceSdkComponents.getDifferenceInYears('', g2Date) <= 3) {
+                        setDriverEducation(true);
+                    }
+                    else {
+                        setDriverEducation(false);
+                    }
                 }
                 else {
                     setDriverEducation(false);
                 }
             }
-            else {
-                setDriverEducation(false);
-            }
         }
-    }, [g2LicenceYear, g2LicenceMonth, licenceType]);
+    }, [g2LicenceYear, g2LicenceMonth, licenceType, useOntarioFlow]);
+    // If the user picks their birth month in their 16th year and birthDay > 1,
+    // selecting that month would imply a date before their actual birthday (since dates are assumed
+    // as the 1st). Auto-advance the Q1 month to birthMonth + 1.
+    React.useEffect(() => {
+        if (!useOntarioFlow || !birthDate || !ontarioQ1Year || !ontarioQ1Month)
+            return;
+        const birthDayNum = parseInt(birthDay || '1', 10);
+        if (birthDayNum <= 1)
+            return;
+        const birthYearNum = parseInt(birthYear || '0', 10);
+        if (parseInt(ontarioQ1Year, 10) !== birthYearNum + 16 || ontarioQ1Month !== birthMonth)
+            return;
+        const q1SlotForCorrection = licenceType || mychoiceSdkComponents.DriverLicenceTypes.G1;
+        let correctedMonth = parseInt(birthMonth || '1', 10) + 1;
+        let correctedYear = birthYearNum + 16;
+        if (correctedMonth > 12) {
+            correctedMonth = 1;
+            correctedYear += 1;
+        }
+        dispatchDriverLicenceState({
+            type: mychoiceSdkStore.StoreFormCarDriverLicenceActionTypes.FormCarDriverLicenceMonthSelect,
+            payload: { value: String(correctedMonth).padStart(2, '0'), config: configState, type: q1SlotForCorrection },
+        });
+        if (correctedYear !== birthYearNum + 16) {
+            dispatchDriverLicenceState({
+                type: mychoiceSdkStore.StoreFormCarDriverLicenceActionTypes.FormCarDriverLicenceYearSelect,
+                payload: { value: String(correctedYear), config: configState, type: q1SlotForCorrection },
+            });
+        }
+    }, [ontarioQ1Year, ontarioQ1Month]);
+    // ── helpers ────────────────────────────────────────────────
     const getMinDate = (type) => {
         switch (type) {
-            case mychoiceSdkComponents.DriverLicenceTypes.G:
-                return gMin;
-            case mychoiceSdkComponents.DriverLicenceTypes.G1:
-                return gOneMin;
-            case mychoiceSdkComponents.DriverLicenceTypes.G2:
-                return gTwoMin;
-            default:
-                return '';
+            case mychoiceSdkComponents.DriverLicenceTypes.G: return gMin;
+            case mychoiceSdkComponents.DriverLicenceTypes.G1: return gOneMin;
+            case mychoiceSdkComponents.DriverLicenceTypes.G2: return gTwoMin;
+            default: return '';
         }
     };
     const getMaxDate = (type) => {
         switch (type) {
-            case mychoiceSdkComponents.DriverLicenceTypes.G:
-                return gMax;
-            case mychoiceSdkComponents.DriverLicenceTypes.G1:
-                return gOneMax;
-            case mychoiceSdkComponents.DriverLicenceTypes.G2:
-                return gTwoMax;
-            default:
-                return '';
+            case mychoiceSdkComponents.DriverLicenceTypes.G: return gMax;
+            case mychoiceSdkComponents.DriverLicenceTypes.G1: return gOneMax;
+            case mychoiceSdkComponents.DriverLicenceTypes.G2: return gTwoMax;
+            default: return '';
         }
     };
     const getLicenceYear = (type) => {
         switch (type) {
-            case mychoiceSdkComponents.DriverLicenceTypes.G:
-                return gLicenceYear;
-            case mychoiceSdkComponents.DriverLicenceTypes.G1:
-                return g1LicenceYear;
-            case mychoiceSdkComponents.DriverLicenceTypes.G2:
-                return g2LicenceYear;
-            default:
-                return '';
+            case mychoiceSdkComponents.DriverLicenceTypes.G: return gLicenceYear;
+            case mychoiceSdkComponents.DriverLicenceTypes.G1: return g1LicenceYear;
+            case mychoiceSdkComponents.DriverLicenceTypes.G2: return g2LicenceYear;
+            default: return '';
         }
     };
     const getLicenceMonth = (type) => {
         switch (type) {
-            case mychoiceSdkComponents.DriverLicenceTypes.G:
-                return gLicenceMonth;
-            case mychoiceSdkComponents.DriverLicenceTypes.G1:
-                return g1LicenceMonth;
-            case mychoiceSdkComponents.DriverLicenceTypes.G2:
-                return g2LicenceMonth;
-            default:
-                return '';
+            case mychoiceSdkComponents.DriverLicenceTypes.G: return gLicenceMonth;
+            case mychoiceSdkComponents.DriverLicenceTypes.G1: return g1LicenceMonth;
+            case mychoiceSdkComponents.DriverLicenceTypes.G2: return g2LicenceMonth;
+            default: return '';
         }
     };
     const getDefaultLicenceDate = (type) => ({
         year: getLicenceYear(type),
         month: getLicenceMonth(type),
-        day: birthDay || '01',
+        day: '01',
     });
+    // Build a YYYY-MM-01 string from stored year/month, returns '' if either missing
+    const toDate = (year, month) => (year && month ? `${year}-${month}-01` : '');
+    const validateLicenceDate = (year, month, minDate) => {
+        const dateStr = toDate(year, month);
+        if (!dateStr)
+            return '';
+        if (mychoiceSdkComponents.compareDates(dateStr, today) > 0)
+            return 'License dates cannot be in the future';
+        if (minDate && mychoiceSdkComponents.compareDates(dateStr, minDate) < 0) {
+            return 'This license date must be equal or later than the prior license date. Please check your selection';
+        }
+        return '';
+    };
+    const validate60Months = (earlierYear, earlierMonth, laterYear, laterMonth) => {
+        const earlier = toDate(earlierYear, earlierMonth);
+        const later = toDate(laterYear, laterMonth);
+        if (!earlier || !later)
+            return '';
+        const months = mychoiceSdkComponents.getDifferenceInMonths(later, earlier);
+        if (months > ON_MAX_MONTHS_BETWEEN_CLASSES) {
+            return "Ontario's graduated license program must be completed within 5 years. Please check your selection";
+        }
+        return '';
+    };
+    // In the Ontario flow, firstLicenceAge is never entered, so gOneMin is stale/empty.
+    // Compute min from DOB + 16, capped to today so minDate never exceeds maxDate.
+    const getG1MinDate = () => {
+        if (useOntarioFlow && birthDate) {
+            const computed = mychoiceSdkComponents.addYearsToDate(birthDate, 16);
+            return mychoiceSdkComponents.compareDates(computed, today) > 0 ? today : computed;
+        }
+        return gOneMin;
+    };
     const handleLicenceAgeChange = ({ value }) => {
         dispatchDriverLicenceState({
             type: mychoiceSdkStore.StoreFormCarDriverLicenceActionTypes.FormCarDriverLicenceAgeSelect,
@@ -1325,6 +1437,18 @@ const SectionDriverLicence = () => {
             payload: { previousLicence: value },
         });
     };
+    const handleReceivedG2Change = ({ value }) => {
+        dispatchDriverLicenceState({
+            type: mychoiceSdkStore.StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedG2Select,
+            payload: { receivedG2: value },
+        });
+    };
+    const handleReceivedGChange = ({ value }) => {
+        dispatchDriverLicenceState({
+            type: mychoiceSdkStore.StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedGSelect,
+            payload: { receivedG: value },
+        });
+    };
     const handleLicenceDateChange = (type) => (dateType) => ({ value }) => {
         if (dateType === mychoiceSdkComponents.DateTypes.Month) {
             dispatchDriverLicenceState({
@@ -1344,23 +1468,86 @@ const SectionDriverLicence = () => {
         const licenceMinDate = getMinDate(currentType);
         const licenceTypeTitle = configState.licenceConfig[currentType].title;
         const formattedMinDate = `${mychoiceSdkComponents.getFormattedDate(licenceMinDate, 'MMMM yyyy')}`;
-        const defaultHintMessage = `${formattedMinDate} would be your earliest ${licenceTypeTitle}
-    licence date based on your first licenced age and date of birth`;
+        const defaultHintMessage = `${formattedMinDate} would be your earliest ${licenceTypeTitle} licence date based on your first licenced age and date of birth`;
         return currentType === mychoiceSdkComponents.DriverLicenceTypes.G2
-            ? `${defaultHintMessage}
-     if you completed a driver education course`
+            ? `${defaultHintMessage} if you completed a driver education course`
             : defaultHintMessage;
     };
     const getLicenceAgeTitle = () => {
-        if (isAlbertaProvince && isTheBig) {
+        if (isAlbertaProvince && isTheBig)
             return 'At what age was Class 5 GDL or Class 5 obtained?';
-        }
-        return `What age was ${firstName || driverNameDefault} when first licenced?`;
-    };
+        return `What age was ${driverName} when first licenced?`;
+    };
+    if (useOntarioFlow) {
+        // When isOnlyG (before Apr 1994), treat as G Full regardless of what licenceType is in the store
+        const firstClass = isOnlyG ? mychoiceSdkComponents.DriverLicenceTypes.G : licenceType;
+        // Q1 date lives in whichever slot the store wrote to (always ${licenceType}LicenceYear/Month).
+        const q1SlotType = licenceType || mychoiceSdkComponents.DriverLicenceTypes.G1;
+        const q1Year = getLicenceYear(q1SlotType);
+        const q1Month = getLicenceMonth(q1SlotType);
+        const q1Date = toDate(q1Year, q1Month);
+        // ── path booleans ──
+        const showG2Date = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1 && receivedG2 === true;
+        // G question shows after G2 date entered (G1→G2 path) OR after No-G2 answer (G1→No G2 path)
+        const showGQuestionAfterG1 = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1
+            && (receivedG2 === false || showG2Date);
+        const showGDateAfterG1 = showGQuestionAfterG1 && receivedG === true;
+        const showGDateAfterG2 = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G2 && receivedG === true;
+        const g2Date = toDate(g2LicenceYear, g2LicenceMonth);
+        const gDate = toDate(gLicenceYear, gLicenceMonth);
+        // G1 branch: ask once, based on the first licence date. Show/hide uses 5-year gate; question text says "3 years".
+        const showDtcG1Only = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1
+            && !!q1Date
+            && mychoiceSdkComponents.getDifferenceInYears('', q1Date) <= 5
+            && !showG2Date;
+        // Branch B: DTC shown as soon as class=G2 and Q1 is within 5 years (before G question)
+        const showDtcG2Only = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G2
+            && !!q1Date
+            && mychoiceSdkComponents.getDifferenceInYears('', q1Date) <= 5;
+        // Branch C G Full: within 5 years of Q1 (G date)
+        const showDtcGFull = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G
+            && !!q1Date
+            && mychoiceSdkComponents.getDifferenceInYears('', q1Date) <= 5;
+        // ── Validation error messages ──
+        const q1MinDate = getG1MinDate();
+        const q1ChronoError = driverState.inValidation
+            ? validateLicenceDate(q1Year, q1Month, q1MinDate)
+            : '';
+        const q1FutureError = q1Date && mychoiceSdkComponents.compareDates(q1Date, today) > 0
+            ? 'License dates cannot be in the future' : '';
+        const q1Error = q1FutureError || q1ChronoError || getDateErrorMessage(['01', q1Month, q1Year], driverState.inValidation);
+        const g2ChronoError = driverState.inValidation
+            ? validateLicenceDate(g2LicenceYear, g2LicenceMonth, q1Date)
+            : '';
+        const g260MonthError = validate60Months(q1Year, q1Month, g2LicenceYear, g2LicenceMonth);
+        const g2FutureError = g2Date && mychoiceSdkComponents.compareDates(g2Date, today) > 0 ? 'License dates cannot be in the future' : '';
+        const g2Error = g2FutureError || g260MonthError || g2ChronoError || getDateErrorMessage(['01', g2LicenceMonth, g2LicenceYear], driverState.inValidation);
+        // G preceding date: G2 date if on G1→G2→G path, else Q1 date
+        const gPrecedingDate = showGDateAfterG1 && showG2Date ? g2Date : q1Date;
+        const gChronoError = driverState.inValidation
+            ? validateLicenceDate(gLicenceYear, gLicenceMonth, gPrecedingDate)
+            : '';
+        const g60MonthError = validate60Months(q1Year, q1Month, gLicenceYear, gLicenceMonth);
+        const gFutureError = gDate && mychoiceSdkComponents.compareDates(gDate, today) > 0 ? 'License dates cannot be in the future' : '';
+        const gError = gFutureError || g60MonthError || gChronoError || getDateErrorMessage(['01', gLicenceMonth, gLicenceYear], driverState.inValidation);
+        // ── Min dates (always capped to today so minDate never exceeds maxDate) ──
+        const g2MinRaw = q1Date && mychoiceSdkComponents.compareDates(q1Date, gTwoMin) > 0 ? q1Date : gTwoMin;
+        const g2MinDate = mychoiceSdkComponents.compareDates(g2MinRaw, today) > 0 ? today : g2MinRaw;
+        const gMinRaw = gPrecedingDate && mychoiceSdkComponents.compareDates(gPrecedingDate, gMin) > 0 ? gPrecedingDate : gMin;
+        const gMinDate = mychoiceSdkComponents.compareDates(gMinRaw, today) > 0 ? today : gMinRaw;
+        const getMax60Date = (refDate) => {
+            if (!refDate)
+                return today;
+            const max60 = mychoiceSdkComponents.addMonthsToDate(refDate, ON_MAX_MONTHS_BETWEEN_CLASSES);
+            return mychoiceSdkComponents.compareDates(today, max60) > 0 ? max60 : today;
+        };
+        const g2MaxDate = getMax60Date(q1Date);
+        const gMaxDate = getMax60Date(q1Date);
+        return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsx(DateSelectFormBox, { name: "firstLicenceDate", dateNames: ['firstLicenceYear', 'firstLicenceMonth'], onDateChange: handleLicenceDateChange(q1SlotType), defaultValue: getDefaultLicenceDate(q1SlotType), title: `When did ${driverName} first receive their drivers license in Canada?`, description: "Select the year and month in which you received your first license to drive an automobile in Canada. This would include a beginners, intermediate or full license.", errorMessage: q1Error, error: driverState.inValidation, minDate: q1MinDate, maxDate: today, disabled: !birthDate }), q1Date && (jsxRuntime.jsx(SelectFormBox, { options: isOnlyG ? ontarioOnlyGOptions : ontarioFirstClassOptions, name: "firstLicenceClass", onChange: handleLicenceTypeChange, defaultValue: getSelectedOption(isOnlyG ? ontarioOnlyGOptions : ontarioFirstClassOptions, licenceType), title: "What class of license was it?", placeholder: "Select from the list", disabled: isOnlyG, description: "Drivers licensed in Ontario under the graduated licensing program would select G1 Beginner. If the driver was licensed outside Ontario or granted an exception for having driving experience from another jurisdiction then select the license class they first received. Select class G Full or equivalent if the driver was licensed in Ontario before 1994 or was licensed in another province. G equivalent classes in Canada are class 5.", autoSelectIfValueIsOutOfOptions: false })), firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [showDtcG1Only && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleReceivedG2Change, name: "receivedG2", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, receivedG2), title: `Did ${driverName} receive a G2 license?` }), showG2Date && (jsxRuntime.jsx(DateSelectFormBox, { name: "g2LicenceDate", dateNames: ['g2LicenceYear', 'g2LicenceMonth'], onDateChange: handleLicenceDateChange(mychoiceSdkComponents.DriverLicenceTypes.G2), defaultValue: getDefaultLicenceDate(mychoiceSdkComponents.DriverLicenceTypes.G2), title: `When did ${driverName} receive this G2 license?`, errorMessage: g2Error, error: driverState.inValidation, minDate: g2MinDate, maxDate: g2MaxDate })), showGQuestionAfterG1 && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` })), showGDateAfterG1 && (jsxRuntime.jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(mychoiceSdkComponents.DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(mychoiceSdkComponents.DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === mychoiceSdkComponents.DriverLicenceTypes.G2 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [showDtcG2Only && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` }), showGDateAfterG2 && (jsxRuntime.jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(mychoiceSdkComponents.DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(mychoiceSdkComponents.DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === mychoiceSdkComponents.DriverLicenceTypes.G && !isOnlyG && showDtcGFull && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), isOnlyG && showDtcGFull && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handlePreviousLicenceChange, name: "previousLicence", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, previousLicence), title: `Has ${driverName} ever had a full license anywhere else in Canada or USA?`, description: "If you have driving experience outside Canada or the United States, it may lower your premium. Your insurer may require proof of insurance in these other locations or some proof of driving experience from the country you indicate (like a copy of a previous driver's licence)." })] }));
+    }
     return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsx(InputFormBox, { name: "firstLicenceAge", title: getLicenceAgeTitle(), onChange: handleLicenceAgeChange, type: mychoiceSdkComponents.InputTypes.Number, defaultValue: firstLicenceAge, description: configState.toolTip.licenceAge, hintMessage: birthDate
-                    ? `${firstName || driverNameDefault} was licenced in
-        ${Number(birthYear) + Number(firstLicenceAge)} - ${Number(birthYear) + Number(firstLicenceAge) + 1}`
-                    : '', placeholder: "Select Licence Age", disabled: !birthDate, error: !firstLicenceAge && driverState.inValidation, errorMessage: getErrorMessage(firstLicenceAge, driverState.inValidation), minValue: minLicenceAge || 16, maxValue: maxLicenceAge }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.getLicenceTypeOptions(licenceTypeOptions, mychoiceSdkComponents.getDisabledLicenceTypes(gBlock, gTwoBlock, gOneBlock), true), name: "licenceType", onChange: handleLicenceTypeChange, defaultValue: getSelectedOption(licenceTypeOptions, licenceType), title: `Please choose the type of licence that ${firstName || driverNameDefault} currently holds`, placeholder: "Select from the list", disabled: !birthDate, description: configState.toolTip.licenceType, autoSelectIfValueIsOutOfOptions: false }), licenceType === mychoiceSdkComponents.DriverLicenceTypes.G && !isOnlyG && (jsxRuntime.jsx(DateSelectFormBox, { name: "g2LicenceDate", dateNames: ['g2LicenceYear', 'g2LicenceMonth'], onDateChange: handleLicenceDateChange(mychoiceSdkComponents.DriverLicenceTypes.G2), defaultValue: getDefaultLicenceDate(mychoiceSdkComponents.DriverLicenceTypes.G2), title: `${configState.licenceConfig.g2.title} licence date`, errorMessage: getDateErrorMessage(['01', g2LicenceMonth, g2LicenceYear], driverState.inValidation), hintMessage: getHintMessage(mychoiceSdkComponents.DriverLicenceTypes.G2), error: driverState.inValidation, minDate: getMinDate(mychoiceSdkComponents.DriverLicenceTypes.G2), maxDate: getMaxDate(mychoiceSdkComponents.DriverLicenceTypes.G2) })), licenceType && (jsxRuntime.jsx(DateSelectFormBox, { name: `${licenceType}LicenceDate`, dateNames: [`${licenceType}LicenceYear`, `${licenceType}LicenceMonth`], onDateChange: handleLicenceDateChange(), defaultValue: getDefaultLicenceDate(licenceType), title: `${configState.licenceConfig[licenceType].title} licence date`, errorMessage: getDateErrorMessage(['01', getLicenceMonth(licenceType), getLicenceYear(licenceType)], driverState.inValidation), hintMessage: getHintMessage(), error: driverState.inValidation, maxDate: getMaxDate(licenceType), minDate: getMinDate(licenceType) })), driverEducation && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${firstName || driverNameDefault} completed a driver education course within the last 3 years?` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handlePreviousLicenceChange, name: "previousLicence", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, previousLicence), title: `Has ${firstName || driverNameDefault} ever had a full license anywhere else in Canada or USA?`, description: "If you have driving experience outside Canada or the United States, it may lower your premium. Your insurer may require proof of insurance in these other locations or some proof of driving experience from the country you indicate (like a copy of a previous driver\u2019s licence)." })] }));
+                    ? `${driverName} was licenced in ${Number(birthYear) + Number(firstLicenceAge)} - ${Number(birthYear) + Number(firstLicenceAge) + 1}`
+                    : '', placeholder: "Select Licence Age", disabled: !birthDate, error: !firstLicenceAge && driverState.inValidation, errorMessage: getErrorMessage(firstLicenceAge, driverState.inValidation), minValue: minLicenceAge || 16, maxValue: maxLicenceAge }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.getLicenceTypeOptions(licenceTypeOptions, mychoiceSdkComponents.getDisabledLicenceTypes(gBlock, gTwoBlock, gOneBlock), true), name: "licenceType", onChange: handleLicenceTypeChange, defaultValue: getSelectedOption(licenceTypeOptions, licenceType), title: `Please choose the type of licence that ${driverName} currently holds`, placeholder: "Select from the list", disabled: !birthDate, description: configState.toolTip.licenceType, autoSelectIfValueIsOutOfOptions: false }), licenceType === mychoiceSdkComponents.DriverLicenceTypes.G && !isOnlyG && (jsxRuntime.jsx(DateSelectFormBox, { name: "g2LicenceDate", dateNames: ['g2LicenceYear', 'g2LicenceMonth'], onDateChange: handleLicenceDateChange(mychoiceSdkComponents.DriverLicenceTypes.G2), defaultValue: getDefaultLicenceDate(mychoiceSdkComponents.DriverLicenceTypes.G2), title: `${configState.licenceConfig.g2.title} licence date`, errorMessage: getDateErrorMessage(['01', g2LicenceMonth, g2LicenceYear], driverState.inValidation), hintMessage: getHintMessage(mychoiceSdkComponents.DriverLicenceTypes.G2), error: driverState.inValidation, minDate: getMinDate(mychoiceSdkComponents.DriverLicenceTypes.G2), maxDate: getMaxDate(mychoiceSdkComponents.DriverLicenceTypes.G2) })), licenceType && (jsxRuntime.jsx(DateSelectFormBox, { name: `${licenceType}LicenceDate`, dateNames: [`${licenceType}LicenceYear`, `${licenceType}LicenceMonth`], onDateChange: handleLicenceDateChange(), defaultValue: getDefaultLicenceDate(licenceType), title: `${configState.licenceConfig[licenceType].title} licence date`, errorMessage: getDateErrorMessage(['01', getLicenceMonth(licenceType), getLicenceYear(licenceType)], driverState.inValidation), hintMessage: getHintMessage(), error: driverState.inValidation, maxDate: getMaxDate(licenceType), minDate: getMinDate(licenceType) })), driverEducation && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a driver education course within the last 3 years?` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handlePreviousLicenceChange, name: "previousLicence", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, previousLicence), title: `Has ${driverName} ever had a full license anywhere else in Canada or USA?`, description: "If you have driving experience outside Canada or the United States, it may lower your premium. Your insurer may require proof of insurance in these other locations or some proof of driving experience from the country you indicate (like a copy of a previous driver's licence)." })] }));
 };
 
 const SectionDriverInsurancePolicy = () => {
@@ -1369,7 +1556,7 @@ const SectionDriverInsurancePolicy = () => {
     const { driverState, dispatchDriverInsuranceState } = mychoiceSdkStore.useStoreFormCarDriverInsurance();
     const { discountState, dispatchDiscountState } = mychoiceSdkStore.useStoreFormCarDiscount();
     const { quoteState: { isRequested }, } = mychoiceSdkStore.useStoreFormCarQuote();
-    const { listed, listedMonth = '', listedYear = '', insured, insuredDate = '', firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge, licenceType, gLicenceYear, gLicenceMonth, g1LicenceYear, g1LicenceMonth }, } = driverState.items[driverState.activeIndex];
+    const { listed, listedMonth = '', listedYear = '', insured, insuredDate = '', lastPolicyEndYear = '', lastPolicyEndMonth = '', lastPolicyCancelReason = '', firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge, licenceType, gLicenceYear, gLicenceMonth, g1LicenceYear, g1LicenceMonth, g2LicenceYear, g2LicenceMonth, }, } = driverState.items[driverState.activeIndex];
     const { policyStartYear, policyStartMonth, policyStartDay } = discountState;
     const driverNameDefault = `Driver ${driverState.activeIndex + 1}`;
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
@@ -1380,20 +1567,20 @@ const SectionDriverInsurancePolicy = () => {
         const options = [{ value: '', name: 'Date Period', disabled: true }];
         if (year && month) {
             const todayDate = new Date();
-            const month = String(todayDate.getMonth() + 1).padStart(2, '0');
-            const day = String(todayDate.getDate()).padStart(2, '0');
-            const yearsInPast = todayDate.getFullYear() - parseInt(year);
-            for (let i = yearsInPast; i > 0; i--) {
-                const pastDate = `${todayDate.getFullYear() - i}-${month}-${day}`;
+            const effectiveMonth = policyStartMonth || String(todayDate.getMonth() + 1).padStart(2, '0');
+            const effectiveDay = policyStartDay || String(todayDate.getDate()).padStart(2, '0');
+            const yearsInPast = Math.min(todayDate.getFullYear() - parseInt(year, 10), 10);
+            options.push({
+                value: mychoiceSdkComponents.subMonthsFromDate('', 6),
+                name: 'Less than 1 year',
+            });
+            for (let i = 1; i <= yearsInPast; i += 1) {
+                const pastDate = `${todayDate.getFullYear() - i}-${effectiveMonth}-${effectiveDay}`;
                 options.push({
                     value: pastDate,
-                    name: `${i} ${i === 1 ? 'Year' : 'Years'}`,
+                    name: i === 10 ? '10+ Years' : `${i} ${i === 1 ? 'Year' : 'Years'}`,
                 });
             }
-            options.push({
-                value: `${todayDate.getFullYear() - 1}-${month}-${day}`,
-                name: 'Less than 1 Year',
-            });
         }
         return options;
     };
@@ -1407,17 +1594,49 @@ const SectionDriverInsurancePolicy = () => {
         month: policyStartMonth,
         day: policyStartDay,
     };
+    const prevListedRef = React.useRef({ year: listedYear, month: listedMonth });
+    const getFirstLicenceDateKey = () => {
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G)
+            return `${gLicenceYear || ''}-${gLicenceMonth || ''}`;
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G2)
+            return `${g2LicenceYear || ''}-${g2LicenceMonth || ''}`;
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G1)
+            return `${g1LicenceYear || ''}-${g1LicenceMonth || ''}`;
+        return `${firstLicenceAge || ''}`;
+    };
+    const firstLicenceDateKey = getFirstLicenceDateKey();
+    const prevFirstLicenceRef = React.useRef(firstLicenceDateKey);
     React.useEffect(() => {
         if (listedYear && listedMonth && !isRequested) {
-            const options = getPeriodOptions(listedYear, listedMonth);
-            if (options.length > 1) {
-                dispatchDriverInsuranceState({
-                    type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredDateSelect,
-                    payload: { insuredDate: options[1].value },
-                });
+            const prev = prevListedRef.current;
+            const hasChanged = prev.year !== listedYear || prev.month !== listedMonth;
+            prevListedRef.current = { year: listedYear, month: listedMonth };
+            if (!insuredDate || hasChanged) {
+                const options = getPeriodOptions(listedYear, listedMonth);
+                if (options.length > 1) {
+                    dispatchDriverInsuranceState({
+                        type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredDateSelect,
+                        payload: { insuredDate: options[1].value },
+                    });
+                }
             }
         }
     }, [listedYear, listedMonth]);
+    React.useEffect(() => {
+        if (!listedYear || !listedMonth || isRequested)
+            return;
+        const hasChanged = prevFirstLicenceRef.current !== firstLicenceDateKey;
+        prevFirstLicenceRef.current = firstLicenceDateKey;
+        if (!hasChanged)
+            return;
+        const options = getPeriodOptions(listedYear, listedMonth);
+        if (options.length > 1) {
+            dispatchDriverInsuranceState({
+                type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredDateSelect,
+                payload: { insuredDate: options[1].value },
+            });
+        }
+    }, [firstLicenceDateKey]);
     React.useEffect(() => {
         if (listedYear && listedMonth && listed) {
             const listedDate = mychoiceSdkComponents.addDaysToDate(`${listedYear}-${listedMonth}-01`, birthDay ? +birthDay + 1 : 1);
@@ -1458,6 +1677,30 @@ you had insurance. If this is correct, please continue with the form.`);
             type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredSelect,
             payload: { insured: !value },
         });
+        dispatchDriverInsuranceState({
+            type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverNotCurrentlyInsuredSelect,
+            payload: { notCurrentlyInsured: value },
+        });
+    };
+    const handleLastPolicyEndDateChange = (dateType) => ({ value }) => {
+        if (dateType === mychoiceSdkComponents.DateTypes.Month) {
+            dispatchDriverInsuranceState({
+                type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndMonthSelect,
+                payload: { lastPolicyEndMonth: value },
+            });
+        }
+        if (dateType === mychoiceSdkComponents.DateTypes.Year) {
+            dispatchDriverInsuranceState({
+                type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndYearSelect,
+                payload: { lastPolicyEndYear: value },
+            });
+        }
+    };
+    const handleLastPolicyCancelReasonChange = ({ value }) => {
+        dispatchDriverInsuranceState({
+            type: mychoiceSdkStore.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyCancelReasonSelect,
+            payload: { lastPolicyCancelReason: value },
+        });
     };
     const handleListedChange = ({ value }) => {
         dispatchDriverInsuranceState({
@@ -1485,6 +1728,14 @@ you had insurance. If this is correct, please continue with the form.`);
             });
         }
     };
+    const firstInsuredMinDate = listedYear && listedMonth
+        ? mychoiceSdkComponents.addDaysToDate(`${listedYear}-${listedMonth}-01`, birthDay ? +birthDay + 1 : 1)
+        : mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge);
+    const twentyYearsAgo = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), 20);
+    let lastPolicyEndMinDate = twentyYearsAgo;
+    if (firstInsuredMinDate && mychoiceSdkComponents.compareDates(firstInsuredMinDate, twentyYearsAgo) > 0) {
+        lastPolicyEndMinDate = firstInsuredMinDate;
+    }
     const handlePolicyStartDateChange = (dateType) => ({ value }) => {
         if (dateType === mychoiceSdkComponents.DateTypes.Day) {
             dispatchDiscountState({
@@ -1505,20 +1756,26 @@ you had insurance. If this is correct, please continue with the form.`);
             });
         }
     };
-    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsxs("div", { className: "box-container", children: [jsxRuntime.jsx(DateSelectFormBox, { name: "listedYear", dateNames: ['listedYear', 'listedMonth'], onDateChange: handleListedDateChange, defaultValue: defaultListedDate, disabled: !listed, title: `When was ${firstName || driverNameDefault} first listed as a driver on a Canadian or US insurance policy?`, description: "The selection indicates what year the main driver was first listed on a Canadian or US insurance policy. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.", errorMessage: listed
+    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsxs("div", { className: "box-container", children: [jsxRuntime.jsx(DateSelectFormBox, { name: "listedYear", dateNames: ['listedYear', 'listedMonth'], onDateChange: handleListedDateChange, defaultValue: defaultListedDate, disabled: !listed, title: `When was ${firstName || driverNameDefault} first listed as a driver on a Canadian or US insurance policy?`, description: "The selection indicates what month and year the driver was first listed on a Canadian or US insurance policy. If you do not remember this date, it is acceptable to provide a best estimate for the purposes of the policy or quote.", errorMessage: listed
                             ? getDateErrorMessage(['01', listedMonth, listedYear], driverState.inValidation)
-                            : '', error: driverState.inValidation, hintMessage: hintMessage, minDate: mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge) }), jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { name: "listed", label: "Never listed on an insurance policy", onChange: handleListedChange, defaultValue: !listed })] }), listed && (jsxRuntime.jsxs("div", { className: "box-container", children: [jsxRuntime.jsx(SelectFormBox, { name: "insuredDate", onChange: handleInsuredPeriodChange, options: getPeriodOptions(listedYear, listedMonth), defaultValue: insuredDate, disabled: !insured, title: `How long has ${firstName || driverNameDefault} been with their current insurance provider?`, description: "It is common for insurers to provide loyalty rewards or discounts for valued customers. Loyalty is a positive trait in the industry, and most insurance companies will want to provide some incentive for continued customer relationships through tangible policy rewards.", errorMessage: insured ? getErrorMessage(insuredDate, driverState.inValidation) : '', error: !insuredDate && driverState.inValidation }), jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { name: "insured", label: "Not currently insured", onChange: handleInsuredChange, defaultValue: !insured })] })), !isTheBig && !mychoiceSdkComponents.isMyChoiceLike(appType) && (jsxRuntime.jsx(DateSelectFormBox, { name: "policyStart", dateNames: ['policyStartYear', 'policyStartMonth', 'policyStartDay'], onDateChange: handlePolicyStartDateChange, defaultValue: defaultPolicyStartDate, title: "What is the ideal start date for your new insurance policy?", description: "Select your preferred date for the beginning of your new insurance policy. For instance, you may set the start date for the day that your current insurance expires to ensure that you\u2019re continuously covered. Alternatively, select today's date for a quote or new policy.", errorMessage: getDateErrorMessage([policyStartDay || '', policyStartMonth || '', policyStartYear || ''], driverState.inValidation), error: driverState.inValidation, minDate: mychoiceSdkComponents.addDaysToDate('', 1), maxDate: mychoiceSdkComponents.addDaysToDate('', 60), isDay: true }))] }));
+                            : '', error: driverState.inValidation, hintMessage: hintMessage, minDate: mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge) }), jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { name: "listed", label: "Never listed on an insurance policy", onChange: handleListedChange, defaultValue: !listed })] }), listed && (jsxRuntime.jsxs("div", { className: "box-container", children: [jsxRuntime.jsx(SelectFormBox, { name: "insuredDate", onChange: handleInsuredPeriodChange, options: getPeriodOptions(listedYear, listedMonth), defaultValue: insuredDate, disabled: !insured, title: `How long has ${firstName || driverNameDefault} been with their current insurance provider?`, description: "It is common for insurers to provide loyalty rewards or discounts for valued customers. Loyalty is a positive trait in the industry, and most insurance companies will want to provide some incentive for continued customer relationships through tangible policy rewards.", errorMessage: insured ? getErrorMessage(insuredDate, driverState.inValidation) : '', error: !insuredDate && driverState.inValidation }), jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { name: "insured", label: "Not currently insured", onChange: handleInsuredChange, defaultValue: !insured })] })), listed && !insured && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(DateSelectFormBox, { name: "lastPolicyEnd", dateNames: ['lastPolicyEndYear', 'lastPolicyEndMonth'], onDateChange: handleLastPolicyEndDateChange, defaultValue: { year: lastPolicyEndYear, month: lastPolicyEndMonth, day: '01' }, title: `When did ${firstName || driverNameDefault}'s most recent policy end?`, errorMessage: getDateErrorMessage(['01', lastPolicyEndMonth, lastPolicyEndYear], driverState.inValidation), error: driverState.inValidation, maxDate: mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), minDate: lastPolicyEndMinDate }), lastPolicyEndYear && lastPolicyEndMonth && (jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.insuranceCancellationReasonOptions, name: "lastPolicyCancelReason", onChange: handleLastPolicyCancelReasonChange, defaultValue: lastPolicyCancelReason, title: "Why was this last insurance policy cancelled?", placeholder: "Select from the list", autoSelectIfValueIsOutOfOptions: false, error: !lastPolicyCancelReason && driverState.inValidation, errorMessage: getErrorMessage(lastPolicyCancelReason, driverState.inValidation) }))] })), !isTheBig && !mychoiceSdkComponents.isMyChoiceLike(appType) && (jsxRuntime.jsx(DateSelectFormBox, { name: "policyStart", dateNames: ['policyStartYear', 'policyStartMonth', 'policyStartDay'], onDateChange: handlePolicyStartDateChange, defaultValue: defaultPolicyStartDate, title: "What is the ideal start date for your new insurance policy?", description: "Select your preferred date for the beginning of your new insurance policy. For instance, you may set the start date for the day that your current insurance expires to ensure that you\u2019re continuously covered. Alternatively, select today's date for a quote or new policy.", errorMessage: getDateErrorMessage([policyStartDay || '', policyStartMonth || '', policyStartYear || ''], driverState.inValidation), error: driverState.inValidation, minDate: mychoiceSdkComponents.addDaysToDate('', 1), maxDate: mychoiceSdkComponents.addDaysToDate('', 60), isDay: true }))] }));
 };
 
 const SectionDriverCancellation = () => {
     const { driverState, dispatchDriverCancellationState } = mychoiceSdkStore.useStoreFormCarDriverCancellation();
     const { dispatchDriverBaseState } = mychoiceSdkStore.useStoreFormCarDriverBase();
+    const { discountState } = mychoiceSdkStore.useStoreFormCarDiscount();
     const { insuranceCancellation, insuranceCancellationList = [] } = driverState.items[driverState.activeIndex];
     const { appConfigState: { appType }, } = mychoiceSdkStore.useStoreAppConfig();
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
     const mychoiceCls = mychoiceSdkComponents.isMyChoiceLike(appType) ? 'mychoice' : '';
-    const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge }, } = driverState.items[driverState.activeIndex];
+    const { firstName, birthYear, birthMonth, birthDay, listedYear, listedMonth, licenceInfo: { firstLicenceAge }, } = driverState.items[driverState.activeIndex];
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
+    const policyStart = discountState.policyStart || mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
+    const firstInsuredDate = listedYear && listedMonth ? `${listedYear}-${listedMonth}-01` : '';
+    const rawYearsSinceFirstInsured = firstInsuredDate ? mychoiceSdkComponents.getDifferenceInYears(policyStart, firstInsuredDate) : 0;
+    const cancellationYearCap = Math.min(rawYearsSinceFirstInsured, 10);
+    const cancellationYearLabel = cancellationYearCap <= 1 ? 'past year' : `past ${cancellationYearCap} years`;
     const handleIconClick = (index) => () => {
         dispatchDriverCancellationState({
             type: mychoiceSdkStore.StoreFormCarDriverCancellationActionTypes.FormCarDriverInsuranceCancellationDelete,
@@ -1591,8 +1848,7 @@ const SectionDriverCancellation = () => {
             });
         }
     };
-    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Insurance Cancellation" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleCancellationChange, name: "insuranceCancellation", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, insuranceCancellation), title: `Has ${firstName} had an insurance company cancellation or
-                a time without insurance coverage, within the past 3 years?`, description: "If an insurance company cancels your policy, it will increase your future insurance premiums. The most common reasons for cancellations include missed payments, excessive claims, false declarations, or criminal actions, for example. If you cancel the insurance policy, it is not relevant." }), insuranceCancellation && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [insuranceCancellationList?.map(({ cancellationReason, startYear, startMonth, endYear, endMonth }, index) => {
+    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Insurance Cancellation" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleCancellationChange, name: "insuranceCancellation", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, insuranceCancellation), title: `Has ${firstName} had an insurance company cancellation or a time without insurance coverage, within the ${cancellationYearLabel}?`, description: "If an insurance company cancels your policy, it will increase your future insurance premiums. The most common reasons for cancellations include missed payments, excessive claims, false declarations, or criminal actions, for example. If you cancel the insurance policy, it is not relevant." }), insuranceCancellation && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [insuranceCancellationList?.map(({ cancellationReason, startYear, startMonth, endYear, endMonth }, index) => {
                         const defaultStartDate = {
                             year: startYear,
                             month: startMonth,
@@ -1604,7 +1860,7 @@ const SectionDriverCancellation = () => {
                         const now = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
                         const days = birthDay ? +birthDay + 1 : 1;
                         const endDate = endYear && endMonth ? mychoiceSdkStore.addDayToDate(`${endYear}-${endMonth}`, days) : now;
-                        const currentMinDate = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge), 3);
+                        const currentMinDate = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge), cancellationYearCap + 1);
                         const currentEndDate = mychoiceSdkComponents.compareDates(endDate, currentMinDate) < 0 ? currentMinDate : endDate;
                         return (jsxRuntime.jsxs("div", { className: "list-block", children: [jsxRuntime.jsx("hr", {}), jsxRuntime.jsxs("div", { className: "list-item", children: [jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.insuranceCancellationReasonOptions, name: `cancellationReason-${index}`, onChange: handleReasonChange(index), defaultValue: cancellationReason, title: "Reason", placeholder: "Select from the list", isRemovable: insuranceCancellationList.length > 1, onIconClick: handleIconClick(index), autoSelectIfValueIsOutOfOptions: false, error: !cancellationReason && driverState.inValidation, errorMessage: getErrorMessage(cancellationReason, driverState.inValidation) }), jsxRuntime.jsx(DateSelectFormBox, { name: `startDate-${index}`, dateNames: [`startYear-${index}`, `startMonth-${index}`], onDateChange: handleStartDateChange(index), defaultValue: defaultStartDate, title: "Start date", errorMessage: getDateErrorMessage(['01', startMonth, startYear], driverState.inValidation), error: driverState.inValidation, minDate: currentMinDate, maxDate: currentEndDate }), jsxRuntime.jsx(DateSelectFormBox, { name: `endDate-${index}`, dateNames: [`endYear-${index}`, `endMonth-${index}`], onDateChange: handleEndDateChange(index), defaultValue: defaultEndDate, title: "End Date", errorMessage: getDateErrorMessage(['01', endMonth, endYear], driverState.inValidation), error: driverState.inValidation, minDate: startMonth && startYear ? mychoiceSdkStore.addDayToDate(`${startYear}-${startMonth}`, days) : currentMinDate })] })] }, `insurance-cancellation-${index}`));
                     }), insuranceCancellationList?.length < 3 && (jsxRuntime.jsx(mychoiceSdkComponents.ButtonBase, { category: mychoiceSdkComponents.CategoryTypes.Filled, onClick: handleAddButtonClick, size: mychoiceSdkComponents.SizeTypes.Medium, color: mychoiceSdkComponents.ColorTypes.Primary, label: "Add another" }))] }))] }));
@@ -1614,10 +1870,15 @@ const BlockDriverSuspension = () => {
     const { driverState, dispatchDriverSuspensionState } = mychoiceSdkStore.useStoreFormCarDriverSuspension();
     const { licenceSuspension, licenceSuspensionList = [] } = driverState.items[driverState.activeIndex];
     const { dispatchDriverBaseState } = mychoiceSdkStore.useStoreFormCarDriverBase();
+    const { discountState } = mychoiceSdkStore.useStoreFormCarDiscount();
     const { appConfigState: { appType } } = mychoiceSdkStore.useStoreAppConfig();
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
     const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge }, } = driverState.items[driverState.activeIndex];
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
+    const earliestLicenceDate = birthDate && firstLicenceAge ? mychoiceSdkComponents.addYearsToDate(birthDate, +firstLicenceAge) : '';
+    const policyStart = discountState.policyStart || mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
+    const yearsElapsed = earliestLicenceDate ? Math.min(mychoiceSdkComponents.getDifferenceInYears(policyStart, earliestLicenceDate), 6) : 6;
+    const suspensionYearLabel = yearsElapsed <= 1 ? 'past year' : `past ${yearsElapsed} years`;
     const handleSuspensionChange = ({ value }) => {
         dispatchDriverSuspensionState({
             type: mychoiceSdkStore.StoreFormCarDriverSuspensionActionTypes.FormCarDriverLicenceSuspensionSelect,
@@ -1690,7 +1951,7 @@ const BlockDriverSuspension = () => {
             });
         }
     };
-    return (jsxRuntime.jsxs("div", { className: "form-block-container", children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Licence Suspensions" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleSuspensionChange, name: "licenceSuspension", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, licenceSuspension), title: `Has ${firstName} had a licence suspension within the past 3 years?`, description: "Three licence suspensions are common: 1) driving under the influence, 2) being found guilty of drinking and driving, and 3) a police officer finding reasonable grounds for a driving offence. Licence suspensions are also different from driving prohibitions as part of a criminal sentence." }), licenceSuspension && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [licenceSuspensionList?.map(({ suspensionReason, suspensionYear, suspensionMonth, reinstatementYear, reinstatementMonth, }, index) => {
+    return (jsxRuntime.jsxs("div", { className: "form-block-container", children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Licence Suspensions" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleSuspensionChange, name: "licenceSuspension", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, licenceSuspension), title: `Has ${firstName} had a licence suspension within the ${suspensionYearLabel}?`, description: "There are two main types of licence suspensions: 1. Non-administrated suspension for cause: A driver's licence is suspended or cancelled because of traffic and criminal code driving offences or collecting too many demerit points. 2. Administrative suspension/cancellation/lapse: A driver's licence is suspended, cancelled, or allowed to lapse for reasons other than driving offences or demerit points such as a roadside licence suspension, medical conditions or failure to comply with court\u2011ordered obligations." }), licenceSuspension && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [licenceSuspensionList?.map(({ suspensionReason, suspensionYear, suspensionMonth, reinstatementYear, reinstatementMonth, }, index) => {
                         const defaultSuspensionDate = {
                             year: suspensionYear,
                             month: suspensionMonth,
@@ -1702,7 +1963,7 @@ const BlockDriverSuspension = () => {
                         const now = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
                         const days = birthDay ? (+birthDay + 1) : 1;
                         const endDate = reinstatementYear && reinstatementMonth ? mychoiceSdkStore.addDayToDate(`${reinstatementYear}-${reinstatementMonth}`, days) : now;
-                        const currentMinDate = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge), 3);
+                        const currentMinDate = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge), 6);
                         const currentEndDate = mychoiceSdkComponents.compareDates(endDate, currentMinDate) < 0 ? currentMinDate : endDate;
                         return (jsxRuntime.jsxs("div", { className: "list-block", children: [jsxRuntime.jsx("hr", {}), jsxRuntime.jsxs("div", { className: "list-item", children: [jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.licenceSuspensionsReasonOptions, name: `suspensionReason-${index}`, onChange: handleReasonChange(index), defaultValue: suspensionReason, title: "Reason for licence suspension", placeholder: "Select from the list", isRemovable: licenceSuspensionList.length > 1, onIconClick: handleIconClick(index), autoSelectIfValueIsOutOfOptions: false, error: !suspensionReason && driverState.inValidation, errorMessage: getErrorMessage(suspensionReason, driverState.inValidation) }), jsxRuntime.jsx(DateSelectFormBox, { name: `suspensionDate-${index}`, dateNames: [`suspensionYear-${index}`, `suspensionMonth-${index}`], onDateChange: handleSuspensionDateChange(index), defaultValue: defaultSuspensionDate, title: "Start date", errorMessage: getDateErrorMessage(['01', suspensionMonth, suspensionYear], driverState.inValidation), error: driverState.inValidation, minDate: currentMinDate, maxDate: currentEndDate }), jsxRuntime.jsx(DateSelectFormBox, { name: `reinstatementDate-${index}`, dateNames: [`reinstatementYear-${index}`, `reinstatementMonth-${index}`], onDateChange: handleReinstatementDateChange(index), defaultValue: defaultReinstatementDate, title: "End Date", errorMessage: getDateErrorMessage(['01', reinstatementMonth, reinstatementYear], driverState.inValidation), error: driverState.inValidation, minDate: suspensionYear && suspensionMonth
                                                 ? mychoiceSdkStore.addDayToDate(`${suspensionYear}-${suspensionMonth}`, days) : currentMinDate })] })] }, `suspension-${index}`));
@@ -1713,10 +1974,25 @@ const BlockDriverAccident = () => {
     const { driverState, dispatchDriverAccidentState } = mychoiceSdkStore.useStoreFormCarDriverAccident();
     const { dispatchDriverBaseState } = mychoiceSdkStore.useStoreFormCarDriverBase();
     const { appConfigState: { appType } } = mychoiceSdkStore.useStoreAppConfig();
+    const { discountState } = mychoiceSdkStore.useStoreFormCarDiscount();
+    const { isAlbertaProvince, isNovaScotiaProvince, isNewfoundlandProvince, isOntarioProvince } = mychoiceSdkStore.useProvince();
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
+    const accidentYearCap = isTheBig || isAlbertaProvince || isNovaScotiaProvince || isNewfoundlandProvince ? 10 : 25;
     const { accident, accidentList = [] } = driverState.items[driverState.activeIndex];
-    const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge }, } = driverState.items[driverState.activeIndex];
+    const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge, licenceType, g1LicenceYear, g1LicenceMonth, g2LicenceYear, g2LicenceMonth, gLicenceYear, gLicenceMonth, }, } = driverState.items[driverState.activeIndex];
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
+    const getOntarioQ1Date = () => {
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G2)
+            return g2LicenceYear && g2LicenceMonth ? `${g2LicenceYear}-${g2LicenceMonth}-01` : '';
+        if (licenceType === mychoiceSdkComponents.DriverLicenceTypes.G)
+            return gLicenceYear && gLicenceMonth ? `${gLicenceYear}-${gLicenceMonth}-01` : '';
+        return g1LicenceYear && g1LicenceMonth ? `${g1LicenceYear}-${g1LicenceMonth}-01` : '';
+    };
+    const ontarioQ1Date = isOntarioProvince && mychoiceSdkComponents.isMyChoiceLike(appType) ? getOntarioQ1Date() : '';
+    const earliestLicenceDate = ontarioQ1Date || (birthDate && firstLicenceAge ? mychoiceSdkComponents.addYearsToDate(birthDate, +firstLicenceAge) : '');
+    const policyStart = discountState.policyStart || mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
+    const yearsElapsed = earliestLicenceDate ? Math.min(mychoiceSdkComponents.getDifferenceInYears(policyStart, earliestLicenceDate), accidentYearCap) : accidentYearCap;
+    const accidentYearLabel = yearsElapsed <= 1 ? 'past year' : `past ${yearsElapsed} years`;
     const handleAccidentChange = ({ value }) => {
         dispatchDriverAccidentState({
             type: mychoiceSdkStore.StoreFormCarDriverAccidentActionTypes.FormCarDriverAccidentSelect,
@@ -1760,27 +2036,28 @@ const BlockDriverAccident = () => {
             });
         }
     };
-    return (jsxRuntime.jsxs("div", { className: "form-block-container", children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Accidents" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleAccidentChange, name: "accident", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, accident), title: `Has ${firstName} ever been at-fault for any accidents?`, description: "An at-fault accident means you are responsible for the car accident according to the investigative report. Whether you did not obey traffic signals or hit the brakes too late, it will show up on your insurance record for up to ten years. Insurers access at-fault information if one party reports it, so it is best to disclose previous incidents. A clean driving record mitigates additional hikes to your insurance premium." }), accident && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [accidentList?.map(({ accidentYear, accidentMonth, }, index) => {
+    return (jsxRuntime.jsxs("div", { className: "form-block-container", children: [jsxRuntime.jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Accidents" }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleAccidentChange, name: "accident", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, accident), title: `Has ${firstName} been at-fault for any accidents in the ${accidentYearLabel}?`, description: "An at-fault accident means you were responsible for the car accident according to provincially regulated Fault Determination Rules. Whether you did not obey traffic signals or hit the brakes too late, it can show up on your insurance record for up to 25 years. Insurers access at-fault information if one party reports it, so it is best to disclose previous incidents. A clean driving record mitigates additional hikes to your insurance premium." }), accident && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [accidentList?.map(({ accidentYear, accidentMonth, }, index) => {
                         const defaultSuspensionDate = {
                             year: accidentYear,
                             month: accidentMonth,
                             day: '01',
                         };
-                        return (jsxRuntime.jsxs("div", { className: "list-block", children: [jsxRuntime.jsx("hr", {}), jsxRuntime.jsx(DateSelectFormBox, { name: `accidentDate-${index}`, dateNames: [`accidentYear-${index}`, `accidentMonth-${index}`], onDateChange: handleAccidentDateChange(index), isRemovable: accidentList.length > 1, onIconClick: handleIconClick(index), defaultValue: defaultSuspensionDate, title: "Accident date", errorMessage: getDateErrorMessage(['01', accidentMonth, accidentYear], driverState.inValidation), error: driverState.inValidation, minDate: mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge) })] }, `accident-${index}`));
+                        return (jsxRuntime.jsxs("div", { className: "list-block", children: [jsxRuntime.jsx("hr", {}), jsxRuntime.jsx(DateSelectFormBox, { name: `accidentDate-${index}`, dateNames: [`accidentYear-${index}`, `accidentMonth-${index}`], onDateChange: handleAccidentDateChange(index), isRemovable: accidentList.length > 1, onIconClick: handleIconClick(index), defaultValue: defaultSuspensionDate, title: "Accident date", errorMessage: getDateErrorMessage(['01', accidentMonth, accidentYear], driverState.inValidation), error: driverState.inValidation, minDate: mychoiceSdkComponents.getMinDateByYears(ontarioQ1Date || mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge), accidentYearCap) })] }, `accident-${index}`));
                     }), accidentList?.length < 3 && (jsxRuntime.jsx(mychoiceSdkComponents.ButtonBase, { category: mychoiceSdkComponents.CategoryTypes.Filled, onClick: handleAddButtonClick, size: mychoiceSdkComponents.SizeTypes.Medium, color: mychoiceSdkComponents.ColorTypes.Primary, label: "Add another" }))] }))] }));
 };
 
 /**
- * Filter out G1/G2 options from "Serious" section for trafficTicketsGroupOptions
+ * Filter out G1/G2 options (ALC, RB) from the "Criminal" section for trafficTicketsGroupOptions
  */
 const getTrafficTicketsGroupOptionsWithoutG1G2 = () => {
     const excludeOptions = ['ALC', 'RB'];
-    const seriousOptions = mychoiceSdkComponents.trafficTicketsGroupOptions.find((entry) => entry.label === 'Serious');
-    const filteredSeriousOptions = seriousOptions.options.filter((option) => !excludeOptions.includes(option.value));
-    return mychoiceSdkComponents.trafficTicketsGroupOptions.map((option) => {
-        if (option.label === 'Serious')
-            return { ...option, options: filteredSeriousOptions };
-        return option;
+    return mychoiceSdkComponents.trafficTicketsGroupOptions.map((group) => {
+        if (group.label !== 'Criminal')
+            return group;
+        return {
+            ...group,
+            options: group.options.filter((option) => !excludeOptions.includes(option.value)),
+        };
     });
 };
 
@@ -1793,11 +2070,43 @@ const BlockDriverTicket = () => {
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
     const { firstName, minMaxDates, } = driverState.items[driverState.activeIndex];
     const { gOneMin } = minMaxDates;
+    // Each speeding tier is tagged with the picklist section it belongs to.
+    // The tier itself determines the Fortus <Speed> and <Severity>, so no speed is asked of the user.
+    const getSpeedingOptions = () => {
+        if (isNovaScotiaProvince) {
+            return [
+                { value: 'SP_NS_MINOR', name: 'Speeding 1 to 30 kph over limit', section: 'Minor' },
+                { value: 'SP_NS_MAJOR', name: 'Speeding 31 to 50 kph over limit', section: 'Major' },
+                { value: 'SP_NS_CRIMINAL', name: 'Speeding 51 kph or more over limit', section: 'Criminal' },
+            ];
+        }
+        if (isAlbertaProvince || isNewfoundlandProvince) {
+            return [
+                { value: 'SP_MINOR', name: 'Speeding 1 to 50 kph over limit', section: 'Minor' },
+                { value: 'SP_51_CRIMINAL', name: 'Speeding 51 kph or more over limit', section: 'Criminal' },
+            ];
+        }
+        return [
+            { value: 'SP_MINOR', name: 'Speeding 1 to 49 kph over limit', section: 'Minor' },
+            { value: 'SP_50_CRIMINAL', name: 'Speeding 50 kph or more over limit', section: 'Criminal' },
+        ];
+    };
     const getTrafficTicketsGroupOptions = () => {
-        if ((isAlbertaProvince || isNewBrunswickProvince || isNovaScotiaProvince || isNewfoundlandProvince) && isTheBig) {
-            return getTrafficTicketsGroupOptionsWithoutG1G2();
-        }
-        return mychoiceSdkComponents.trafficTicketsGroupOptions;
+        const base = (isAlbertaProvince || isNewBrunswickProvince || isNovaScotiaProvince || isNewfoundlandProvince) && isTheBig
+            ? getTrafficTicketsGroupOptionsWithoutG1G2()
+            : mychoiceSdkComponents.trafficTicketsGroupOptions;
+        const speedingOptions = getSpeedingOptions();
+        const toOption = ({ value, name }) => ({ value, name });
+        return base.map((group) => {
+            // Drop the generic "Speeding" entry; tiers are injected per section below.
+            const options = group.options.filter((opt) => !(opt.value === 'SP' && opt.name === 'Speeding'));
+            // Each tier appears in the Common section and in its matching severity section.
+            const tiersForGroup = speedingOptions.filter((tier) => group.label === 'Common' || group.label === tier.section);
+            return {
+                ...group,
+                options: [...options, ...tiersForGroup.map(toOption)],
+            };
+        });
     };
     const handleTicketChange = ({ value }) => {
         dispatchDriverTicketState({
@@ -1951,12 +2260,14 @@ const getDynamicLicenceBoxProps = ({ isAlbertaProvince, isOntarioProvince, isNew
 const SectionDiscountInfo$1 = () => {
     const { appConfigState: { appType }, } = mychoiceSdkStore.useStoreAppConfig();
     const allProvinces = mychoiceSdkStore.useProvince();
+    const { isAlbertaProvince } = allProvinces;
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
     const mychoiceCls = mychoiceSdkComponents.isMyChoiceLike(appType) ? 'mychoice' : '';
     const { discountState, dispatchDiscountState } = mychoiceSdkStore.useStoreFormCarDiscount();
     const { validateEmail, errorMessage } = mychoiceSdkStore.useHandlerCarQuoterEmail();
+    const { validatePhone, errorMessage: phoneErrorMessage } = mychoiceSdkStore.useHandlerCarQuoterPhone();
     const { multiplePoliciesDiscount, appInstallDiscount, caaMemberDiscount, quoterInfo, emailTo: { email, emailStatus }, } = discountState;
-    const { firstName, lastName, phone, driverLicense = '', caslConsent } = quoterInfo;
+    const { firstName, lastName, phone, phoneStatus, driverLicense = '', caslConsent } = quoterInfo;
     const handleMultiplePolicyChange = ({ value }) => {
         dispatchDiscountState({
             type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountMultiplePoliciesSelect,
@@ -1994,10 +2305,16 @@ const SectionDiscountInfo$1 = () => {
         });
     };
     const handlePhoneNumberChange = ({ value }) => {
-        dispatchDiscountState({
-            type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneSet,
-            payload: { phone: value },
-        });
+        const digits = value.replace(/\D/g, '');
+        if (digits.length === 10) {
+            validatePhone(value);
+        }
+        else {
+            dispatchDiscountState({
+                type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                payload: { phone: value, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial },
+            });
+        }
     };
     const handleEmailChange = ({ value }) => {
         validateEmail(value);
@@ -2008,7 +2325,11 @@ const SectionDiscountInfo$1 = () => {
             payload: { caslConsent: value },
         });
     };
-    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [isTheBig ? (jsxRuntime.jsx(LabelFormBox, { title: "You are seconds away from receiving your car insurance quotes,\n         please provide your email after completing the discount section so we\n         can send you your personalized free car insurance quotes!" })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("h2", { className: "section-title", children: "A little extra info for discounts and connecting you with our partners." }), jsxRuntime.jsx("span", { className: "info-title-message", children: "You are seconds away from receiving your car insurance quotes, please provide your email after completing the discount section so we can send you your personalized free car insurance quotes!" })] })), jsxRuntime.jsx(BlockVehLinks, {}), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleMultiplePolicyChange, name: "multiplePoliciesDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, multiplePoliciesDiscount), title: "You could receive a 10-15% discount for bundling insurance with multiple policies with the same insurance company. Does that interest you?", description: "Bundling your home and auto insurance can save you significantly on insurance premiums as a whole package. Do you want to learn more about the benefits of multiple policies for home, tenant, condo, or car insurance? All you have to do is select yes.." }), !isTheBig && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleCaaMemberChange, name: "caaMemberDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, caaMemberDiscount), title: "Please indicate if you are a member of CAA, you could save up to an additional 20%." })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleAppInstallChange, name: "appInstallDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, appInstallDiscount), title: "You could receive up to a 30% discount by using an app to track driving habits. Does that interest you?", description: "Get rewarded for safe driving with the click of a button. If you install the app, you may be eligible for a 30% discount on your insurance premiums. Typically, you receive 10% of the discount upfront and the balance after six months of good driving." }), isTheBig ? (jsxRuntime.jsxs("div", { className: "input-form-box-container", children: [jsxRuntime.jsx(LabelFormBox, { title: "Complete this form to see all your personalized\n              quotes on the next page, you will also be able to:" }), jsxRuntime.jsxs("ol", { className: "ordered-block", children: [jsxRuntime.jsx("li", { children: "See what rates insurance carriers are offering" }), jsxRuntime.jsx("li", { children: "Get in touch with us and secure your rate" }), jsxRuntime.jsx("li", { children: "Potentially save more by speaking with a broker" })] })] })) : (jsxRuntime.jsx("h2", { children: "Complete the form below to see which companies are offering your quotes." })), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && discountState.inValidation, errorMessage: getErrorMessage(firstName, discountState.inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastname", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && discountState.inValidation, errorMessage: getErrorMessage(lastName, discountState.inValidation) }), isTheBig && (jsxRuntime.jsx(InputFormLicenceBox, { ...getDynamicLicenceBoxProps({ ...allProvinces }), name: "driverLicense", title: "Driver Licence Number (Optional)", onChange: handleDriverLicenseChange, defaultValue: driverLicense, description: "Enter your drivers licence number in to receive a more accurate, prequalified quote from our broker partners. This will enable you to provide less details over the phone if you choose to have a broker contact you. This is an optional input." })), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", error: !phone && discountState.inValidation, errorMessage: getErrorMessage(phone, discountState.inValidation) }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+    return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [isTheBig ? (jsxRuntime.jsx(LabelFormBox, { title: "You are seconds away from receiving your car insurance quotes,\n         please provide your email after completing the discount section so we\n         can send you your personalized free car insurance quotes!" })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("h2", { className: "section-title", children: "A little extra info for discounts and connecting you with our partners." }), jsxRuntime.jsx("span", { className: "info-title-message", children: "You are seconds away from receiving your car insurance quotes, please provide your email after completing the discount section so we can send you your personalized free car insurance quotes!" })] })), jsxRuntime.jsx(BlockVehLinks, {}), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleMultiplePolicyChange, name: "multiplePoliciesDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, multiplePoliciesDiscount), title: "You could receive a 10-15% discount for bundling insurance with multiple policies with the same insurance company. Does that interest you?", description: "Bundling your home and auto insurance can save you significantly on insurance premiums as a whole package. Do you want to learn more about the benefits of multiple policies for home, tenant, condo, or car insurance? All you have to do is select yes.." }), !isTheBig && !isAlbertaProvince && (jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleCaaMemberChange, name: "caaMemberDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, caaMemberDiscount), title: "Please indicate if you are a member of CAA, you could save up to an additional 20%." })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleAppInstallChange, name: "appInstallDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, appInstallDiscount), title: "You could receive up to a 30% discount by using an app to track driving habits. Does that interest you?", description: "Get rewarded for safe driving with the click of a button. If you install the app, you may be eligible for a 30% discount on your insurance premiums. Typically, you receive 10% of the discount upfront and the balance after six months of good driving." }), isTheBig ? (jsxRuntime.jsxs("div", { className: "input-form-box-container", children: [jsxRuntime.jsx(LabelFormBox, { title: "Complete this form to see all your personalized\n              quotes on the next page, you will also be able to:" }), jsxRuntime.jsxs("ol", { className: "ordered-block", children: [jsxRuntime.jsx("li", { children: "See what rates insurance carriers are offering" }), jsxRuntime.jsx("li", { children: "Get in touch with us and secure your rate" }), jsxRuntime.jsx("li", { children: "Potentially save more by speaking with a broker" })] })] })) : (jsxRuntime.jsx("h2", { children: "Complete the form below to see which companies are offering your quotes." })), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && discountState.inValidation, errorMessage: getErrorMessage(firstName, discountState.inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastname", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && discountState.inValidation, errorMessage: getErrorMessage(lastName, discountState.inValidation) }), isTheBig && (jsxRuntime.jsx(InputFormLicenceBox, { ...getDynamicLicenceBoxProps({ ...allProvinces }), name: "driverLicense", title: "Driver Licence Number (Optional)", onChange: handleDriverLicenseChange, defaultValue: driverLicense, description: "Enter your drivers licence number in to receive a more accurate, prequalified quote from our broker partners. This will enable you to provide less details over the phone if you choose to have a broker contact you. This is an optional input." })), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", validationStatus: phoneStatus, error: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    || (phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Initial && discountState.inValidation)
+                    || (!phone && discountState.inValidation), errorMessage: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    ? phoneErrorMessage
+                    : getErrorMessage(phone, discountState.inValidation) || (discountState.inValidation ? 'Enter a valid phone number.' : '') }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
                     ? errorMessage
                     : getErrorMessage(email, discountState.inValidation), error: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined || (!email && discountState.inValidation), name: "email", title: "Please share your email address with us, we'll use it to send you a copy of your quotes.", description: "We will provide you with your insurance quotes immediately after this form completion. If you are not ready to apply today, don\u2019t worry as we will be emailing your quotes to you if you\u2019d like to complete at a later date with the help of one of our trusted broker partners.", onChange: handleEmailChange, defaultValue: email, placeholder: mychoiceSdkComponents.getPlaceholderEmail(appType) }), isTheBig && (jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { className: "casl-consent", name: "caslConsent", label: "Yes, I consent to receiving emails from the Billyard Insurance Group.\n                I understand that I can unsubscribe at any time", onChange: handleCaslConsentChange, defaultValue: caslConsent })), jsxRuntime.jsx(BlockSubmit$2, { className: isTheBig ? 'thebig-bold' : 'mychoice' }), jsxRuntime.jsx(BlockNextPageInfo$2, {})] }));
 };
@@ -3193,8 +3514,9 @@ const SectionDiscountInfo = () => {
     const { discountState, dispatchDiscountState } = mychoiceSdkStore.useStoreFormHomeDiscount();
     // const { applicantState, dispatchApplicantInfoState } = useStoreFormHomeApplicantInfo();
     const { validateEmail, errorMessage } = mychoiceSdkStore.useHandlerHomeQuoterEmail();
+    const { validatePhone, errorMessage: phoneErrorMessage } = mychoiceSdkStore.useHandlerHomeQuoterPhone();
     const { multiplePoliciesDiscount, emailTo: { email, emailStatus }, quoterInfo = {}, } = discountState;
-    const { firstName = '', lastName = '', phone = '', caslConsent } = quoterInfo;
+    const { firstName = '', lastName = '', phone = '', phoneStatus, caslConsent } = quoterInfo;
     const handleMultiplePolicyChange = ({ value }) => {
         dispatchDiscountState({
             type: mychoiceSdkStore.StoreFormHomeDiscountActionTypes.FormHomeDiscountMultiplePoliciesSelect,
@@ -3214,10 +3536,16 @@ const SectionDiscountInfo = () => {
         });
     };
     const handlePhoneNumberChange = ({ value }) => {
-        dispatchDiscountState({
-            type: mychoiceSdkStore.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneSet,
-            payload: { phone: value },
-        });
+        const digits = value.replace(/\D/g, '');
+        if (digits.length === 10) {
+            validatePhone(value);
+        }
+        else {
+            dispatchDiscountState({
+                type: mychoiceSdkStore.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                payload: { phone: value, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial },
+            });
+        }
     };
     const handleEmailChange = ({ value }) => {
         validateEmail(value);
@@ -3230,7 +3558,11 @@ const SectionDiscountInfo = () => {
     };
     return (jsxRuntime.jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsxRuntime.jsx("h2", { className: "section-title", children: "A little extra info for discounts and connecting you with our partners." }), isTheBig ? (jsxRuntime.jsx(LabelFormBox, { title: `You are seconds away from receiving your ${insuranceType} insurance quotes, please provide your email after completing the discount section so we can send you your personalized free ${insuranceType} insurance quotes!` })) : (jsxRuntime.jsx("span", { className: "info-title-message", children: `You are seconds away from receiving your ${insuranceType} insurance quotes,
                please provide your email after completing the discount section so we
-                can send you your personalized free ${insuranceType} insurance quotes!` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleMultiplePolicyChange, name: "multiplePoliciesDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, multiplePoliciesDiscount), title: "You could potentially save up to 18% more. Would you consider consolidating multiple policies (like auto insurance) with the same provider?", description: "Most insurers offer discounts to consumers who purchase multiple policies. Select \u2018yes\u2019 if you\u2019d like to bundle your home and auto insurance policies." }), jsxRuntime.jsx(BlockDwellingInfo, {}), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && discountState.inValidation, errorMessage: getErrorMessage(firstName, discountState.inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastName", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && discountState.inValidation, errorMessage: getErrorMessage(lastName, discountState.inValidation) }), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", error: !phone && discountState.inValidation, errorMessage: getErrorMessage(phone, discountState.inValidation) }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, name: "email", title: "Please share your email address with us, we'll use it to send you a copy of your quotes.", description: "We will provide you with your insurance quotes immediately after this form completion. If you are not ready to apply today, don\u2019t worry as we will be emailing your quotes to you if you\u2019d like to complete at a later date with the help of one of our trusted broker partners.", onChange: handleEmailChange, defaultValue: email, placeholder: mychoiceSdkComponents.getPlaceholderEmail(appType), errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                can send you your personalized free ${insuranceType} insurance quotes!` })), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.yesNoOptions, onChange: handleMultiplePolicyChange, name: "multiplePoliciesDiscount", defaultValue: getSelectedOption(mychoiceSdkComponents.yesNoOptions, multiplePoliciesDiscount), title: "You could potentially save up to 18% more. Would you consider consolidating multiple policies (like auto insurance) with the same provider?", description: "Most insurers offer discounts to consumers who purchase multiple policies. Select \u2018yes\u2019 if you\u2019d like to bundle your home and auto insurance policies." }), jsxRuntime.jsx(BlockDwellingInfo, {}), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && discountState.inValidation, errorMessage: getErrorMessage(firstName, discountState.inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastName", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && discountState.inValidation, errorMessage: getErrorMessage(lastName, discountState.inValidation) }), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", validationStatus: phoneStatus, error: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    || (phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Initial && discountState.inValidation)
+                    || (!phone && discountState.inValidation), errorMessage: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    ? phoneErrorMessage
+                    : getErrorMessage(phone, discountState.inValidation) || (discountState.inValidation ? 'Enter a valid phone number.' : '') }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, name: "email", title: "Please share your email address with us, we'll use it to send you a copy of your quotes.", description: "We will provide you with your insurance quotes immediately after this form completion. If you are not ready to apply today, don\u2019t worry as we will be emailing your quotes to you if you\u2019d like to complete at a later date with the help of one of our trusted broker partners.", onChange: handleEmailChange, defaultValue: email, placeholder: mychoiceSdkComponents.getPlaceholderEmail(appType), errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
                     ? errorMessage
                     : getErrorMessage(email, discountState.inValidation), error: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined || (!email && discountState.inValidation) }), isTheBig && (jsxRuntime.jsx(mychoiceSdkComponents.CheckboxForm, { className: "casl-consent", name: "caslConsent", label: "Yes, I consent to receiving emails from the Billyard Insurance Group.\n               I understand that I can unsubscribe at any time", onChange: handleCaslConsentChange, defaultValue: caslConsent })), jsxRuntime.jsx(BlockSubmit$1, { className: isTheBig ? 'thebig-bold' : 'mychoice' }), jsxRuntime.jsx(BlockNextPageInfo$1, {})] }));
 };
@@ -3552,8 +3884,9 @@ const SectionApplicant = () => {
     const isTheBig = appType === mychoiceSdkComponents.AppTypes.TheBig;
     const { applicantState, dispatchApplicantState } = mychoiceSdkStore.useStoreFormLifeApplicant();
     const { validateEmail, errorMessage } = mychoiceSdkStore.useHandlerLifeQuoterEmail();
+    const { validatePhone, errorMessage: phoneErrorMessage } = mychoiceSdkStore.useHandlerLifeQuoterPhone();
     const { birthYear, birthMonth, birthDay, gender, smoker, quoterInfo, emailTo: { email, emailStatus }, inValidation, } = applicantState;
-    const { firstName, lastName, phone } = quoterInfo || {};
+    const { firstName, lastName, phone, phoneStatus } = quoterInfo || {};
     const defaultDateOfBirth = {
         day: birthDay,
         month: birthMonth,
@@ -3604,10 +3937,16 @@ const SectionApplicant = () => {
         });
     };
     const handlePhoneNumberChange = ({ value }) => {
-        dispatchApplicantState({
-            type: mychoiceSdkStore.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneSet,
-            payload: { phone: value },
-        });
+        const digits = value.replace(/\D/g, '');
+        if (digits.length === 10) {
+            validatePhone(value);
+        }
+        else {
+            dispatchApplicantState({
+                type: mychoiceSdkStore.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                payload: { phone: value, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial },
+            });
+        }
     };
     const handleEmailChange = ({ value }) => {
         validateEmail(value);
@@ -3627,7 +3966,11 @@ const SectionApplicant = () => {
                             textAlign: 'center',
                             fontSize: '1.15rem',
                             marginTop: '10px',
-                        }, children: `Canadians have compared rates in the last 24 hours and saved ${savedPercentage}% on average` })] }), jsxRuntime.jsx("h2", { className: "section-title", style: { textAlign: 'center' }, children: `${lockEmoji} Complete the form below to see which companies are offering your quotes.` }), jsxRuntime.jsx("span", { className: "info-title-message", children: "You are seconds away from receiving your life insurance quotes, please provide your email after completing the final steps so we can send you your personalized free life insurance quotes!" }), jsxRuntime.jsx(DateSelectFormBox, { name: "dateOfBirth", dateNames: ['birthYear', 'birthMonth', 'birthDay'], onDateChange: handleDateOfBirthChange, defaultValue: defaultDateOfBirth, title: "Date of birth", error: inValidation, errorMessage: getDateErrorMessage([birthDay || '', birthMonth || '', birthYear || ''], inValidation), maxDate: mychoiceSdkComponents.subYearsFromDate('', 14), isDay: true }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.genderOptions, name: "gender", onChange: handleGenderChange, defaultValue: getSelectedOption(mychoiceSdkComponents.genderOptions, gender), title: "Gender", placeholder: "Select", autoSelectIfValueIsOutOfOptions: false, error: !gender && inValidation, errorMessage: getErrorMessage(`${gender}`.toString(), inValidation) }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.smokerOptions, onChange: handleSmokerChange, name: "smoker", defaultValue: getSelectedOption(mychoiceSdkComponents.smokerOptions, smoker), title: "Smoker" }), isTheBig && (jsxRuntime.jsxs("div", { className: "input-form-box-container", children: [jsxRuntime.jsx(LabelFormBox, { title: "Complete this form to see all your personalized\n              quotes on the next page, you will also be able to:" }), jsxRuntime.jsxs("ol", { className: "ordered-block", children: [jsxRuntime.jsx("li", { children: "See what rates insurance carriers are offering" }), jsxRuntime.jsx("li", { children: "Get in touch with us and secure your rate" }), jsxRuntime.jsx("li", { children: "Potentially save more by speaking with a broker" })] })] })), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && inValidation, errorMessage: getErrorMessage(firstName, inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastname", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && inValidation, errorMessage: getErrorMessage(lastName, inValidation) }), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", error: !phone && inValidation, errorMessage: getErrorMessage(phone, inValidation) }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, name: "email", title: "Please provide your email address so we can send you a copy of your quotes", onChange: handleEmailChange, defaultValue: email, placeholder: mychoiceSdkComponents.getPlaceholderEmail(appType), errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                        }, children: `Canadians have compared rates in the last 24 hours and saved ${savedPercentage}% on average` })] }), jsxRuntime.jsx("h2", { className: "section-title", style: { textAlign: 'center' }, children: `${lockEmoji} Complete the form below to see which companies are offering your quotes.` }), jsxRuntime.jsx("span", { className: "info-title-message", children: "You are seconds away from receiving your life insurance quotes, please provide your email after completing the final steps so we can send you your personalized free life insurance quotes!" }), jsxRuntime.jsx(DateSelectFormBox, { name: "dateOfBirth", dateNames: ['birthYear', 'birthMonth', 'birthDay'], onDateChange: handleDateOfBirthChange, defaultValue: defaultDateOfBirth, title: "Date of birth", error: inValidation, errorMessage: getDateErrorMessage([birthDay || '', birthMonth || '', birthYear || ''], inValidation), maxDate: mychoiceSdkComponents.subYearsFromDate('', 14), isDay: true }), jsxRuntime.jsx(SelectFormBox, { options: mychoiceSdkComponents.genderOptions, name: "gender", onChange: handleGenderChange, defaultValue: getSelectedOption(mychoiceSdkComponents.genderOptions, gender), title: "Gender", placeholder: "Select", autoSelectIfValueIsOutOfOptions: false, error: !gender && inValidation, errorMessage: getErrorMessage(`${gender}`.toString(), inValidation) }), jsxRuntime.jsx(SwitchButtonBox, { items: mychoiceSdkComponents.smokerOptions, onChange: handleSmokerChange, name: "smoker", defaultValue: getSelectedOption(mychoiceSdkComponents.smokerOptions, smoker), title: "Smoker" }), isTheBig && (jsxRuntime.jsxs("div", { className: "input-form-box-container", children: [jsxRuntime.jsx(LabelFormBox, { title: "Complete this form to see all your personalized\n              quotes on the next page, you will also be able to:" }), jsxRuntime.jsxs("ol", { className: "ordered-block", children: [jsxRuntime.jsx("li", { children: "See what rates insurance carriers are offering" }), jsxRuntime.jsx("li", { children: "Get in touch with us and secure your rate" }), jsxRuntime.jsx("li", { children: "Potentially save more by speaking with a broker" })] })] })), jsxRuntime.jsx(InputFormBox, { name: "firstName", title: "First Name", onChange: handleFirstNameChange, defaultValue: firstName, placeholder: "Your First Name", error: !firstName && inValidation, errorMessage: getErrorMessage(firstName, inValidation) }), jsxRuntime.jsx(InputFormBox, { name: "lastname", title: "Last Name", onChange: handleLastNameChange, defaultValue: lastName, placeholder: "Your Last Name", error: !lastName && inValidation, errorMessage: getErrorMessage(lastName, inValidation) }), jsxRuntime.jsx(InputFormPhoneBox, { name: "phone", onChange: handlePhoneNumberChange, defaultValue: phone, title: "Phone Number", placeholder: "(855) 325-8444", validationStatus: phoneStatus, error: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    || (phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Initial && inValidation)
+                    || (!phone && inValidation), errorMessage: phoneStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
+                    ? phoneErrorMessage
+                    : getErrorMessage(phone, inValidation) || (inValidation ? 'Enter a valid phone number.' : '') }), jsxRuntime.jsx(InputFormEmailBox, { validationStatus: emailStatus, name: "email", title: "Please provide your email address so we can send you a copy of your quotes", onChange: handleEmailChange, defaultValue: email, placeholder: mychoiceSdkComponents.getPlaceholderEmail(appType), errorMessage: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined
                     ? errorMessage
                     : getErrorMessage(email, inValidation), error: emailStatus === mychoiceSdkComponents.ValidationStatusTypes.Declined || (!email && inValidation) }), jsxRuntime.jsx(BlockSubmit, { className: isTheBig ? 'thebig-bold' : '' }), jsxRuntime.jsx(BlockNextPageInfo, {})] }));
 };