Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/9661-Chika-AddDODToProofOfVeteranStatus #10266

Merged
merged 4 commits into from
Dec 3, 2024
Merged

feature/9661-Chika-AddDODToProofOfVeteranStatus #10266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb47868
added dod id to veteran status screen
cadibemma Nov 22, 2024
37bd40d
updated demo mode
cadibemma Nov 22, 2024
6165f33
detox test update
cadibemma Nov 22, 2024
b9032d8
Merge branch 'develop' into 9661-add-dod-to-proof-of-vs
cadibemma Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions VAMobile/e2e/tests/VeteranStatusCard.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export async function validateVeteranStatusDesign() {
await expect(element(by.id('veteranStatusBranchTestID'))).toExist()
await expect(element(by.id('veteranStatusDisabilityRatingTestID'))).toExist()
await expect(element(by.id('veteranStatusMilitaryServiceTestID')).atIndex(0)).toExist()
await expect(element(by.id('veteranStatusDODTestID'))).toExist()
await expect(element(by.text(VeteranStatusCardConstants.VETERAN_STATUS_DISCLAIMER_TEXT))).toExist()
await expect(element(by.text(VeteranStatusCardConstants.VETERAN_STATUS_DOB_DISABILITY_ERROR_PHONE_TEXT))).toExist()
await expect(element(by.id(CommonE2eIdConstants.CALL_VA_TTY_PHONE_NUMBER_ID)).atIndex(0)).toExist()
Expand Down
1 change: 1 addition & 0 deletions VAMobile/src/api/types/PersonalInformationData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type PersonalInformationPayload = {
signinService: string
birthDate: string | null
hasFacilityTransitioningToCerner: boolean
edipi: string | null
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions VAMobile/src/screens/HomeScreen/VeteranStatusScreen/VeteranStatusScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,23 @@ function VeteranStatusScreen({ navigation }: VeteranStatusScreenProps) {
</TextView>
</Box>
)}
<Box {...boxProps} borderBottomWidth={theme.dimensions.borderWidth} mb={theme.dimensions.formMarginBetween}>
<Box {...boxProps} borderBottomWidth={personalInfo?.edipi ? 0 : theme.dimensions.borderWidth}>
<TextView variant="MobileBodyBold" color="primaryContrast" accessibilityRole="header">
{t('veteranStatus.periodOfService')}
</TextView>
{getPeriodOfService}
</Box>
<Box mb={theme.dimensions.formMarginBetween}>
{personalInfo?.edipi && (
<Box {...boxProps} borderBottomWidth={theme.dimensions.borderWidth}>
<TextView variant="MobileBodyBold" color="primaryContrast" accessibilityRole="header">
{t('veteranStatus.dodIdNumber')}
</TextView>
<TextView variant="MobileBody" color="primaryContrast" testID="veteranStatusDODTestID">
{personalInfo?.edipi}
</TextView>
</Box>
)}
<Box my={theme.dimensions.formMarginBetween}>
<TextView variant="MobileBody" color="primaryContrast" mb={theme.dimensions.formMarginBetween}>
{t('veteranStatus.uniformedServices')}
</TextView>
Expand Down
3 changes: 2 additions & 1 deletion VAMobile/src/store/api/demo/mocks/personalInformation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"signinEmail": "[email protected]",
"signinService": "IDME",
"birthDate": "1950-01-01",
"hasFacilityTransitioningToCerner": false
"hasFacilityTransitioningToCerner": false,
"edipi": "1235981947"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions VAMobile/src/translations/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,7 @@
"veteransCrisisLine.urlDisplayed": "VeteransCrisisLine.net",
"veteransCrisisLine.weAreHereForYou": "We’re here anytime, day or night – 24/7",
"veteransCrisisLine.weAreHereForYou.a11yLabel": "We’re here anytime, day or night – 24 7",
"veteranStatus.dodIdNumber": "DoD ID number",
"veteranStatus.editPhoto": "Edit photo",
"veteranStatus.fixAnError": "Need to fix an error?",
"veteranStatus.fixAnError.2": "To fix an error in your disability benefits, call us.",
Expand Down
Loading