From 77c15cee7b37b332d5d0e9aa85dddf2742e9b0c8 Mon Sep 17 00:00:00 2001 From: Adam Whitlock <8332986+adamwhitlock1@users.noreply.github.com> Date: Tue, 5 Nov 2024 21:25:54 +0000 Subject: [PATCH 1/8] make card flex on VeteranInformation --- .../pattern2/TaskBlue/VeteranInformation.jsx | 84 ++++++++++--------- .../pattern2/TaskOrange/config/form.js | 2 +- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx index 9f2a3975a9d9..c41b96f00046 100644 --- a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx +++ b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx @@ -28,54 +28,56 @@ const VeteranInformation = ({ formData }) => {
- Last 4 digits of Social Security number: - - {veteranSocialSecurityNumber.slice(-4)} - -
- ) : null} - {/* {vaFileLastFour ? ( */} - {/*+
+ Last 4 digits of Social Security number: + + {veteranSocialSecurityNumber.slice(-4)} + +
+ ) : null} + {/* {vaFileLastFour ? ( */} + {/*VA file number:{' '} - {mask(vaFileLastFour)} + {mask(vaFileLastFour)} -
- ) : null} */} -- Date of birth: - {isValid(dobDateObj) ? ( +
+ ) : null} */} ++ Date of birth: + {isValid(dobDateObj) ? ( + + {format(dobDateObj, FORMAT_READABLE_DATE_FNS)} + + ) : null} +
++ Gender: - {format(dobDateObj, FORMAT_READABLE_DATE_FNS)} + {genderLabels?.[gender] || ''} - ) : null} -
-- Gender: - - {genderLabels?.[gender] || ''} - -
-- Note: Any updates you make here will only be reflected - in this form. -
> ), From 00400309a1ca4c379394028d3172fe6ae62d57c9 Mon Sep 17 00:00:00 2001 From: Adam Whitlock <8332986+adamwhitlock1@users.noreply.github.com> Date: Tue, 5 Nov 2024 22:47:04 -0700 Subject: [PATCH 4/8] add name label to card, update save button, add post study button --- .../pattern2/TaskBlue/VeteranInformation.jsx | 13 ++++++++----- .../TaskGray/form/components/EditContactInfo.jsx | 1 + .../utils/data/tabs.js | 7 +++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx index c41b96f00046..44bff575faa3 100644 --- a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx +++ b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskBlue/VeteranInformation.jsx @@ -30,13 +30,16 @@ const VeteranInformation = ({ formData }) => {+ + Name:{' '} + {`${first || ''} ${middle || ''} ${last || ''}`} {suffix ? `, ${suffix}` : null} -
+ {veteranSocialSecurityNumber ? (Last 4 digits of Social Security number: diff --git a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskGray/form/components/EditContactInfo.jsx b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskGray/form/components/EditContactInfo.jsx index cfc72e77372e..f973877d8fbd 100644 --- a/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskGray/form/components/EditContactInfo.jsx +++ b/src/applications/_mock-form-ae-design-patterns/patterns/pattern2/TaskGray/form/components/EditContactInfo.jsx @@ -85,6 +85,7 @@ export const BuildPage = props => { isDeleteDisabled cancelCallback={handlers.cancel} successCallback={handlers.success} + saveButtonText="Save to profile" />
- This is the contact information we have on file for you. We’ll send any - updates or information about your {appName} to this address. -
- > - ), // page titles & link aria-labels editHomePhone: 'Edit home phone number',