diff --git a/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx b/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx
index 3e3feb011f64..d847ce2599d8 100644
--- a/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx
+++ b/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx
@@ -53,7 +53,7 @@ const AddressValidationRadio = props => {
state_code: state || militaryState,
country_name: 'United States',
country_code_iso3: 'USA',
- address_pou: 'RESIDENCE/CHOICE',
+ address_pou: 'RESIDENCE',
address_type: 'DOMESTIC',
};
diff --git a/src/applications/ask-va/components/RequireSignInModal.jsx b/src/applications/ask-va/components/RequireSignInModal.jsx
index 4902af0c954c..fd539d544d3b 100644
--- a/src/applications/ask-va/components/RequireSignInModal.jsx
+++ b/src/applications/ask-va/components/RequireSignInModal.jsx
@@ -10,7 +10,7 @@ const RequireSignInModal = ({ onClose, show, restrictedItem, message }) => {
const openLoginModal = () => {
onClose();
- dispatch(toggleLoginModal(true, 'askVA'));
+ dispatch(toggleLoginModal(true));
};
useEffect(
diff --git a/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js b/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js
index 4d1dd5c383ec..11211fd53e46 100644
--- a/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js
+++ b/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js
@@ -1,22 +1,172 @@
-import { titleUI } from 'platform/forms-system/src/js/web-component-patterns';
-import { CHAPTER_3 } from '../../../constants';
+import React from 'react';
+
+import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField';
+import {
+ dateOfBirthSchema,
+ dateOfBirthUI,
+ selectSchema,
+ selectUI,
+ serviceNumberSchema,
+ serviceNumberUI,
+ ssnSchema,
+ ssnUI,
+ titleUI,
+ yesNoSchema,
+ yesNoUI,
+} from 'platform/forms-system/src/js/web-component-patterns';
+import VaSelectField from '~/platform/forms-system/src/js/web-component-fields/VaSelectField';
import {
- personalInformationFormSchemas,
- personalInformationUiSchemas,
-} from '../../schema-helpers/personalInformationHelper';
+ branchesOfService,
+ CHAPTER_3,
+ suffixes,
+ yesNoOptions,
+} from '../../../constants';
+import { isBranchOfServiceRequired } from '../../helpers';
+
+const ssnServiceInfo = (
+
@@ -80,26 +81,6 @@ export const personalInformationFormSchemas = {
branchOfService: selectSchema(branchesOfService),
};
-export const aboutYourselfRelationshipFamilyMemberSchema = {
- first: {
- type: 'string',
- pattern: '^[A-Za-z]+$',
- minLength: 1,
- maxLength: 25,
- },
- middle: {
- type: 'string',
- pattern: '^[A-Za-z]+$',
- minLength: 1,
- maxLength: 25,
- },
- last: { type: 'string', pattern: '^[A-Za-z]+$', minLength: 1, maxLength: 25 },
- suffix: selectSchema(suffixes),
- socialNum: ssnSchema,
- dateOfBirth: dateOfBirthSchema,
- branchOfService: selectSchema(branchesOfService),
-};
-
export const aboutYourselfGeneralSchema = {
first: {
type: 'string',
@@ -166,7 +147,7 @@ export const personalInformationUiSchemas = {
'ui:title': 'Branch of service',
'ui:webComponentField': VaSelectField,
'ui:options': {
- hideIf: () => true,
+ hideIf: formData => !isBranchOfServiceRequired(formData),
},
},
};
@@ -254,28 +235,10 @@ export const personalInformationAboutYourselfUiSchemas = {
branchOfService: {
'ui:title': 'Branch of service',
'ui:webComponentField': VaSelectField,
- 'ui:required': formData =>
- (formData.whoIsYourQuestionAbout === 'Myself' ||
- formData.whoIsYourQuestionAbout === 'Someone else') &&
- formData.relationshipToVeteran === "I'm the Veteran" &&
- (formData.selectCategory === 'Veteran Identification Card (VIC)' ||
- formData.selectCategory === 'Survivor Benefits' ||
- formData.selectCategory === 'Burial & Memorial Benefits (NCA)' ||
- formData.selectCategory === "Women Veterans' issues" ||
- formData.selectCategory === 'Benefits Issues Outside the US'),
+ 'ui:required': formData => isBranchOfServiceRequired(formData),
'ui:options': {
uswds: true,
- hideIf: formData =>
- !(
- (formData.whoIsYourQuestionAbout === 'Myself' ||
- formData.whoIsYourQuestionAbout === 'Someone else') &&
- formData.relationshipToVeteran === "I'm the Veteran" &&
- (formData.selectCategory === 'Veteran Identification Card (VIC)' ||
- formData.selectCategory === 'Survivor Benefits' ||
- formData.selectCategory === 'Burial & Memorial Benefits (NCA)' ||
- formData.selectCategory === "Women Veterans' issues" ||
- formData.selectCategory === 'Benefits Issues Outside the US')
- ),
+ hideIf: formData => !isBranchOfServiceRequired(formData),
},
},
};
diff --git a/src/applications/ask-va/constants.js b/src/applications/ask-va/constants.js
index 73810a79c18c..3fa8b9249c2e 100644
--- a/src/applications/ask-va/constants.js
+++ b/src/applications/ask-va/constants.js
@@ -538,6 +538,15 @@ export const CHAPTER_3 = {
TITLE: 'Your VA health facility',
DESCRIPTION: 'Search by city, postal code, or use your current location.',
},
+ VETERAN_VA_HEALTH_FACILITY: {
+ TITLE: "Veteran's VA health facility",
+ DESCRIPTION: 'Search by city, postal code, or use your current location.',
+ },
+ FAMILY_MEMBER_VA_HEALTH_FACILITY: {
+ PATH: 'your-va-health-facility',
+ TITLE: "Family member's VA health facility",
+ DESCRIPTION: 'Search by city, postal code, or use your current location.',
+ },
YOUR_VRE_INFORMATION: {
TITLE:
'Have you ever applied for Veteran Readiness and Employment benefits and services?',
@@ -563,6 +572,10 @@ export const CHAPTER_3 = {
DESCRIPTION: 'Select your branch of service',
ERROR: 'Please select your branch of service',
},
+ VETERANS_BRANCH_OF_SERVICE: {
+ TITLE: 'Branch of service',
+ ERROR: "Please select the Veteran's branch of service",
+ },
};
export const noEditBtn = [
diff --git a/src/applications/ask-va/containers/ResponseInboxPage.jsx b/src/applications/ask-va/containers/ResponseInboxPage.jsx
index a436e1a28a74..51af9481dc84 100644
--- a/src/applications/ask-va/containers/ResponseInboxPage.jsx
+++ b/src/applications/ask-va/containers/ResponseInboxPage.jsx
@@ -7,6 +7,7 @@ import {
import { isLoggedIn } from '@department-of-veterans-affairs/platform-user/selectors';
import { apiRequest } from '@department-of-veterans-affairs/platform-utilities/api';
import { focusElement } from '@department-of-veterans-affairs/platform-utilities/ui';
+import DOMPurify from 'dompurify';
import PropTypes from 'prop-types';
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
@@ -87,10 +88,7 @@ const ResponseInboxPage = ({ router }) => {
useEffect(
() => {
- if (inquiryId)
- getApiData(
- `${envUrl}${URL.GET_INQUIRIES}/${inquiryId}?user_mock_data=true`,
- );
+ if (inquiryId) getApiData(`${envUrl}${URL.GET_INQUIRIES}/${inquiryId}`);
},
[inquiryId],
);
@@ -226,6 +224,18 @@ const ResponseInboxPage = ({ router }) => {
{correspondence.attributes.description}
+
+ {/* Testing what MHV is doing to sanitize html and keep formatting */}
+
+
{correspondence.attributes.attachments.length > 0 && (
{RESPONSE_PAGE.ATTACHMENTS}
diff --git a/src/applications/ask-va/containers/YourVAHealthFacility.jsx b/src/applications/ask-va/containers/YourVAHealthFacility.jsx
index 64ab545d4fda..6b5cc29dff98 100644
--- a/src/applications/ask-va/containers/YourVAHealthFacility.jsx
+++ b/src/applications/ask-va/containers/YourVAHealthFacility.jsx
@@ -1,11 +1,12 @@
import { apiRequest } from '@department-of-veterans-affairs/platform-utilities/api';
+import { focusElement } from 'platform/utilities/ui';
import PropTypes from 'prop-types';
import React, { useState } from 'react';
-import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons';
-import { focusElement } from 'platform/utilities/ui';
import { connect } from 'react-redux';
+import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons';
import SearchControls from '../components/search/SearchControls';
import SearchItem from '../components/search/SearchItem';
+import { getHealthFacilityTitle } from '../config/helpers';
import { CHAPTER_3, URL, envUrl } from '../constants';
import { convertToLatLng } from '../utils/mapbox';
@@ -80,7 +81,7 @@ const YourVAHealthFacilityPage = props => {
return (
<>
-
{CHAPTER_3.YOUR_VA_HEALTH_FACILITY.TITLE}
+
{getHealthFacilityTitle(data)}