@mychoice/mychoice-sdk-store 2.2.23 → 2.2.25

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, defaultBrokerPhone, DriverPriorityTypes, 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';
@@ -465,7 +465,7 @@ const vehicleItemInitialState = {
     winterTires: true,
     parkingLocation: 'garage',
     primaryUse: VehiclePrimaryUseTypes.Personal,
-    distanceDaily: 0,
+    distanceDaily: undefined,
     distanceBusiness: 0,
     distanceYearly: 0,
     comprehensive: { ...vehicleComprehensiveInitialState },
@@ -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 = {}));
@@ -900,6 +910,10 @@ const driverItemInitialState = {
     listedMonth: '',
     insured: true,
     insuredDate: '',
+    notCurrentlyInsured: false,
+    lastPolicyEndYear: '',
+    lastPolicyEndMonth: '',
+    lastPolicyCancelReason: '',
     insuranceCancellation: false,
     insuranceCancellationList: [{ ...driverCancellationItemInitialState }],
     licenceSuspension: false,
@@ -1060,37 +1074,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 +1353,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 +1380,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 +1478,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;
     }
@@ -1850,6 +1873,7 @@ const discountQuoterInfoInitialState = {
     firstName: '',
     lastName: '',
     phone: '',
+    phoneStatus: ValidationStatusTypes.Initial,
     recalculate: false,
     utmSource: '',
     utmCampaign: '',
@@ -1880,6 +1904,7 @@ const formCarDiscountStateInitialState = {
             priority: DriverPriorityTypes.Prn,
             vehicleIndex: 0,
         }],
+    occVehlinks: [],
     inValidation: false,
     isValid: false,
 };
@@ -1897,10 +1922,12 @@ var StoreFormCarDiscountActionTypes;
     StoreFormCarDiscountActionTypes["FormCarDiscountQuoterFirstNameSet"] = "FormCarDiscountQuoterFirstNameSet";
     StoreFormCarDiscountActionTypes["FormCarDiscountQuoterLastNameSet"] = "FormCarDiscountQuoterLastNameSet";
     StoreFormCarDiscountActionTypes["FormCarDiscountQuoterPhoneSet"] = "FormCarDiscountQuoterPhoneSet";
+    StoreFormCarDiscountActionTypes["FormCarDiscountQuoterPhoneStatusSet"] = "FormCarDiscountQuoterPhoneStatusSet";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkAdd"] = "FormCarDiscountVehlinkAdd";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkSelect"] = "FormCarDiscountVehlinkSelect";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkByVehicleDelete"] = "FormCarDiscountVehlinkByVehicleDelete";
     StoreFormCarDiscountActionTypes["FormCarDiscountVehlinkByDriverDelete"] = "FormCarDiscountVehlinkByDriverDelete";
+    StoreFormCarDiscountActionTypes["FormCarDiscountOccVehlinkSelect"] = "FormCarDiscountOccVehlinkSelect";
     StoreFormCarDiscountActionTypes["FormCarDiscountQuoterEmailStatusSet"] = "FormCarDiscountQuoterEmailStatusSet";
     StoreFormCarDiscountActionTypes["FormCarDiscountValidate"] = "FormCarDiscountValidate";
     StoreFormCarDiscountActionTypes["FormCarDiscountValidateSet"] = "FormCarDiscountValidateSet";
@@ -2018,6 +2045,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:
@@ -2038,6 +2073,10 @@ const formCarDiscountStateReducer = (state = { ...formCarDiscountStateInitialSta
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'lastName', action.payload.lastName));
         case StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneSet:
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'phone', action.payload.phone));
+        case StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet: {
+            const phoneState = setDiscountQuoterProperty(state, 'phone', action.payload.phone);
+            return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(phoneState, 'phoneStatus', action.payload.phoneStatus));
+        }
         case StoreFormCarDiscountActionTypes.FormCarDiscountQuoterUtmSourceSet:
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'utmSource', action.payload.utmSource));
         case StoreFormCarDiscountActionTypes.FormCarDiscountQuoterUtmCampaignSet:
@@ -2852,6 +2891,7 @@ const formHomeDiscountStateInitialState = {
         firstName: '',
         lastName: '',
         phone: '',
+        phoneStatus: ValidationStatusTypes.Initial,
         recalculate: false,
         utmCampaign: '',
         utmSource: '',
@@ -2887,6 +2927,7 @@ var StoreFormHomeDiscountActionTypes;
     StoreFormHomeDiscountActionTypes["FormHomeQuoterFirstNameSet"] = "FormHomeQuoterFirstNameSet";
     StoreFormHomeDiscountActionTypes["FormHomeQuoterLastNameSet"] = "FormHomeQuoterLastNameSet";
     StoreFormHomeDiscountActionTypes["FormHomeQuoterPhoneSet"] = "FormHomeQuoterPhoneSet";
+    StoreFormHomeDiscountActionTypes["FormHomeQuoterPhoneStatusSet"] = "FormHomeQuoterPhoneStatusSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmCampaignSet"] = "FormHomeUtmCampaignSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmSourceSet"] = "FormHomeUtmSourceSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmProducerSet"] = "FormHomeUtmProducerSet";
@@ -2947,6 +2988,11 @@ const formHomeDiscountStateReducer = (state = { ...formHomeDiscountStateInitialS
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'lastName', action.payload.lastName, 'quoterInfo'));
         case StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneSet:
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'phone', action.payload.phone, 'quoterInfo'));
+        case StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet:
+            return setLocalDiscounts(action.localIndex, {
+                ...state,
+                quoterInfo: { ...state.quoterInfo, ...{ phone: action.payload.phone, phoneStatus: action.payload.phoneStatus } },
+            });
         case StoreFormHomeDiscountActionTypes.FormHomeUtmSourceSet:
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'utmSource', action.payload.utmSource, 'quoterInfo'));
         case StoreFormHomeDiscountActionTypes.FormHomeUtmCampaignSet:
@@ -3103,6 +3149,7 @@ const lifeFormApplicantInitialState = {
         firstName: '',
         lastName: '',
         phone: '',
+        phoneStatus: ValidationStatusTypes.Initial,
         recalculate: false,
         utmCampaign: '',
         utmSource: '',
@@ -3138,6 +3185,7 @@ var StoreFormLifeApplicantActionTypes;
     StoreFormLifeApplicantActionTypes["FormLifeQuoterFirstNameSet"] = "FormLifeQuoterFirstNameSet";
     StoreFormLifeApplicantActionTypes["FormLifeQuoterLastNameSet"] = "FormLifeQuoterLastNameSet";
     StoreFormLifeApplicantActionTypes["FormLifeQuoterPhoneSet"] = "FormLifeQuoterPhoneSet";
+    StoreFormLifeApplicantActionTypes["FormLifeQuoterPhoneStatusSet"] = "FormLifeQuoterPhoneStatusSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmCampaignSet"] = "FormLifeUtmCampaignSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmSourceSet"] = "FormLifeUtmSourceSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmProducerSet"] = "FormLifeUtmProducerSet";
@@ -3174,6 +3222,11 @@ const formLifeApplicantStateReducer = (state = { ...lifeFormApplicantInitialStat
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'lastName', action.payload.lastName, 'quoterInfo'));
         case StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneSet:
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'phone', action.payload.phone, 'quoterInfo'));
+        case StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet:
+            return setLocalApplicant(action?.localIndex, {
+                ...state,
+                quoterInfo: { ...state.quoterInfo, ...{ phone: action.payload.phone, phoneStatus: action.payload.phoneStatus } },
+            });
         case StoreFormLifeApplicantActionTypes.FormLifeUtmSourceSet:
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'utmSource', action.payload.utmSource, 'quoterInfo'));
         case StoreFormLifeApplicantActionTypes.FormLifeUtmCampaignSet:
@@ -5051,6 +5104,190 @@ const useHandlerLifeQuoterEmail = () => {
     };
 };
 
+const useHandlerCarQuoterPhone = () => {
+    const [requestState, setRequestState] = useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchDiscountState } = useStoreFormCarDiscount();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchDiscountState({
+            type: StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+            payload: {
+                phone,
+                phoneStatus: ValidationStatusTypes.Loading,
+            },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchDiscountState({
+                        type: StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                        payload: {
+                            phone,
+                            phoneStatus: ValidationStatusTypes.Approved,
+                        },
+                    });
+                }
+                else {
+                    dispatchDiscountState({
+                        type: StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                        payload: {
+                            phone,
+                            phoneStatus: ValidationStatusTypes.Declined,
+                        },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchDiscountState({
+                    type: StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                    payload: {
+                        phone,
+                        phoneStatus: ValidationStatusTypes.Declined,
+                    },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchDiscountState({
+                type: StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                payload: {
+                    phone,
+                    phoneStatus: ValidationStatusTypes.Declined,
+                },
+            });
+            setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'This field may not be blank.' });
+        }
+    };
+    return {
+        status,
+        validatePhone,
+        successMessage,
+        responseData,
+        errorMessage,
+        isFirstRequest,
+        responseError,
+    };
+};
+const useHandlerHomeQuoterPhone = () => {
+    const [requestState, setRequestState] = useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchDiscountState } = useStoreFormHomeDiscount();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchDiscountState({
+            type: StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+            payload: { phone, phoneStatus: ValidationStatusTypes.Loading },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchDiscountState({
+                        type: StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: ValidationStatusTypes.Approved },
+                    });
+                }
+                else {
+                    dispatchDiscountState({
+                        type: StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchDiscountState({
+                    type: StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                    payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchDiscountState({
+                type: StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+            });
+            setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'This field may not be blank.' });
+        }
+    };
+    return {
+        status, validatePhone, successMessage, responseData, errorMessage, isFirstRequest, responseError,
+    };
+};
+const useHandlerLifeQuoterPhone = () => {
+    const [requestState, setRequestState] = useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchApplicantState } = useStoreFormLifeApplicant();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchApplicantState({
+            type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+            payload: { phone, phoneStatus: ValidationStatusTypes.Loading },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchApplicantState({
+                        type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: ValidationStatusTypes.Approved },
+                    });
+                }
+                else {
+                    dispatchApplicantState({
+                        type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchApplicantState({
+                    type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                    payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchApplicantState({
+                type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                payload: { phone, phoneStatus: ValidationStatusTypes.Declined },
+            });
+            setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'This field may not be blank.' });
+        }
+    };
+    return {
+        status, validatePhone, successMessage, responseData, errorMessage, isFirstRequest, responseError,
+    };
+};
+
 const CarQuoteDataHandler = () => {
     const { configState } = useStoreFormCarConfig();
     const { vehicleState } = useStoreFormCarVehicle();
@@ -5148,9 +5385,6 @@ const CarQuoteDataHandler = () => {
             if (driver.applicantRelationship === '') {
                 delete driver.applicantRelationship;
             }
-            if (driver.gender === GenderTypes.Other) {
-                driver.gender = GenderTypes.Male;
-            }
             // ==================================
             // thebig additional properties
             if (appConfigState.appType === AppTypes.TheBig) {
@@ -5202,9 +5436,20 @@ const CarQuoteDataHandler = () => {
                 delete driver.insuredYear;
                 delete driver.insuredDate;
             }
+            // "Not currently insured": build the open-ended lapse incident.
+            // IncidentDate uses the selected month/year with the day defaulted to the 1st (History 1-4).
+            if (driver.notCurrentlyInsured && driver.lastPolicyEndYear && driver.lastPolicyEndMonth) {
+                driver.lastPolicyEndDate = addDayToDate(`${driver.lastPolicyEndYear}-${driver.lastPolicyEndMonth}`, 1);
+            }
+            else {
+                driver.notCurrentlyInsured = false;
+                delete driver.lastPolicyEndDate;
+                delete driver.lastPolicyCancelReason;
+            }
+            delete driver.lastPolicyEndYear;
+            delete driver.lastPolicyEndMonth;
             const defaultMinDate = driver.dateOfBirth && driver.licenceInfo.firstLicenceAge
-                ? addYearsToDate(driver.dateOfBirth, +driver.licenceInfo.firstLicenceAge)
-                : '';
+                ? addYearsToDate(driver.dateOfBirth, +driver.licenceInfo.firstLicenceAge) : '';
             const isOnlyG = compareDates(defaultMinDate, configState.minDates.g.specialDate) < 0;
             // licence
             const deleteLicenceDates = () => {
@@ -5215,8 +5460,73 @@ const CarQuoteDataHandler = () => {
                 delete driver.licenceInfo.g2LicenceYear;
                 delete driver.licenceInfo.g2LicenceMonth;
             };
-            const { g1LicenceMonth, g1LicenceYear, g2LicenceMonth, g2LicenceYear, gLicenceYear, gLicenceMonth } = licenceInfo;
-            if (isOnlyG) {
+            const { g1LicenceMonth, g1LicenceYear, g2LicenceMonth, g2LicenceYear, gLicenceYear, gLicenceMonth, } = licenceInfo;
+            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;
@@ -5246,6 +5556,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;
@@ -5293,27 +5648,68 @@ const CarQuoteDataHandler = () => {
             }
             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 + 1 && 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) {
                 delete vehicle.distanceBusiness;
+                delete vehicle.businessUsePercent;
+            }
+            else if (vehicle.businessUsePercent) {
+                // Send business_use_percent to the API; backend computes distance_business
+                delete vehicle.distanceBusiness;
             }
             if (!vehicle.collision.coverage) {
                 vehicle.collision.deductible = 1000;
@@ -5343,7 +5739,7 @@ const CarQuoteDataHandler = () => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             return transformedVehicle;
         });
-        requestBody.vehlinks = localVehlinks;
+        requestBody.vehlinks = buildVehlinks();
         return {
             ...requestBody,
         };
@@ -5936,6 +6332,7 @@ const useValidationVehicle = () => {
             'distanceDaily',
             'distanceBusiness',
             'distanceYearly',
+            'businessUsePercent',
             'purchaseYear',
             'purchaseMonth',
         ];
@@ -5946,8 +6343,10 @@ const useValidationVehicle = () => {
         });
         vehicleState.items.forEach((item) => {
             Object.keys(item).map((key) => {
-                if (checkableKeys.includes(key) && !item[key]) {
-                    if (!(item.primaryUse === VehiclePrimaryUseTypes.Personal && key === 'distanceBusiness')) {
+                const isEmpty = key === 'distanceDaily' ? item[key] === undefined || item[key] === null : !item[key];
+                if (checkableKeys.includes(key) && isEmpty) {
+                    if (!(key === 'distanceBusiness' && (item.primaryUse === VehiclePrimaryUseTypes.Personal || item.businessUsePercent))
+                        && !(key === 'businessUsePercent' && item.primaryUse !== VehiclePrimaryUseTypes.Business)) {
                         errors.push(key);
                     }
                 }
@@ -6006,6 +6405,7 @@ const useValidationDriver = () => {
     const { discountState } = useStoreFormCarDiscount();
     const { inValidation: driverFormIsInValidation = false, isValid: driverFormIsValid = false, } = driverState;
     const { appConfigState } = useStoreAppConfig();
+    const { appType } = appConfigState;
     const { dispatchAppModalState } = useStoreAppModal();
     const navigate = useNavigate();
     const driverFormValidate = (isRedirect = true) => {
@@ -6020,6 +6420,9 @@ const useValidationDriver = () => {
             'listedYear',
             'listedMonth',
             'insuredDate',
+            'lastPolicyEndYear',
+            'lastPolicyEndMonth',
+            'lastPolicyCancelReason',
             // 'insuredYear',
             // 'insuredMonth',
         ];
@@ -6052,30 +6455,32 @@ const useValidationDriver = () => {
             type: StoreFormCarDriverBaseActionTypes.FormCarDriverValidate,
             payload: { inValidation: true },
         });
-        Object.keys(discountState).forEach((key) => {
-            // checking errors in discountState
-            if (discountKeys.includes(key) && !discountState[key]) {
-                errors.push(key);
+        const showPolicyStart = appType !== AppTypes.TheBig && !isMyChoiceLike(appType);
+        if (showPolicyStart) {
+            Object.keys(discountState).forEach((key) => {
+                // checking errors in discountState
+                if (discountKeys.includes(key) && !discountState[key]) {
+                    errors.push(key);
+                }
+            });
+            const { policyStartYear = 0, policyStartMonth = 0, policyStartDay = 0 } = discountState;
+            const policyDate = `${policyStartYear}-${policyStartMonth}-${policyStartDay}`;
+            const currentDate = getFormattedDate('', 'yyyy-MM-dd');
+            if (compareDates(currentDate, policyDate) >= 0) {
+                errors.push('policyStartYear');
+                errors.push('policyStartMonth');
+                errors.push('policyStartDay');
             }
-        });
-        const { policyStartYear = 0, policyStartMonth = 0, policyStartDay = 0 } = discountState;
-        const policyDate = `${policyStartYear}-${policyStartMonth}-${policyStartDay}`;
-        // const currentDay = new Date().getUTCDate();
-        // const currentMonth = new Date().getUTCMonth();
-        // const currentYear = new Date().getUTCFullYear();
-        const currentDate = getFormattedDate('', 'yyyy-MM-dd');
-        if (compareDates(currentDate, policyDate) >= 0) {
-            errors.push('policyStartYear');
-            errors.push('policyStartMonth');
-            errors.push('policyStartDay');
         }
         driverState.items.forEach((item, index) => {
             Object.keys(item).forEach((key) => {
                 // checking errors in driverState
                 if (keys.includes(key) && !item[key]) {
                     if ((!item.listed
-                        && (key === 'listedYear' || key === 'listedMonth' || key === 'insuredDate'))
+                        && (key === 'listedYear' || key === 'listedMonth' || key === 'insuredDate'
+                            || key === 'lastPolicyEndYear' || key === 'lastPolicyEndMonth' || key === 'lastPolicyCancelReason'))
                         || (!item.insured && item.listed && (key === 'insuredDate'))
+                        || (item.insured && (key === 'lastPolicyEndYear' || key === 'lastPolicyEndMonth' || key === 'lastPolicyCancelReason'))
                         || (index === 0 && key === 'applicantRelationship')) {
                         return;
                     }
@@ -6163,6 +6568,7 @@ const useValidationCarDiscount = () => {
             'phone',
             'email',
             'emailStatus',
+            'phoneStatus',
         ];
         const errors = [];
         dispatchDiscountState({
@@ -6176,11 +6582,14 @@ const useValidationCarDiscount = () => {
                         errors.push(objectKey);
                     }
                 });
-                if (discountState.emailTo.emailStatus !== ValidationStatusTypes.Approved) {
-                    errors.push('email');
-                }
             }
         });
+        if (discountState.emailTo.emailStatus !== ValidationStatusTypes.Approved) {
+            errors.push('email');
+        }
+        if (discountState.quoterInfo.phoneStatus !== ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (!errors.length) {
             dispatchDiscountState({
                 type: StoreFormCarDiscountActionTypes.FormCarDiscountValidate,
@@ -6581,7 +6990,6 @@ const useValidationHomeDiscount = () => {
         const discountKeys = [
             'firstName',
             'lastName',
-            'phone',
         ];
         const errors = [];
         dispatchDiscountState({
@@ -6604,6 +7012,9 @@ const useValidationHomeDiscount = () => {
         if (discountState.emailTo.emailStatus !== ValidationStatusTypes.Approved) {
             errors.push('email');
         }
+        if (quoterInfo?.phoneStatus !== ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (!errors.length) {
             dispatchDiscountState({
                 type: StoreFormHomeDiscountActionTypes.FormHomeDiscountValidate,
@@ -6721,7 +7132,6 @@ const useValidationLifeApplicant = () => {
         const quoterInfoKeys = [
             'firstName',
             'lastName',
-            'phone',
         ];
         const errors = [];
         dispatchApplicantState({
@@ -6736,6 +7146,9 @@ const useValidationLifeApplicant = () => {
         if (applicantState.emailTo.emailStatus !== ValidationStatusTypes.Approved) {
             errors.push('email');
         }
+        if (quoterInfo?.phoneStatus !== ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (quoterInfo) {
             Object.keys(quoterInfo).forEach((key) => {
                 if (quoterInfoKeys.includes(key) && !quoterInfo?.[key]) {
@@ -7480,12 +7893,13 @@ const useAutofillLifeForm = (options) => {
                     },
                 });
             }
-            // Dispatch quoter info - phone
+            // Dispatch quoter info - phone (pre-approved since it comes from a trusted autofill source)
             if (applicantData.quoterInfo.phone) {
                 dispatchApplicantState({
-                    type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneSet,
+                    type: StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
                     payload: {
                         phone: applicantData.quoterInfo.phone,
+                        phoneStatus: ValidationStatusTypes.Approved,
                     },
                 });
             }
@@ -7519,5 +7933,5 @@ const useAutofillLifeForm = (options) => {
     }, [dispatchPostalState, dispatchCoverageState, dispatchApplicantState, dispatchQuoteState, dispatchAppModalState]);
 };
 
-export { CarBrokerTypeEnum, CarQuoteDataHandler, ClearFormDataHandler, HomeBrokerTypeEnum, HomeQuoteDataHandler, LifeQuoteDataHandler, StoreClientActionTypes, StoreConfigAppConfigActionTypes, StoreConfigAppDeviceActionTypes, StoreConfigAppLoaderActionTypes, StoreConfigAppModalActionTypes, StoreFormCarConfigActionTypes, StoreFormCarDiscountActionTypes, StoreFormCarDriverAccidentActionTypes, StoreFormCarDriverBaseActionTypes, StoreFormCarDriverCancellationActionTypes, StoreFormCarDriverInfoActionTypes, StoreFormCarDriverInsuranceActionTypes, StoreFormCarDriverLicenceActionTypes, StoreFormCarDriverSuspensionActionTypes, StoreFormCarDriverTicketActionTypes, StoreFormCarPostalActionTypes, StoreFormCarQuoteActionTypes, StoreFormCarVehicleActionTypes, StoreFormHomeApplicantBaseActionTypes, StoreFormHomeApplicantCancellationActionTypes, StoreFormHomeApplicantClaimActionTypes, StoreFormHomeApplicantInfoActionTypes, StoreFormHomeApplicantInsuranceActionTypes, StoreFormHomeDiscountActionTypes, StoreFormHomeDwellingActionTypes, StoreFormHomePostalActionTypes, StoreFormHomeQuoteActionTypes, StoreFormLifeApplicantActionTypes, StoreFormLifeCoverageActionTypes, StoreFormLifePostalActionTypes, StoreFormLifeQuoteActionTypes, StorePartnerActionTypes, StoreProvider, addDayToDate, configStateReducer, differenceInHoursFromNow, formCarReducer, formCondoDwellingInitialState, formHomeDwellingInitialState, formHomeReducer, formLifeReducer, formTenantDwellingInitialState, getDwellingInitialState, getProvinceCodeFromState, getProvinceName, globalStateReducer, initHttpResponse, mapToConfigState, mapToDriverState, mapToLifeApplicantState, mapToLifeCoverageState, mapToLifePostalState, mapToPostalState, mapToVehicleState, parseAutofillParam, parseLifeAutofillParam, reducers, default_1 as token, useAbReform, useAutofillCarForm, useAutofillLifeForm, useHandlerAuth, useHandlerCarMake, useHandlerCarModel, useHandlerCarQuoterEmail, useHandlerHomeQuoterEmail, useHandlerLifeQuoterEmail, useHandlerPartner, useHandlerPostal, useProvince, useStoreAppConfig, useStoreAppDevice, useStoreAppLoader, useStoreAppModal, useStoreClient, useStoreClientLoggedIn, useStoreClientProfile, useStoreClientToken, useStoreDeviceBP, useStoreDeviceType, useStoreFormCarConfig, useStoreFormCarDiscount, useStoreFormCarDriverAccident, useStoreFormCarDriverBase, useStoreFormCarDriverCancellation, useStoreFormCarDriverInfo, useStoreFormCarDriverInsurance, useStoreFormCarDriverLicence, useStoreFormCarDriverSuspension, useStoreFormCarDriverTicket, useStoreFormCarPostal, useStoreFormCarQuote, useStoreFormCarVehicle, useStoreFormHomeApplicantBase, useStoreFormHomeApplicantCancellation, useStoreFormHomeApplicantClaim, useStoreFormHomeApplicantInfo, useStoreFormHomeApplicantInsurance, useStoreFormHomeDiscount, useStoreFormHomeDwelling, useStoreFormHomePostal, useStoreFormHomeQuote, useStoreFormLifeApplicant, useStoreFormLifeCoverage, useStoreFormLifePostal, useStoreFormLifeQuote, useStorePartner, useValidationAddress, useValidationApplicant, useValidationCarDiscount, useValidationCoverage, useValidationDriver, useValidationDwelling, useValidationHomeDiscount, useValidationLifeApplicant, useValidationVehicle };
+export { CarBrokerTypeEnum, CarQuoteDataHandler, ClearFormDataHandler, HomeBrokerTypeEnum, HomeQuoteDataHandler, LifeQuoteDataHandler, StoreClientActionTypes, StoreConfigAppConfigActionTypes, StoreConfigAppDeviceActionTypes, StoreConfigAppLoaderActionTypes, StoreConfigAppModalActionTypes, StoreFormCarConfigActionTypes, StoreFormCarDiscountActionTypes, StoreFormCarDriverAccidentActionTypes, StoreFormCarDriverBaseActionTypes, StoreFormCarDriverCancellationActionTypes, StoreFormCarDriverInfoActionTypes, StoreFormCarDriverInsuranceActionTypes, StoreFormCarDriverLicenceActionTypes, StoreFormCarDriverSuspensionActionTypes, StoreFormCarDriverTicketActionTypes, StoreFormCarPostalActionTypes, StoreFormCarQuoteActionTypes, StoreFormCarVehicleActionTypes, StoreFormHomeApplicantBaseActionTypes, StoreFormHomeApplicantCancellationActionTypes, StoreFormHomeApplicantClaimActionTypes, StoreFormHomeApplicantInfoActionTypes, StoreFormHomeApplicantInsuranceActionTypes, StoreFormHomeDiscountActionTypes, StoreFormHomeDwellingActionTypes, StoreFormHomePostalActionTypes, StoreFormHomeQuoteActionTypes, StoreFormLifeApplicantActionTypes, StoreFormLifeCoverageActionTypes, StoreFormLifePostalActionTypes, StoreFormLifeQuoteActionTypes, StorePartnerActionTypes, StoreProvider, addDayToDate, configStateReducer, differenceInHoursFromNow, formCarReducer, formCondoDwellingInitialState, formHomeDwellingInitialState, formHomeReducer, formLifeReducer, formTenantDwellingInitialState, getDwellingInitialState, getProvinceCodeFromState, getProvinceName, globalStateReducer, initHttpResponse, mapToConfigState, mapToDriverState, mapToLifeApplicantState, mapToLifeCoverageState, mapToLifePostalState, mapToPostalState, mapToVehicleState, parseAutofillParam, parseLifeAutofillParam, reducers, default_1 as token, useAbReform, useAutofillCarForm, useAutofillLifeForm, useHandlerAuth, useHandlerCarMake, useHandlerCarModel, useHandlerCarQuoterEmail, useHandlerCarQuoterPhone, useHandlerHomeQuoterEmail, useHandlerHomeQuoterPhone, useHandlerLifeQuoterEmail, useHandlerLifeQuoterPhone, useHandlerPartner, useHandlerPostal, useProvince, useStoreAppConfig, useStoreAppDevice, useStoreAppLoader, useStoreAppModal, useStoreClient, useStoreClientLoggedIn, useStoreClientProfile, useStoreClientToken, useStoreDeviceBP, useStoreDeviceType, useStoreFormCarConfig, useStoreFormCarDiscount, useStoreFormCarDriverAccident, useStoreFormCarDriverBase, useStoreFormCarDriverCancellation, useStoreFormCarDriverInfo, useStoreFormCarDriverInsurance, useStoreFormCarDriverLicence, useStoreFormCarDriverSuspension, useStoreFormCarDriverTicket, useStoreFormCarPostal, useStoreFormCarQuote, useStoreFormCarVehicle, useStoreFormHomeApplicantBase, useStoreFormHomeApplicantCancellation, useStoreFormHomeApplicantClaim, useStoreFormHomeApplicantInfo, useStoreFormHomeApplicantInsurance, useStoreFormHomeDiscount, useStoreFormHomeDwelling, useStoreFormHomePostal, useStoreFormHomeQuote, useStoreFormLifeApplicant, useStoreFormLifeCoverage, useStoreFormLifePostal, useStoreFormLifeQuote, useStorePartner, useValidationAddress, useValidationApplicant, useValidationCarDiscount, useValidationCoverage, useValidationDriver, useValidationDwelling, useValidationHomeDiscount, useValidationLifeApplicant, useValidationVehicle };
 //# sourceMappingURL=index.js.map