@mychoice/mychoice-sdk-store 2.2.23 → 2.2.25

package/dist/cjs/index.js

@@ -474,7 +474,7 @@ const vehicleItemInitialState = {
     winterTires: true,
     parkingLocation: 'garage',
     primaryUse: mychoiceSdkComponents.VehiclePrimaryUseTypes.Personal,
-    distanceDaily: 0,
+    distanceDaily: undefined,
     distanceBusiness: 0,
     distanceYearly: 0,
     comprehensive: { ...vehicleComprehensiveInitialState },
@@ -527,6 +527,7 @@ exports.StoreFormCarVehicleActionTypes = void 0;
     StoreFormCarVehicleActionTypes["FormCarParkingLocationSelect"] = "FormCarParkingLocationSelect";
     StoreFormCarVehicleActionTypes["FormCarDailyDistanceSelect"] = "FormCarDailyDistanceSelect";
     StoreFormCarVehicleActionTypes["FormCarBusinessDistanceSelect"] = "FormCarBusinessDistanceSelect";
+    StoreFormCarVehicleActionTypes["FormCarBusinessUsePercentSelect"] = "FormCarBusinessUsePercentSelect";
     StoreFormCarVehicleActionTypes["FormCarYearlyDistanceSelect"] = "FormCarYearlyDistanceSelect";
     StoreFormCarVehicleActionTypes["FormCarComprehensiveCoverageSelect"] = "FormCarComprehensiveCoverageSelect";
     StoreFormCarVehicleActionTypes["FormCarComprehensiveDeductibleSelect"] = "FormCarComprehensiveDeductibleSelect";
@@ -690,6 +691,8 @@ const formCarVehicleStateReducer = (state = { ...carFormVehicleInitialState }, a
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceDaily', action.payload.distanceDaily));
         case exports.StoreFormCarVehicleActionTypes.FormCarBusinessDistanceSelect:
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceBusiness', action.payload.distanceBusiness));
+        case exports.StoreFormCarVehicleActionTypes.FormCarBusinessUsePercentSelect:
+            return setLocalVehicles(action.localIndex, setItemProperty(state, 'businessUsePercent', action.payload.businessUsePercent));
         case exports.StoreFormCarVehicleActionTypes.FormCarYearlyDistanceSelect:
             return setLocalVehicles(action.localIndex, setItemProperty(state, 'distanceYearly', action.payload.distanceYearly));
         case exports.StoreFormCarVehicleActionTypes.FormCarComprehensiveCoverageSelect:
@@ -774,6 +777,10 @@ exports.StoreFormCarDriverInsuranceActionTypes = void 0;
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverListedMonthSelect"] = "FormCarDriverListedMonthSelect";
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverInsuredSelect"] = "FormCarDriverInsuredSelect";
     StoreFormCarDriverInsuranceActionTypes["FormCarDriverInsuredDateSelect"] = "FormCarDriverInsuredDateSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverNotCurrentlyInsuredSelect"] = "FormCarDriverNotCurrentlyInsuredSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyEndYearSelect"] = "FormCarDriverLastPolicyEndYearSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyEndMonthSelect"] = "FormCarDriverLastPolicyEndMonthSelect";
+    StoreFormCarDriverInsuranceActionTypes["FormCarDriverLastPolicyCancelReasonSelect"] = "FormCarDriverLastPolicyCancelReasonSelect";
 })(exports.StoreFormCarDriverInsuranceActionTypes || (exports.StoreFormCarDriverInsuranceActionTypes = {}));
 
 exports.StoreFormCarDriverLicenceActionTypes = void 0;
@@ -788,6 +795,8 @@ exports.StoreFormCarDriverLicenceActionTypes = void 0;
     StoreFormCarDriverLicenceActionTypes["FormCarDriverG1LicenceMaxSelect"] = "FormCarDriverG1LicenceMaxSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverTrainingSelect"] = "FormCarDriverTrainingSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverPreviousLicenceSelect"] = "FormCarDriverPreviousLicenceSelect";
+    StoreFormCarDriverLicenceActionTypes["FormCarDriverReceivedG2Select"] = "FormCarDriverReceivedG2Select";
+    StoreFormCarDriverLicenceActionTypes["FormCarDriverReceivedGSelect"] = "FormCarDriverReceivedGSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverLicenceYearSelect"] = "FormCarDriverLicenceYearSelect";
     StoreFormCarDriverLicenceActionTypes["FormCarDriverLicenceMonthSelect"] = "FormCarDriverLicenceMonthSelect";
 })(exports.StoreFormCarDriverLicenceActionTypes || (exports.StoreFormCarDriverLicenceActionTypes = {}));
@@ -810,6 +819,7 @@ exports.StoreFormCarDriverTicketActionTypes = void 0;
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketReasonSelect"] = "FormCarDriverTrafficTicketReasonSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketYearSelect"] = "FormCarDriverTrafficTicketYearSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketMonthSelect"] = "FormCarDriverTrafficTicketMonthSelect";
+    StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketSpeedSelect"] = "FormCarDriverTrafficTicketSpeedSelect";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketAdd"] = "FormCarDriverTrafficTicketAdd";
     StoreFormCarDriverTicketActionTypes["FormCarDriverTrafficTicketDelete"] = "FormCarDriverTrafficTicketDelete";
 })(exports.StoreFormCarDriverTicketActionTypes || (exports.StoreFormCarDriverTicketActionTypes = {}));
@@ -909,6 +919,10 @@ const driverItemInitialState = {
     listedMonth: '',
     insured: true,
     insuredDate: '',
+    notCurrentlyInsured: false,
+    lastPolicyEndYear: '',
+    lastPolicyEndMonth: '',
+    lastPolicyCancelReason: '',
     insuranceCancellation: false,
     insuranceCancellationList: [{ ...driverCancellationItemInitialState }],
     licenceSuspension: false,
@@ -1069,37 +1083,32 @@ const setDriverLicenceInfoDate = (state, type, payload) => {
     const { licenceType } = newState.items[newState.activeIndex].licenceInfo;
     const { birthDay } = newState.items[newState.activeIndex];
     const currentDate = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
-    if (!(licenceType === mychoiceSdkComponents.DriverLicenceTypes.G && (currentLicenceType === mychoiceSdkComponents.DriverLicenceTypes.G2))) {
-        switch (type) {
-            case mychoiceSdkComponents.DateTypes.Year:
-                newState.items[newState.activeIndex].licenceInfo[`${licenceType}LicenceYear`] = value;
-                break;
-            case mychoiceSdkComponents.DateTypes.Month:
-                newState.items[newState.activeIndex].licenceInfo[`${licenceType}LicenceMonth`] = value;
-                break;
-        }
-        if (licenceType === mychoiceSdkComponents.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 mychoiceSdkComponents.DateTypes.Year:
+            newState.items[newState.activeIndex].licenceInfo[`${targetSlot}LicenceYear`] = value;
+            break;
+        case mychoiceSdkComponents.DateTypes.Month:
+            newState.items[newState.activeIndex].licenceInfo[`${targetSlot}LicenceMonth`] = value;
+            break;
     }
-    else {
-        switch (type) {
-            case mychoiceSdkComponents.DateTypes.Year:
-                newState.items[newState.activeIndex].licenceInfo.g2LicenceYear = value;
-                break;
-            case mychoiceSdkComponents.DateTypes.Month:
-                newState.items[newState.activeIndex].licenceInfo.g2LicenceMonth = value;
-                break;
+    if (targetSlot === mychoiceSdkComponents.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 === mychoiceSdkComponents.DriverLicenceTypes.G && targetSlot === mychoiceSdkComponents.DriverLicenceTypes.G2) {
         const { g2LicenceMonth, g2LicenceYear } = newState.items[newState.activeIndex].licenceInfo;
         if (g2LicenceMonth && g2LicenceYear && config) {
             const g2Date = mychoiceSdkComponents.addDaysToDate(`${g2LicenceYear}-${g2LicenceMonth}-01`, birthDay ? +birthDay + 1 : 1);
             const gMinDefaultDate = mychoiceSdkComponents.getLicenceMinDate(licenceType, g2Date, config);
-            const gMinDate = mychoiceSdkComponents.compareDates(gMinDefaultDate, currentDate) > 0
-                ? currentDate : gMinDefaultDate;
+            const gMinDate = mychoiceSdkComponents.compareDates(gMinDefaultDate, currentDate) > 0 ? currentDate : gMinDefaultDate;
             const { minMaxDates } = newState.items[newState.activeIndex];
             if (minMaxDates) {
                 minMaxDates.gMin = gMinDate;
@@ -1353,6 +1362,14 @@ const formCarDriverInsuranceStateReducer = (state = { ...carFormDriverInitialSta
             return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'insured', action.payload.insured));
         case exports.StoreFormCarDriverInsuranceActionTypes.FormCarDriverInsuredDateSelect:
             return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'insuredDate', action.payload.insuredDate));
+        case exports.StoreFormCarDriverInsuranceActionTypes.FormCarDriverNotCurrentlyInsuredSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'notCurrentlyInsured', action.payload.notCurrentlyInsured));
+        case exports.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndYearSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyEndYear', action.payload.lastPolicyEndYear));
+        case exports.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyEndMonthSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyEndMonth', action.payload.lastPolicyEndMonth));
+        case exports.StoreFormCarDriverInsuranceActionTypes.FormCarDriverLastPolicyCancelReasonSelect:
+            return setLocalDrivers(action?.localIndex, setDriverItemProperty(state, 'lastPolicyCancelReason', action.payload.lastPolicyCancelReason));
         default:
             return state;
     }
@@ -1372,6 +1389,10 @@ const formCarDriverLicenceStateReducer = (state = { ...carFormDriverInitialState
             return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'passedDriverTraining', action.payload.training));
         case exports.StoreFormCarDriverLicenceActionTypes.FormCarDriverPreviousLicenceSelect:
             return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'previousLicence', action.payload.previousLicence));
+        case exports.StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedG2Select:
+            return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'receivedG2', action.payload.receivedG2));
+        case exports.StoreFormCarDriverLicenceActionTypes.FormCarDriverReceivedGSelect:
+            return setLocalDrivers(action?.localIndex, setDriverLicenceInfo(state, 'receivedG', action.payload.receivedG));
         case exports.StoreFormCarDriverLicenceActionTypes.FormCarDriverGLicenceMinSelect:
             return setLocalDrivers(action?.localIndex, setDriverLicenceMinMaxDates(state, 'gMin', action.payload.gMin));
         case exports.StoreFormCarDriverLicenceActionTypes.FormCarDriverG1LicenceMinSelect:
@@ -1466,6 +1487,8 @@ const formCarDriverTicketStateReducer = (state = { ...carFormDriverInitialState
             return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'ticketYear', action.payload.ticketYear));
         case exports.StoreFormCarDriverTicketActionTypes.FormCarDriverTrafficTicketMonthSelect:
             return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'ticketMonth', action.payload.ticketMonth));
+        case exports.StoreFormCarDriverTicketActionTypes.FormCarDriverTrafficTicketSpeedSelect:
+            return setLocalDrivers(action?.localIndex, setDriverListItemProperty(state, 'ticketList', action.payload.index, 'speed', action.payload.speed));
         default:
             return state;
     }
@@ -1859,6 +1882,7 @@ const discountQuoterInfoInitialState = {
     firstName: '',
     lastName: '',
     phone: '',
+    phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial,
     recalculate: false,
     utmSource: '',
     utmCampaign: '',
@@ -1889,6 +1913,7 @@ const formCarDiscountStateInitialState = {
             priority: mychoiceSdkComponents.DriverPriorityTypes.Prn,
             vehicleIndex: 0,
         }],
+    occVehlinks: [],
     inValidation: false,
     isValid: false,
 };
@@ -1906,10 +1931,12 @@ exports.StoreFormCarDiscountActionTypes = void 0;
     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";
@@ -2027,6 +2054,14 @@ const formCarDiscountStateReducer = (state = { ...formCarDiscountStateInitialSta
             return setLocalDiscounts$1(action.localIndex, deleteVehlinkByDriver(state, action.payload.driverIndex));
         case exports.StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect:
             return setLocalDiscounts$1(action.localIndex, selectDriverForVehicle(state, action.payload.driverIndex, action.payload.vehicleIndex));
+        case exports.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 exports.StoreFormCarDiscountActionTypes.FormCarDiscountMultiplePoliciesSelect:
             return setLocalDiscounts$1(action.localIndex, setDiscountStateProperty(state, 'multiplePoliciesDiscount', action.payload.multiplePoliciesDiscount));
         case exports.StoreFormCarDiscountActionTypes.FormCarDiscountCaaMemberSelect:
@@ -2047,6 +2082,10 @@ const formCarDiscountStateReducer = (state = { ...formCarDiscountStateInitialSta
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'lastName', action.payload.lastName));
         case exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneSet:
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'phone', action.payload.phone));
+        case exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet: {
+            const phoneState = setDiscountQuoterProperty(state, 'phone', action.payload.phone);
+            return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(phoneState, 'phoneStatus', action.payload.phoneStatus));
+        }
         case exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterUtmSourceSet:
             return setLocalDiscounts$1(action.localIndex, setDiscountQuoterProperty(state, 'utmSource', action.payload.utmSource));
         case exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterUtmCampaignSet:
@@ -2861,6 +2900,7 @@ const formHomeDiscountStateInitialState = {
         firstName: '',
         lastName: '',
         phone: '',
+        phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial,
         recalculate: false,
         utmCampaign: '',
         utmSource: '',
@@ -2896,6 +2936,7 @@ exports.StoreFormHomeDiscountActionTypes = void 0;
     StoreFormHomeDiscountActionTypes["FormHomeQuoterFirstNameSet"] = "FormHomeQuoterFirstNameSet";
     StoreFormHomeDiscountActionTypes["FormHomeQuoterLastNameSet"] = "FormHomeQuoterLastNameSet";
     StoreFormHomeDiscountActionTypes["FormHomeQuoterPhoneSet"] = "FormHomeQuoterPhoneSet";
+    StoreFormHomeDiscountActionTypes["FormHomeQuoterPhoneStatusSet"] = "FormHomeQuoterPhoneStatusSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmCampaignSet"] = "FormHomeUtmCampaignSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmSourceSet"] = "FormHomeUtmSourceSet";
     StoreFormHomeDiscountActionTypes["FormHomeUtmProducerSet"] = "FormHomeUtmProducerSet";
@@ -2956,6 +2997,11 @@ const formHomeDiscountStateReducer = (state = { ...formHomeDiscountStateInitialS
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'lastName', action.payload.lastName, 'quoterInfo'));
         case exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneSet:
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'phone', action.payload.phone, 'quoterInfo'));
+        case exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet:
+            return setLocalDiscounts(action.localIndex, {
+                ...state,
+                quoterInfo: { ...state.quoterInfo, ...{ phone: action.payload.phone, phoneStatus: action.payload.phoneStatus } },
+            });
         case exports.StoreFormHomeDiscountActionTypes.FormHomeUtmSourceSet:
             return setLocalDiscounts(action.localIndex, setStateProperty(state, 'utmSource', action.payload.utmSource, 'quoterInfo'));
         case exports.StoreFormHomeDiscountActionTypes.FormHomeUtmCampaignSet:
@@ -3112,6 +3158,7 @@ const lifeFormApplicantInitialState = {
         firstName: '',
         lastName: '',
         phone: '',
+        phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Initial,
         recalculate: false,
         utmCampaign: '',
         utmSource: '',
@@ -3147,6 +3194,7 @@ exports.StoreFormLifeApplicantActionTypes = void 0;
     StoreFormLifeApplicantActionTypes["FormLifeQuoterFirstNameSet"] = "FormLifeQuoterFirstNameSet";
     StoreFormLifeApplicantActionTypes["FormLifeQuoterLastNameSet"] = "FormLifeQuoterLastNameSet";
     StoreFormLifeApplicantActionTypes["FormLifeQuoterPhoneSet"] = "FormLifeQuoterPhoneSet";
+    StoreFormLifeApplicantActionTypes["FormLifeQuoterPhoneStatusSet"] = "FormLifeQuoterPhoneStatusSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmCampaignSet"] = "FormLifeUtmCampaignSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmSourceSet"] = "FormLifeUtmSourceSet";
     StoreFormLifeApplicantActionTypes["FormLifeUtmProducerSet"] = "FormLifeUtmProducerSet";
@@ -3183,6 +3231,11 @@ const formLifeApplicantStateReducer = (state = { ...lifeFormApplicantInitialStat
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'lastName', action.payload.lastName, 'quoterInfo'));
         case exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneSet:
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'phone', action.payload.phone, 'quoterInfo'));
+        case exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet:
+            return setLocalApplicant(action?.localIndex, {
+                ...state,
+                quoterInfo: { ...state.quoterInfo, ...{ phone: action.payload.phone, phoneStatus: action.payload.phoneStatus } },
+            });
         case exports.StoreFormLifeApplicantActionTypes.FormLifeUtmSourceSet:
             return setLocalApplicant(action?.localIndex, setStateProperty(state, 'utmSource', action.payload.utmSource, 'quoterInfo'));
         case exports.StoreFormLifeApplicantActionTypes.FormLifeUtmCampaignSet:
@@ -5060,6 +5113,190 @@ const useHandlerLifeQuoterEmail = () => {
     };
 };
 
+const useHandlerCarQuoterPhone = () => {
+    const [requestState, setRequestState] = react.useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchDiscountState } = useStoreFormCarDiscount();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchDiscountState({
+            type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+            payload: {
+                phone,
+                phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Loading,
+            },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${mychoiceSdkComponents.API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: mychoiceSdkComponents.RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchDiscountState({
+                        type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                        payload: {
+                            phone,
+                            phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Approved,
+                        },
+                    });
+                }
+                else {
+                    dispatchDiscountState({
+                        type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                        payload: {
+                            phone,
+                            phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined,
+                        },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchDiscountState({
+                    type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                    payload: {
+                        phone,
+                        phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined,
+                    },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchDiscountState({
+                type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountQuoterPhoneStatusSet,
+                payload: {
+                    phone,
+                    phoneStatus: mychoiceSdkComponents.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] = react.useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchDiscountState } = useStoreFormHomeDiscount();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchDiscountState({
+            type: exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+            payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Loading },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${mychoiceSdkComponents.API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: mychoiceSdkComponents.RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchDiscountState({
+                        type: exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Approved },
+                    });
+                }
+                else {
+                    dispatchDiscountState({
+                        type: exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchDiscountState({
+                    type: exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                    payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchDiscountState({
+                type: exports.StoreFormHomeDiscountActionTypes.FormHomeQuoterPhoneStatusSet,
+                payload: { phone, phoneStatus: mychoiceSdkComponents.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] = react.useReducer(dataHandlerReducer, {
+        ...initialHandlerRequestState,
+    });
+    const { dispatchApplicantState } = useStoreFormLifeApplicant();
+    const { cancelToken } = useCancelToken();
+    const { status, successMessage, responseData, errorMessage, isFirstRequest, responseError, } = requestState;
+    const validatePhone = async (phone) => {
+        dispatchApplicantState({
+            type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+            payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Loading },
+        });
+        if (phone) {
+            try {
+                const response = await httpRequest({
+                    url: `${mychoiceSdkComponents.API_AUTH.GET_PHONE_VALIDATION}?phone=${encodeURIComponent(phone)}`,
+                    method: mychoiceSdkComponents.RequestTypes.Get,
+                    withoutToken: true,
+                    cancelToken,
+                });
+                if (response.data.valid) {
+                    dispatchApplicantState({
+                        type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Approved },
+                    });
+                }
+                else {
+                    dispatchApplicantState({
+                        type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                        payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined },
+                    });
+                    setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+                }
+            }
+            catch (error) {
+                dispatchApplicantState({
+                    type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                    payload: { phone, phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Declined },
+                });
+                setRequestState({ type: DataHandlerActionTypes.SetError, payload: 'Enter a valid phone number.' });
+            }
+        }
+        else {
+            dispatchApplicantState({
+                type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
+                payload: { phone, phoneStatus: mychoiceSdkComponents.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();
@@ -5157,9 +5394,6 @@ const CarQuoteDataHandler = () => {
             if (driver.applicantRelationship === '') {
                 delete driver.applicantRelationship;
             }
-            if (driver.gender === mychoiceSdkComponents.GenderTypes.Other) {
-                driver.gender = mychoiceSdkComponents.GenderTypes.Male;
-            }
             // ==================================
             // thebig additional properties
             if (appConfigState.appType === mychoiceSdkComponents.AppTypes.TheBig) {
@@ -5211,9 +5445,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
-                ? mychoiceSdkComponents.addYearsToDate(driver.dateOfBirth, +driver.licenceInfo.firstLicenceAge)
-                : '';
+                ? mychoiceSdkComponents.addYearsToDate(driver.dateOfBirth, +driver.licenceInfo.firstLicenceAge) : '';
             const isOnlyG = mychoiceSdkComponents.compareDates(defaultMinDate, configState.minDates.g.specialDate) < 0;
             // licence
             const deleteLicenceDates = () => {
@@ -5224,8 +5469,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' && mychoiceSdkComponents.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 === mychoiceSdkComponents.DriverLicenceTypes.G2)
+                        return { year: g2LicenceYear, month: g2LicenceMonth };
+                    if (firstClass === mychoiceSdkComponents.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
+                    && mychoiceSdkComponents.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 === mychoiceSdkComponents.DriverLicenceTypes.G) {
+                    // G Full path: Q1 date is in gLicenceYear/Month slot
+                    driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                    driver.licenceInfo.licenceType = mychoiceSdkComponents.DriverLicenceTypes.G;
+                    delete driver.licenceInfo.passedDriverTraining;
+                }
+                else if (firstClass === mychoiceSdkComponents.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 = mychoiceSdkComponents.DriverLicenceTypes.G;
+                        }
+                        else {
+                            driver.licenceInfo.licenceType = mychoiceSdkComponents.DriverLicenceTypes.G2;
+                        }
+                    }
+                    else if (receivedG) {
+                        driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
+                        driver.licenceInfo.licenceType = mychoiceSdkComponents.DriverLicenceTypes.G;
+                    }
+                    else {
+                        driver.licenceInfo.licenceType = mychoiceSdkComponents.DriverLicenceTypes.G1;
+                    }
+                }
+                else if (firstClass === mychoiceSdkComponents.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 = mychoiceSdkComponents.DriverLicenceTypes.G;
+                    }
+                    else {
+                        driver.licenceInfo.licenceType = mychoiceSdkComponents.DriverLicenceTypes.G2;
+                    }
+                }
+                deleteLicenceDates();
+            }
+            else if (isOnlyG) {
                 if (driver.licenceInfo.licenceType === mychoiceSdkComponents.DriverLicenceTypes.G) {
                     driver.licenceInfo.gLicenceDate = addDayToDate(`${gLicenceYear}-${gLicenceMonth}`, +birthDay + 1);
                     delete driver.licenceInfo.g1LicenceDate;
@@ -5255,6 +5565,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 === mychoiceSdkComponents.DriverLicenceTypes.G1 || !!g1Date;
+                const hasG2 = !!g2Date || receivedG2;
+                const hasG = !!gDate || receivedG;
+                let outside = false;
+                if (hasG1 && hasG2 && g1Date && g2Date) {
+                    const monthsG1toG2 = mychoiceSdkComponents.getDifferenceInMonths(g2Date, g1Date);
+                    if (!training && monthsG1toG2 < 12)
+                        outside = true;
+                    if (training && monthsG1toG2 < 8)
+                        outside = true;
+                }
+                if (hasG1 && hasG && g1Date && gDate) {
+                    const monthsG1toG = mychoiceSdkComponents.getDifferenceInMonths(gDate, g1Date);
+                    if (!training && monthsG1toG < 24)
+                        outside = true;
+                    if (training && monthsG1toG < 20)
+                        outside = true;
+                }
+                if (hasG2 && hasG && g2Date && gDate) {
+                    const monthsG2toG = mychoiceSdkComponents.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 !== mychoiceSdkComponents.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;
@@ -5302,27 +5657,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: mychoiceSdkComponents.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: mychoiceSdkComponents.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: mychoiceSdkComponents.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
-                    ? mychoiceSdkComponents.DriverPriorityTypes.Prn
-                    : mychoiceSdkComponents.DriverPriorityTypes.Occ,
-            }));
-            localVehlinks.push(...vehlink);
             vehicle.purchaseDate = addDayToDate(`${vehicle.purchaseYear}-${vehicle.purchaseMonth}`);
             delete vehicle.purchaseYear;
             delete vehicle.purchaseMonth;
             delete vehicle.purchaseDay;
             if (vehicle.primaryUse === mychoiceSdkComponents.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;
@@ -5352,7 +5748,7 @@ const CarQuoteDataHandler = () => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             return transformedVehicle;
         });
-        requestBody.vehlinks = localVehlinks;
+        requestBody.vehlinks = buildVehlinks();
         return {
             ...requestBody,
         };
@@ -5945,6 +6341,7 @@ const useValidationVehicle = () => {
             'distanceDaily',
             'distanceBusiness',
             'distanceYearly',
+            'businessUsePercent',
             'purchaseYear',
             'purchaseMonth',
         ];
@@ -5955,8 +6352,10 @@ const useValidationVehicle = () => {
         });
         vehicleState.items.forEach((item) => {
             Object.keys(item).map((key) => {
-                if (checkableKeys.includes(key) && !item[key]) {
-                    if (!(item.primaryUse === mychoiceSdkComponents.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 === mychoiceSdkComponents.VehiclePrimaryUseTypes.Personal || item.businessUsePercent))
+                        && !(key === 'businessUsePercent' && item.primaryUse !== mychoiceSdkComponents.VehiclePrimaryUseTypes.Business)) {
                         errors.push(key);
                     }
                 }
@@ -6015,6 +6414,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 = reactRouterDom.useNavigate();
     const driverFormValidate = (isRedirect = true) => {
@@ -6029,6 +6429,9 @@ const useValidationDriver = () => {
             'listedYear',
             'listedMonth',
             'insuredDate',
+            'lastPolicyEndYear',
+            'lastPolicyEndMonth',
+            'lastPolicyCancelReason',
             // 'insuredYear',
             // 'insuredMonth',
         ];
@@ -6061,30 +6464,32 @@ const useValidationDriver = () => {
             type: exports.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 !== mychoiceSdkComponents.AppTypes.TheBig && !mychoiceSdkComponents.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 = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
+            if (mychoiceSdkComponents.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 = mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd');
-        if (mychoiceSdkComponents.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;
                     }
@@ -6172,6 +6577,7 @@ const useValidationCarDiscount = () => {
             'phone',
             'email',
             'emailStatus',
+            'phoneStatus',
         ];
         const errors = [];
         dispatchDiscountState({
@@ -6185,11 +6591,14 @@ const useValidationCarDiscount = () => {
                         errors.push(objectKey);
                     }
                 });
-                if (discountState.emailTo.emailStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
-                    errors.push('email');
-                }
             }
         });
+        if (discountState.emailTo.emailStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
+            errors.push('email');
+        }
+        if (discountState.quoterInfo.phoneStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (!errors.length) {
             dispatchDiscountState({
                 type: exports.StoreFormCarDiscountActionTypes.FormCarDiscountValidate,
@@ -6590,7 +6999,6 @@ const useValidationHomeDiscount = () => {
         const discountKeys = [
             'firstName',
             'lastName',
-            'phone',
         ];
         const errors = [];
         dispatchDiscountState({
@@ -6613,6 +7021,9 @@ const useValidationHomeDiscount = () => {
         if (discountState.emailTo.emailStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
             errors.push('email');
         }
+        if (quoterInfo?.phoneStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (!errors.length) {
             dispatchDiscountState({
                 type: exports.StoreFormHomeDiscountActionTypes.FormHomeDiscountValidate,
@@ -6730,7 +7141,6 @@ const useValidationLifeApplicant = () => {
         const quoterInfoKeys = [
             'firstName',
             'lastName',
-            'phone',
         ];
         const errors = [];
         dispatchApplicantState({
@@ -6745,6 +7155,9 @@ const useValidationLifeApplicant = () => {
         if (applicantState.emailTo.emailStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
             errors.push('email');
         }
+        if (quoterInfo?.phoneStatus !== mychoiceSdkComponents.ValidationStatusTypes.Approved) {
+            errors.push('phone');
+        }
         if (quoterInfo) {
             Object.keys(quoterInfo).forEach((key) => {
                 if (quoterInfoKeys.includes(key) && !quoterInfo?.[key]) {
@@ -7489,12 +7902,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: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneSet,
+                    type: exports.StoreFormLifeApplicantActionTypes.FormLifeQuoterPhoneStatusSet,
                     payload: {
                         phone: applicantData.quoterInfo.phone,
+                        phoneStatus: mychoiceSdkComponents.ValidationStatusTypes.Approved,
                     },
                 });
             }
@@ -7565,8 +7979,11 @@ exports.useHandlerAuth = useHandlerAuth;
 exports.useHandlerCarMake = useHandlerCarMake;
 exports.useHandlerCarModel = useHandlerCarModel;
 exports.useHandlerCarQuoterEmail = useHandlerCarQuoterEmail;
+exports.useHandlerCarQuoterPhone = useHandlerCarQuoterPhone;
 exports.useHandlerHomeQuoterEmail = useHandlerHomeQuoterEmail;
+exports.useHandlerHomeQuoterPhone = useHandlerHomeQuoterPhone;
 exports.useHandlerLifeQuoterEmail = useHandlerLifeQuoterEmail;
+exports.useHandlerLifeQuoterPhone = useHandlerLifeQuoterPhone;
 exports.useHandlerPartner = useHandlerPartner;
 exports.useHandlerPostal = useHandlerPostal;
 exports.useProvince = useProvince;