@mychoice/mychoice-sdk-modules 2.2.29 → 2.2.31

package/dist/cjs/index.js

@@ -218,40 +218,84 @@ const BlockVehLinks = () => {
     const { vehicleState: { items: vehicles } } = mychoiceSdkStore.useStoreFormCarVehicle();
     const { driverState: { items: drivers } } = mychoiceSdkStore.useStoreFormCarDriverBase();
     const { discountState: { vehlinks, occVehlinks, inValidation }, dispatchDiscountState } = mychoiceSdkStore.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 equalCounts = drivers.length === vehicles.length;
+    const askedVehicleCount = equalCounts ? vehicles.length - 1 : vehicles.length;
     const assignPrimary = (driverIndex, vehicleIndex) => {
         dispatchDiscountState({
             type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect,
             payload: { driverIndex, vehicleIndex },
         });
     };
+    const primaryOf = (vehicleIndex) => vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn)?.driverIndex ?? -1;
+    const getTwoDriverSystemAllocation = () => {
+        if (drivers.length !== 2 || vehicles.length !== 3)
+            return { driverIndex: -1, vehicleIndex: -1 };
+        const firstTwo = [primaryOf(0), primaryOf(1)];
+        if (firstTwo.some((driverIndex) => driverIndex < 0) || new Set(firstTwo).size === drivers.length) {
+            return { driverIndex: -1, vehicleIndex: -1 };
+        }
+        const driverIndex = drivers.findIndex((_driver, index) => !firstTwo.includes(index));
+        return { driverIndex, vehicleIndex: 2 };
+    };
     React.useEffect(() => {
-        if (!isTwoByTwo)
+        if (!equalCounts || drivers.length <= 1)
+            return;
+        const askedDrivers = new Set();
+        for (let vehicleIndex = 0; vehicleIndex < askedVehicleCount; vehicleIndex += 1) {
+            const po = primaryOf(vehicleIndex);
+            if (po < 0)
+                return;
+            askedDrivers.add(po);
+        }
+        if (askedDrivers.size !== askedVehicleCount)
+            return;
+        const remainingDriver = drivers.findIndex((_, driverIndex) => !askedDrivers.has(driverIndex));
+        if (remainingDriver < 0)
             return;
-        const v1 = vehlinks.find((l) => l.vehicleIndex === 0 && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
-        if (!v1 || v1.driverIndex < 0)
+        const lastVehicleIndex = vehicles.length - 1;
+        if (primaryOf(lastVehicleIndex) === remainingDriver)
+            return;
+        assignPrimary(remainingDriver, lastVehicleIndex);
+    }, [equalCounts, askedVehicleCount, vehlinks, drivers, vehicles]);
+    React.useEffect(() => {
+        const { driverIndex, vehicleIndex } = getTwoDriverSystemAllocation();
+        if (driverIndex >= 0 && vehicleIndex >= 0 && primaryOf(vehicleIndex) !== driverIndex) {
+            assignPrimary(driverIndex, vehicleIndex);
+        }
+    }, [vehlinks, drivers, vehicles]);
+    React.useEffect(() => {
+        if (vehicles.length <= drivers.length || drivers.length <= 1)
             return;
-        const otherDriverIndex = drivers.findIndex((_, index) => index !== v1.driverIndex);
-        if (otherDriverIndex < 0)
+        for (let vehicleIndex = 0; vehicleIndex < vehicles.length; vehicleIndex += 1) {
+            if (primaryOf(vehicleIndex) < 0)
+                return;
+        }
+        const usedDrivers = new Set(vehicles.map((_, vehicleIndex) => primaryOf(vehicleIndex)));
+        const unusedDriver = drivers.findIndex((_, driverIndex) => !usedDrivers.has(driverIndex));
+        if (unusedDriver < 0)
             return;
-        const v2 = vehlinks.find((l) => l.vehicleIndex === 1 && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
-        if (v2?.driverIndex === otherDriverIndex)
+        // Target the last vehicle whose PO is a duplicate, so we never strand another driver.
+        const poCounts = new Map();
+        vehicles.forEach((_v, vehicleIndex) => {
+            const po = primaryOf(vehicleIndex);
+            poCounts.set(po, (poCounts.get(po) ?? 0) + 1);
+        });
+        let target = -1;
+        for (let vehicleIndex = vehicles.length - 1; vehicleIndex >= 0; vehicleIndex -= 1) {
+            if ((poCounts.get(primaryOf(vehicleIndex)) ?? 0) > 1) {
+                target = vehicleIndex;
+                break;
+            }
+        }
+        if (target < 0)
             return;
-        assignPrimary(otherDriverIndex, 1);
-    }, [isTwoByTwo, vehlinks, drivers]);
+        assignPrimary(unusedDriver, target);
+    }, [vehlinks, drivers, vehicles]);
     if (drivers.length <= 1) {
         return null;
     }
     const handlePrimaryDriverChange = (vehicleIndex) => ({ value }) => {
-        const driverIndex = Number(value);
-        assignPrimary(driverIndex, vehicleIndex);
-        if (isTwoByTwo && vehicleIndex === 0) {
-            const otherDriverIndex = drivers.findIndex((_, index) => index !== driverIndex);
-            if (otherDriverIndex >= 0) {
-                assignPrimary(otherDriverIndex, 1);
-            }
-        }
+        assignPrimary(value === '' ? -1 : Number(value), vehicleIndex);
     };
     const handleOccDriverChange = (driverIndex) => ({ value }) => {
         dispatchDiscountState({
@@ -269,24 +313,34 @@ const BlockVehLinks = () => {
     const unassignedDrivers = drivers
         .map((driver, index) => ({ driver, index }))
         .filter(({ index }) => !primaryDriverIndices.includes(index));
-    const vehiclesToAsk = isTwoByTwo ? vehicles.slice(0, 1) : vehicles;
+    const vehiclesToAsk = vehicles.slice(0, askedVehicleCount);
+    const { vehicleIndex: systemAllocatedVehicleIndex } = getTwoDriverSystemAllocation();
+    const primaryQuestionsAnswered = vehiclesToAsk.every((_vehicle, vehicleIndex) => vehlinks.some((l) => l.vehicleIndex === vehicleIndex
+        && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
+        && l.driverIndex >= 0));
+    const primaryQuestionsAreUnique = new Set(primaryDriverIndices).size >= vehicles.length;
+    const shouldAskOccasional = drivers.length > vehicles.length
+        && vehicles.length > 1
+        && primaryQuestionsAnswered
+        && primaryQuestionsAreUnique;
     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." }), vehiclesToAsk.map((vehicle, vehicleIndex) => {
+                if (vehicleIndex === systemAllocatedVehicleIndex)
+                    return null;
                 const { year, make, model } = vehicle;
                 const selectedPrimary = vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
                 const isPrimaryAnswered = selectedPrimary !== undefined && selectedPrimary.driverIndex >= 0;
-                // Show all drivers so the user can freely reselect / re-order primaries.
+                const previousPrimaryDriverIndices = new Set(vehlinks
+                    .filter((l) => l.vehicleIndex < vehicleIndex
+                    && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
+                    && l.driverIndex >= 0)
+                    .map((l) => l.driverIndex));
+                const canRepeatPrimary = vehicles.length > drivers.length;
                 const primaryOptions = drivers
-                    .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }));
-                const isDuplicatePrimary = !isTwoByTwo
-                    && isPrimaryAnswered
-                    && drivers.length >= vehicles.length
-                    && vehlinks.some((l) => l.vehicleIndex !== vehicleIndex
-                        && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
-                        && l.driverIndex === selectedPrimary?.driverIndex);
-                return (jsxRuntime.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
+                    .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }))
+                    .filter(({ value }) => canRepeatPrimary
+                    || !previousPrimaryDriverIndices.has(value));
+                return (jsxRuntime.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 }, `vehlink-${vehicleIndex}`));
+            }), shouldAskOccasional
                 && unassignedDrivers.map(({ driver, index: driverIndex }) => {
                     const selectedVehicle = occVehlinks.find((l) => l.driverIndex === driverIndex);
                     const vehicleOptions = vehicles.map((vehicle, vehicleIndex) => ({
@@ -1224,6 +1278,10 @@ const SectionDriverInfo = () => {
         month: birthMonth,
         year: birthYear,
     };
+    const policyEffectiveDate = discountState.policyStartYear && discountState.policyStartMonth
+        && discountState.policyStartDay
+        ? `${discountState.policyStartYear}-${discountState.policyStartMonth}-${discountState.policyStartDay}`
+        : discountState.policyStart;
     React.useEffect(() => {
         if (discountState.quoterInfo.firstName !== driverState.items[0].firstName) {
             dispatchDiscountState({
@@ -1248,19 +1306,19 @@ const SectionDriverInfo = () => {
         if (dateType === mychoiceSdkComponents.DateTypes.Day) {
             dispatchDriverInfoState({
                 type: mychoiceSdkStore.StoreFormCarDriverInfoActionTypes.FormCarDriverBirthDaySelect,
-                payload: { birthDay: value, config: configState },
+                payload: { birthDay: value, config: configState, appType },
             });
         }
         if (dateType === mychoiceSdkComponents.DateTypes.Month) {
             dispatchDriverInfoState({
                 type: mychoiceSdkStore.StoreFormCarDriverInfoActionTypes.FormCarDriverBirthMonthSelect,
-                payload: { birthMonth: value, config: configState },
+                payload: { birthMonth: value, config: configState, appType },
             });
         }
         if (dateType === mychoiceSdkComponents.DateTypes.Year) {
             dispatchDriverInfoState({
                 type: mychoiceSdkStore.StoreFormCarDriverInfoActionTypes.FormCarDriverBirthYearSelect,
-                payload: { birthYear: value, config: configState },
+                payload: { birthYear: value, config: configState, appType },
             });
         }
     };
@@ -1282,11 +1340,13 @@ const SectionDriverInfo = () => {
             payload: { applicantRelationship: value },
         });
     };
-    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) }))] }));
+    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(policyEffectiveDate, 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 ON_MIN_MONTHS_G1_TO_G2 = 8;
+const ON_MIN_MONTHS_G1_TO_G = 20;
 const SectionDriverLicence = () => {
     const { appConfigState: { appType }, } = mychoiceSdkStore.useStoreAppConfig();
     const [driverEducation, setDriverEducation] = React.useState(false);
@@ -1312,7 +1372,11 @@ const SectionDriverLicence = () => {
         ? (!!ontarioQ1Date && mychoiceSdkComponents.checkDateIsSpecial(ontarioQ1Date, configState.minDates.g.specialDate))
         : mychoiceSdkComponents.checkDateIsSpecial(defaultMinDate, configState.minDates.g.specialDate);
     const driverName = firstName || driverNameDefault;
+    const { policyStart, policyStartYear, policyStartMonth, policyStartDay, } = discountState;
     const today = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
+    const policyEffectiveDate = policyStartYear && policyStartMonth && policyStartDay
+        ? `${policyStartYear}-${policyStartMonth}-${policyStartDay}`
+        : policyStart || today;
     const { g, g1, g2, minLicenceAge } = configState.licenceConfig;
     const licenceTypeOptions = [
         { value: g.name, name: g.title },
@@ -1348,36 +1412,6 @@ const SectionDriverLicence = () => {
             }
         }
     }, [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 = 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) {
@@ -1418,11 +1452,11 @@ const SectionDriverLicence = () => {
     });
     // 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);
+    const validateLicenceDate = (year, month, minDate, dateOverride) => {
+        const dateStr = dateOverride || toDate(year, month);
         if (!dateStr)
             return '';
-        if (mychoiceSdkComponents.compareDates(dateStr, today) > 0)
+        if (mychoiceSdkComponents.compareDates(dateStr, policyEffectiveDate) > 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';
@@ -1441,11 +1475,11 @@ const SectionDriverLicence = () => {
         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.
+    // Compute the minimum from DOB + 16 and validate it against the policy effective date.
     const getG1MinDate = () => {
         if (useOntarioFlow && birthDate) {
             const computed = mychoiceSdkComponents.addYearsToDate(birthDate, 16);
-            return mychoiceSdkComponents.compareDates(computed, today) > 0 ? today : computed;
+            return mychoiceSdkComponents.compareDates(computed, policyEffectiveDate) > 0 ? policyEffectiveDate : computed;
         }
         return gOneMin;
     };
@@ -1523,18 +1557,30 @@ const SectionDriverLicence = () => {
         const q1Year = getLicenceYear(q1SlotType);
         const q1Month = getLicenceMonth(q1SlotType);
         const q1Date = toDate(q1Year, q1Month);
+        const g2Date = toDate(g2LicenceYear, g2LicenceMonth);
+        const gDate = toDate(gLicenceYear, gLicenceMonth);
+        // Thresholds per the licensing flow: G1 < 5 years (4y11m = 59 months); G2/G < 3 years (2y11m = 35 months).
+        const q1BirthdayDate = birthDate
+            && q1Year === String(Number(birthYear) + 16)
+            && q1Month === birthMonth
+            ? `${q1Year}-${birthMonth}-${birthDay}`
+            : q1Date;
+        const q1MonthsFromEffective = q1BirthdayDate
+            ? mychoiceSdkComponents.getDifferenceInMonths(policyEffectiveDate, q1BirthdayDate)
+            : Infinity;
+        // A G2 requires at least 8 months after G1; a G requires another 12 months.
+        const canHaveG2 = !!q1Date && q1MonthsFromEffective >= ON_MIN_MONTHS_G1_TO_G2;
+        const canHaveG = !!q1Date && q1MonthsFromEffective >= ON_MIN_MONTHS_G1_TO_G;
         // ── path booleans ──
-        const showG2Date = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1 && receivedG2 === true;
+        const showG2Question = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1 && canHaveG2;
+        const showG2Date = showG2Question && 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
+            && canHaveG
             && (receivedG2 === false || showG2Date);
+        const showGQuestionAfterG2 = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G2 && canHaveG;
         const showGDateAfterG1 = showGQuestionAfterG1 && receivedG === true;
-        const showGDateAfterG2 = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G2 && receivedG === true;
-        const g2Date = toDate(g2LicenceYear, g2LicenceMonth);
-        const gDate = toDate(gLicenceYear, gLicenceMonth);
-        // 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 ? mychoiceSdkComponents.getDifferenceInMonths(policyStart, q1Date) : Infinity;
+        const showGDateAfterG2 = showGQuestionAfterG2 && receivedG === true;
         // G1 branch: ask once, based on the first licence date (< 5 years / 60 months).
         const showDtcG1Only = firstClass === mychoiceSdkComponents.DriverLicenceTypes.G1
             && !!q1Date
@@ -1550,39 +1596,46 @@ const SectionDriverLicence = () => {
         // ── Validation error messages ──
         const q1MinDate = getG1MinDate();
         const q1ChronoError = driverState.inValidation
-            ? validateLicenceDate(q1Year, q1Month, q1MinDate)
+            ? validateLicenceDate(q1Year, q1Month, q1MinDate, q1BirthdayDate)
             : '';
-        const q1FutureError = q1Date && mychoiceSdkComponents.compareDates(q1Date, today) > 0
+        const q1FutureError = q1BirthdayDate && mychoiceSdkComponents.compareDates(q1BirthdayDate, policyEffectiveDate) > 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)
+            ? validateLicenceDate(g2LicenceYear, g2LicenceMonth, q1BirthdayDate)
             : '';
-        const g260MonthError = validate60Months(q1Year, q1Month, g2LicenceYear, g2LicenceMonth);
-        const g2FutureError = g2Date && mychoiceSdkComponents.compareDates(g2Date, today) > 0 ? 'License dates cannot be in the future' : '';
+        const g260MonthError = validate60Months(q1BirthdayDate?.slice(0, 4), q1BirthdayDate?.slice(5, 7), g2LicenceYear, g2LicenceMonth);
+        const g2FutureError = g2Date && mychoiceSdkComponents.compareDates(g2Date, policyEffectiveDate) > 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 gPrecedingDate = showGDateAfterG1 && showG2Date ? g2Date : q1BirthdayDate;
         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 g60MonthError = validate60Months(q1BirthdayDate?.slice(0, 4), q1BirthdayDate?.slice(5, 7), gLicenceYear, gLicenceMonth);
+        const gFutureError = gDate && mychoiceSdkComponents.compareDates(gDate, policyEffectiveDate) > 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;
+        // ── Min dates (capped to the policy effective date so a future policy remains selectable) ──
+        const g2MinRaw = q1BirthdayDate && mychoiceSdkComponents.compareDates(q1BirthdayDate, gTwoMin) > 0 ? q1BirthdayDate : gTwoMin;
+        const g2MinDate = mychoiceSdkComponents.compareDates(g2MinRaw, policyEffectiveDate) > 0 ? policyEffectiveDate : g2MinRaw;
         const gMinRaw = gPrecedingDate && mychoiceSdkComponents.compareDates(gPrecedingDate, gMin) > 0 ? gPrecedingDate : gMin;
-        const gMinDate = mychoiceSdkComponents.compareDates(gMinRaw, today) > 0 ? today : gMinRaw;
+        const gMinDate = mychoiceSdkComponents.compareDates(gMinRaw, policyEffectiveDate) > 0 ? policyEffectiveDate : gMinRaw;
+        const getMonthPickerMinDate = (minDate) => {
+            if (!minDate || mychoiceSdkComponents.getFormattedDate(minDate, 'dd') === '01')
+                return minDate;
+            return mychoiceSdkComponents.addMonthsToDate(minDate, 1);
+        };
+        const g2PickerMinDate = getMonthPickerMinDate(g2MinDate);
+        const gPickerMinDate = getMonthPickerMinDate(gMinDate);
         const getMax60Date = (refDate) => {
             if (!refDate)
-                return today;
+                return policyEffectiveDate;
             const max60 = mychoiceSdkComponents.addMonthsToDate(refDate, ON_MAX_MONTHS_BETWEEN_CLASSES);
-            return mychoiceSdkComponents.compareDates(today, max60) > 0 ? max60 : today;
+            return mychoiceSdkComponents.compareDates(policyEffectiveDate, max60) > 0 ? max60 : policyEffectiveDate;
         };
-        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, 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 === 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 5 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)." })] }));
+        const g2MaxDate = getMax60Date(q1BirthdayDate);
+        const gMaxDate = getMax60Date(q1BirthdayDate);
+        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: policyEffectiveDate, disabled: !birthDate }), q1Date && (jsxRuntime.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 === 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?` })), showG2Question && (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: g2PickerMinDate, 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: gPickerMinDate, 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?` })), showGQuestionAfterG2 && (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: gPickerMinDate, 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
                     ? `${driverName} was licenced in ${Number(birthYear) + Number(firstLicenceAge)} - ${Number(birthYear) + Number(firstLicenceAge) + 1}`
@@ -1770,7 +1823,7 @@ 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);
+    const twentyYearsAgo = mychoiceSdkComponents.subYearsFromDate('', 20);
     let lastPolicyEndMinDate = twentyYearsAgo;
     if (firstInsuredMinDate && mychoiceSdkComponents.compareDates(firstInsuredMinDate, twentyYearsAgo) > 0) {
         lastPolicyEndMinDate = firstInsuredMinDate;