@mychoice/mychoice-sdk-modules 2.2.26 → 2.2.28

package/dist/cjs/insurances/car/pages/driver/helpers.d.ts

@@ -1,5 +1,5 @@
 import { SelectOptionGroupInterface } from '@mychoice/mychoice-sdk-components';
 /**
- * Filter out G1/G2 options (ALC, RB) from the "Criminal" section for trafficTicketsGroupOptions
+ * Filter out G1/G2 options from "Serious" section for trafficTicketsGroupOptions
  */
 export declare const getTrafficTicketsGroupOptionsWithoutG1G2: () => SelectOptionGroupInterface[];

package/dist/cjs/shared/boxes/SwitchButtonBox/interface.d.ts

@@ -2,7 +2,7 @@ import { SelectOptionInterface, OnChangeEventInterface } from '@mychoice/mychoic
 import { LabelFormBoxProps } from '../LabelFormBox/interface';
 export type SwitchButtonBoxProps = LabelFormBoxProps & {
     name: string;
-    defaultValue: string;
+    defaultValue: string | boolean;
     items: SelectOptionInterface[];
     onChange: (option: OnChangeEventInterface) => void;
     errorMessage?: string;

package/dist/esm/index.js

@@ -1,9 +1,9 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { ErrorBoundary } from 'react-error-boundary';
-import { AppTypes, isMyChoiceLike, TitleForm, TooltipForm, IconDelete, ColorVariablesTypes, InputTypes, InputForm, InputFormPhone, InputFormEmail, InputFormLicence, SelectForm, getFormattedDate, DateTypes, getDateOptions, ButtonForm, defaultBrokerPhone, DriverPriorityTypes, SizeTypes, ButtonBase, CategoryTypes, ColorTypes, defaultLocalIndex, liabilityOptions, accidentBenefitsOptionalOptions, coverageOptions, lossOfUseOptions, liabilityForDamageOptions, limitedWaiverOfDepreciationOptions, OfferDetail, CompanyRoleTypes, OperationHoursInfo, OfferHeader, OfferPrice, ButtonTypes, ButtonVariantTypes, IconDropdownArrow, InsuranceTypes, HeaderNavGroup, ButtonMenu, DeviceTypes, IconLoaderPrimary, getInsuranceType, RequestStatusTypes, formatPostalCode, IconLoaderSecondary, postalCodeFormat, useEffectOnce, carCondition, carStatus, carWinterTiresCheck, carKeepPlace, carUsagePurpose, firstDriveDistanceList, yearlyDriveDistanceList, numberWithCommas, VehiclePrimaryUseTypes, businessUsePercentOptions, addDaysToDate, comprehensiveCoverage, collisionCoverage, maritalStatusOptions, subYearsFromDate, occupationOptions, genderOptions, applicantRelationshipOptions, addYearsToDate, checkDateIsSpecial, DriverLicenceTypes, getDifferenceInYears, compareDates, yesNoOptions, getLicenceTypeOptions, getDisabledLicenceTypes, getDifferenceInMonths, addMonthsToDate, getMinDate, getMinDateByYears, CheckboxForm, insuranceCancellationReasonOptions, subMonthsFromDate, DriverListTypes, licenceSuspensionsReasonOptions, trafficTicketsGroupOptions, ValidationStatusTypes, getPlaceholderEmail, QuoteEdit, homeOwnerTypeOptions, tenantBuildingStructureOptions, condoBuildingStructureOptions, homeBuildingStructureOptions, residentsOptions, insuredYearsOptions, getInsuranceYearsOptions, ApplicantListTypes, claimTypeOptions, exteriorFinishOptions, constructionTypeOptions, garageTypeOptions, getNumericOptions, fireHallDistanceOptions, fireHydrantDistanceOptions, primaryHeatingTypeOptions, auxHeatingTypeOptions, InfoMessage, ppOptions, homeCoverageOptions, homeLiabilityOptions, lifeInsuranceTypeOptions, lifeInsuranceOntarioTypeOptions, lifeCoverageOptions, smokerOptions, MychoiceStep, Step, IconClock, ButtonArrow, DirectionTypes, ButtonTabArrow, ButtonTab, ButtonTabMobile, NavigationCar, NavigationPerson, NavigationDiscount, NavigationQuotes, NavigationAddress, NavigationProperty, ModalTypes } from '@mychoice/mychoice-sdk-components';
+import { AppTypes, isMyChoiceLike, TitleForm, TooltipForm, IconDelete, ColorVariablesTypes, InputTypes, InputForm, InputFormPhone, InputFormEmail, InputFormLicence, SelectForm, getFormattedDate, DateTypes, getDateOptions, ButtonForm, defaultBrokerPhone, DriverPriorityTypes, SizeTypes, ButtonBase, CategoryTypes, ColorTypes, defaultLocalIndex, liabilityOptions, accidentBenefitsOptionalOptions, coverageOptions, lossOfUseOptions, liabilityForDamageOptions, limitedWaiverOfDepreciationOptions, OfferDetail, CompanyRoleTypes, OperationHoursInfo, OfferHeader, OfferPrice, ButtonTypes, ButtonVariantTypes, IconDropdownArrow, InsuranceTypes, HeaderNavGroup, ButtonMenu, DeviceTypes, IconLoaderPrimary, getInsuranceType, RequestStatusTypes, formatPostalCode, IconLoaderSecondary, postalCodeFormat, useEffectOnce, carCondition, carStatus, carWinterTiresCheck, carKeepPlace, carUsagePurpose, firstDriveDistanceList, yearlyDriveDistanceList, numberWithCommas, VehiclePrimaryUseTypes, businessUsePercentOptions, addDaysToDate, comprehensiveCoverage, collisionCoverage, maritalStatusOptions, subYearsFromDate, occupationOptions, genderOptions, applicantRelationshipOptions, addYearsToDate, checkDateIsSpecial, DriverLicenceTypes, getDifferenceInYears, getDifferenceInMonths, compareDates, yesNoOptions, getLicenceTypeOptions, getDisabledLicenceTypes, addMonthsToDate, getMinDate, getMinDateByYears, CheckboxForm, insuranceCancellationReasonOptions, subMonthsFromDate, DriverListTypes, licenceSuspensionsReasonOptions, trafficTicketsGroupOptions, ValidationStatusTypes, getPlaceholderEmail, QuoteEdit, homeOwnerTypeOptions, tenantBuildingStructureOptions, condoBuildingStructureOptions, homeBuildingStructureOptions, residentsOptions, insuredYearsOptions, getInsuranceYearsOptions, ApplicantListTypes, claimTypeOptions, exteriorFinishOptions, constructionTypeOptions, garageTypeOptions, getNumericOptions, fireHallDistanceOptions, fireHydrantDistanceOptions, primaryHeatingTypeOptions, auxHeatingTypeOptions, InfoMessage, ppOptions, homeCoverageOptions, homeLiabilityOptions, lifeInsuranceTypeOptions, lifeInsuranceOntarioTypeOptions, lifeCoverageOptions, smokerOptions, MychoiceStep, Step, IconClock, ButtonArrow, DirectionTypes, ButtonTabArrow, ButtonTab, ButtonTabMobile, NavigationCar, NavigationPerson, NavigationDiscount, NavigationQuotes, NavigationAddress, NavigationProperty, ModalTypes } from '@mychoice/mychoice-sdk-components';
 import { useStoreAppConfig, useStoreFormCarVehicle, useStoreFormCarDriverBase, useStoreFormCarDiscount, StoreFormCarDiscountActionTypes, useStoreFormCarQuote, CarQuoteDataHandler, useValidationCarDiscount, StoreFormCarVehicleActionTypes, useStoreFormHomeDiscount, useStorePartner, useStoreDeviceType, useStoreAppLoader, useStoreAppModal, StoreConfigAppModalActionTypes, useHandlerPostal, useHandlerCarMake, useHandlerCarModel, useProvince, useAbReform, useValidationVehicle, useAutofillCarForm, StoreFormCarDriverBaseActionTypes, useStoreFormCarConfig, useStoreFormCarDriverInfo, StoreFormCarDriverInfoActionTypes, useStoreFormCarDriverLicence, addDayToDate, StoreFormCarDriverLicenceActionTypes, useStoreFormCarDriverInsurance, StoreFormCarDriverInsuranceActionTypes, useStoreFormCarDriverCancellation, StoreFormCarDriverCancellationActionTypes, useStoreFormCarDriverSuspension, StoreFormCarDriverSuspensionActionTypes, useStoreFormCarDriverAccident, StoreFormCarDriverAccidentActionTypes, useStoreFormCarDriverTicket, StoreFormCarDriverTicketActionTypes, useValidationDriver, useHandlerCarQuoterEmail, useHandlerCarQuoterPhone, useStoreFormHomeDwelling, useStoreFormHomePostal, useStoreFormHomeApplicantBase, StoreFormHomePostalActionTypes, StoreFormHomeDwellingActionTypes, StoreConfigAppConfigActionTypes, StoreFormHomeApplicantBaseActionTypes, useValidationAddress, useStoreFormHomeApplicantInfo, StoreFormHomeDiscountActionTypes, StoreFormHomeApplicantInfoActionTypes, useStoreFormHomeApplicantInsurance, StoreFormHomeApplicantInsuranceActionTypes, useStoreFormHomeApplicantCancellation, StoreFormHomeApplicantCancellationActionTypes, useStoreFormHomeApplicantClaim, StoreFormHomeApplicantClaimActionTypes, useValidationApplicant, useValidationDwelling, useStoreFormHomeQuote, HomeQuoteDataHandler, useValidationHomeDiscount, useHandlerHomeQuoterEmail, useHandlerHomeQuoterPhone, useStoreFormLifeCoverage, StoreFormLifeCoverageActionTypes, useValidationCoverage, useAutofillLifeForm, useStoreFormLifeQuote, useStoreFormLifeApplicant, LifeQuoteDataHandler, useValidationLifeApplicant, useHandlerLifeQuoterEmail, useHandlerLifeQuoterPhone, StoreFormLifeApplicantActionTypes, useStoreFormCarPostal, useStoreFormLifePostal, ClearFormDataHandler, useStoreAppDevice, useStoreClient, useHandlerAuth, useHandlerPartner, StoreConfigAppLoaderActionTypes, StoreFormCarConfigActionTypes, StoreFormCarPostalActionTypes, StoreFormCarQuoteActionTypes, StoreFormHomeQuoteActionTypes, StoreFormLifePostalActionTypes, StoreFormLifeQuoteActionTypes, StoreClientActionTypes, StoreConfigAppDeviceActionTypes, StoreProvider, initHttpResponse } from '@mychoice/mychoice-sdk-store';
 import { useNavigate, useLocation, BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
-import React, { useState, useCallback, useEffect, useRef, useMemo } from 'react';
+import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react';
 import { random } from 'lodash';
 import GooglePlacesAutocomplete, { geocodeByPlaceId } from 'react-google-places-autocomplete';
 import { components } from 'react-select';
@@ -108,10 +108,14 @@ DateSelectFormBox.defaultProps = {
 
 const SwitchButtonBox = (props) => {
     const { name, title, description, hintMessage, isRemovable, errorMessage, className, defaultValue, items, onChange } = props;
+    // Allow boolean true/false answers; empty string means unanswered (neither Yes nor No).
     const [activeId, setActiveId] = useState(defaultValue);
     const { appConfigState: { appType }, } = useStoreAppConfig();
     const isTheBig = appType === AppTypes.TheBig;
     const isMychoice = isMyChoiceLike(appType);
+    useEffect(() => {
+        setActiveId(defaultValue);
+    }, [defaultValue]);
     const setClassNames = (isActive) => {
         if (isTheBig) {
             return isActive ? 'thebig-bold' : 'thebig-regular';
@@ -121,6 +125,7 @@ const SwitchButtonBox = (props) => {
         }
         return '';
     };
+    const isAnswered = activeId === true || activeId === false;
     const handleClick = useCallback((selectedItem) => () => {
         setActiveId(selectedItem.value);
         if (onChange) {
@@ -129,8 +134,11 @@ const SwitchButtonBox = (props) => {
                 value: selectedItem.value,
             });
         }
-    }, []);
-    return (jsx(Container, { name: name, className: className, title: title, description: description, errorMessage: errorMessage, isRemovable: isRemovable, hintMessage: hintMessage, children: jsx("div", { className: "flex-items-container", children: items.map((item, index) => (jsx(ButtonForm, { className: setClassNames(item.value === activeId), onClick: handleClick(item), selected: item.value === activeId, label: item.name }, `${item.name}_${index}`))) }) }));
+    }, [name, onChange]);
+    return (jsx(Container, { name: name, className: className, title: title, description: description, errorMessage: errorMessage, isRemovable: isRemovable, hintMessage: hintMessage, children: jsx("div", { className: "flex-items-container", children: items.map((item, index) => {
+                const isSelected = isAnswered && item.value === activeId;
+                return (jsx(ButtonForm, { className: setClassNames(isSelected), onClick: handleClick(item), selected: isSelected, label: item.name }, `${item.name}_${index}`));
+            }) }) }));
 };
 SwitchButtonBox.defaultProps = {
     defaultValue: '',
@@ -199,18 +207,41 @@ const capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 const BlockVehLinks = () => {
     const { vehicleState: { items: vehicles } } = useStoreFormCarVehicle();
     const { driverState: { items: drivers } } = useStoreFormCarDriverBase();
-    const { discountState: { vehlinks, occVehlinks }, dispatchDiscountState } = useStoreFormCarDiscount();
+    const { discountState: { vehlinks, occVehlinks, inValidation }, dispatchDiscountState } = useStoreFormCarDiscount();
+    // Spec: 2 drivers / 2 vehicles — ask only for Vehicle1; system assigns the other driver as PO on Vehicle2.
+    const isTwoByTwo = drivers.length === 2 && vehicles.length === 2;
+    const assignPrimary = (driverIndex, vehicleIndex) => {
+        dispatchDiscountState({
+            type: StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect,
+            payload: { driverIndex, vehicleIndex },
+        });
+    };
+    useEffect(() => {
+        if (!isTwoByTwo)
+            return;
+        const v1 = vehlinks.find((l) => l.vehicleIndex === 0 && l.priority === DriverPriorityTypes.Prn);
+        if (!v1 || v1.driverIndex < 0)
+            return;
+        const otherDriverIndex = drivers.findIndex((_, index) => index !== v1.driverIndex);
+        if (otherDriverIndex < 0)
+            return;
+        const v2 = vehlinks.find((l) => l.vehicleIndex === 1 && l.priority === DriverPriorityTypes.Prn);
+        if (v2?.driverIndex === otherDriverIndex)
+            return;
+        assignPrimary(otherDriverIndex, 1);
+    }, [isTwoByTwo, vehlinks, drivers]);
     if (drivers.length <= 1) {
         return null;
     }
     const handlePrimaryDriverChange = (vehicleIndex) => ({ value }) => {
-        dispatchDiscountState({
-            type: StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect,
-            payload: {
-                driverIndex: value,
-                vehicleIndex,
-            },
-        });
+        const driverIndex = Number(value);
+        assignPrimary(driverIndex, vehicleIndex);
+        if (isTwoByTwo && vehicleIndex === 0) {
+            const otherDriverIndex = drivers.findIndex((_, index) => index !== driverIndex);
+            if (otherDriverIndex >= 0) {
+                assignPrimary(otherDriverIndex, 1);
+            }
+        }
     };
     const handleOccDriverChange = (driverIndex) => ({ value }) => {
         dispatchDiscountState({
@@ -223,30 +254,38 @@ const BlockVehLinks = () => {
     };
     // Drivers that are NOT assigned as primary for any vehicle
     const primaryDriverIndices = vehlinks
-        .filter((l) => l.priority === DriverPriorityTypes.Prn)
+        .filter((l) => l.priority === DriverPriorityTypes.Prn && l.driverIndex >= 0)
         .map((l) => l.driverIndex);
     const unassignedDrivers = drivers
         .map((driver, index) => ({ driver, index }))
         .filter(({ index }) => !primaryDriverIndices.includes(index));
-    return (jsxs(Fragment, { children: [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 vehiclesToAsk = isTwoByTwo ? vehicles.slice(0, 1) : vehicles;
+    return (jsxs(Fragment, { children: [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." }), vehiclesToAsk.map((vehicle, vehicleIndex) => {
                 const { year, make, model } = vehicle;
                 const selectedPrimary = vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === DriverPriorityTypes.Prn);
-                const allDriverOptions = drivers
+                const isPrimaryAnswered = selectedPrimary !== undefined && selectedPrimary.driverIndex >= 0;
+                // Show all drivers so the user can freely reselect / re-order primaries.
+                const primaryOptions = drivers
                     .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }));
-                const filteredOptions = allDriverOptions.filter(({ value }) => {
-                    const assignedVehicle = vehlinks.find((l) => l.driverIndex === value && l.priority === DriverPriorityTypes.Prn);
-                    return !assignedVehicle || assignedVehicle.vehicleIndex === vehicleIndex;
-                });
-                const availablePrimaryOptions = filteredOptions.length > 0 ? filteredOptions : allDriverOptions;
-                return (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 (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 isDuplicatePrimary = !isTwoByTwo
+                    && isPrimaryAnswered
+                    && drivers.length >= vehicles.length
+                    && vehlinks.some((l) => l.vehicleIndex !== vehicleIndex
+                        && l.priority === DriverPriorityTypes.Prn
+                        && l.driverIndex === selectedPrimary?.driverIndex);
+                return (jsx(SelectFormBox, { title: `Who is the principal driver of the ${year} ${make} ${model}?`, onChange: handlePrimaryDriverChange(vehicleIndex), options: primaryOptions, defaultValue: isPrimaryAnswered ? selectedPrimary.driverIndex : '', name: `vehlink-${vehicleIndex}`, placeholder: "Select from the list", autoSelectIfValueIsOutOfOptions: false, error: (!isPrimaryAnswered && inValidation) || isDuplicatePrimary, errorMessage: isDuplicatePrimary
+                        ? 'This driver is already the primary driver of another vehicle. Each vehicle should have a different primary driver.'
+                        : '' }, `vehlink-${vehicleIndex}`));
+            }), drivers.length > vehicles.length && vehicles.length > 1
+                && 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,
+                    }));
+                    const isOccAnswered = selectedVehicle !== undefined && selectedVehicle.vehicleIndex >= 0;
+                    return (jsx(SelectFormBox, { title: `Which vehicle does ${driver.firstName} drive the most?`, onChange: handleOccDriverChange(driverIndex), options: vehicleOptions, defaultValue: isOccAnswered ? selectedVehicle.vehicleIndex : '', name: `occ-vehlink-${driverIndex}`, placeholder: "Select from the list", autoSelectIfValueIsOutOfOptions: false, error: !isOccAnswered && inValidation }, `occ-vehlink-${driverIndex}`));
+                })] }));
 };
 
 const BlockNextPageInfo$2 = () => {
@@ -883,7 +922,7 @@ const BlockCarConditionInfo = () => {
             type: StoreFormCarVehicleActionTypes.FormCarDailyDistanceSelect,
             payload: { distanceDaily: value },
         });
-        const yearlyDefault = `${getRecommendedRange(value, primaryUse === VehiclePrimaryUseTypes.Business ? distanceBusiness : 1)}`;
+        const yearlyDefault = `${getRecommendedRange(value, primaryUse === VehiclePrimaryUseTypes.Business ? distanceBusiness : undefined)}`;
         dispatchVehicleState({
             type: StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect,
             payload: { distanceYearly: yearlyDefault },
@@ -906,7 +945,7 @@ const BlockCarConditionInfo = () => {
                     purchaseMonth || '',
                     purchaseYear || '',
                 ], vehicleState.inValidation), error: vehicleState.inValidation, minDate: year ? `${Number(year) - 1}-01-01` : getFormattedDate('', 'yyyy-MM-dd'), maxDate: getFormattedDate('', 'yyyy-MM-dd') }), !(isAlbertaProvince && isTheBig) && (jsx(SwitchButtonBox, { items: carWinterTiresCheck, onChange: handleWinterTiresChange, name: "winterTires", defaultValue: getSelectedOption(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?" })), jsx(SelectFormBox, { options: carKeepPlace, name: "parkingLocation", onChange: handleCarParkingLocationChange, defaultValue: getSelectedOption(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) }), jsx(SwitchButtonBox, { items: carUsagePurpose, onChange: handleCarUsageChange, name: "primaryUse", defaultValue: getSelectedOption(carUsagePurpose, primaryUse) || 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?" }), jsx(SelectFormBox, { options: firstDriveDistanceList, name: "distanceDaily", onChange: handleCarDailyDistanceChange, defaultValue: getSelectedOption(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) }), jsx(SelectFormBox, { options: yearlyDriveDistanceList, name: "distanceYearly", onChange: handleCarYearlyDistanceChange, defaultValue: getSelectedOption(yearlyDriveDistanceList, distanceYearly), title: "How many total kilometers are driven each year?", placeholder: "Select", hintMessage: distanceDaily !== undefined ? `Based on your daily driven kilometers, we recommend
-                      ${numberWithCommas(getRecommendedRange(distanceDaily, primaryUse === VehiclePrimaryUseTypes.Business ? distanceBusiness : 1))} for your yearly driven kilometers` : '', autoSelectIfValueIsOutOfOptions: false, error: !distanceYearly && vehicleState.inValidation, errorMessage: getErrorMessage(distanceYearly, vehicleState.inValidation) }), primaryUse === 'business' && (jsx(SelectFormBox, { options: businessUsePercentOptions, name: "businessUsePercent", onChange: handleBusinessUsePercentChange, defaultValue: getSelectedOption(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 && (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: addDaysToDate('', 1), maxDate: addDaysToDate('', 90), isDay: true }))] }));
+                      ${numberWithCommas(getRecommendedRange(distanceDaily, primaryUse === VehiclePrimaryUseTypes.Business ? distanceBusiness : undefined))} for your yearly driven kilometers` : '', autoSelectIfValueIsOutOfOptions: false, error: !distanceYearly && vehicleState.inValidation, errorMessage: getErrorMessage(distanceYearly, vehicleState.inValidation) }), primaryUse === 'business' && (jsx(SelectFormBox, { options: businessUsePercentOptions, name: "businessUsePercent", onChange: handleBusinessUsePercentChange, defaultValue: getSelectedOption(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 && (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: addDaysToDate('', 1), maxDate: addDaysToDate('', 90), isDay: true }))] }));
 };
 
 const VehicleSectionMain = () => {
@@ -918,6 +957,7 @@ const VehicleSectionMain = () => {
 const AccidentBenefitsModal = ({ selectedCoverages, onApply, onCancel, selectAllByDefault = false, }) => {
     const { appConfigState: { appType } } = useStoreAppConfig();
     const isMyChoice = isMyChoiceLike(appType);
+    const isMyChoiceOnly = appType === AppTypes.MyChoice;
     const allValues = accidentBenefitsOptionalOptions.map((o) => o.value);
     const [localSelected, setLocalSelected] = useState(selectedCoverages.length > 0
         ? [...selectedCoverages]
@@ -936,7 +976,7 @@ const AccidentBenefitsModal = ({ selectedCoverages, onApply, onCancel, selectAll
     };
     return (jsx("div", { className: "ab-modal-overlay", onClick: onCancel, children: jsxs("div", { className: "ab-modal", onClick: (e) => e.stopPropagation(), children: [jsxs("div", { className: "ab-modal-header", children: [jsx("h3", { children: "Accident Benefits" }), jsx("p", { className: "ab-modal-subtitle", children: isMyChoice ? 'Standard Coverage + Optional Enhancements' : 'Standard Coverage + Self-Selected Optional Enhancements' }), jsx("p", { className: "ab-modal-body-text", children: isMyChoice
                                 ? 'Maximum coverage with flexibility to remove additional benefits.'
-                                : 'Base coverage with flexibility to select additional benefits' })] }), jsxs("div", { className: "ab-modal-content", children: [jsxs("div", { className: "ab-modal-standard-block ab-modal-standard-block--included", children: [jsxs("div", { className: "ab-modal-standard-included-header", children: [jsx("input", { type: "checkbox", checked: true, disabled: true, readOnly: true, className: "ab-modal-standard-locked-checkbox" }), jsx("h4", { children: isMyChoice ? 'All Coverages Included by Default' : 'Standard Benefits — Included' })] }), !isMyChoice && (jsx("p", { className: "ab-modal-standard-subtitle", children: "Medical, Rehabilitation, and Attendant Care" })), jsx("p", { className: "ab-modal-standard-description", children: isMyChoice ? (jsxs(Fragment, { children: ["Our standard quote automatically includes all optional accident benefits at their minimum coverage limits. We strongly recommend keeping all coverages selected to ensure the most complete protection \u2014 opting out could leave you without critical support when you need it most. For example, deselecting Income Replacement means no weekly payments if an injury prevents you from working, and removing Caregiver Replacement leaves no financial support for dependents in your care.", jsx("br", {}), jsx("br", {}), "Please speak with a broker partner to discuss higher limits or learn more about how each benefit protects you."] })) : ('Covers medical expenses, therapy and personal care for injuries from an accident, including doctor visits and physiotherapy.') })] }), jsxs("div", { className: "ab-modal-optional-block", children: [jsxs("label", { className: "ab-modal-select-all", children: [jsx("input", { type: "checkbox", checked: allSelected, onChange: handleSelectAll }), jsx("span", { children: "Select All Additional Benefits" })] }), jsx("div", { className: "ab-modal-options", children: accidentBenefitsOptionalOptions.map((option) => (jsxs("label", { className: "ab-modal-option", children: [jsx("input", { type: "checkbox", checked: localSelected.includes(option.value), onChange: () => handleToggle(option.value) }), jsxs("div", { className: "ab-modal-option-text", children: [jsx("strong", { children: option.name }), jsx("span", { children: option.description })] })] }, option.value))) }), jsxs("div", { className: "ab-modal-minimum-notice", children: [jsx("strong", { children: "Minimum Limits Apply" }), jsx("p", { children: "All optional benefits selected below will be quoted at their minimum coverage limits. Please speak with your broker if you wish to discuss higher limits." })] })] })] }), jsxs("div", { className: "ab-modal-actions", children: [jsx("button", { type: "button", className: "ab-modal-btn ab-modal-btn-cancel", onClick: onCancel, children: "Cancel" }), jsx("button", { type: "button", className: "ab-modal-btn ab-modal-btn-apply", onClick: () => onApply(localSelected), children: "Apply" })] })] }) }));
+                                : 'Base coverage with flexibility to select additional benefits' })] }), jsxs("div", { className: "ab-modal-content", children: [jsxs("div", { className: "ab-modal-standard-block ab-modal-standard-block--included", children: [jsxs("div", { className: "ab-modal-standard-included-header", children: [jsx("input", { type: "checkbox", checked: true, disabled: true, readOnly: true, className: "ab-modal-standard-locked-checkbox" }), jsx("h4", { children: isMyChoice ? 'All Coverages Included by Default' : 'Standard Benefits — Included' })] }), !isMyChoice && (jsx("p", { className: "ab-modal-standard-subtitle", children: "Medical, Rehabilitation, and Attendant Care" })), jsx("p", { className: "ab-modal-standard-description", children: isMyChoice ? (jsxs(Fragment, { children: ["Our standard quote automatically includes all optional accident benefits at their minimum coverage limits. We strongly recommend keeping all coverages selected to ensure the most complete protection \u2014 opting out could leave you without critical support when you need it most. For example, deselecting Income Replacement means no weekly payments if an injury prevents you from working, and removing Caregiver Replacement leaves no financial support for dependents in your care.", jsx("br", {}), jsx("br", {}), "Please speak with a broker partner to discuss higher limits or learn more about how each benefit protects you."] })) : ('Covers medical expenses, therapy and personal care for injuries from an accident, including doctor visits and physiotherapy.') })] }), jsxs("div", { className: "ab-modal-optional-block", children: [jsxs("label", { className: "ab-modal-select-all", children: [jsx("input", { type: "checkbox", checked: allSelected, onChange: handleSelectAll }), jsx("span", { children: "Select All Additional Benefits" })] }), jsx("div", { className: "ab-modal-options", children: accidentBenefitsOptionalOptions.map((option) => (jsxs("label", { className: "ab-modal-option", children: [jsx("input", { type: "checkbox", checked: localSelected.includes(option.value), onChange: () => handleToggle(option.value) }), jsxs("div", { className: "ab-modal-option-text", children: [jsx("strong", { children: option.name }), jsx("span", { children: option.description })] })] }, option.value))) }), jsxs("div", { className: "ab-modal-minimum-notice", children: [jsx("strong", { children: "Minimum Limits Apply" }), jsx("p", { children: "All optional benefits selected below will be quoted at their minimum coverage limits. Please speak with your broker if you wish to discuss higher limits." })] })] })] }), jsxs("div", { className: "ab-modal-actions", children: [jsx("button", { type: "button", className: "ab-modal-btn ab-modal-btn-cancel", onClick: onCancel, children: "Cancel" }), jsx("button", { type: "button", className: "ab-modal-btn ab-modal-btn-apply", onClick: () => onApply(localSelected), children: isMyChoiceOnly ? 'Ok' : 'Apply' })] })] }) }));
 };
 
 const allAccidentBenefitsCoverageValues = accidentBenefitsOptionalOptions.map((option) => option.value);
@@ -1242,6 +1282,7 @@ const SectionDriverLicence = () => {
     const [driverEducation, setDriverEducation] = useState(false);
     const { configState } = useStoreFormCarConfig();
     const { driverState, dispatchDriverLicenceState } = useStoreFormCarDriverLicence();
+    const { discountState } = useStoreFormCarDiscount();
     const { isAlbertaProvince, isOntarioProvince } = useProvince();
     const mychoiceCls = isMyChoiceLike(appType) ? 'mychoice' : '';
     const isTheBig = appType === AppTypes.TheBig;
@@ -1253,14 +1294,9 @@ const SectionDriverLicence = () => {
     const driverNameDefault = `Driver ${driverState.activeIndex + 1}`;
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
     const defaultMinDate = birthDate && firstLicenceAge ? addYearsToDate(birthDate, +firstLicenceAge) : '';
-    const getOntarioQ1YearMonth = () => {
-        if (licenceType === DriverLicenceTypes.G2)
-            return { year: g2LicenceYear, month: g2LicenceMonth };
-        if (licenceType === DriverLicenceTypes.G)
-            return { year: gLicenceYear, month: gLicenceMonth };
-        return { year: g1LicenceYear, month: g1LicenceMonth };
-    };
-    const { year: ontarioQ1Year, month: ontarioQ1Month } = getOntarioQ1YearMonth();
+    // Ontario Q1 (first-licence date) always lives in the G1 slot, independent of the chosen class.
+    const ontarioQ1Year = g1LicenceYear;
+    const ontarioQ1Month = g1LicenceMonth;
     const ontarioQ1Date = ontarioQ1Year && ontarioQ1Month ? `${ontarioQ1Year}-${ontarioQ1Month}-01` : '';
     const isOnlyG = useOntarioFlow
         ? (!!ontarioQ1Date && checkDateIsSpecial(ontarioQ1Date, configState.minDates.g.specialDate))
@@ -1314,7 +1350,7 @@ const SectionDriverLicence = () => {
         const birthYearNum = parseInt(birthYear || '0', 10);
         if (parseInt(ontarioQ1Year, 10) !== birthYearNum + 16 || ontarioQ1Month !== birthMonth)
             return;
-        const q1SlotForCorrection = licenceType || DriverLicenceTypes.G1;
+        const q1SlotForCorrection = DriverLicenceTypes.G1;
         let correctedMonth = parseInt(birthMonth || '1', 10) + 1;
         let correctedYear = birthYearNum + 16;
         if (correctedMonth > 12) {
@@ -1471,8 +1507,9 @@ const SectionDriverLicence = () => {
     if (useOntarioFlow) {
         // When isOnlyG (before Apr 1994), treat as G Full regardless of what licenceType is in the store
         const firstClass = isOnlyG ? DriverLicenceTypes.G : licenceType;
-        // Q1 date lives in whichever slot the store wrote to (always ${licenceType}LicenceYear/Month).
-        const q1SlotType = licenceType || DriverLicenceTypes.G1;
+        // Q1 (first-licence date) is always stored in the G1 slot, independent of the chosen class,
+        // so switching the class never moves it and the DTC/isOnlyG checks stay consistent.
+        const q1SlotType = DriverLicenceTypes.G1;
         const q1Year = getLicenceYear(q1SlotType);
         const q1Month = getLicenceMonth(q1SlotType);
         const q1Date = toDate(q1Year, q1Month);
@@ -1485,19 +1522,21 @@ const SectionDriverLicence = () => {
         const showGDateAfterG2 = firstClass === 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".
+        // Thresholds per the licensing flow: G1 < 5 years (4y11m = 59 months); G2/G < 3 years (2y11m = 35 months).
+        const policyStart = discountState.policyStart || today;
+        const q1MonthsFromEffective = q1Date ? getDifferenceInMonths(policyStart, q1Date) : Infinity;
+        // G1 branch: ask once, based on the first licence date (< 5 years / 60 months).
         const showDtcG1Only = firstClass === DriverLicenceTypes.G1
             && !!q1Date
-            && getDifferenceInYears('', q1Date) <= 5
-            && !showG2Date;
-        // Branch B: DTC shown as soon as class=G2 and Q1 is within 5 years (before G question)
+            && q1MonthsFromEffective < 60;
+        // Branch B: G2 first class (< 3 years / 36 months).
         const showDtcG2Only = firstClass === DriverLicenceTypes.G2
             && !!q1Date
-            && getDifferenceInYears('', q1Date) <= 5;
-        // Branch C G Full: within 5 years of Q1 (G date)
+            && q1MonthsFromEffective < 36;
+        // Branch C G Full: G first class (< 3 years / 36 months).
         const showDtcGFull = firstClass === DriverLicenceTypes.G
             && !!q1Date
-            && getDifferenceInYears('', q1Date) <= 5;
+            && q1MonthsFromEffective < 36;
         // ── Validation error messages ──
         const q1MinDate = getG1MinDate();
         const q1ChronoError = driverState.inValidation
@@ -1533,7 +1572,7 @@ const SectionDriverLicence = () => {
         };
         const g2MaxDate = getMax60Date(q1Date);
         const gMaxDate = getMax60Date(q1Date);
-        return (jsxs("div", { className: `form-section ${mychoiceCls}`, children: [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 && (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 === DriverLicenceTypes.G1 && (jsxs(Fragment, { children: [showDtcG1Only && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedG2Change, name: "receivedG2", defaultValue: getSelectedOption(yesNoOptions, receivedG2), title: `Did ${driverName} receive a G2 license?` }), showG2Date && (jsx(DateSelectFormBox, { name: "g2LicenceDate", dateNames: ['g2LicenceYear', 'g2LicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G2), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G2), title: `When did ${driverName} receive this G2 license?`, errorMessage: g2Error, error: driverState.inValidation, minDate: g2MinDate, maxDate: g2MaxDate })), showGQuestionAfterG1 && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` })), showGDateAfterG1 && (jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === DriverLicenceTypes.G2 && (jsxs(Fragment, { children: [showDtcG2Only && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` }), showGDateAfterG2 && (jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === DriverLicenceTypes.G && !isOnlyG && showDtcGFull && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), isOnlyG && showDtcGFull && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handlePreviousLicenceChange, name: "previousLicence", defaultValue: getSelectedOption(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 (jsxs("div", { className: `form-section ${mychoiceCls}`, children: [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 && (jsx(SelectFormBox, { options: isOnlyG ? ontarioOnlyGOptions : ontarioFirstClassOptions, name: "firstLicenceClass", onChange: handleLicenceTypeChange, defaultValue: getSelectedOption(isOnlyG ? ontarioOnlyGOptions : ontarioFirstClassOptions, firstClass), title: "What class of license was it?", placeholder: "Select from the list", 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 === DriverLicenceTypes.G1 && (jsxs(Fragment, { children: [showDtcG1Only && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedG2Change, name: "receivedG2", defaultValue: getSelectedOption(yesNoOptions, receivedG2), title: `Did ${driverName} receive a G2 license?` }), showG2Date && (jsx(DateSelectFormBox, { name: "g2LicenceDate", dateNames: ['g2LicenceYear', 'g2LicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G2), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G2), title: `When did ${driverName} receive this G2 license?`, errorMessage: g2Error, error: driverState.inValidation, minDate: g2MinDate, maxDate: g2MaxDate })), showGQuestionAfterG1 && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` })), showGDateAfterG1 && (jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === DriverLicenceTypes.G2 && (jsxs(Fragment, { children: [showDtcG2Only && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleReceivedGChange, name: "receivedG", defaultValue: getSelectedOption(yesNoOptions, receivedG), title: `Did ${driverName} receive a G license?` }), showGDateAfterG2 && (jsx(DateSelectFormBox, { name: "gLicenceDate", dateNames: ['gLicenceYear', 'gLicenceMonth'], onDateChange: handleLicenceDateChange(DriverLicenceTypes.G), defaultValue: getDefaultLicenceDate(DriverLicenceTypes.G), title: `When did ${driverName} receive this G license?`, errorMessage: gError, error: driverState.inValidation, minDate: gMinDate, maxDate: gMaxDate }))] })), firstClass === DriverLicenceTypes.G && !isOnlyG && showDtcGFull && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), isOnlyG && showDtcGFull && (jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleTrainingChange, name: "passedDriverTraining", defaultValue: getSelectedOption(yesNoOptions, passedDriverTraining), title: `Has ${driverName} completed a gov't approved drivers education course within the past 3 years?` })), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handlePreviousLicenceChange, name: "previousLicence", defaultValue: getSelectedOption(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 (jsxs("div", { className: `form-section ${mychoiceCls}`, children: [jsx(InputFormBox, { name: "firstLicenceAge", title: getLicenceAgeTitle(), onChange: handleLicenceAgeChange, type: InputTypes.Number, defaultValue: firstLicenceAge, description: configState.toolTip.licenceAge, hintMessage: birthDate
                     ? `${driverName} was licenced in ${Number(birthYear) + Number(firstLicenceAge)} - ${Number(birthYear) + Number(firstLicenceAge) + 1}`
@@ -1560,17 +1599,17 @@ const SectionDriverInsurancePolicy = () => {
             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: subMonthsFromDate('', 6),
-                name: 'Less than 1 year',
-            });
-            for (let i = 1; i <= yearsInPast; i += 1) {
+            for (let i = yearsInPast; i >= 1; i -= 1) {
                 const pastDate = `${todayDate.getFullYear() - i}-${effectiveMonth}-${effectiveDay}`;
                 options.push({
                     value: pastDate,
                     name: i === 10 ? '10+ Years' : `${i} ${i === 1 ? 'Year' : 'Years'}`,
                 });
             }
+            options.push({
+                value: subMonthsFromDate('', 6),
+                name: 'Less than 1 year',
+            });
         }
         return options;
     };
@@ -1856,19 +1895,34 @@ const SectionDriverCancellation = () => {
                     }), insuranceCancellationList?.length < 3 && (jsx(ButtonBase, { category: CategoryTypes.Filled, onClick: handleAddButtonClick, size: SizeTypes.Medium, color: ColorTypes.Primary, label: "Add another" }))] }))] }));
 };
 
+const SUSPENSION_YEAR_CAP = 6;
+const SuspensionDescription = () => {
+    const listStyle = { margin: 0, paddingLeft: '1.25rem', whiteSpace: 'normal' };
+    return (jsxs("div", { children: ["There are two main types of licence suspensions:", jsx("br", {}), "1. Suspension for Cause (Non-administrative)", jsx("br", {}), "A driver's licence is suspended or cancelled because of:", jsxs("ul", { style: listStyle, children: [jsx("li", { children: "Traffic offences." }), jsx("li", { children: "Criminal Code driving offences." }), jsx("li", { children: "Accumulating too many demerit points." })] }), "2. Administrative Suspension / Cancellation / Lapse", jsx("br", {}), "A driver's licence is suspended, cancelled, or allowed to lapse for reasons not related to driving offences or demerit points, such as:", jsxs("ul", { style: listStyle, children: [jsx("li", { children: "Roadside licence suspensions." }), jsx("li", { children: "Medical conditions." }), jsx("li", { children: "Failure to comply with court-ordered obligations." })] })] }));
+};
 const BlockDriverSuspension = () => {
     const { driverState, dispatchDriverSuspensionState } = useStoreFormCarDriverSuspension();
     const { licenceSuspension, licenceSuspensionList = [] } = driverState.items[driverState.activeIndex];
     const { dispatchDriverBaseState } = useStoreFormCarDriverBase();
     const { discountState } = useStoreFormCarDiscount();
     const { appConfigState: { appType } } = useStoreAppConfig();
+    const { isOntarioProvince } = useProvince();
     const isTheBig = appType === AppTypes.TheBig;
-    const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge }, } = driverState.items[driverState.activeIndex];
+    const { firstName, birthYear, birthMonth, birthDay, licenceInfo: { firstLicenceAge, g1LicenceYear, g1LicenceMonth, }, } = driverState.items[driverState.activeIndex];
     const birthDate = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
-    const earliestLicenceDate = birthDate && firstLicenceAge ? addYearsToDate(birthDate, +firstLicenceAge) : '';
+    // Ontario flow stores the first-licence (Q1) date in the G1 slot; firstLicenceAge is not collected.
+    const ontarioQ1Date = isOntarioProvince && isMyChoiceLike(appType) && g1LicenceYear && g1LicenceMonth
+        ? `${g1LicenceYear}-${g1LicenceMonth}-01`
+        : '';
+    const earliestLicenceDate = ontarioQ1Date
+        || (birthDate && firstLicenceAge ? addYearsToDate(birthDate, +firstLicenceAge) : '');
     const policyStart = discountState.policyStart || getFormattedDate('', 'yyyy-MM-dd');
-    const yearsElapsed = earliestLicenceDate ? Math.min(getDifferenceInYears(policyStart, earliestLicenceDate), 6) : 6;
+    const yearsElapsed = earliestLicenceDate
+        ? Math.min(getDifferenceInYears(policyStart, earliestLicenceDate), SUSPENSION_YEAR_CAP)
+        : SUSPENSION_YEAR_CAP;
+    const suspensionLookbackYears = Math.max(yearsElapsed, 1);
     const suspensionYearLabel = yearsElapsed <= 1 ? 'past year' : `past ${yearsElapsed} years`;
+    const suspensionMinFloor = earliestLicenceDate || getMinDate(birthDate, firstLicenceAge);
     const handleSuspensionChange = ({ value }) => {
         dispatchDriverSuspensionState({
             type: StoreFormCarDriverSuspensionActionTypes.FormCarDriverLicenceSuspensionSelect,
@@ -1941,7 +1995,7 @@ const BlockDriverSuspension = () => {
             });
         }
     };
-    return (jsxs("div", { className: "form-block-container", children: [jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Licence Suspensions" }), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleSuspensionChange, name: "licenceSuspension", defaultValue: getSelectedOption(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 && (jsxs(Fragment, { children: [licenceSuspensionList?.map(({ suspensionReason, suspensionYear, suspensionMonth, reinstatementYear, reinstatementMonth, }, index) => {
+    return (jsxs("div", { className: "form-block-container", children: [jsx("h2", { className: isTheBig ? 'thebig-bold' : '', children: "Licence Suspensions" }), jsx(SwitchButtonBox, { items: yesNoOptions, onChange: handleSuspensionChange, name: "licenceSuspension", defaultValue: getSelectedOption(yesNoOptions, licenceSuspension), title: `Has ${firstName} had a licence suspension within the ${suspensionYearLabel}?`, description: jsx(SuspensionDescription, {}) }), licenceSuspension && (jsxs(Fragment, { children: [licenceSuspensionList?.map(({ suspensionReason, suspensionYear, suspensionMonth, reinstatementYear, reinstatementMonth, }, index) => {
                         const defaultSuspensionDate = {
                             year: suspensionYear,
                             month: suspensionMonth,
@@ -1953,7 +2007,7 @@ const BlockDriverSuspension = () => {
                         const now = getFormattedDate('', 'yyyy-MM-dd');
                         const days = birthDay ? (+birthDay + 1) : 1;
                         const endDate = reinstatementYear && reinstatementMonth ? addDayToDate(`${reinstatementYear}-${reinstatementMonth}`, days) : now;
-                        const currentMinDate = getMinDateByYears(getMinDate(birthDate, firstLicenceAge), 6);
+                        const currentMinDate = getMinDateByYears(suspensionMinFloor, suspensionLookbackYears);
                         const currentEndDate = compareDates(endDate, currentMinDate) < 0 ? currentMinDate : endDate;
                         return (jsxs("div", { className: "list-block", children: [jsx("hr", {}), jsxs("div", { className: "list-item", children: [jsx(SelectFormBox, { options: 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) }), 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 }), 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
                                                 ? addDayToDate(`${suspensionYear}-${suspensionMonth}`, days) : currentMinDate })] })] }, `suspension-${index}`));
@@ -2037,17 +2091,16 @@ const BlockDriverAccident = () => {
 };
 
 /**
- * Filter out G1/G2 options (ALC, RB) from the "Criminal" section for trafficTicketsGroupOptions
+ * Filter out G1/G2 options from "Serious" section for trafficTicketsGroupOptions
  */
 const getTrafficTicketsGroupOptionsWithoutG1G2 = () => {
     const excludeOptions = ['ALC', 'RB'];
-    return trafficTicketsGroupOptions.map((group) => {
-        if (group.label !== 'Criminal')
-            return group;
-        return {
-            ...group,
-            options: group.options.filter((option) => !excludeOptions.includes(option.value)),
-        };
+    const seriousOptions = trafficTicketsGroupOptions.find((entry) => entry.label === 'Serious');
+    const filteredSeriousOptions = seriousOptions.options.filter((option) => !excludeOptions.includes(option.value));
+    return trafficTicketsGroupOptions.map((option) => {
+        if (option.label === 'Serious')
+            return { ...option, options: filteredSeriousOptions };
+        return option;
     });
 };
 
@@ -4399,7 +4452,9 @@ const NavigationBottom = ({ createItem, validateForm, formSteps, className, item
         setSteps(filteredSteps);
     }, [isCompleted]);
     const onForwardClick = () => {
-        const isValid = !formIsValid ? validateForm && validateForm() : formIsValid;
+        // Always re-run validation so newly shown required fields (e.g. G2 Yes/No) cannot be skipped
+        // after an earlier successful validate left formIsValid=true.
+        const isValid = validateForm ? validateForm() : !!formIsValid;
         if (activeIndex < steps.length && isValid) {
             navigate(`/${appConfigState.localIndex}/${appConfigState.insuranceType}${steps[activeIndex + 1].path}`);
         }
@@ -4433,7 +4488,9 @@ const NavigationBottomTheBig = ({ createItem, validateForm, formSteps, className
         setSteps(filteredSteps);
     }, [isCompleted]);
     const onForwardClick = () => {
-        const isValid = !formIsValid ? validateForm && validateForm() : formIsValid;
+        // Always re-run validation so newly shown required fields cannot be skipped after
+        // an earlier successful validate left formIsValid=true.
+        const isValid = validateForm ? validateForm() : !!formIsValid;
         if (activeIndex < steps.length && isValid) {
             navigate(`/${appConfigState.localIndex}/${appConfigState.insuranceType}${steps[activeIndex + 1].path}`);
         }