Merge v2.37.0 to develop (#9605)

Co-authored-by: Dylan Nienberg <[email protected]> Co-authored-by: rbontrager <[email protected]>
department-of-veterans-affairs · Sep 18, 2024 · 11fce4f · 11fce4f
1 parent 0eca14b
commit 11fce4f
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 87 deletions.
diff --git a/VAMobile/android/fastlane/metadata/android/en-US/changelogs/default.txt b/VAMobile/android/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1 +1 @@
-We fixed an accessibility issue where some users were not able use a keyboard to navigate the app.
+We added general improvements and fixed a few bugs.
diff --git a/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts b/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts
@@ -130,15 +130,15 @@ const AFNavigationForIndividual = [
   ],
   ['BenefitLetters.e2e', 'WG_ClaimLettersScreen', 'Benefits', 'Claims', 'Claim letters'],
   ['Claims.e2e', 'WG_ClaimDetailsScreen', 'Benefits', 'Claims', 'Claims history', 'Received December 05, 2021'],
-  [
-    'Claims.e2e',
-    'WG_SubmitEvidence',
-    'Benefits',
-    'Claims',
-    'Claims history',
-    'Received December 05, 2021',
-    'Submit evidence',
-  ],
+  // [
+    // 'Claims.e2e',
+    // 'WG_SubmitEvidence',
+    // 'Benefits',
+    // 'Claims',
+    // 'Claims history',
+    // 'Received December 05, 2021',
+    // 'Submit evidence',
+  // ],
   ['Appeals.e2e', 'WG_AppealDetailsScreen', 'Benefits', 'Claims', 'Claims history', 'Received July 17, 2008'],
   [
     'Claims.e2e',

diff --git a/VAMobile/e2e/tests/Claims.e2e.ts b/VAMobile/e2e/tests/Claims.e2e.ts
@@ -225,80 +225,81 @@ describe(':ios: Claims Screen', () => {
     ).toExist()
   })
 
-  it('should verify submit evidence button exists', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
-    await element(by.text('Submit evidence')).tap()
-  })
-
-  it('should verify submit evidence screen', async () => {
-    await expect(element(by.text('Submit evidence'))).toExist()
-    await expect(element(by.text('What to know before you submit evidence'))).toExist()
-    await expect(
-      element(
-        by.text(
-          'You can submit evidence for this claim at any time. But if you submit evidence after Step 3, your claim will go back to that step for review.',
-        ),
-      ),
-    ).toExist()
-    await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT))).toExist()
-    await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT))).toExist()
-  })
-
-  it('verify the select files screen displays the correct info', async () => {
-    await element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).tap()
-    await expect(element(by.text('Select a file to upload'))).toExist()
-    await expect(element(by.label(ClaimsE2eIdConstants.MAXIMUM_FILE_SIZE_LABEL))).toExist()
-    await expect(element(by.text(ClaimsE2eIdConstants.ACCEPTED_FILE_TYPES_TEXT))).toExist()
-    await expect(element(by.id(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1)).toExist()
-  })
-
-  it('verify tap select a file options', async () => {
-    if (device.getPlatform() === 'android') {
-      await element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1).tap()
-    } else {
-      await element(by.id(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1).tap()
-    }
-    await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_FILE_FOLDER_OPTION_TEXT))).toExist()
-    await expect(element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT))).toExist()
-  })
-
-  it('should navigate back to the submit evidence screen', async () => {
-    if (device.getPlatform() === 'android') {
-      await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).tap()
-    } else {
-      await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).atIndex(1).tap()
-    }
-    await element(by.text('Back')).tap()
-  })
-
-  it('should verify take or select photos flow', async () => {
-    await element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).tap()
-    await expect(element(by.text('This feature is not yet accessible to screen readers'))).toExist()
-    await expect(element(by.label(ClaimsE2eIdConstants.MAXIMUM_FILE_SIZE_LABEL))).toExist()
-    await expect(element(by.text(ClaimsE2eIdConstants.ACCEPTED_FILE_TYPES_TEXT))).toExist()
-    await expect(element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(1)).toExist()
-  })
-
-  it('should select take or select photos and verify the options given', async () => {
-    await element(by.id('takePhotosTestID')).scrollTo('bottom')
-    if (device.getPlatform() === 'android') {
-      await element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(0).tap()
-    } else {
-      await element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(1).tap()
-    }
-    await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_CAMERA_OPTION_TEXT))).toExist()
-    await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_PHOTO_GALLERY_OPTION_TEXT))).toExist()
-  })
-
-  it('should navigate back to the claim details screen', async () => {
-    if (device.getPlatform() === 'android') {
-      await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).tap()
-    } else {
-      await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).atIndex(1).tap()
-    }
-    await element(by.text('Back')).tap()
-    await element(by.text('Cancel')).tap()
-  })
+  //flag has been turned off per slack convo in DSVA, commenting tests out until it is turned back on
+  // it('should verify submit evidence button exists', async () => {
+  //   await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
+  //   await element(by.text('Submit evidence')).tap()
+  // })
+
+  // it('should verify submit evidence screen', async () => {
+  //   await expect(element(by.text('Submit evidence'))).toExist()
+  //   await expect(element(by.text('What to know before you submit evidence'))).toExist()
+  //   await expect(
+  //     element(
+  //       by.text(
+  //         'You can submit evidence for this claim at any time. But if you submit evidence after Step 3, your claim will go back to that step for review.',
+  //       ),
+  //     ),
+  //   ).toExist()
+  //   await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT))).toExist()
+  //   await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT))).toExist()
+  // })
+
+  // it('verify the select files screen displays the correct info', async () => {
+  //   await element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).tap()
+  //   await expect(element(by.text('Select a file to upload'))).toExist()
+  //   await expect(element(by.label(ClaimsE2eIdConstants.MAXIMUM_FILE_SIZE_LABEL))).toExist()
+  //   await expect(element(by.text(ClaimsE2eIdConstants.ACCEPTED_FILE_TYPES_TEXT))).toExist()
+  //   await expect(element(by.id(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1)).toExist()
+  // })
+
+  // it('verify tap select a file options', async () => {
+  //   if (device.getPlatform() === 'android') {
+  //     await element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1).tap()
+  //   } else {
+  //     await element(by.id(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(1).tap()
+  //   }
+  //   await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_FILE_FOLDER_OPTION_TEXT))).toExist()
+  //   await expect(element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT))).toExist()
+  // })
+
+  // it('should navigate back to the submit evidence screen', async () => {
+  //   if (device.getPlatform() === 'android') {
+  //     await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).tap()
+  //   } else {
+  //     await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).atIndex(1).tap()
+  //   }
+  //   await element(by.text('Back')).tap()
+  // })
+
+  // it('should verify take or select photos flow', async () => {
+  //   await element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).tap()
+  //   await expect(element(by.text('This feature is not yet accessible to screen readers'))).toExist()
+  //   await expect(element(by.label(ClaimsE2eIdConstants.MAXIMUM_FILE_SIZE_LABEL))).toExist()
+  //   await expect(element(by.text(ClaimsE2eIdConstants.ACCEPTED_FILE_TYPES_TEXT))).toExist()
+  //   await expect(element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(1)).toExist()
+  // })
+
+  // it('should select take or select photos and verify the options given', async () => {
+  //   await element(by.id('takePhotosTestID')).scrollTo('bottom')
+  //   if (device.getPlatform() === 'android') {
+  //     await element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(0).tap()
+  //   } else {
+  //     await element(by.id(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT)).atIndex(1).tap()
+  //   }
+  //   await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_CAMERA_OPTION_TEXT))).toExist()
+  //   await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_PHOTO_GALLERY_OPTION_TEXT))).toExist()
+  // })
+
+  // it('should navigate back to the claim details screen', async () => {
+  //   if (device.getPlatform() === 'android') {
+  //     await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).tap()
+  //   } else {
+  //     await element(by.text(CommonE2eIdConstants.CANCEL_PLATFORM_SPECIFIC_TEXT)).atIndex(1).tap()
+  //   }
+  //   await element(by.text('Back')).tap()
+  //   await element(by.text('Cancel')).tap()
+  // })
 
   it('should verify details of claim on step 3 w/ waiver', async () => {
     await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()

diff --git a/VAMobile/e2e/tests/Navigation.e2e.ts b/VAMobile/e2e/tests/Navigation.e2e.ts
@@ -36,7 +36,7 @@ const navigationDic = {
     ['Claims.e2e', ['Claims', 'Claims history', 'Closed'], 'Your closed claims, decision reviews, and appeals'],
     ['Claims.e2e', ['Claims', 'Claims history', 'Active'], 'Your active claims, decision reviews, and appeals'],
     ['Claims.e2e', ['Claims', 'Claims history', 'Received July 20, 2021'], 'Claim details'],
-    ['Claims.e2e', ['Claims', 'Claims history', 'Received July 20, 2021', 'Submit evidence'], 'Submit evidence'],
+    //['Claims.e2e', ['Claims', 'Claims history', 'Received July 20, 2021', 'Submit evidence'], 'Submit evidence'],
     ['Claims.e2e', ['Claims', 'Claims history', 'Received January 01, 2021', 'Review file requests'], 'File requests'],
     [
       'Claims.e2e',

diff --git a/VAMobile/ios/fastlane/metadata/en-US/release_notes.txt b/VAMobile/ios/fastlane/metadata/en-US/release_notes.txt
@@ -1 +1 @@
-We fixed an accessibility issue where some users were not able use a keyboard to navigate the app.
+We added general improvements and fixed a few bugs.
diff --git a/VAMobile/src/utils/remoteConfig.ts b/VAMobile/src/utils/remoteConfig.ts
@@ -66,7 +66,7 @@ export const defaults: FeatureToggleValues = {
   patientCheckInWaygate: true,
   preferredNameGenderWaygate: true,
   prescriptions: true,
-  submitEvidenceExpansion: true,
+  submitEvidenceExpansion: false,
   testFeature: false,
   whatsNewUI: true,
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		We fixed an accessibility issue where some users were not able use a keyboard to navigate the app.
		We added general improvements and fixed a few bugs.