@sheerid/jslib 1.131.0 → 1.132.0

package/sheerides6.js

@@ -667,6 +667,7 @@ var FieldIdEnum;
     FieldIdEnum["country"] = "country";
     FieldIdEnum["state"] = "state";
     FieldIdEnum["dischargeDate"] = "dischargeDate";
+    FieldIdEnum["activeDutyStartDate"] = "activeDutyStartDate";
     FieldIdEnum["docUpload"] = "docUpload";
     FieldIdEnum["status"] = "status";
     FieldIdEnum["statuses"] = "statuses";
@@ -3538,6 +3539,7 @@ const activeMilitaryPInfoReqEmpty = {
     ...withLocaleAndCountryEmpty,
     ...withFieldsToSkipValidationEmpty,
     ...blankOrganization,
+    activeDutyStartDate: "",
     birthDate: "",
     status: undefined,
     metadata: {
@@ -3550,6 +3552,7 @@ const inactiveMilitaryPInfoReqEmpty = {
     ...withLocaleAndCountryEmpty,
     ...withFieldsToSkipValidationEmpty,
     ...blankOrganization,
+    activeDutyStartDate: "",
     birthDate: "",
     dischargeDate: "",
     status: undefined,
@@ -3720,6 +3723,7 @@ const initialErrorStructure = {
     city: undefined,
     country: undefined,
     state: undefined,
+    activeDutyStartDate: undefined,
     dischargeDate: undefined,
     docUpload: undefined,
     status: undefined,
@@ -4542,20 +4546,36 @@ const getStateValidationError = (value) => {
         return invalidError;
     }
 };
+const existsAndIsValidDate = (value) => value !== undefined && isValidDateFormat(value) && isValidDate(value);
+const isBeforeBirthdate = (value, vm) => {
+    const date = new Date(value);
+    const birthDate = new Date(vm.birthDate);
+    return date < birthDate;
+};
 const getDischargeDateValidationError = (value, formValidationOptions) => {
-    const invalidDischargeDate = "invalidDischargeDate";
-    const futureDischargeDate = "futureDischargeDate";
-    const dischargeDateBeforeBirthDate = "dischargeDateBeforeBirthDate";
-    if (value === undefined || !isValidDateFormat(value) || !isValidDate(value)) {
-        return invalidDischargeDate;
+    if (!existsAndIsValidDate(value)) {
+        return "invalidDischargeDate";
+    }
+    if (isFutureDate(value)) {
+        return "futureDischargeDate";
+    }
+    if (isBeforeBirthdate(value, formValidationOptions.viewModel)) {
+        return "dischargeDateBeforeBirthDate";
+    }
+};
+const getActiveDutyStartDateValidationError = (value, formValidationOptions) => {
+    if (!value && !formValidationOptions.strictMilitaryValidationEnabled) {
+        // a falsey value is valid unless strictMilitaryValidation is enabled.
+        return;
+    }
+    if (!existsAndIsValidDate(value)) {
+        return "invalidActiveDutyStartDate";
     }
     if (isFutureDate(value)) {
-        return futureDischargeDate;
+        return "futureActiveDutyStartDate";
     }
-    const dischargeDate = new Date(value);
-    const birthDate = new Date(formValidationOptions.viewModel.birthDate);
-    if (dischargeDate < birthDate) {
-        return dischargeDateBeforeBirthDate;
+    if (isBeforeBirthdate(value, formValidationOptions.viewModel)) {
+        return "activeDutyStartDateBeforeBirthDate";
     }
 };
 const getSsnValidationError = (value) => {
@@ -4780,6 +4800,9 @@ const validateFieldById = (fieldId, value, formValidationOptions) => {
         case FieldIdEnum.dischargeDate:
             defaultValidator = getDischargeDateValidationError;
             return getValidationError(fieldId, value, defaultValidator, overriddenValidator, formValidationOptions);
+        case FieldIdEnum.activeDutyStartDate:
+            defaultValidator = getActiveDutyStartDateValidationError;
+            return getValidationError(fieldId, value, defaultValidator, overriddenValidator, formValidationOptions);
         case FieldIdEnum.socialSecurityNumber:
             defaultValidator = getSsnValidationError;
             return getValidationError(fieldId, value, defaultValidator, overriddenValidator, formValidationOptions);
@@ -11863,6 +11886,7 @@ const activeMilitaryViewModelToRequest = (viewModel) => ({
     firstName: viewModel.firstName,
     lastName: viewModel.lastName,
     birthDate: viewModel.birthDate,
+    activeDutyStartDate: viewModel.activeDutyStartDate || undefined,
     email: viewModel.email,
     phoneNumber: viewModel.phoneNumber,
     organization: viewModel.organization,
@@ -11876,6 +11900,7 @@ const inactiveMilitaryViewModelToRequest = (viewModel) => ({
     firstName: viewModel.firstName,
     lastName: viewModel.lastName,
     birthDate: viewModel.birthDate,
+    activeDutyStartDate: viewModel.activeDutyStartDate || undefined,
     email: viewModel.email,
     phoneNumber: viewModel.phoneNumber,
     organization: viewModel.organization,
@@ -14877,6 +14902,7 @@ const verificationServiceReducer = (state = getInitialState(), action) => {
                     maxAge: state.verificationResponse.maxAge || state.programTheme.config.maxAge,
                     minAge: state.verificationResponse.minAge || state.programTheme.config.minAge,
                     smsLoopEnabled: state.programTheme.smsLoopEnabled,
+                    strictMilitaryValidationEnabled: state.programTheme.strictMilitaryValidationEnabled,
                     currentStep: state.verificationResponse.currentStep,
                     viewModel: state.viewModel,
                 },
@@ -16972,12 +16998,14 @@ const formatTwoDigitValues = (value) => {
     }
 };
 
-const BirthDate = ({ onChange, intl, isErrored, isRequired = true, errorId, value, }) => {
-    const birthDateParts = value.split("-");
-    const birthDateYear = Number.parseInt(birthDateParts[0], 10) || undefined;
-    const birthDateMonth = Number.parseInt(birthDateParts[1], 10) || undefined;
-    const birthDateDay = Number.parseInt(birthDateParts[2], 10) || undefined;
-    const minBirthYear = 1900;
+const DateInput = ({ onChange, intl, isErrored, isRequired = true, value = "2000-01-01", errorMsg, label, fieldName, fieldId, mode = "date", }) => {
+    const cssId = `sid-${fieldId}`;
+    const dateParts = value.split("-");
+    const dateYear = Number.parseInt(dateParts[0], 10) || undefined;
+    const dateMonth = Number.parseInt(dateParts[1], 10) || undefined;
+    // Default day to 1 if in month mode (where days are ignored) so that we return valid date strings.
+    const dateDay = mode === "month" ? 1 : Number.parseInt(dateParts[2], 10) || undefined;
+    const minYear = 1900;
     const thisYear = new Date().getFullYear();
     /* prettier-ignore */
     const months = [
@@ -16995,98 +17023,86 @@ const BirthDate = ({ onChange, intl, isErrored, isRequired = true, errorId, valu
         { value: "12", label: intl.formatHTMLMessage({ id: "dateTime.december", defaultMessage: "December" }) },
     ];
     const isDateFieldEmpty = (year, month, day) => (!day || day === "") && (!month || month === "") && (!year || year === "");
-    const updateBirthMonth = (month) => {
-        if (isDateFieldEmpty(birthDateYear, month, birthDateDay)) {
+    const updateMonth = (month) => {
+        if (isDateFieldEmpty(dateYear, month, dateDay)) {
             onChange("");
             return;
         }
         if (month === "" || month === null) {
-            onChange(`${birthDateYear}--${birthDateDay}`);
+            onChange(`${dateYear}--${dateDay}`);
         }
         const newVal = Number.parseInt(month, 10);
         if (typeof newVal === "number" && newVal >= 1 && newVal <= 12) {
-            onChange(`${birthDateYear}-${formatTwoDigitValues(month)}-${formatTwoDigitValues(birthDateDay)}`);
+            onChange(`${dateYear}-${formatTwoDigitValues(month)}-${formatTwoDigitValues(dateDay)}`);
         }
         else {
-            logger.warn(`Value '${newVal}' is an invalid birth month`);
+            logger.warn(`Value '${newVal}' is an invalid month`);
         }
     };
-    const updateBirthDay = (day) => {
-        if (isDateFieldEmpty(birthDateYear, birthDateMonth, day)) {
+    const updateDay = (day) => {
+        if (isDateFieldEmpty(dateYear, dateMonth, day)) {
             onChange("");
             return;
         }
         if (day === "") {
-            onChange(`${birthDateYear}-${birthDateMonth}-`);
+            onChange(`${dateYear}-${dateMonth}-`);
         }
         const newVal = Number.parseInt(day, 10);
         if (typeof newVal === "number" && newVal >= 1 && newVal <= 31) {
-            onChange(`${birthDateYear}-${formatTwoDigitValues(birthDateMonth)}-${formatTwoDigitValues(newVal)}`);
+            onChange(`${dateYear}-${formatTwoDigitValues(dateMonth)}-${formatTwoDigitValues(newVal)}`);
         }
         else {
-            logger.warn(`Value '${newVal}' is an invalid birth day`);
+            logger.warn(`Value '${newVal}' is an invalid day`);
         }
     };
     const updateBirthYear = (year) => {
-        if (isDateFieldEmpty(year, birthDateMonth, birthDateDay)) {
+        if (isDateFieldEmpty(year, dateMonth, dateDay)) {
             onChange("");
             return;
         }
         if (year === "") {
-            onChange(`-${birthDateMonth}-${birthDateDay}`);
+            onChange(`-${dateMonth}-${dateDay}`);
         }
         const newVal = Number.parseInt(year, 10);
         if (typeof newVal === "number" && newVal >= 1 && newVal <= thisYear) {
-            onChange(`${newVal}-${formatTwoDigitValues(birthDateMonth)}-${formatTwoDigitValues(birthDateDay)}`);
+            onChange(`${newVal}-${formatTwoDigitValues(dateMonth)}-${formatTwoDigitValues(dateDay)}`);
         }
         else {
-            logger.warn(`Value '${newVal}' is an invalid birth year`);
+            logger.warn(`Value '${newVal}' is an invalid year`);
         }
     };
-    const getBirthDate = () => {
-        if (!birthDateDay && !birthDateMonth && !birthDateYear) {
+    const getDate = () => {
+        if (!dateDay && !dateMonth && !dateYear) {
             onChange("");
         }
         else {
-            onChange(`${birthDateYear}-${formatTwoDigitValues(birthDateMonth)}-${formatTwoDigitValues(birthDateDay)}`);
+            onChange(`${dateYear}-${formatTwoDigitValues(dateMonth)}-${formatTwoDigitValues(dateDay)}`);
         }
     };
-    const monthFieldId = "sid-birthdate__month";
-    const fieldLabelId = "sid-birthdate-label";
-    const errMsg = errorId ? (React.createElement("div", { className: "sid-field-error" },
-        React.createElement(FormattedHTMLMessage, { id: `errorId.${errorId}`, defaultMessage: "Invalid birth date" }))) : (React.createElement("div", { className: "sid-field-error" },
-        React.createElement(FormattedHTMLMessage, { id: "errorId.invalidBirthDate", defaultMessage: "Invalid birth date" })));
-    const birthDateDayRef = useRef(null);
-    const birthDateYearRef = useRef(null);
-    // NOTE: Dependency array omitted to account for use of resetRef(), as useEffect with dep arr
-    // will only trigger on initial render leaving the refs empty, this replicates prior version
-    // where ref callback would trigger with each re-render
-    useEffect(() => {
-        setRef("birthDateDay", birthDateDayRef.current);
-        setRef("birthDateYear", birthDateYearRef.current);
-    });
-    return (React.createElement("div", { className: "sid-field sid-birthdate" },
+    const monthFieldId = `${cssId}__month`;
+    const fieldLabelId = `${cssId}-label`;
+    const wrappedErrMsg = React.createElement("div", { className: "sid-field-error" }, errorMsg);
+    return (React.createElement("div", { className: `sid-field ${cssId}` },
         React.createElement("div", { className: "sid-l-space-top-md" }),
-        React.createElement(FieldLabel, { text: React.createElement(FormattedHTMLMessage, { id: "birthDate", defaultMessage: "Date of birth" }), htmlForLabel: monthFieldId, id: fieldLabelId, displayClasses: "sid-field__label-with-explanation", isRequired: isRequired },
+        React.createElement(FieldLabel, { text: label, htmlForLabel: monthFieldId, id: fieldLabelId, displayClasses: "sid-field__label-with-explanation", isRequired: isRequired },
             React.createElement(FormattedHTMLMessage, { id: "verificationPurposesOnly", defaultMessage: "Used for verification purposes only" })),
-        React.createElement("div", { className: "sid-birthdate__inputs" },
-            React.createElement(InputSelectComponent, { className: "sid-birthdate__month", fieldId: "birthDate", inputId: monthFieldId, fieldLabelId: fieldLabelId, isErrored: isErrored, options: months, onChange: (choice) => {
+        React.createElement("div", { className: `${cssId}__inputs sid-date__inputs` },
+            React.createElement(InputSelectComponent, { className: `${cssId}__month sid-date__month`, fieldId: fieldName, inputId: monthFieldId, fieldLabelId: fieldLabelId, isErrored: isErrored, options: months, onChange: (choice) => {
                     if (choice) {
-                        updateBirthMonth(choice.value);
+                        updateMonth(choice.value);
                     }
                     else {
                         // clear the birth month
-                        updateBirthMonth(null);
+                        updateMonth(null);
                     }
-                }, placeholder: intl.formatHTMLMessage({ id: "dateTime.month", defaultMessage: "Month" }), suppressPlaceholder: false, value: birthDateMonth ? months[birthDateMonth - 1] : undefined, isRequired: isRequired, buttonRef: "inputSelectButtonBirthDate" }),
-            React.createElement("input", { className: `sid-birthdate__day sid-text-input sid-text-input--required ${isErrored ? "sid-text-input--error" : ""}`, id: "sid-birthdate-day", min: 1, max: 31, name: "sid-birthdate-day", onChange: (e) => updateBirthDay(e.target.value), onBlur: getBirthDate, pattern: "\\d*", placeholder: intl.formatHTMLMessage({ id: "dateTime.day", defaultMessage: "Day" }), "aria-label": intl.formatHTMLMessage({ id: "dateTime.day", defaultMessage: "Day" }), "aria-labelledby": "sid-birthdate", "aria-required": isRequired, ref: birthDateDayRef, type: "text", value: birthDateDay || "" }),
-            React.createElement("input", { className: `sid-birthdate__year sid-text-input sid-text-input--required ${isErrored ? "sid-text-input--error" : ""}`, id: "sid-birthdate-year", name: "sid-birthdate-year", type: "text", min: minBirthYear, max: thisYear, value: birthDateYear || "", pattern: "\\d*", placeholder: intl.formatHTMLMessage({ id: "dateTime.year", defaultMessage: "Year" }), "aria-label": intl.formatHTMLMessage({ id: "dateTime.year", defaultMessage: "Year" }), "aria-labelledby": "sid-birthdate", "aria-required": isRequired, ref: birthDateYearRef, onChange: (e) => updateBirthYear(e.target.value), onBlur: getBirthDate })),
-        isErrored ? errMsg : null));
+                }, placeholder: intl.formatHTMLMessage({ id: "dateTime.month", defaultMessage: "Month" }), suppressPlaceholder: false, value: dateMonth ? months[dateMonth - 1] : undefined, isRequired: isRequired, buttonRef: "inputSelectButtonBirthDate" }),
+            mode === "date" && (React.createElement(InputTextComponent, { className: `${cssId}__day sid-date__day sid-text-input sid-text-input--required ${isErrored ? "sid-text-input--error" : ""}`, id: `${fieldId}-day`, isErrored: isErrored, min: 1, max: 31, name: `${cssId}-day`, onChange: (e) => updateDay(e.target.value), onBlur: getDate, pattern: "\\d*", placeholder: intl.formatHTMLMessage({ id: "dateTime.day", defaultMessage: "Day" }), "aria-label": intl.formatHTMLMessage({ id: "dateTime.day", defaultMessage: "Day" }), "aria-labelledby": cssId, "aria-required": isRequired, refId: `${fieldName}Day`, type: "text", value: dateDay || "" })),
+            React.createElement(InputTextComponent, { className: `${cssId}__year sid-date__year sid-text-input sid-text-input--required ${isErrored ? "sid-text-input--error" : ""}`, id: `${fieldId}-year`, name: `${cssId}-year`, type: "text", isErrored: isErrored, min: minYear, max: thisYear, value: dateYear || "", pattern: "\\d*", placeholder: intl.formatHTMLMessage({ id: "dateTime.year", defaultMessage: "Year" }), "aria-label": intl.formatHTMLMessage({ id: "dateTime.year", defaultMessage: "Year" }), "aria-labelledby": cssId, "aria-required": isRequired, refId: `${fieldName}Year`, onChange: (e) => updateBirthYear(e.target.value), onBlur: getDate })),
+        isErrored ? wrappedErrMsg : null));
 };
-BirthDate.defaultProps = {
-    value: "2000-01-01",
-};
-const BirthDateComponent = injectIntl(BirthDate);
+const DateComponent = injectIntl(DateInput);
+
+const BirthDateComponent = ({ onChange, isErrored, isRequired = true, errorId, value = "2000-01-01", }) => (React.createElement(DateComponent, { value: value, label: React.createElement(FormattedHTMLMessage, { id: "birthDate", defaultMessage: "Date of birth" }), onChange: onChange, fieldId: "birthdate", fieldName: "birthDate", isErrored: isErrored, isRequired: isRequired, errorMsg: errorId ? (React.createElement(FormattedHTMLMessage, { id: `errorId.${errorId}`, defaultMessage: "Invalid birth date" })) : (React.createElement(FormattedHTMLMessage, { id: "errorId.invalidBirthDate", defaultMessage: "Invalid birth date" })) }));
 
 function replaceCustomTags(text, tagmap) {
     if (typeof text !== "string")
@@ -18065,6 +18081,8 @@ const BranchOfService = ({ autoFocus, onChange, value, isErrored, organizations,
 };
 const BranchOfServiceComponent = injectIntl(BranchOfService);
 
+const ActiveDutyStartDateComponent = ({ onChange, isErrored, errorId = "invalidActiveDutyStartDate", value = "2000-01-01", }) => (React.createElement(DateComponent, { value: value, label: React.createElement(FormattedHTMLMessage, { id: "activeDutyStartDate", defaultMessage: "Active Duty Start Date" }), onChange: onChange, fieldName: "activeDutyStartDate", fieldId: "sid-active-duty-start-date", isErrored: isErrored, isRequired: true, errorMsg: React.createElement(FormattedHTMLMessage, { id: `errorId.${errorId}`, defaultMessage: "Invalid start date" }) }));
+
 /**
  * TODO - preamble
  */
@@ -18142,6 +18160,10 @@ const StepActiveMilitaryPersonalInfo = ({ intl, verificationService, }) => {
                 updateActiveMilitaryViewModel("birthDate", newValue);
                 updateFieldValidationErrorsByFieldId("birthDate", newValue, verificationService);
             }, value: viewModel.birthDate }),
+        verificationService.programTheme.strictMilitaryValidationEnabled && (React.createElement(ActiveDutyStartDateComponent, { isErrored: !!fieldValidationErrors.activeDutyStartDate, errorId: fieldValidationErrors.activeDutyStartDate, onChange: (newValue) => {
+                updateActiveMilitaryViewModel("activeDutyStartDate", newValue);
+                updateFieldValidationErrorsByFieldId("activeDutyStartDate", newValue, verificationService);
+            }, value: viewModel.activeDutyStartDate })),
         React.createElement(EmailComponent, { value: viewModel.email, isErrored: !!fieldValidationErrors.email, explanation: React.createElement(FormattedHTMLMessage, { id: "emailExplanation", defaultMessage: "Personal email address is recommended" }), onChange: (newValue) => {
                 updateActiveMilitaryViewModel("email", newValue);
                 updateFieldValidationErrorsByFieldId("email", newValue, verificationService);
@@ -18170,78 +18192,7 @@ const StepActiveMilitaryPersonalInfo = ({ intl, verificationService, }) => {
 };
 const StepActiveMilitaryPersonalInfoComponent = injectIntl(StepActiveMilitaryPersonalInfo);
 
-const DischargeDate = ({ onChange, intl, isErrored, value, }) => {
-    const dischargeDateParts = value.split("-");
-    const dischargeDateYear = Number.parseInt(dischargeDateParts[0], 10) || undefined;
-    const dischargeDateMonth = Number.parseInt(dischargeDateParts[1], 10) || undefined;
-    const dischargeDateDay = 1;
-    const minDischargeYear = 1900;
-    const thisYear = new Date().getFullYear();
-    const inputId = "sid-discharge-date";
-    /* prettier-ignore */
-    const months = [
-        { value: "1", label: intl.formatHTMLMessage({ id: "dateTime.january", defaultMessage: "January" }), },
-        { value: "2", label: intl.formatHTMLMessage({ id: "dateTime.february", defaultMessage: "February" }), },
-        { value: "3", label: intl.formatHTMLMessage({ id: "dateTime.march", defaultMessage: "March" }), },
-        { value: "4", label: intl.formatHTMLMessage({ id: "dateTime.april", defaultMessage: "April" }), },
-        { value: "5", label: intl.formatHTMLMessage({ id: "dateTime.may", defaultMessage: "May" }) },
-        { value: "6", label: intl.formatHTMLMessage({ id: "dateTime.june", defaultMessage: "June" }) },
-        { value: "7", label: intl.formatHTMLMessage({ id: "dateTime.july", defaultMessage: "July" }) },
-        { value: "8", label: intl.formatHTMLMessage({ id: "dateTime.august", defaultMessage: "August" }), },
-        { value: "9", label: intl.formatHTMLMessage({ id: "dateTime.september", defaultMessage: "September" }), },
-        { value: "10", label: intl.formatHTMLMessage({ id: "dateTime.october", defaultMessage: "October" }), },
-        { value: "11", label: intl.formatHTMLMessage({ id: "dateTime.november", defaultMessage: "November" }), },
-        { value: "12", label: intl.formatHTMLMessage({ id: "dateTime.december", defaultMessage: "December" }), },
-    ];
-    const updateDischargeMonth = (month) => {
-        if (month === "" || month === null) {
-            onChange(`${dischargeDateYear}--${dischargeDateDay}`);
-        }
-        const newVal = Number.parseInt(month, 10);
-        if (typeof newVal === "number" && newVal >= 1 && newVal <= 12) {
-            onChange(`${dischargeDateYear}-${formatTwoDigitValues(month)}-${formatTwoDigitValues(dischargeDateDay)}`);
-        }
-        else {
-            logger.warn(`Value '${newVal}' is an invalid discharge month`);
-        }
-    };
-    const updateDischargeYear = (year) => {
-        if (year === "") {
-            onChange(`-${dischargeDateMonth}-${dischargeDateDay}`);
-        }
-        const newVal = Number.parseInt(year, 10);
-        if (typeof newVal === "number" && newVal >= 1 && newVal <= thisYear) {
-            onChange(`${newVal}-${formatTwoDigitValues(dischargeDateMonth)}-${formatTwoDigitValues(dischargeDateDay)}`);
-        }
-        else {
-            logger.warn(`Value '${newVal}' is an invalid discharge year`);
-        }
-    };
-    const getDischargeDate = () => {
-        onChange(`${dischargeDateYear}-${formatTwoDigitValues(dischargeDateMonth)}-${formatTwoDigitValues(dischargeDateDay)}`);
-    };
-    return (React.createElement("div", { className: `sid-field ${inputId}` },
-        React.createElement("div", { className: "sid-l-space-top-md" }),
-        React.createElement(FieldLabel, { text: React.createElement(FormattedHTMLMessage, { id: "dischargeDate", defaultMessage: "Discharge date" }), htmlForLabel: `${inputId}__month`, id: `${inputId}-label`, displayClasses: "sid-field__label-with-explanation" },
-            React.createElement(FormattedHTMLMessage, { id: "verificationPurposesOnly", defaultMessage: "Used for verification purposes only" })),
-        React.createElement("div", { className: `${inputId}__inputs` },
-            React.createElement(InputSelectComponent, { className: `${inputId}__month`, fieldId: "dischargeDate", inputId: `${inputId}__month`, fieldLabelId: `${inputId}-label`, isErrored: isErrored, options: months, onChange: (choice) => {
-                    if (choice) {
-                        updateDischargeMonth(choice.value);
-                    }
-                    else {
-                        // clear the discharge month
-                        updateDischargeMonth(null);
-                    }
-                }, placeholder: intl.formatHTMLMessage({ id: "dateTime.month", defaultMessage: "Month" }), suppressPlaceholder: false, value: dischargeDateMonth ? months[dischargeDateMonth - 1] : undefined, buttonRef: "inputSelectButtonDischargeDate", isRequired: true }),
-            React.createElement(InputTextComponent, { className: `${inputId}__year`, id: "discharge-date-year", isErrored: isErrored, max: thisYear, min: minDischargeYear, onBlur: getDischargeDate, onChange: (e) => updateDischargeYear(e.target.value), pattern: "\\d*", placeholder: intl.formatHTMLMessage({ id: "dateTime.year", defaultMessage: "Year" }), hidePlaceholder: false, refId: "dischargeDateYear", required: true, value: dischargeDateYear || "", "aria-labelledby": "sid-discharge-date-label" })),
-        isErrored ? (React.createElement("div", { className: "sid-field-error" },
-            React.createElement(FormattedHTMLMessage, { id: "errorId.invalidDischargeDate", defaultMessage: "Invalid discharge date" }))) : null));
-};
-DischargeDate.defaultProps = {
-    value: "2000-01-01",
-};
-const DischargeDateComponent = injectIntl(DischargeDate);
+const DischargeDateComponent = ({ onChange, isErrored, value = "2000-01-01", }) => (React.createElement(DateComponent, { mode: "month", value: value, label: React.createElement(FormattedHTMLMessage, { id: "dischargeDate", defaultMessage: "Discharge date" }), onChange: onChange, fieldName: "dischargeDate", fieldId: "discharge-date", isErrored: isErrored, isRequired: true, errorMsg: React.createElement(FormattedHTMLMessage, { id: "errorId.invalidDischargeDate", defaultMessage: "Invalid discharge date" }) }));
 
 /**
  * TODO - preamble
@@ -18317,6 +18268,10 @@ const StepInactiveMilitaryPersonalInfo = ({ intl, verificationService, }) => {
                 updateInactiveMilitaryViewModel("birthDate", newValue);
                 updateFieldValidationErrorsByFieldId("birthDate", newValue, verificationService);
             }, value: viewModel.birthDate }),
+        verificationService.programTheme.strictMilitaryValidationEnabled && (React.createElement(ActiveDutyStartDateComponent, { isErrored: !!fieldValidationErrors.activeDutyStartDate, onChange: (newValue) => {
+                updateInactiveMilitaryViewModel("activeDutyStartDate", newValue);
+                updateFieldValidationErrorsByFieldId("activeDutyStartDate", newValue, verificationService);
+            }, value: viewModel.activeDutyStartDate })),
         React.createElement(DischargeDateComponent, { isErrored: !!fieldValidationErrors.dischargeDate, onChange: (newValue) => {
                 updateInactiveMilitaryViewModel("dischargeDate", newValue);
                 updateFieldValidationErrorsByFieldId("dischargeDate", newValue, verificationService);