@mychoice/mychoice-sdk-store 2.2.26 → 2.2.28

package/dist/esm/index.js

@@ -901,6 +901,8 @@ const driverItemInitialState = {
         gLicenceMonth: '',
         passedDriverTraining: false,
         previousLicence: false,
+        receivedG2: false,
+        receivedG: false,
     },
     minMaxDates: {
         ...driverItemMinMaxDates,
@@ -943,13 +945,267 @@ const carFormDriverInitialState = {
 const localStateName$c = 'car_drivers';
 const getLocalDrivers = (localIndex = '') => {
     const localDrivers = localStorage.getItem(`${localIndex}_${localStateName$c}`) ? JSON.parse(localStorage.getItem(`${localIndex}_${localStateName$c}`) || '') : null;
-    return localDrivers || { ...carFormDriverInitialState };
+    const state = localDrivers || { ...carFormDriverInitialState };
+    // Coerce legacy null Yes/No licence flags back to default No
+    state.items?.forEach((item) => {
+        const info = item.licenceInfo;
+        if (!info)
+            return;
+        ['passedDriverTraining', 'previousLicence', 'receivedG2', 'receivedG'].forEach((key) => {
+            if (info[key] == null)
+                info[key] = false;
+        });
+    });
+    return state;
 };
 const setLocalDrivers = (localIndex, state) => {
     localStorage.setItem(`${localIndex || defaultLocalIndex}_${localStateName$c}`, JSON.stringify(state));
     return state;
 };
 
+const OntarioCode = 'ON';
+const AlbertaCode = 'AB';
+const NovaScotiaCode = 'NS';
+const NewfoundlandCode = 'NF';
+const NewBrunswickCode = 'NB';
+const provinceList = [
+    {
+        name: 'Ontario',
+        code: OntarioCode,
+        toolTip: {
+            // eslint-disable-next-line max-len
+            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
+            // eslint-disable-next-line max-len
+            licenceType: 'The primary driver should disclose their type of driver’s licence on the policy. If you received your licence in Canada before 1994, it should have a ‘G’ classification.',
+        },
+        licenceConfig: {
+            minLicenceAge: 16,
+            title: '',
+            g1: {
+                title: 'G1',
+                name: 'g1',
+                id: 'G1',
+                description: '',
+            },
+            g2: {
+                title: 'G2',
+                name: 'g2',
+                id: 'G2',
+                description: '',
+            },
+            g: {
+                title: 'G',
+                name: 'g',
+                id: 'G',
+                description: '',
+            },
+        },
+        minDates: {
+            g1: {
+                minMonth: 0,
+                defaultMonth: 0, // month plus g one min
+            },
+            g2: {
+                minMonth: 8,
+                defaultMonth: 4, // month plus g2 min
+            },
+            g: {
+                minMonth: 12,
+                defaultMonth: 0,
+                specialDate: '1994-04-01', // special g date, before it you can choose only g licence
+            },
+        },
+    },
+    {
+        name: 'Alberta',
+        code: AlbertaCode,
+        toolTip: {
+            // eslint-disable-next-line max-len
+            licenceAge: 'Please indicate the age at which this driver first received a driver\'s licence of any type in Alberta. If you don\'t remember the age at which the licence was received, please make your best estimate.',
+            // eslint-disable-next-line max-len
+            licenceType: 'A Class 7 licence is a learner’s licence that let’s you drive under the supervision of a licenced driver. A Class 5-GDL licence is a probationary licence that let’s you drive with limited restrictions. This licence is obtained after having a Class 7 licence for 1 year or more. A Class 5 licence is a full licence obtained after holding a Class 5-GDL licence for 2 years and allows you to drive with almost no restrictions. If you have you have driving experience from another country, please select your present Alberta driver’s licence.',
+        },
+        licenceConfig: {
+            title: '',
+            minLicenceAge: 14,
+            g1: {
+                title: 'Class 7',
+                name: 'g1',
+                id: 'G1',
+                description: '',
+            },
+            g2: {
+                title: 'Class 5-GDL',
+                name: 'g2',
+                id: 'G2',
+                description: '',
+            },
+            g: {
+                title: 'Class 5',
+                name: 'g',
+                id: 'G',
+                description: '',
+            },
+        },
+        minDates: {
+            g1: {
+                minMonth: 0,
+                defaultMonth: 0,
+            },
+            g2: {
+                minMonth: 12,
+                defaultMonth: 0,
+            },
+            g: {
+                minMonth: 24,
+                defaultMonth: 0,
+                specialDate: '2004-01-01',
+            },
+        },
+    },
+    {
+        name: 'Nova Scotia',
+        code: NovaScotiaCode,
+        toolTip: {
+            // eslint-disable-next-line max-len
+            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
+            // eslint-disable-next-line max-len
+            licenceType: 'A Class 7 licence is the learner\'s licence you obtain after passing the written test and it allows you to drive with supervision from a licenced driver. A Class 5N licence is a probationary licence obtained after holding a Class 7 licence for at least 1 year (or 9 months with the completion of a driver\'s education course) and after you pass an advanced test on the road. Here you can drive with limited restrictions. A Class 5 licence is a full driving licence obtained after holding a Class 5N licence for 2 years. If you have driving experience from another country, please select your present Nova Scotia driver’s licence.',
+        },
+        licenceConfig: {
+            title: '',
+            minLicenceAge: 16,
+            g1: {
+                title: 'Class 7',
+                name: 'g1',
+                id: 'G1',
+                description: '',
+            },
+            g2: {
+                title: 'Class 5N',
+                name: 'g2',
+                id: 'G2',
+                description: '',
+            },
+            g: {
+                title: 'Class 5',
+                name: 'g',
+                id: 'G',
+                description: '',
+            },
+        },
+        minDates: {
+            g1: {
+                minMonth: 0,
+                defaultMonth: 0,
+            },
+            g2: {
+                minMonth: 9,
+                defaultMonth: 3,
+            },
+            g: {
+                minMonth: 24,
+                defaultMonth: 0,
+                specialDate: '1995-01-01',
+            },
+        },
+    },
+    {
+        name: 'Newfoundland',
+        code: NewfoundlandCode,
+        toolTip: {
+            // eslint-disable-next-line max-len
+            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
+            // eslint-disable-next-line max-len
+            licenceType: 'A Class 5-Level 1 licence is a learner\'s licence obtained after passing a written test and allows you to drive under supervision. A Class 5-Level 2 licence is a probationary licence obtained after holding a Class 5-Level 1 licence for 1 year (or 8 months with the completion of a driver\'s education course) and passing an advanced test on the road. This allows you to drive with some restrictions. A Class 5 licence is a full licence obtained after holding a Class 5-Level 2 licence for 1 year and passing the final test on the road. If you have driving experience from another country, please select your current Newfoundland and Labrador driver’s licence.',
+        },
+        licenceConfig: {
+            title: '',
+            minLicenceAge: 16,
+            g1: {
+                title: 'Class 5-Level 1',
+                name: 'g1',
+                id: 'G1',
+                description: '',
+            },
+            g2: {
+                title: 'Class 5-Level 2',
+                name: 'g2',
+                id: 'G2',
+                description: '',
+            },
+            g: {
+                title: 'Class 5',
+                name: 'g',
+                id: 'G',
+                description: '',
+            },
+        },
+        minDates: {
+            g1: {
+                minMonth: 0,
+                defaultMonth: 0,
+            },
+            g2: {
+                minMonth: 8,
+                defaultMonth: 4,
+            },
+            g: {
+                minMonth: 12,
+                defaultMonth: 0,
+                specialDate: '1999-01-01',
+            },
+        },
+    },
+    {
+        name: 'New Brunswick',
+        code: NewBrunswickCode,
+        toolTip: {
+            // eslint-disable-next-line max-len
+            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
+            // eslint-disable-next-line max-len
+            licenceType: 'A Class 7-Level 1 licence is a learner\'s licence obtained after passing a written test. A Class 7-Level 2 licence is a probationary licence obtained after holding a Class 7-Level 1 licence for 12 months (or 8 months with the completion of a driver\'s education course) and passing an advanced road test. A Class 5 licence is a full licence obtained after holding a Class 7-Level 2 licence for 12 months and passing the final road test. If you do not currently hold any of the licences listed above, but have a licence for another vehicle class, province, or the U.S., please select "Other',
+        },
+        licenceConfig: {
+            title: '',
+            minLicenceAge: 16,
+            g1: {
+                title: 'Class 7 - Level 1',
+                name: 'g1',
+                id: 'G1',
+                description: '',
+            },
+            g2: {
+                title: 'Class 7 - Level 2',
+                name: 'g2',
+                id: 'G2',
+                description: '',
+            },
+            g: {
+                title: 'Class 5',
+                name: 'g',
+                id: 'G',
+                description: '',
+            },
+        },
+        minDates: {
+            g1: {
+                minMonth: 0,
+                defaultMonth: 0,
+            },
+            g2: {
+                minMonth: 8,
+                defaultMonth: 4,
+            },
+            g: {
+                minMonth: 12,
+                defaultMonth: 0,
+                specialDate: '1995-01-01',
+            },
+        },
+    },
+];
+
 const setDriverProperty = (state, name, value) => {
     const newState = deepClone(state);
     if (name !== 'isValid' && name !== 'inValidation') {
@@ -1113,11 +1369,17 @@ const setDriverLicenceType = (state, payload) => {
     const newState = deepClone(state);
     newState.isValid = false;
     newState.items[newState.activeIndex].licenceInfo.licenceType = payload.licenceType;
+    // Reset follow-up Yes/No to default No when the first licence class changes
+    newState.items[newState.activeIndex].licenceInfo.receivedG2 = false;
+    newState.items[newState.activeIndex].licenceInfo.receivedG = false;
     const { minMaxDates } = newState.items[newState.activeIndex];
     const currentDate = getFormattedDate('', 'yyyy-MM-dd');
     if (payload.licenceType === DriverLicenceTypes.G2 && minMaxDates) {
         minMaxDates.gTwoMax = currentDate;
     }
+    if (payload.config.code === OntarioCode) {
+        return newState;
+    }
     const { licenceType, firstLicenceAge } = newState.items[state.activeIndex].licenceInfo;
     const { birthYear, birthMonth, birthDay } = newState.items[state.activeIndex];
     const dateOfBirth = birthYear && birthMonth && birthDay ? `${birthYear}-${birthMonth}-${birthDay}` : '';
@@ -1602,249 +1864,6 @@ var StoreFormCarConfigActionTypes;
     StoreFormCarConfigActionTypes["FormCarConfigClear"] = "FormCarConfigClear";
 })(StoreFormCarConfigActionTypes || (StoreFormCarConfigActionTypes = {}));
 
-const OntarioCode = 'ON';
-const AlbertaCode = 'AB';
-const NovaScotiaCode = 'NS';
-const NewfoundlandCode = 'NF';
-const NewBrunswickCode = 'NB';
-const provinceList = [
-    {
-        name: 'Ontario',
-        code: OntarioCode,
-        toolTip: {
-            // eslint-disable-next-line max-len
-            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
-            // eslint-disable-next-line max-len
-            licenceType: 'The primary driver should disclose their type of driver’s licence on the policy. If you received your licence in Canada before 1994, it should have a ‘G’ classification.',
-        },
-        licenceConfig: {
-            minLicenceAge: 16,
-            title: '',
-            g1: {
-                title: 'G1',
-                name: 'g1',
-                id: 'G1',
-                description: '',
-            },
-            g2: {
-                title: 'G2',
-                name: 'g2',
-                id: 'G2',
-                description: '',
-            },
-            g: {
-                title: 'G',
-                name: 'g',
-                id: 'G',
-                description: '',
-            },
-        },
-        minDates: {
-            g1: {
-                minMonth: 0,
-                defaultMonth: 0, // month plus g one min
-            },
-            g2: {
-                minMonth: 8,
-                defaultMonth: 4, // month plus g2 min
-            },
-            g: {
-                minMonth: 12,
-                defaultMonth: 0,
-                specialDate: '1994-04-01', // special g date, before it you can choose only g licence
-            },
-        },
-    },
-    {
-        name: 'Alberta',
-        code: AlbertaCode,
-        toolTip: {
-            // eslint-disable-next-line max-len
-            licenceAge: 'Please indicate the age at which this driver first received a driver\'s licence of any type in Alberta. If you don\'t remember the age at which the licence was received, please make your best estimate.',
-            // eslint-disable-next-line max-len
-            licenceType: 'A Class 7 licence is a learner’s licence that let’s you drive under the supervision of a licenced driver. A Class 5-GDL licence is a probationary licence that let’s you drive with limited restrictions. This licence is obtained after having a Class 7 licence for 1 year or more. A Class 5 licence is a full licence obtained after holding a Class 5-GDL licence for 2 years and allows you to drive with almost no restrictions. If you have you have driving experience from another country, please select your present Alberta driver’s licence.',
-        },
-        licenceConfig: {
-            title: '',
-            minLicenceAge: 14,
-            g1: {
-                title: 'Class 7',
-                name: 'g1',
-                id: 'G1',
-                description: '',
-            },
-            g2: {
-                title: 'Class 5-GDL',
-                name: 'g2',
-                id: 'G2',
-                description: '',
-            },
-            g: {
-                title: 'Class 5',
-                name: 'g',
-                id: 'G',
-                description: '',
-            },
-        },
-        minDates: {
-            g1: {
-                minMonth: 0,
-                defaultMonth: 0,
-            },
-            g2: {
-                minMonth: 12,
-                defaultMonth: 0,
-            },
-            g: {
-                minMonth: 24,
-                defaultMonth: 0,
-                specialDate: '2004-01-01',
-            },
-        },
-    },
-    {
-        name: 'Nova Scotia',
-        code: NovaScotiaCode,
-        toolTip: {
-            // eslint-disable-next-line max-len
-            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
-            // eslint-disable-next-line max-len
-            licenceType: 'A Class 7 licence is the learner\'s licence you obtain after passing the written test and it allows you to drive with supervision from a licenced driver. A Class 5N licence is a probationary licence obtained after holding a Class 7 licence for at least 1 year (or 9 months with the completion of a driver\'s education course) and after you pass an advanced test on the road. Here you can drive with limited restrictions. A Class 5 licence is a full driving licence obtained after holding a Class 5N licence for 2 years. If you have driving experience from another country, please select your present Nova Scotia driver’s licence.',
-        },
-        licenceConfig: {
-            title: '',
-            minLicenceAge: 16,
-            g1: {
-                title: 'Class 7',
-                name: 'g1',
-                id: 'G1',
-                description: '',
-            },
-            g2: {
-                title: 'Class 5N',
-                name: 'g2',
-                id: 'G2',
-                description: '',
-            },
-            g: {
-                title: 'Class 5',
-                name: 'g',
-                id: 'G',
-                description: '',
-            },
-        },
-        minDates: {
-            g1: {
-                minMonth: 0,
-                defaultMonth: 0,
-            },
-            g2: {
-                minMonth: 9,
-                defaultMonth: 3,
-            },
-            g: {
-                minMonth: 24,
-                defaultMonth: 0,
-                specialDate: '1995-01-01',
-            },
-        },
-    },
-    {
-        name: 'Newfoundland',
-        code: NewfoundlandCode,
-        toolTip: {
-            // eslint-disable-next-line max-len
-            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
-            // eslint-disable-next-line max-len
-            licenceType: 'A Class 5-Level 1 licence is a learner\'s licence obtained after passing a written test and allows you to drive under supervision. A Class 5-Level 2 licence is a probationary licence obtained after holding a Class 5-Level 1 licence for 1 year (or 8 months with the completion of a driver\'s education course) and passing an advanced test on the road. This allows you to drive with some restrictions. A Class 5 licence is a full licence obtained after holding a Class 5-Level 2 licence for 1 year and passing the final test on the road. If you have driving experience from another country, please select your current Newfoundland and Labrador driver’s licence.',
-        },
-        licenceConfig: {
-            title: '',
-            minLicenceAge: 16,
-            g1: {
-                title: 'Class 5-Level 1',
-                name: 'g1',
-                id: 'G1',
-                description: '',
-            },
-            g2: {
-                title: 'Class 5-Level 2',
-                name: 'g2',
-                id: 'G2',
-                description: '',
-            },
-            g: {
-                title: 'Class 5',
-                name: 'g',
-                id: 'G',
-                description: '',
-            },
-        },
-        minDates: {
-            g1: {
-                minMonth: 0,
-                defaultMonth: 0,
-            },
-            g2: {
-                minMonth: 8,
-                defaultMonth: 4,
-            },
-            g: {
-                minMonth: 12,
-                defaultMonth: 0,
-                specialDate: '1999-01-01',
-            },
-        },
-    },
-    {
-        name: 'New Brunswick',
-        code: NewBrunswickCode,
-        toolTip: {
-            // eslint-disable-next-line max-len
-            licenceAge: 'The selection indicates how old the primary driver was when they received their original driver’s licence. It includes motorcycle and commercial licences, too. If you do not remember your age, it is acceptable to provide a best estimate for the purposes of the policy or quote.',
-            // eslint-disable-next-line max-len
-            licenceType: 'A Class 7-Level 1 licence is a learner\'s licence obtained after passing a written test. A Class 7-Level 2 licence is a probationary licence obtained after holding a Class 7-Level 1 licence for 12 months (or 8 months with the completion of a driver\'s education course) and passing an advanced road test. A Class 5 licence is a full licence obtained after holding a Class 7-Level 2 licence for 12 months and passing the final road test. If you do not currently hold any of the licences listed above, but have a licence for another vehicle class, province, or the U.S., please select "Other',
-        },
-        licenceConfig: {
-            title: '',
-            minLicenceAge: 16,
-            g1: {
-                title: 'Class 7 - Level 1',
-                name: 'g1',
-                id: 'G1',
-                description: '',
-            },
-            g2: {
-                title: 'Class 7 - Level 2',
-                name: 'g2',
-                id: 'G2',
-                description: '',
-            },
-            g: {
-                title: 'Class 5',
-                name: 'g',
-                id: 'G',
-                description: '',
-            },
-        },
-        minDates: {
-            g1: {
-                minMonth: 0,
-                defaultMonth: 0,
-            },
-            g2: {
-                minMonth: 8,
-                defaultMonth: 4,
-            },
-            g: {
-                minMonth: 12,
-                defaultMonth: 0,
-                specialDate: '1995-01-01',
-            },
-        },
-    },
-];
-
 const formCarConfigInitialState = {
     ...provinceList[0],
 };
@@ -1900,7 +1919,7 @@ const formCarDiscountStateInitialState = {
     policyStartYear: getFormattedDate(addDaysToDate('', 1), 'yyyy'),
     quoterInfo: { ...discountQuoterInfoInitialState },
     vehlinks: [{
-            driverIndex: 0,
+            driverIndex: -1,
             priority: DriverPriorityTypes.Prn,
             vehicleIndex: 0,
         }],
@@ -1954,6 +1973,10 @@ const deleteVehlinkByVehicle = (state, vehicleIndex) => {
         }
     });
     newState.vehlinks = newVehLinks;
+    // Keep occVehlinks in sync: drop links to the removed vehicle, reindex those after it.
+    newState.occVehlinks = state.occVehlinks
+        .filter((l) => l.vehicleIndex !== vehicleIndex)
+        .map((l) => (l.vehicleIndex > vehicleIndex ? { ...l, vehicleIndex: l.vehicleIndex - 1 } : { ...l }));
     return newState;
 };
 const deleteVehlinkByDriver = (state, driverIndex) => {
@@ -1961,16 +1984,20 @@ const deleteVehlinkByDriver = (state, driverIndex) => {
     newState.vehlinks.map((vehLink) => {
         const currentVehLink = vehLink;
         if (currentVehLink.driverIndex === driverIndex) {
-            currentVehLink.driverIndex = 0;
+            currentVehLink.driverIndex = -1;
         }
         return currentVehLink;
     });
+    // Keep occVehlinks in sync: drop the removed driver, reindex drivers after it.
+    newState.occVehlinks = state.occVehlinks
+        .filter((l) => l.driverIndex !== driverIndex)
+        .map((l) => (l.driverIndex > driverIndex ? { ...l, driverIndex: l.driverIndex - 1 } : { ...l }));
     return newState;
 };
 const addVehlink = (state) => {
     const newState = deepClone(state);
     newState.vehlinks.push({
-        driverIndex: 0,
+        driverIndex: -1,
         priority: DriverPriorityTypes.Prn,
         vehicleIndex: state.vehlinks.length,
     });
@@ -2046,7 +2073,9 @@ const formCarDiscountStateReducer = (state = { ...formCarDiscountStateInitialSta
         case StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect:
             return setLocalDiscounts$1(action.localIndex, selectDriverForVehicle(state, action.payload.driverIndex, action.payload.vehicleIndex));
         case StoreFormCarDiscountActionTypes.FormCarDiscountOccVehlinkSelect: {
-            const { driverIndex, vehicleIndex } = action.payload;
+            const { driverIndex } = action.payload;
+            // vehicleIndex arrives as a string from the select onChange; store it as a number so the
+            const vehicleIndex = Number(action.payload.vehicleIndex);
             const filtered = state.occVehlinks.filter((l) => l.driverIndex !== driverIndex);
             const updated = vehicleIndex >= 0
                 ? [...filtered, { driverIndex, vehicleIndex }]
@@ -5462,23 +5491,13 @@ const CarQuoteDataHandler = () => {
             };
             const { g1LicenceMonth, g1LicenceYear, g2LicenceMonth, g2LicenceYear, gLicenceYear, gLicenceMonth, } = licenceInfo;
             const isOntarioMyChoiceLicence = requestBody.provinceCode === 'ON' && isMyChoiceLike(appConfigState.appType);
+            const originalFirstClass = driver.licenceInfo.licenceType;
             if (isOntarioMyChoiceLicence) {
-                // Ontario new flow: licenceType = first class received (Q2).
-                // receivedG2/receivedG flags determine the full progression.
-                // Q1 date is stored in the slot matching licenceType.
                 const { receivedG2, receivedG } = driver.licenceInfo;
-                const firstClass = driver.licenceInfo.licenceType;
-                // isOnlyG must use the actual Q1 date the user entered, not DOB+firstLicenceAge.
-                // DOB+16 can predate 1994 for older drivers (e.g. born 1966 → 1982), which falsely
-                // triggers the G-Full path even when the user's actual first licence is much later.
-                const getOntarioQ1Slot = () => {
-                    if (firstClass === DriverLicenceTypes.G2)
-                        return { year: g2LicenceYear, month: g2LicenceMonth };
-                    if (firstClass === DriverLicenceTypes.G)
-                        return { year: gLicenceYear, month: gLicenceMonth };
-                    return { year: g1LicenceYear, month: g1LicenceMonth };
-                };
-                const { year: ontarioQ1Year, month: ontarioQ1Month } = getOntarioQ1Slot();
+                const firstClass = originalFirstClass;
+                // Q1 (first-licence date) is always stored in the G1 slot, regardless of the chosen class.
+                const ontarioQ1Year = g1LicenceYear;
+                const ontarioQ1Month = g1LicenceMonth;
                 const ontarioQ1DateStr = ontarioQ1Year && ontarioQ1Month
                     ? `${ontarioQ1Year}-${ontarioQ1Month}-01` : '';
                 const ontarioIsOnlyG = !!ontarioQ1DateStr
@@ -5486,18 +5505,18 @@ const CarQuoteDataHandler = () => {
                 // Determine which dates to send and final licence_type for the API.
                 // The backend always requires g1_licence_date as the first licence date.
                 if (ontarioIsOnlyG || firstClass === DriverLicenceTypes.G) {
-                    // G Full path: Q1 date is in gLicenceYear/Month slot
-                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                    // G Full path: Q1 (first licence) date is in the G1 slot; send it as the G date.
+                    driver.licenceInfo.gLicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     driver.licenceInfo.licenceType = DriverLicenceTypes.G;
                     delete driver.licenceInfo.passedDriverTraining;
                 }
                 else if (firstClass === DriverLicenceTypes.G1) {
                     // G1 path: Q1 date is in g1LicenceYear/Month
-                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     if (receivedG2) {
-                        driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, 1);
                         if (receivedG) {
-                            driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                            driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, 1);
                             driver.licenceInfo.licenceType = DriverLicenceTypes.G;
                         }
                         else {
@@ -5505,7 +5524,7 @@ const CarQuoteDataHandler = () => {
                         }
                     }
                     else if (receivedG) {
-                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, 1);
                         driver.licenceInfo.licenceType = DriverLicenceTypes.G;
                     }
                     else {
@@ -5513,11 +5532,11 @@ const CarQuoteDataHandler = () => {
                     }
                 }
                 else if (firstClass === DriverLicenceTypes.G2) {
-                    // G2 path: Q1 (first licence) date is in g2LicenceYear/Month.
-                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
-                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
+                    // G2 path: Q1 (first licence) date is in the G1 slot and IS the G2 date.
+                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
+                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     if (receivedG) {
-                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, 1);
                         driver.licenceInfo.licenceType = DriverLicenceTypes.G;
                     }
                     else {
@@ -5528,7 +5547,7 @@ const CarQuoteDataHandler = () => {
             }
             else if (isOnlyG) {
                 if (driver.licenceInfo.licenceType === DriverLicenceTypes.G) {
-                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, 1);
                     delete driver.licenceInfo.g1LicenceDate;
                     delete driver.licenceInfo.g2LicenceDate;
                     deleteLicenceDates();
@@ -5537,12 +5556,12 @@ const CarQuoteDataHandler = () => {
             }
             else {
                 if (driver.licenceInfo.licenceType === DriverLicenceTypes.G1) {
-                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     deleteLicenceDates();
                 }
                 if (driver.licenceInfo.licenceType === DriverLicenceTypes.G2) {
-                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
-                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, 1);
+                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     delete driver.licenceInfo.gLicenceDate;
                     deleteLicenceDates();
                 }
@@ -5550,9 +5569,9 @@ const CarQuoteDataHandler = () => {
                     delete driver.licenceInfo.passedDriverTraining;
                 }
                 if (driver.licenceInfo.licenceType === DriverLicenceTypes.G) {
-                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
-                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
-                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, 1);
+                    driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, 1);
+                    driver.licenceInfo.g1LicenceDate = addDayToDate(`${g1LicenceYear}-${g1LicenceMonth}`, 1);
                     deleteLicenceDates();
                 }
             }
@@ -5585,7 +5604,7 @@ const CarQuoteDataHandler = () => {
                     if (monthsG2toG < 12)
                         outside = true;
                 }
-                if (receivedG2 === undefined && !!g2Date)
+                if (originalFirstClass === DriverLicenceTypes.G2)
                     outside = true;
                 if (hasG1 && hasG && !hasG2)
                     outside = true;
@@ -5604,7 +5623,10 @@ const CarQuoteDataHandler = () => {
             delete driver.birthYear;
             delete driver.birthMonth;
             delete driver.birthDay;
-            driver.licenceInfo.licenceType = configState.licenceConfig[driver.licenceInfo.licenceType].id;
+            const licenceConfigEntry = configState.licenceConfig[driver.licenceInfo.licenceType];
+            if (licenceConfigEntry) {
+                driver.licenceInfo.licenceType = licenceConfigEntry.id;
+            }
             if (driver.minMaxDates) {
                 delete driver.minMaxDates;
             }
@@ -5615,8 +5637,8 @@ const CarQuoteDataHandler = () => {
             else {
                 driver.insuranceCancellationList = driver.insuranceCancellationList?.map((listItem) => ({
                     reason: listItem.cancellationReason,
-                    startDate: addDayToDate(`${listItem.startYear}-${listItem.startMonth}`, +birthDay + 1),
-                    endDate: addDayToDate(`${listItem.endYear}-${listItem.endMonth}`, +birthDay + 1),
+                    startDate: addDayToDate(`${listItem.startYear}-${listItem.startMonth}`, 1),
+                    endDate: addDayToDate(`${listItem.endYear}-${listItem.endMonth}`, 1),
                 }));
             }
             if (!driver.licenceSuspension) {
@@ -5625,8 +5647,8 @@ const CarQuoteDataHandler = () => {
             else {
                 driver.licenceSuspensionList = driver.licenceSuspensionList?.map((listItem) => ({
                     reason: listItem.suspensionReason,
-                    reinstatementDate: addDayToDate(`${listItem.reinstatementYear}-${listItem.reinstatementMonth}`, +birthDay + 1),
-                    suspensionDate: addDayToDate(`${listItem.suspensionYear}-${listItem.suspensionMonth}`, +birthDay + 1),
+                    reinstatementDate: addDayToDate(`${listItem.reinstatementYear}-${listItem.reinstatementMonth}`, 1),
+                    suspensionDate: addDayToDate(`${listItem.suspensionYear}-${listItem.suspensionMonth}`, 1),
                 }));
             }
             if (!driver.accident) {
@@ -5634,7 +5656,7 @@ const CarQuoteDataHandler = () => {
             }
             else {
                 driver.accidentList = driver.accidentList?.map((listItem) => ({
-                    accidentDate: addDayToDate(`${listItem.accidentYear}-${listItem.accidentMonth}`, +birthDay + 1),
+                    accidentDate: addDayToDate(`${listItem.accidentYear}-${listItem.accidentMonth}`, 1),
                 }));
             }
             if (!driver.ticket) {
@@ -5643,7 +5665,7 @@ const CarQuoteDataHandler = () => {
             else {
                 driver.ticketList = driver.ticketList?.map((listItem) => ({
                     reason: listItem.ticketReason,
-                    ticketDate: addDayToDate(`${listItem.ticketYear}-${listItem.ticketMonth}`, +birthDay + 1),
+                    ticketDate: addDayToDate(`${listItem.ticketYear}-${listItem.ticketMonth}`, 1),
                 }));
             }
             return driver;
@@ -5654,7 +5676,8 @@ const CarQuoteDataHandler = () => {
             const vehicleCount = requestBody.vehicles.length;
             const result = [];
             for (let vehicleIndex = 0; vehicleIndex < vehicleCount; vehicleIndex++) {
-                const primaryDriverIndex = requestBody.vehlinks[vehicleIndex]?.driverIndex ?? 0;
+                const storedDriverIndex = requestBody.vehlinks[vehicleIndex]?.driverIndex ?? -1;
+                const primaryDriverIndex = driverCount === 1 || storedDriverIndex < 0 ? 0 : storedDriverIndex;
                 // Primary driver for this vehicle
                 result.push({
                     driverIndex: Number(primaryDriverIndex + 1),
@@ -5675,7 +5698,7 @@ const CarQuoteDataHandler = () => {
                         }
                         else {
                             // g-k) Use user-selected vehicle for extra drivers; skip if they are primary on another vehicle
-                            const isPrimaryElsewhere = requestBody.vehlinks.some((l) => l.driverIndex === driverIndex + 1 && l.vehicleIndex !== vehicleIndex);
+                            const isPrimaryElsewhere = requestBody.vehlinks.some((l) => l.driverIndex === driverIndex && l.vehicleIndex !== vehicleIndex);
                             if (isPrimaryElsewhere)
                                 continue;
                             const occAssignment = discount.occVehlinks?.find((l) => l.driverIndex === driverIndex);
@@ -6353,7 +6376,8 @@ const useValidationVehicle = () => {
                 return item;
             });
         });
-        if (isAbReformActive) {
+        // MyChoice does not force AB review; the user can proceed without acknowledging.
+        if (isAbReformActive && appConfigState.appType !== AppTypes.MyChoice) {
             vehicleState.items.forEach((item) => {
                 if (!item.accidentbenefits.abAcknowledged) {
                     errors.push('abAcknowledged');
@@ -6403,6 +6427,7 @@ const useValidationVehicle = () => {
 const useValidationDriver = () => {
     const { driverState, dispatchDriverBaseState } = useStoreFormCarDriverBase();
     const { discountState } = useStoreFormCarDiscount();
+    const { configState } = useStoreFormCarConfig();
     const { inValidation: driverFormIsInValidation = false, isValid: driverFormIsValid = false, } = driverState;
     const { appConfigState } = useStoreAppConfig();
     const { appType } = appConfigState;
@@ -6472,6 +6497,7 @@ const useValidationDriver = () => {
                 errors.push('policyStartDay');
             }
         }
+        const isOntarioMyChoice = configState.code === OntarioCode && isMyChoiceLike(appType);
         driverState.items.forEach((item, index) => {
             Object.keys(item).forEach((key) => {
                 // checking errors in driverState
@@ -6492,7 +6518,15 @@ const useValidationDriver = () => {
                         if (key === 'licenceInfo') {
                             if (licenceInfoKeys.includes(objectKey) && !item[key][objectKey]) {
                                 const { birthDay, birthMonth, birthYear } = item;
-                                if (birthDay && birthMonth && birthYear && item[key].firstLicenceAge) {
+                                if (isOntarioMyChoice) {
+                                    // Ontario first-licence date lives in the G1 slot; firstLicenceAge is unused.
+                                    if (objectKey === 'licenceType'
+                                        || objectKey === 'g1LicenceYear'
+                                        || objectKey === 'g1LicenceMonth') {
+                                        errors.push(objectKey);
+                                    }
+                                }
+                                else if (birthDay && birthMonth && birthYear && item[key].firstLicenceAge) {
                                     errors.push(objectKey);
                                 }
                             }
@@ -6516,6 +6550,27 @@ const useValidationDriver = () => {
                     });
                 }
             });
+            // Ontario MyChoice: validate licence dates when follow-up Yes answers require them.
+            if (isOntarioMyChoice) {
+                const { licenceType, g1LicenceYear, g1LicenceMonth, g2LicenceYear, g2LicenceMonth, gLicenceYear, gLicenceMonth, receivedG2, receivedG, } = item.licenceInfo;
+                const q1Date = g1LicenceYear && g1LicenceMonth ? `${g1LicenceYear}-${g1LicenceMonth}-01` : '';
+                const specialDate = configState.minDates?.g?.specialDate;
+                const isOnlyG = !!q1Date && !!specialDate && compareDates(specialDate, q1Date) >= 0;
+                const firstClass = isOnlyG ? DriverLicenceTypes.G : licenceType;
+                if (firstClass === DriverLicenceTypes.G1 && receivedG2 === true) {
+                    if (!g2LicenceYear)
+                        errors.push('g2LicenceYear');
+                    if (!g2LicenceMonth)
+                        errors.push('g2LicenceMonth');
+                }
+                if ((firstClass === DriverLicenceTypes.G1 || firstClass === DriverLicenceTypes.G2)
+                    && receivedG === true) {
+                    if (!gLicenceYear)
+                        errors.push('gLicenceYear');
+                    if (!gLicenceMonth)
+                        errors.push('gLicenceMonth');
+                }
+            }
         });
         if (!errors.length) {
             dispatchDriverBaseState({
@@ -6556,6 +6611,8 @@ const useValidationDriver = () => {
 
 const useValidationCarDiscount = () => {
     const { discountState, dispatchDiscountState } = useStoreFormCarDiscount();
+    const { vehicleState: { items: vehicles } } = useStoreFormCarVehicle();
+    const { driverState: { items: drivers } } = useStoreFormCarDriverBase();
     const { inValidation = false, isValid = false, } = discountState;
     const { appConfigState } = useStoreAppConfig();
     const { dispatchAppModalState } = useStoreAppModal();
@@ -6590,6 +6647,42 @@ const useValidationCarDiscount = () => {
         if (discountState.quoterInfo.phoneStatus !== ValidationStatusTypes.Approved) {
             errors.push('phone');
         }
+        if (drivers.length > 1) {
+            // One primary-driver question per vehicle must be answered.
+            vehicles.forEach((_vehicle, vehicleIndex) => {
+                const primary = discountState.vehlinks.find((l) => l.vehicleIndex === vehicleIndex);
+                if (!primary || primary.driverIndex < 0) {
+                    errors.push(`vehlink-${vehicleIndex}`);
+                }
+            });
+            // When there are at least as many drivers as vehicles, every vehicle must have a distinct/unique primary.
+            if (drivers.length >= vehicles.length) {
+                const seenDrivers = new Set();
+                vehicles.forEach((_vehicle, vehicleIndex) => {
+                    const primary = discountState.vehlinks.find((l) => l.vehicleIndex === vehicleIndex);
+                    if (primary && primary.driverIndex >= 0) {
+                        if (seenDrivers.has(primary.driverIndex)) {
+                            errors.push(`vehlink-${vehicleIndex}`);
+                        }
+                        seenDrivers.add(primary.driverIndex);
+                    }
+                });
+            }
+            // When drivers outnumber vehicles AND there is more than one vehicle, each unassigned driver must pick a vehicle.
+            if (drivers.length > vehicles.length && vehicles.length > 1) {
+                const primaryDriverIndices = discountState.vehlinks
+                    .filter((l) => l.driverIndex >= 0)
+                    .map((l) => l.driverIndex);
+                drivers.forEach((_driver, driverIndex) => {
+                    if (primaryDriverIndices.includes(driverIndex))
+                        return;
+                    const occ = discountState.occVehlinks.find((l) => l.driverIndex === driverIndex);
+                    if (!occ || occ.vehicleIndex < 0) {
+                        errors.push(`occ-vehlink-${driverIndex}`);
+                    }
+                });
+            }
+        }
         if (!errors.length) {
             dispatchDiscountState({
                 type: StoreFormCarDiscountActionTypes.FormCarDiscountValidate,