@mychoice/mychoice-sdk-store 2.2.22 → 2.2.24

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { defaultLocalIndex, HttpRequestHeaderTypes, RequestTypes, ModalTypes, DeviceTypes, ScreenBPTypes, DeviceTypeWidthList, ScreenBPList, AppTypes, InsuranceTypes, VehicleConditionTypes, VehiclePrimaryUseTypes, deepClone, CoverageTypes, getFormattedDate, GenderTypes, OccupationTypes, addDaysToDate, compareDates, DriverLicenceTypes, DateTypes, getLicenceMinDate, addYearsToDate, subMonthsFromDate, getDifferenceInYears, DriverListTypes, addMonthsToDate, ValidationStatusTypes, DriverPriorityTypes, defaultBrokerPhone, subYearsFromDate, ApplicantListTypes, useEffectOnce, getInsuranceType as getInsuranceType$2, API_AUTH, RequestStatusTypes, PROFILE_API, getDaysOfMonth, getDifferenceInHours, MAX_LOCAL_STORAGE_HOURS_THEBIG, MAX_LOCAL_STORAGE_HOURS, API_APP, API_FORM_CAR, supportedProvinceCodes, API_FORM_HOME, API_FORM_LIFE } from '@mychoice/mychoice-sdk-components';
+import { defaultLocalIndex, HttpRequestHeaderTypes, RequestTypes, ModalTypes, DeviceTypes, ScreenBPTypes, DeviceTypeWidthList, ScreenBPList, AppTypes, InsuranceTypes, VehicleConditionTypes, VehiclePrimaryUseTypes, deepClone, CoverageTypes, getFormattedDate, GenderTypes, OccupationTypes, addDaysToDate, compareDates, DriverLicenceTypes, DateTypes, getLicenceMinDate, addYearsToDate, subMonthsFromDate, getDifferenceInYears, DriverListTypes, addMonthsToDate, ValidationStatusTypes, DriverPriorityTypes, defaultBrokerPhone, subYearsFromDate, ApplicantListTypes, useEffectOnce, getInsuranceType as getInsuranceType$2, API_AUTH, RequestStatusTypes, PROFILE_API, getDaysOfMonth, getDifferenceInHours, MAX_LOCAL_STORAGE_HOURS_THEBIG, MAX_LOCAL_STORAGE_HOURS, API_APP, API_FORM_CAR, supportedProvinceCodes, API_FORM_HOME, API_FORM_LIFE, isMyChoiceLike, getDifferenceInMonths } from '@mychoice/mychoice-sdk-components';
 import { useMemo, useReducer, useState, useRef, useEffect } from 'react';
 import { jsx } from 'react/jsx-runtime';
 import { Provider, useSelector, useDispatch } from 'react-redux';
@@ -518,6 +518,7 @@ var StoreFormCarVehicleActionTypes;
     StoreFormCarVehicleActionTypes["FormCarParkingLocationSelect"] = "FormCarParkingLocationSelect";
     StoreFormCarVehicleActionTypes["FormCarDailyDistanceSelect"] = "FormCarDailyDistanceSelect";
     StoreFormCarVehicleActionTypes["FormCarBusinessDistanceSelect"] = "FormCarBusinessDistanceSelect";
+    StoreFormCarVehicleActionTypes["FormCarBusinessUsePercentSelect"] = "FormCarBusinessUsePercentSelect";
     StoreFormCarVehicleActionTypes["FormCarYearlyDistanceSelect"] = "FormCarYearlyDistanceSelect";
     StoreFormCarVehicleActionTypes["FormCarComprehensiveCoverageSelect"] = "FormCarComprehensiveCoverageSelect";
     StoreFormCarVehicleActionTypes["FormCarComprehensiveDeductibleSelect"] = "FormCarComprehensiveDeductibleSelect";
@@ -681,6 +682,8 @@ const formCarVehicleStateReducer = (state = { ...carFormVehicleInitialState }, a
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceDaily', action.payload.distanceDaily));
         case StoreFormCarVehicleActionTypes.FormCarBusinessDistanceSelect:
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceBusiness', action.payload.distanceBusiness));
+        case StoreFormCarVehicleActionTypes.FormCarBusinessUsePercentSelect:
+            return setLocalVehicles(action.localIndex, setItemProperty(state, 'businessUsePercent', action.payload.businessUsePercent));
         case StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect:
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceYearly', action.payload.distanceYearly));
         case StoreFormCarVehicleActionTypes.FormCarComprehensiveCoverageSelect:
@@ -765,6 +768,10 @@ var StoreFormCarDriverInsuranceActionTypes;
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverListedMonthSelect"] = "FormCarDriverListedMonthSelect";
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverInsuredSelect"] = "FormCarDriverInsuredSelect";
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverInsuredDateSelect"] = "FormCarDriverInsuredDateSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverNotCurrentlyInsuredSelect"] = "FormCarDriverNotCurrentlyInsuredSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyEndYearSelect"] = "FormCarDriverLastPolicyEndYearSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyEndMonthSelect"] = "FormCarDriverLastPolicyEndMonthSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyCancelReasonSelect"] = "FormCarDriverLastPolicyCancelReasonSelect";
 })(StoreFormCarDriverInsuranceActionTypes || (StoreFormCarDriverInsuranceActionTypes = {}));
 
 var StoreFormCarDriverLicenceActionTypes;
@@ -779,6 +786,8 @@ var StoreFormCarDriverLicenceActionTypes;
     StoreFormCarDriverLicenceActionTypes["FormCarDriverG1LicenceMaxSelect"] = "FormCarDriverG1LicenceMaxSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverTrainingSelect"] = "FormCarDriverTrainingSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverPreviousLicenceSelect"] = "FormCarDriverPreviousLicenceSelect";
+    StoreFormCarDriverLicenceActionTypes["FormCarDriverReceivedG2Select"] = "FormCarDriverReceivedG2Select";
+    StoreFormCarDriverLicenceActionTypes["FormCarDriverReceivedGSelect"] = "FormCarDriverReceivedGSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverLicenceYearSelect"] = "FormCarDriverLicenceYearSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverLicenceMonthSelect"] = "FormCarDriverLicenceMonthSelect";
 })(StoreFormCarDriverLicenceActionTypes || (StoreFormCarDriverLicenceActionTypes = {}));
@@ -801,6 +810,7 @@ var StoreFormCarDriverTicketActionTypes;
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketReasonSelect"] = "FormCarDriverTrafficTicketReasonSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketYearSelect"] = "FormCarDriverTrafficTicketYearSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketMonthSelect"] = "FormCarDriverTrafficTicketMonthSelect";
+    StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketSpeedSelect"] = "FormCarDriverTrafficTicketSpeedSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketAdd"] = "FormCarDriverTrafficTicketAdd";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketDelete"] = "FormCarDriverTrafficTicketDelete";
 })(StoreFormCarDriverTicketActionTypes || (StoreFormCarDriverTicketActionTypes = {}));
@@ -1060,37 +1070,32 @@ const setDriverLicenceInfoDate = (state, type, payload) => {
     const { licenceType } = newState.items[newState.activeIndex].licenceInfo;
     const { birthDay } = newState.items[newState.activeIndex];
     const currentDate = getFormattedDate('', 'yyyy-MM-dd');
-    if (!(licenceType === DriverLicenceTypes.G && (currentLicenceType === DriverLicenceTypes.G2))) {
-        switch (type) {
-            case DateTypes.Year:
-                newState.items[newState.activeIndex].licenceInfo[`${licenceType}LicenceYear`] = value;
-                break;
-            case DateTypes.Month:
-                newState.items[newState.activeIndex].licenceInfo[`${licenceType}LicenceMonth`] = value;
-                break;
-        }
-        if (licenceType === DriverLicenceTypes.G2) {
-            const { minMaxDates } = newState.items[newState.activeIndex];
-            if (minMaxDates) {
-                minMaxDates.gTwoMax = currentDate;
-            }
-        }
+    // When the picker explicitly targets a different slot (e.g. G1 driver entering G2/G date),
+    // write to that slot rather than the store's current licenceType.
+    const targetSlot = currentLicenceType && currentLicenceType !== licenceType
+        ? currentLicenceType
+        : licenceType;
+    switch (type) {
+        case DateTypes.Year:
+            newState.items[newState.activeIndex].licenceInfo[`${targetSlot}LicenceYear`] = value;
+            break;
+        case DateTypes.Month:
+            newState.items[newState.activeIndex].licenceInfo[`${targetSlot}LicenceMonth`] = value;
+            break;
     }
-    else {
-        switch (type) {
-            case DateTypes.Year:
-                newState.items[newState.activeIndex].licenceInfo.g2LicenceYear = value;
-                break;
-            case DateTypes.Month:
-                newState.items[newState.activeIndex].licenceInfo.g2LicenceMonth = value;
-                break;
+    if (targetSlot === DriverLicenceTypes.G2) {
+        const { minMaxDates } = newState.items[newState.activeIndex];
+        if (minMaxDates) {
+            minMaxDates.gTwoMax = currentDate;
         }
+    }
+    // Non-Ontario G driver entering G2 date: recompute the G min date (existing behaviour).
+    if (licenceType === DriverLicenceTypes.G && targetSlot === DriverLicenceTypes.G2) {
         const { g2LicenceMonth, g2LicenceYear } = newState.items[newState.activeIndex].licenceInfo;
         if (g2LicenceMonth && g2LicenceYear && config) {
             const g2Date = addDaysToDate(`${g2LicenceYear}-${g2LicenceMonth}-01`, birthDay ? +birthDay + 1 : 1);
             const gMinDefaultDate = getLicenceMinDate(licenceType, g2Date, config);
-            const gMinDate = compareDates(gMinDefaultDate, currentDate) > 0
-                ? currentDate : gMinDefaultDate;
+            const gMinDate = compareDates(gMinDefaultDate, currentDate) > 0 ? currentDate : gMinDefaultDate;
             const { minMaxDates } = newState.items[newState.activeIndex];
             if (minMaxDates) {
                 minMaxDates.gMin = gMinDate;
@@ -1344,6 +1349,14 @@ const formCarDriverInsuranceStateReducer = (state = { ...carFormDriverInitialSta
             return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'insured', action.payload.insured));
         case StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredDateSelect:
             return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'insuredDate', action.payload.insuredDate));
+        case StoreFormCarDriverInsuranceActionTypes.FormCarDriverNotCurrentlyInsuredSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'notCurrentlyInsured', action.payload.notCurrentlyInsured));
+        case StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndYearSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyEndYear', action.payload.lastPolicyEndYear));
+        case StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndMonthSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyEndMonth', action.payload.lastPolicyEndMonth));
+        case StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyCancelReasonSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyCancelReason', action.payload.lastPolicyCancelReason));
         default:
             return state;
     }
@@ -1363,6 +1376,10 @@ const formCarDriverLicenceStateReducer = (state = { ...carFormDriverInitialState
             return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'passedDriverTraining', action.payload.training));
         case StoreFormCarDriverLicenceActionTypes.FormCarDriverPreviousLicenceSelect:
             return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'previousLicence', action.payload.previousLicence));
+        case StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedG2Select:
+            return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'receivedG2', action.payload.receivedG2));
+        case StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedGSelect:
+            return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'receivedG', action.payload.receivedG));
         case StoreFormCarDriverLicenceActionTypes.FormCarDriverGLicenceMinSelect:
             return setLocalDrivers(action?.localIndex, setDriverLicenceMinMaxDates(state, 'gMin', action.payload.gMin));
         case StoreFormCarDriverLicenceActionTypes.FormCarDriverG1LicenceMinSelect:
@@ -1457,6 +1474,8 @@ const formCarDriverTicketStateReducer = (state = { ...carFormDriverInitialState
             return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'ticketYear', action.payload.ticketYear));
         case StoreFormCarDriverTicketActionTypes.FormCarDriverTrafficTicketMonthSelect:
             return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'ticketMonth', action.payload.ticketMonth));
+        case StoreFormCarDriverTicketActionTypes.FormCarDriverTrafficTicketSpeedSelect:
+            return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'speed', action.payload.speed));
         default:
             return state;
     }
@@ -1880,6 +1899,7 @@ const formCarDiscountStateInitialState = {
             priority: DriverPriorityTypes.Prn,
             vehicleIndex: 0,
         }],
+    occVehlinks: [],
     inValidation: false,
     isValid: false,
 };
@@ -1901,6 +1921,7 @@ var StoreFormCarDiscountActionTypes;
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkSelect"] = "FormCarDiscountVehlinkSelect";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkByVehicleDelete"] = "FormCarDiscountVehlinkByVehicleDelete";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkByDriverDelete"] = "FormCarDiscountVehlinkByDriverDelete";
+    StoreFormCarDiscountActionTypes["FormCarDiscountOccVehlinkSelect"] = "FormCarDiscountOccVehlinkSelect";
     StoreFormCarDiscountActionTypes["FormCarDiscountQuoterEmailStatusSet"] = "FormCarDiscountQuoterEmailStatusSet";
     StoreFormCarDiscountActionTypes["FormCarDiscountValidate"] = "FormCarDiscountValidate";
     StoreFormCarDiscountActionTypes["FormCarDiscountValidateSet"] = "FormCarDiscountValidateSet";
@@ -2018,6 +2039,14 @@ const formCarDiscountStateReducer = (state = { ...formCarDiscountStateInitialSta
             return setLocalDiscounts$1(action.localIndex, deleteVehlinkByDriver(state, action.payload.driverIndex));
         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 filtered = state.occVehlinks.filter((l) => l.driverIndex !== driverIndex);
+            const updated = vehicleIndex >= 0
+                ? [...filtered, { driverIndex, vehicleIndex }]
+                : filtered;
+            return setLocalDiscounts$1(action.localIndex, { ...state, occVehlinks: updated });
+        }
         case StoreFormCarDiscountActionTypes.FormCarDiscountMultiplePoliciesSelect:
             return setLocalDiscounts$1(action.localIndex, setDiscountStateProperty(state, 'multiplePoliciesDiscount', action.payload.multiplePoliciesDiscount));
         case StoreFormCarDiscountActionTypes.FormCarDiscountCaaMemberSelect:
@@ -5064,7 +5093,7 @@ const CarQuoteDataHandler = () => {
     const navigate = useNavigate();
     const { checkIsExpired, checkIsExpiredWithModal } = ClearFormDataHandler();
     const [requestState, setRequestState] = useReducer(dataHandlerReducer, { ...initialHandlerRequestState });
-    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError } = requestState;
     const { cancelToken } = useCancelToken();
     const openLoader = (loaderDescription = '') => {
         dispatchAppLoaderState({
@@ -5110,11 +5139,12 @@ const CarQuoteDataHandler = () => {
             provinceName: postal.provinceName,
         };
         requestBody.quoterInfo.recalculate = isRecalc;
+        requestBody.quoterInfo.initial = !isRecalc;
         const isAbReformEligible = requestBody.provinceCode === 'ON' && policyStartDate >= '2026-07-01';
         // Flag if any Accident Benefits buy-ups are selected (Ontario only)
         if (isRecalc && isAbReformEligible) {
-            const hasAbChanges = vehicles.some((v) => v.accidentbenefits?.baseCoverage !== 'minimum_required'
-                || v.accidentbenefits?.additionalCoverages?.length > 0);
+            const hasAbChanges = vehicles.some((v) => v.accidentbenefits?.baseCoverage !== 'minimum_required' ||
+                v.accidentbenefits?.additionalCoverages?.length > 0);
             requestBody.quoterInfo.accidentBenefitsChanged = hasAbChanges;
         }
         delete requestBody.isValid;
@@ -5141,15 +5171,12 @@ const CarQuoteDataHandler = () => {
         }
         // driver
         requestBody.drivers = requestBody.drivers.map((driverItem) => {
-            const { birthYear, birthMonth, birthDay = '01', licenceInfo, } = driverItem;
+            const { birthYear, birthMonth, birthDay = '01', licenceInfo } = driverItem;
             const driver = { ...driverItem };
             driver.dateOfBirth = `${birthYear}-${birthMonth}-${birthDay}`;
             if (driver.applicantRelationship === '') {
                 delete driver.applicantRelationship;
             }
-            if (driver.gender === GenderTypes.Other) {
-                driver.gender = GenderTypes.Male;
-            }
             // ==================================
             // thebig additional properties
             if (appConfigState.appType === AppTypes.TheBig) {
@@ -5214,7 +5241,72 @@ const CarQuoteDataHandler = () => {
                 delete driver.licenceInfo.g2LicenceMonth;
             };
             const { g1LicenceMonth, g1LicenceYear, g2LicenceMonth, g2LicenceYear, gLicenceYear, gLicenceMonth, } = licenceInfo;
-            if (isOnlyG) {
+            const isOntarioMyChoiceLicence = requestBody.provinceCode === 'ON' && isMyChoiceLike(appConfigState.appType);
+            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 ontarioQ1DateStr = ontarioQ1Year && ontarioQ1Month
+                    ? `${ontarioQ1Year}-${ontarioQ1Month}-01` : '';
+                const ontarioIsOnlyG = !!ontarioQ1DateStr
+                    && compareDates(configState.minDates.g.specialDate, ontarioQ1DateStr) >= 0;
+                // 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);
+                    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);
+                    if (receivedG2) {
+                        driver.licenceInfo.g2LicenceDate = addDayToDate(`${g2LicenceYear}-${g2LicenceMonth}`, +birthDay + 1);
+                        if (receivedG) {
+                            driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                            driver.licenceInfo.licenceType = DriverLicenceTypes.G;
+                        }
+                        else {
+                            driver.licenceInfo.licenceType = DriverLicenceTypes.G2;
+                        }
+                    }
+                    else if (receivedG) {
+                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.licenceType = DriverLicenceTypes.G;
+                    }
+                    else {
+                        driver.licenceInfo.licenceType = DriverLicenceTypes.G1;
+                    }
+                }
+                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);
+                    if (receivedG) {
+                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.licenceType = DriverLicenceTypes.G;
+                    }
+                    else {
+                        driver.licenceInfo.licenceType = DriverLicenceTypes.G2;
+                    }
+                }
+                deleteLicenceDates();
+            }
+            else if (isOnlyG) {
                 if (driver.licenceInfo.licenceType === DriverLicenceTypes.G) {
                     driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
                     delete driver.licenceInfo.g1LicenceDate;
@@ -5244,6 +5336,51 @@ const CarQuoteDataHandler = () => {
                     deleteLicenceDates();
                 }
             }
+            if (isOntarioMyChoiceLicence) {
+                const { receivedG2, receivedG } = driver.licenceInfo;
+                const g1Date = driver.licenceInfo.g1LicenceDate;
+                const g2Date = driver.licenceInfo.g2LicenceDate;
+                const gDate = driver.licenceInfo.gLicenceDate;
+                const training = !!driver.licenceInfo.passedDriverTraining;
+                const hasG1 = driver.licenceInfo.licenceType === DriverLicenceTypes.G1 || !!g1Date;
+                const hasG2 = !!g2Date || receivedG2;
+                const hasG = !!gDate || receivedG;
+                let outside = false;
+                if (hasG1 && hasG2 && g1Date && g2Date) {
+                    const monthsG1toG2 = getDifferenceInMonths(g2Date, g1Date);
+                    if (!training && monthsG1toG2 < 12)
+                        outside = true;
+                    if (training && monthsG1toG2 < 8)
+                        outside = true;
+                }
+                if (hasG1 && hasG && g1Date && gDate) {
+                    const monthsG1toG = getDifferenceInMonths(gDate, g1Date);
+                    if (!training && monthsG1toG < 24)
+                        outside = true;
+                    if (training && monthsG1toG < 20)
+                        outside = true;
+                }
+                if (hasG2 && hasG && g2Date && gDate) {
+                    const monthsG2toG = getDifferenceInMonths(gDate, g2Date);
+                    if (monthsG2toG < 12)
+                        outside = true;
+                }
+                if (receivedG2 === undefined && !!g2Date)
+                    outside = true;
+                if (hasG1 && hasG && !hasG2)
+                    outside = true;
+                driver.licenceInfo.outsideExp = outside;
+                delete driver.licenceInfo.receivedG2;
+                delete driver.licenceInfo.receivedG;
+                // API only accepts passed_driver_training for G2 licence type
+                if (driver.licenceInfo.licenceType !== DriverLicenceTypes.G2) {
+                    delete driver.licenceInfo.passedDriverTraining;
+                }
+            }
+            else {
+                driver.licenceInfo.outsideExp = !!driver.licenceInfo.previousLicence;
+            }
+            delete driver.licenceInfo.previousLicence;
             delete driver.birthYear;
             delete driver.birthMonth;
             delete driver.birthDay;
@@ -5287,29 +5424,67 @@ const CarQuoteDataHandler = () => {
                 driver.ticketList = driver.ticketList?.map((listItem) => ({
                     reason: listItem.ticketReason,
                     ticketDate: addDayToDate(`${listItem.ticketYear}-${listItem.ticketMonth}`, +birthDay + 1),
+                    ...(listItem.speed !== undefined ? { speed: listItem.speed } : {}),
                 }));
             }
             return driver;
         });
-        const localVehlinks = [];
+        // Build a complete set of vehlinks combining primary assignments + occasional assignments
+        const buildVehlinks = () => {
+            const driverCount = requestBody.drivers.length;
+            const vehicleCount = requestBody.vehicles.length;
+            const result = [];
+            for (let vehicleIndex = 0; vehicleIndex < vehicleCount; vehicleIndex++) {
+                const primaryDriverIndex = requestBody.vehlinks[vehicleIndex]?.driverIndex ?? 0;
+                // Primary driver for this vehicle
+                result.push({
+                    driverIndex: Number(primaryDriverIndex + 1),
+                    vehicleIndex: Number(vehicleIndex + 1),
+                    priority: DriverPriorityTypes.Prn,
+                });
+                if (driverCount > 1) {
+                    for (let driverIndex = 0; driverIndex < driverCount; driverIndex++) {
+                        if (driverIndex === primaryDriverIndex)
+                            continue;
+                        if (vehicleCount === 1) {
+                            // f) All non-primary drivers are occasional on the only vehicle
+                            result.push({
+                                driverIndex: Number(driverIndex + 1),
+                                vehicleIndex: Number(vehicleIndex + 1),
+                                priority: DriverPriorityTypes.Occ,
+                            });
+                        }
+                        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 && l.vehicleIndex !== vehicleIndex);
+                            if (isPrimaryElsewhere)
+                                continue;
+                            const occAssignment = discount.occVehlinks?.find((l) => l.driverIndex === driverIndex);
+                            const occVehicleIndex = occAssignment ? occAssignment.vehicleIndex : 0;
+                            if (occVehicleIndex === vehicleIndex) {
+                                result.push({
+                                    driverIndex: Number(driverIndex + 1),
+                                    vehicleIndex: Number(vehicleIndex + 1),
+                                    priority: DriverPriorityTypes.Occ,
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+        };
         // vehicle
-        requestBody.vehicles = requestBody.vehicles.map((vehicleItem, vehicleIndex) => {
+        requestBody.vehicles = requestBody.vehicles.map((vehicleItem) => {
             const vehicle = { ...vehicleItem, ...postalState.item };
             if (!vehicle.redirectURL) {
                 delete vehicle.redirectURL;
             }
-            const vehlink = requestBody.drivers.map((_, driverIndex) => ({
-                driverIndex: Number(driverIndex + 1),
-                vehicleIndex: Number(vehicleIndex + 1),
-                priority: requestBody.vehlinks[vehicleIndex].driverIndex === driverIndex
-                    ? DriverPriorityTypes.Prn : DriverPriorityTypes.Occ,
-            }));
-            localVehlinks.push(...vehlink);
             vehicle.purchaseDate = addDayToDate(`${vehicle.purchaseYear}-${vehicle.purchaseMonth}`);
             delete vehicle.purchaseYear;
             delete vehicle.purchaseMonth;
             delete vehicle.purchaseDay;
-            if (vehicle.primaryUse === VehiclePrimaryUseTypes.Personal) {
+            if (vehicle.primaryUse === VehiclePrimaryUseTypes.Personal || vehicle.businessUsePercent) {
                 delete vehicle.distanceBusiness;
             }
             if (!vehicle.collision.coverage) {
@@ -5330,8 +5505,7 @@ const CarQuoteDataHandler = () => {
             const transformedVehicle = { ...vehiclePayload };
             if (accidentbenefits) {
                 const { baseCoverage, additionalCoverages } = accidentbenefits;
-                if (isAbReformEligible
-                    && (baseCoverage !== 'minimum_required' || additionalCoverages.length > 0)) {
+                if (isAbReformEligible && (baseCoverage !== 'minimum_required' || additionalCoverages.length > 0)) {
                     transformedVehicle.accidentBenefits = {
                         baseCoverage,
                         additionalCoverages,
@@ -5341,7 +5515,7 @@ const CarQuoteDataHandler = () => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             return transformedVehicle;
         });
-        requestBody.vehlinks = localVehlinks;
+        requestBody.vehlinks = buildVehlinks();
         return {
             ...requestBody,
         };
@@ -5486,7 +5660,7 @@ const CarQuoteDataHandler = () => {
         });
         dispatchAppLoaderState({ type: StoreConfigAppLoaderActionTypes.AppLoaderClose });
     };
-    return ({
+    return {
         status,
         successMessage,
         responseData,
@@ -5496,7 +5670,7 @@ const CarQuoteDataHandler = () => {
         postRequestQuoteOnliaUrl,
         postRequestQuote,
         postPerformLeadsAction,
-    });
+    };
 };
 
 const HomeQuoteDataHandler = () => {
@@ -5627,6 +5801,7 @@ const HomeQuoteDataHandler = () => {
             quoterInfo: discount.quoterInfo || {},
         };
         requestBody.quoterInfo.recalculate = isRecalc;
+        requestBody.quoterInfo.initial = !isRecalc;
         if (requestBody.quoterInfo?.utmSource === '') {
             delete requestBody.quoterInfo.utmSource;
         }
@@ -5944,7 +6119,7 @@ const useValidationVehicle = () => {
         vehicleState.items.forEach((item) => {
             Object.keys(item).map((key) => {
                 if (checkableKeys.includes(key) && !item[key]) {
-                    if (!(item.primaryUse === VehiclePrimaryUseTypes.Personal && key === 'distanceBusiness')) {
+                    if (!(key === 'distanceBusiness' && (item.primaryUse === VehiclePrimaryUseTypes.Personal || item.businessUsePercent))) {
                         errors.push(key);
                     }
                 }