Merge branch 'develop' into jw-ds-publish-checkbox

department-of-veterans-affairs · Oct 7, 2024 · c599d3b · c599d3b
2 parents 557a017 + 61e0fc5
commit c599d3b
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 81 deletions.
diff --git a/VAMobile/package.json b/VAMobile/package.json
@@ -41,7 +41,7 @@
     "@department-of-veterans-affairs/mobile-component-library": "0.21.0",
     "@department-of-veterans-affairs/mobile-tokens": "0.17.1",
     "@expo/react-native-action-sheet": "^4.1.0",
-    "@react-native-async-storage/async-storage": "^1.23.1",
+    "@react-native-async-storage/async-storage": "^1.24.0",
     "@react-native-firebase/analytics": "^18.9.0",
     "@react-native-firebase/app": "^18.9.0",
     "@react-native-firebase/crashlytics": "^18.9.0",
@@ -73,7 +73,7 @@
     "react-native-image-picker": "^7.1.2",
     "react-native-keyboard-manager": "^6.5.11-2",
     "react-native-keychain": "^8.2.0",
-    "react-native-localize": "^3.1.0",
+    "react-native-localize": "^3.2.1",
     "react-native-notifications": "^5.1.0",
     "react-native-safe-area-context": "^4.10.9",
     "react-native-screens": "^3.34.0",
@@ -92,7 +92,7 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-transform-runtime": "^7.24.7",
     "@babel/preset-env": "^7.24.8",
-    "@babel/preset-typescript": "^7.24.7",
+    "@babel/preset-typescript": "^7.25.7",
     "@babel/runtime": "^7.24.8",
     "@department-of-veterans-affairs/eslint-config-mobile": "0.15.0",
     "@react-native/babel-preset": "0.75.3",
@@ -123,7 +123,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.0",
+    "eslint-plugin-react": "^7.37.1",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-native": "^4.1.0",
     "husky": "^9.1.6",

diff --git a/VAMobile/src/components/VABulletList.tsx b/VAMobile/src/components/VABulletList.tsx
@@ -94,7 +94,7 @@ const VABulletList: FC<VABulletListProps> = ({ listOfText, paragraphSpacing }) =
             <Box mr={20} mt={12}>
               <VAIcon name="Bullet" fill={color || 'bodyText'} height={6} width={6} />
             </Box>
-            <TextView {...textViewProps} accessibilityLabel={a11yLabel || text}>
+            <TextView {...textViewProps} accessibilityLabel={a11yLabel}>
               {!!boldedTextPrefix && <TextView variant="MobileBodyBold">{boldedTextPrefix}</TextView>}
               {text.trim()}
               {!!boldedText && <TextView variant="MobileBodyBold">{boldedText}</TextView>}

diff --git a/...sScreen/AppealDetailsScreen/AppealStatus/AppealCurrentStatus/AppealCurrentStatus.test.tsx b/...sScreen/AppealDetailsScreen/AppealStatus/AppealCurrentStatus/AppealCurrentStatus.test.tsx
@@ -181,9 +181,8 @@ context('AppealStatus', () => {
         ),
       ).toBeTruthy()
       expect(
-        screen.getByLabelText("Submit VA Form 9 to continue your appeal to the Board of Veterans' Appeals,"),
+        screen.getByText("Submit VA Form 9 to continue your appeal to the Board of Veterans' Appeals, or"),
       ).toBeTruthy()
-      expect(screen.getByText('or')).toBeTruthy()
       expect(screen.getByText('Opt in to the new decision review process')).toBeTruthy()
     })
   })

diff --git a/...msScreen/ClaimDetailsScreen/ClaimStatus/ClosedClaimInfo/ClosedClaimStatusDetails.test.tsx b/...msScreen/ClaimDetailsScreen/ClaimStatus/ClosedClaimInfo/ClosedClaimStatusDetails.test.tsx
@@ -39,8 +39,8 @@ context('ClosedClaimStatusDetails', () => {
 
   it('renders list of claimed items', () => {
     renderWithProps()
-    expect(screen.getByLabelText('Hearing Loss (Increase)')).toBeTruthy()
-    expect(screen.getByLabelText('Ankle strain (related to: PTSD - Combat POW) (New)')).toBeTruthy()
-    expect(screen.getByLabelText('Diabetes mellitus2 (Secondary)')).toBeTruthy()
+    expect(screen.getByText('Hearing Loss (Increase)')).toBeTruthy()
+    expect(screen.getByText('Ankle strain (related to: PTSD - Combat POW) (New)')).toBeTruthy()
+    expect(screen.getByText('Diabetes mellitus2 (Secondary)')).toBeTruthy()
   })
 })
diff --git a/...bile/src/screens/HealthScreen/Pharmacy/PrescriptionDetails/PrescriptionsDetailsBanner.tsx b/...bile/src/screens/HealthScreen/Pharmacy/PrescriptionDetails/PrescriptionsDetailsBanner.tsx
@@ -34,7 +34,6 @@ function PrescriptionsDetailsBanner() {
       {
         text: t('prescription.details.banner.bullet3'),
         boldedText: ' ' + t('or'),
-        a11yLabel: t('prescription.details.banner.bullet3') + ' ' + t('or'),
       },
       { text: t('prescription.details.banner.bullet4') },
     ]

diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/ReplyHelp/ReplyHelp.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/ReplyHelp/ReplyHelp.tsx
@@ -42,7 +42,6 @@ function ReplyHelp() {
             {
               boldedTextPrefix: t('secureMessaging.replyHelp.ifYoureInCrisis'),
               text: t('secureMessaging.replyHelp.connectWithOur'),
-              a11yLabel: t('secureMessaging.replyHelp.ifYoureInCrisis') + t('secureMessaging.replyHelp.connectWithOur'),
             },
           ]}
           paragraphSpacing={true}
@@ -56,7 +55,6 @@ function ReplyHelp() {
               {
                 boldedTextPrefix: t('secureMessaging.replyHelp.ifYouThink'),
                 text: t('secureMessaging.replyHelp.call911OrGoTo'),
-                a11yLabel: t('secureMessaging.replyHelp.ifYouThink') + t('secureMessaging.replyHelp.call911OrGoTo'),
               },
             ]}
             paragraphSpacing={true}

diff --git a/...reen/PersonalInformationScreen/GenderIdentityScreen/WhatToKnowScreen/WhatToKnowScreen.tsx b/...reen/PersonalInformationScreen/GenderIdentityScreen/WhatToKnowScreen/WhatToKnowScreen.tsx
@@ -33,33 +33,21 @@ function WhatToKnowScreen({}: WhatToKnowScreenProps) {
                 variant: 'MobileBody',
                 boldedTextPrefix: t('personalInformation.genderIdentity.whatToKnow.ReasonsToShare.1'),
                 text: t('personalInformation.genderIdentity.whatToKnow.ReasonsToShare.2'),
-                a11yLabel:
-                  t('personalInformation.genderIdentity.whatToKnow.ReasonsToShare.1') +
-                  t('personalInformation.genderIdentity.whatToKnow.ReasonsToShare.2'),
               },
               {
                 variant: 'MobileBody',
                 boldedTextPrefix: t('personalInformation.genderIdentity.whatToKnow.whoCanAccess'),
                 text: t('personalInformation.genderIdentity.whatToKnow.privacy'),
-                a11yLabel:
-                  t('personalInformation.genderIdentity.whatToKnow.whoCanAccess') +
-                  t('personalInformation.genderIdentity.whatToKnow.privacy'),
               },
               {
                 variant: 'MobileBody',
                 boldedTextPrefix: t('personalInformation.genderIdentity.whatToKnow.healthRecordsOnly.1'),
                 text: t('personalInformation.genderIdentity.whatToKnow.healthRecordsOnly.2'),
-                a11yLabel:
-                  t('personalInformation.genderIdentity.whatToKnow.healthRecordsOnly.1') +
-                  t('personalInformation.genderIdentity.whatToKnow.healthRecordsOnly.2'),
               },
               {
                 variant: 'MobileBody',
                 boldedTextPrefix: t('personalInformation.genderIdentity.whatToKnow.birthCertificate.1'),
                 text: t('personalInformation.genderIdentity.whatToKnow.birthCertificate.2'),
-                a11yLabel:
-                  t('personalInformation.genderIdentity.whatToKnow.birthCertificate.1') +
-                  t('personalInformation.genderIdentity.whatToKnow.birthCertificate.2'),
               },
             ]}
           />

diff --git a/VAMobile/src/screens/auth/LoaGate/LoaGate.tsx b/VAMobile/src/screens/auth/LoaGate/LoaGate.tsx
@@ -21,7 +21,6 @@ function LoaGate({}: LoaGateProps) {
   const bulletOne = {
     text: t('loaGate.readMore.bulletOne'),
     boldedText: ' ' + t('loaGate.readMore.or'),
-    a11yLabel: t('loaGate.readMore.bulletOne.a11y'),
   }
 
   const bodyTextProps: TextViewProps = {