diff --git a/.github/workflows/e2e_detox_mapping.yml b/.github/workflows/e2e_detox_mapping.yml
index b7a1ffbb162..366a531c42a 100644
--- a/.github/workflows/e2e_detox_mapping.yml
+++ b/.github/workflows/e2e_detox_mapping.yml
@@ -71,7 +71,7 @@ jobs:
             jq 'select(contains(["Login"])) += ["LoginScreen"] | 
             select(contains(["AppealsDetailsScreen"])) += ["Appeals", "AppealsExpanded"] |
             select(contains(["NeedHelpData"]) or contains(["NoClaimsAndAppeals"]) or contains(["NoClaimsAndAppealsAccess"]) or contains(["ClaimsAndAppealsListView"]) or contains(["claimsAndAppeals"])) += ["Appeals", "AppealsExpanded", "Claims"] |
-            select(contains(["ClaimsDetailsScreen"]) or contains(["ClaimsLettersScreen"]) or contains(["ClaimsHistoryScreen"])) += ["Claims"] |
+            select(contains(["ClaimsDetailsScreen"]) or contains(["ClaimsLettersScreen"]) or contains(["SubmitEvidence"]) or contains(["ClaimsHistoryScreen"])) += ["Claims"] |
             select(contains(["ClaimsLettersScreen"]) or contains(["decisionLetters"])) += ["DecisionLetters"] |
             select(contains(["DisabilityRatingsScreen"]) or contains(["disabilityRating"])) += ["DisabilityRatings", "VeteranStatusCard"] |
             select(contains(["Letters"]) or contains(["letters"])) += ["VALetters"] |
diff --git a/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts b/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts
index 62c410b722f..683d47b1073 100644
--- a/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts
+++ b/VAMobile/e2e/tests/AvailabilityFramework.e2e.ts
@@ -130,6 +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',
+  ],
   ['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
index 5ce197a7fa5..93879bd5161 100644
--- a/VAMobile/e2e/tests/Claims.e2e.ts
+++ b/VAMobile/e2e/tests/Claims.e2e.ts
@@ -155,139 +155,63 @@ describe(':ios: Claims Screen', () => {
     await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
   })
 
-  it('automatically expands and scrolls to current step', async () => {
+  it('automatically expands and scrolls to current step and dates match', async () => {
     await element(by.id(ClaimsE2eIdConstants.CLAIM_4_ID)).tap()
     await expect(element(by.text('Received January 01, 2021'))).toExist()
   })
 
   it('should verify that the review file request alert is visible', async () => {
+    await expect(element(by.label('You have 3 file requests'))).toExist()
     await waitFor(element(by.id(ClaimsE2eIdConstants.ALERT_FILE_REQUEST_BUTTON_ID))).toExist()
   })
 
-  it('should tap on a claim and verify the dates match', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
-    await expect(element(by.text('Received January 01, 2021'))).toExist()
+  it('should verify that user is sent to File requests screen', async () => {
+    await element(by.id(ClaimsE2eIdConstants.ALERT_FILE_REQUEST_BUTTON_ID)).tap()
+    await expect(element(by.text('You have 3 file requests from VA'))).toExist()
+    await expect(element(by.text('Dental disability - More information needed'))).toExist()
   })
 
-  it('verify number of requests in review file requests', async () => {
-    await expect(element(by.label('You have 3 file requests'))).toExist()
-    await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
+  it('verify that the user is sent to the file upload page', async () => {
+    await element(by.text('Dental disability - More information needed')).tap()
+    await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT))).toExist()
+    await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT))).toExist()
+  })
+
+  it('should back out of the file request screen and reenter a new file request screen', async () => {
+    await element(by.text('Back')).tap()
+    await element(by.text('Accidental injury - 21-4176 needed')).tap()
+  })
+
+  it('verify Review evaluation details', async () => {
+    await element(by.text('Back')).tap()
+    await element(by.id('fileRequestPageTestID')).scrollTo('bottom')
+    await element(by.id('Review evaluation details')).tap()
+    await expect(element(by.text('Claim evaluation'))).toExist()
+    await expect(
+      element(
+        by.text(
+          'I have submitted all evidence that will support my claim and I’m not going to turn in any more information. I would like VA to make a decision on my claim based on the information already provided. (Required)',
+        ),
+      ),
+    ).toExist()
+    await expect(element(by.id('Request claim evaluation'))).toExist()
   })
 
-  /******* Commented out because file request/review details buttons are moving *******/
-  //
-  // it('should verify that the review file request button is visible in step 3', async () => {
-  //   await waitFor(element(by.text('Review file requests')))
-  //     .toBeVisible()
-  //     .whileElement(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
-  //     .scroll(100, 'down')
-  // })
-
-  // it('expand step 3 and verify that the review file request button is visible', async () => {
-  //   await element(by.id('Step 3 of 5. current. Evidence gathering, review, and decision June 4, 2021')).tap()
-  //   await expect(element(by.id(ClaimsE2eIdConstants.FILE_REQUEST_BUTTON_ID))).toExist()
-  //   await element(by.id('Step 3 of 5. current. Evidence gathering, review, and decision June 4, 2021')).tap()
-  // })
-
-  // it('verify that the user is sent to the file upload page', async () => {
-  //   await element(by.text('Dental disability - More information needed')).tap()
-  //   await expect(element(by.text(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT))).toExist()
-  //   await expect(element(by.text(ClaimsE2eIdConstants.TAKE_OR_SELECT_PHOTOS_TEXT))).toExist()
-  // })
-
-  // it('should back out of the file request screen and reenter a new file request screen', async () => {
-  //   await element(by.text('Requests')).tap()
-  //   await element(by.text('Accidental injury - 21-4176 needed')).tap()
-  // })
-
-  // 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 for Accidental injury - 21-4176 needed'))).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(0).tap()
-  //   } else {
-  //     await element(by.id(ClaimsE2eIdConstants.SELECT_A_FILE_TEXT)).atIndex(0).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 request <x> select a file 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(CommonE2eIdConstants.CANCEL_UNIVERSAL_TEXT)).tap()
-  // })
-
-  // it('verify take or select photos panel', 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 file request 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(CommonE2eIdConstants.CANCEL_UNIVERSAL_TEXT)).tap()
-  //   await element(by.text('Requests')).tap()
-  // })
-
-  // it('verify Review evaluation details', async () => {
-  //   await element(by.id('fileRequestPageTestID')).scrollTo('bottom')
-  //   await element(by.id('Review evaluation details')).tap()
-  //   await expect(element(by.text('Claim evaluation'))).toExist()
-  //   await expect(
-  //     element(
-  //       by.text(
-  //         'I have submitted all evidence that will support my claim and I’m not going to turn in any more information. I would like VA to make a decision on my claim based on the information already provided. (Required)',
-  //       ),
-  //     ),
-  //   ).toExist()
-  //   await expect(element(by.id('Request claim evaluation'))).toExist()
-  // })
-
-  // it('verify error is displayed when request claim evaluation isnt checked', async () => {
-  //   await element(by.id('askForClaimDecisionPageTestID')).scrollTo('bottom')
-  //   await element(by.id('Request claim evaluation')).tap()
-  //   await expect(element(by.text('Check the box to confirm the information is correct.'))).toExist()
-  // })
-
-  // it('should navigate back to the claims history screen', async () => {
-  //   await element(by.text('Cancel')).tap()
-  //   await element(by.text('Claim')).tap()
-  //   await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
-  // })
+  it('verify error is displayed when request claim evaluation isnt checked', async () => {
+    await element(by.id('askForClaimDecisionPageTestID')).scrollTo('bottom')
+    await element(by.id('Request claim evaluation')).tap()
+    await expect(element(by.text('Check the box to confirm the information is correct.'))).toExist()
+  })
 
   it('should verify details of claim on step 1', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_HISTORY_SCREEN_ID)).scrollTo('top')
+    await element(by.text('Back')).tap()
+    await element(by.text('Cancel')).tap()
+    await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
+    await element(by.id('claimsHistoryID')).scrollTo('top')
     await element(by.id(ClaimsE2eIdConstants.CLAIM_1_ID)).tap()
     await expect(element(by.id('Step 1. Claim received. Current step.'))).toExist()
     await expect(element(by.text(ClaimsE2eIdConstants.CURRENT_STEP_TEXT))).toExist()
-    await expect(element(by.text('Thank you. VA received your claim')))
+    await expect(element(by.text('Thank you. VA received your claim'))).toExist()
     await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
   })
 
@@ -299,10 +223,85 @@ describe(':ios: Claims Screen', () => {
         by.text('Your claim has been assigned to a reviewer who is determining if additional information is needed.'),
       ),
     ).toExist()
-    await element(by.text(CommonE2eIdConstants.CLAIMS_HISTORY_BUTTON_TEXT)).tap()
+  })
+
+  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()
     await waitFor(element(by.id(ClaimsE2eIdConstants.CLAIM_5_ID)))
       .toBeVisible()
       .whileElement(by.id(ClaimsE2eIdConstants.CLAIMS_HISTORY_SCREEN_ID))
diff --git a/VAMobile/e2e/tests/Navigation.e2e.ts b/VAMobile/e2e/tests/Navigation.e2e.ts
index b73b920fe7d..f20a664131e 100644
--- a/VAMobile/e2e/tests/Navigation.e2e.ts
+++ b/VAMobile/e2e/tests/Navigation.e2e.ts
@@ -36,6 +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 January 01, 2021', 'Review file requests'], 'File requests'],
     [
       'Claims.e2e',
@@ -261,7 +262,7 @@ const navigateToPage = async (key, navigationDicValue) => {
         .toBeVisible()
         .whileElement(by.id('claimsHistoryID'))
         .scroll(100, 'down')
-    } else if (subNavigationArray.slice(-1)[0] === 'Files') {
+    } else if (subNavigationArray.slice(-1)[0] === 'Files' || subNavigationArray.slice(-1)[0] === 'Submit evidence') {
       await element(by.id('ClaimDetailsScreen')).scrollTo('top')
     }
 
diff --git a/VAMobile/e2e/tests/utils.ts b/VAMobile/e2e/tests/utils.ts
index 9e11b4546d4..53f6706cb71 100644
--- a/VAMobile/e2e/tests/utils.ts
+++ b/VAMobile/e2e/tests/utils.ts
@@ -373,7 +373,8 @@ export async function enableAF(AFFeature, AFUseCase, AFAppUpdate = false) {
       AFFeature === 'WG_WhatToKnow' ||
       AFFeature === 'WG_EditAddress' ||
       AFFeature === 'WG_EditPhoneNumber' ||
-      AFFeature === 'WG_EditEmail') &&
+      AFFeature === 'WG_EditEmail' ||
+	  AFFeature === 'WG_ConsolidatedClaimsNote') &&
     AFUseCase === 'DenyAccess'
   ) {
     await resetInAppReview()
diff --git a/VAMobile/src/api/claimsAndAppeals/uploadFileToClaim.tsx b/VAMobile/src/api/claimsAndAppeals/uploadFileToClaim.tsx
index 028c1ea2d3c..a3d7ba3b1bf 100644
--- a/VAMobile/src/api/claimsAndAppeals/uploadFileToClaim.tsx
+++ b/VAMobile/src/api/claimsAndAppeals/uploadFileToClaim.tsx
@@ -22,8 +22,11 @@ import { claimsAndAppealsKeys } from './queryKeys'
 
 /**
  * Uploads a File to Claim
+ *
+ * request is only required if the upload is tied to a file request
+ * if the upload is not tied to a file request, request is null but documentType is required
  */
-const uploadFileToClaim = ({ claimID, request, files }: UploadFileToClaimParamaters) => {
+const uploadFileToClaim = ({ claimID, documentType, request, files }: UploadFileToClaimParamaters) => {
   if (files.length > 1) {
     const fileStrings = files.map((file: DocumentPickerResponse | Asset) => {
       return file.base64
@@ -32,8 +35,8 @@ const uploadFileToClaim = ({ claimID, request, files }: UploadFileToClaimParamat
     const payload = JSON.parse(
       JSON.stringify({
         files: fileStrings,
-        trackedItemId: request.trackedItemId,
-        document_type: request.documentType,
+        trackedItemId: request?.trackedItemId,
+        document_type: request?.documentType || documentType,
       }),
     )
     return post<ClaimDocUploadData>(`/v0/claim/${claimID}/documents/multi-image`, payload as unknown as Params)
@@ -67,8 +70,12 @@ const uploadFileToClaim = ({ claimID, request, files }: UploadFileToClaimParamat
       ),
     )
 
-    formData.append('trackedItemId', JSON.parse(JSON.stringify(request.trackedItemId)))
-    formData.append('documentType', JSON.parse(JSON.stringify(request.documentType)))
+    if (request) {
+      formData.append('trackedItemId', JSON.parse(JSON.stringify(request.trackedItemId)))
+      formData.append('documentType', JSON.parse(JSON.stringify(request.documentType)))
+    } else {
+      formData.append('documentType', documentType)
+    }
     return post<ClaimDocUploadData>(
       `/v0/claim/${claimID}/documents`,
       formData as unknown as Params,
@@ -79,29 +86,43 @@ const uploadFileToClaim = ({ claimID, request, files }: UploadFileToClaimParamat
 
 /**
  * Returns a mutation for Uploading a File to Claim
+ * request is only required if the upload is tied to a file request
  */
 export const useUploadFileToClaim = (
   claimID: string,
-  request: ClaimEventData,
+  request: ClaimEventData | undefined,
   files: Array<Asset> | Array<DocumentPickerResponse> | undefined,
 ) => {
   const queryClient = useQueryClient()
-  const dateUploadedString = DateTime.local().toISO()
-  const claimData = queryClient.getQueryData([claimsAndAppealsKeys.claim, claimID]) as ClaimData
-  const indexOfRequest = claimData.attributes.eventsTimeline.findIndex((el) => el.description === request.description)
-  claimData.attributes.eventsTimeline[indexOfRequest].uploaded = true
-  claimData.attributes.eventsTimeline[indexOfRequest].status = FILE_REQUEST_STATUS.SUBMITTED_AWAITING_REVIEW
-  claimData.attributes.eventsTimeline[indexOfRequest].documents = createFileRequestDocumentsArray(
-    files || [],
-    request?.trackedItemId || undefined,
-    request?.documentType || '',
-    dateUploadedString,
-  )
-  claimData.attributes.eventsTimeline[indexOfRequest].uploadDate = dateUploadedString
-
   return useMutation({
     mutationFn: uploadFileToClaim,
     onSuccess: () => {
+      const dateUploadedString = DateTime.local().toISO()
+      const claimData = queryClient.getQueryData([claimsAndAppealsKeys.claim, claimID]) as ClaimData
+      if (request) {
+        const indexOfRequest = claimData.attributes.eventsTimeline.findIndex(
+          (el) => el.description === request.description,
+        )
+        claimData.attributes.eventsTimeline[indexOfRequest].uploaded = true
+        claimData.attributes.eventsTimeline[indexOfRequest].status = FILE_REQUEST_STATUS.SUBMITTED_AWAITING_REVIEW
+        claimData.attributes.eventsTimeline[indexOfRequest].documents = createFileRequestDocumentsArray(
+          files || [],
+          request?.trackedItemId || undefined,
+          request?.documentType || '',
+          dateUploadedString,
+        )
+        claimData.attributes.eventsTimeline[indexOfRequest].uploadDate = dateUploadedString
+      } else {
+        const claimEvent: ClaimEventData = {
+          type: '',
+          date: dateUploadedString,
+          status: FILE_REQUEST_STATUS.SUBMITTED_AWAITING_REVIEW,
+          uploaded: true,
+          uploadDate: dateUploadedString,
+          documents: createFileRequestDocumentsArray(files || [], undefined, '', dateUploadedString),
+        }
+        claimData.attributes.eventsTimeline.push(claimEvent)
+      }
       const setDataOptions: SetDataOptions = {
         updatedAt: DateTime.now().toMillis(),
       }
diff --git a/VAMobile/src/api/types/ClaimsAndAppealsData.ts b/VAMobile/src/api/types/ClaimsAndAppealsData.ts
index 3233b230253..8f1f9c90fea 100644
--- a/VAMobile/src/api/types/ClaimsAndAppealsData.ts
+++ b/VAMobile/src/api/types/ClaimsAndAppealsData.ts
@@ -588,6 +588,7 @@ export const FILE_REQUEST_STATUS: {
 
 export type UploadFileToClaimParamaters = {
   claimID: string
-  request: ClaimEventData
+  documentType: string
+  request: ClaimEventData | undefined
   files: Array<Asset> | Array<DocumentPickerResponse>
 }
diff --git a/VAMobile/src/screens/BenefitsScreen/BenefitsScreen.tsx b/VAMobile/src/screens/BenefitsScreen/BenefitsScreen.tsx
index edefc823abe..e80bc75a6bd 100644
--- a/VAMobile/src/screens/BenefitsScreen/BenefitsScreen.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/BenefitsScreen.tsx
@@ -9,7 +9,7 @@ import { useClaimsAndAppeals } from 'api/claimsAndAppeals'
 import { Box, CategoryLanding, CategoryLandingAlert, LargeNavButton } from 'components'
 import { CloseSnackbarOnNavigation } from 'constants/common'
 import { NAMESPACE } from 'constants/namespaces'
-import { FEATURE_LANDING_TEMPLATE_OPTIONS } from 'constants/screens'
+import { FEATURE_LANDING_TEMPLATE_OPTIONS, FULLSCREEN_SUBTASK_OPTIONS } from 'constants/screens'
 import ClaimsScreen from 'screens/BenefitsScreen/ClaimsScreen'
 import AppealDetailsScreen from 'screens/BenefitsScreen/ClaimsScreen/AppealDetailsScreen/AppealDetailsScreen'
 import ClaimDetailsScreen from 'screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen'
@@ -26,6 +26,7 @@ import { featureEnabled } from 'utils/remoteConfig'
 import { screenContentAllowed } from 'utils/waygateConfig'
 
 import { BenefitsStackParamList } from './BenefitsStackScreens'
+import SubmitEvidence from './ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence'
 import ClaimLettersScreen from './ClaimsScreen/ClaimLettersScreen/ClaimLettersScreen'
 
 type BenefitsScreenProps = StackScreenProps<BenefitsStackParamList, 'Benefits'>
@@ -147,7 +148,12 @@ function BenefitsStackScreen() {
         component={DisabilityRatingsScreen}
         options={{ headerShown: false }}
       />
-      <BenefitsScreenStack.Screen name="FileRequest" component={FileRequest} options={{ headerShown: false }} />
+      <BenefitsScreenStack.Screen name="FileRequest" component={FileRequest} options={FULLSCREEN_SUBTASK_OPTIONS} />
+      <BenefitsScreenStack.Screen
+        name="SubmitEvidence"
+        component={SubmitEvidence}
+        options={FULLSCREEN_SUBTASK_OPTIONS}
+      />
       <BenefitsScreenStack.Screen
         name="FileRequestDetails"
         component={FileRequestDetails}
diff --git a/VAMobile/src/screens/BenefitsScreen/BenefitsStackScreens.tsx b/VAMobile/src/screens/BenefitsScreen/BenefitsStackScreens.tsx
index 5aa86e7fe08..731ad7b11c4 100644
--- a/VAMobile/src/screens/BenefitsScreen/BenefitsStackScreens.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/BenefitsStackScreens.tsx
@@ -5,7 +5,7 @@ import { createStackNavigator } from '@react-navigation/stack'
 
 import { ClaimData, ClaimEventData, LetterTypes } from 'api/types'
 import { ClaimType } from 'constants/claims'
-import { FULLSCREEN_SUBTASK_OPTIONS, LARGE_PANEL_OPTIONS } from 'constants/screens'
+import { LARGE_PANEL_OPTIONS } from 'constants/screens'
 import AskForClaimDecision from 'screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/AskForClaimDecision/AskForClaimDecision'
 import SelectFile from 'screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/SelectFile'
 import UploadFile from 'screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/UploadFile/UploadFile'
@@ -68,24 +68,27 @@ export type BenefitsStackParamList = {
   }
   TakePhotos: {
     claimID: string
-    request: ClaimEventData
+    request?: ClaimEventData
     focusOnSnackbar?: boolean
   }
   SelectFile: {
     claimID: string
-    request: ClaimEventData
+    request?: ClaimEventData
     focusOnSnackbar?: boolean
   }
+  SubmitEvidence: {
+    claimID: string
+  }
   UploadOrAddPhotos: {
     claimID: string
-    request: ClaimEventData
     firstImageResponse: ImagePickerResponse
+    request?: ClaimEventData
   }
   UploadFile: {
     claimID: string
-    request: ClaimEventData
     fileUploaded: DocumentPickerResponse
     imageUploaded: ImagePickerResponse
+    request?: ClaimEventData
   }
 }
 
@@ -109,31 +112,31 @@ export const getBenefitsScreens = (): Array<ReactNode> => {
       key={'AskForClaimDecision'}
       name="AskForClaimDecision"
       component={AskForClaimDecision}
-      options={FULLSCREEN_SUBTASK_OPTIONS}
+      options={{ headerShown: false }}
     />,
     <BenefitsStack.Screen
       key={'TakePhotos'}
       name="TakePhotos"
       component={TakePhotos}
-      options={FULLSCREEN_SUBTASK_OPTIONS}
+      options={{ headerShown: false }}
     />,
     <BenefitsStack.Screen
       key={'SelectFile'}
       name="SelectFile"
       component={SelectFile}
-      options={FULLSCREEN_SUBTASK_OPTIONS}
+      options={{ headerShown: false }}
     />,
     <BenefitsStack.Screen
       key={'UploadOrAddPhotos'}
       name="UploadOrAddPhotos"
       component={UploadOrAddPhotos}
-      options={FULLSCREEN_SUBTASK_OPTIONS}
+      options={{ headerShown: false }}
     />,
     <BenefitsStack.Screen
       key={'UploadFile'}
       name="UploadFile"
       component={UploadFile}
-      options={FULLSCREEN_SUBTASK_OPTIONS}
+      options={{ headerShown: false }}
     />,
   ]
 }
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx
index 8ac6d2053c0..106b7966f41 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.test.tsx
@@ -31,6 +31,7 @@ context('ClaimDetailsScreen', () => {
     claim?: Partial<ClaimData>,
   ): void => {
     when(featureEnabled).calledWith('claimPhaseExpansion').mockReturnValue(featureFlag)
+    when(featureEnabled).calledWith('submitEvidenceExpansion').mockReturnValue(featureFlag)
     let queriesData: QueriesData | undefined
     if (claim) {
       queriesData = [
@@ -74,6 +75,19 @@ context('ClaimDetailsScreen', () => {
     })
   })
 
+  describe('submit evidence ', () => {
+    it('submit evidence button should exist', async () => {
+      renderWithData(ClaimTypeConstants.ACTIVE, true, {
+        ...claimData,
+        attributes: {
+          ...claimData.attributes,
+          phase: 2,
+        },
+      })
+      await waitFor(() => expect(screen.getByRole('button', { name: 'Submit evidence' })).toBeTruthy())
+    })
+  })
+
   describe('when the selected tab is status', () => {
     it('should display the ClaimStatus component', async () => {
       renderWithData(ClaimTypeConstants.ACTIVE, false, {
@@ -123,12 +137,12 @@ context('ClaimDetailsScreen', () => {
       await waitFor(() => expect(Linking.openURL).toHaveBeenCalled())
     })
 
-    it('should display on claim details, to be renamed files tab', async () => {
-      renderWithData(ClaimTypeConstants.ACTIVE, false, {
+    it('should display on claim files tab', async () => {
+      renderWithData(ClaimTypeConstants.ACTIVE, true, {
         ...claimData,
       })
-      await waitFor(() => fireEvent.press(screen.getByText('Details')))
-      await waitFor(() => fireEvent.press(screen.getByText('Details')))
+      await waitFor(() => fireEvent.press(screen.getByText('Files')))
+      await waitFor(() => fireEvent.press(screen.getByText('Files')))
       await waitFor(() => expect(screen.getByRole('header', { name: 'Need help?' })).toBeTruthy())
     })
   })
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx
index 8d5cadae41a..2def1723fda 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimDetailsScreen.tsx
@@ -7,7 +7,10 @@ import { StackScreenProps } from '@react-navigation/stack/lib/typescript/src/typ
 
 import { ButtonVariants, SegmentedControl } from '@department-of-veterans-affairs/mobile-component-library'
 import { AlertProps } from '@department-of-veterans-affairs/mobile-component-library/src/components/Alert/Alert'
-import { ButtonProps } from '@department-of-veterans-affairs/mobile-component-library/src/components/Button/Button'
+import {
+  Button,
+  ButtonProps,
+} from '@department-of-veterans-affairs/mobile-component-library/src/components/Button/Button'
 import { useQueryClient } from '@tanstack/react-query'
 import { TFunction } from 'i18next'
 
@@ -86,6 +89,7 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
   ) //force a rerender due to react query updating data
 
   const claimPhaseExpansionFlag = featureEnabled('claimPhaseExpansion')
+  const submitEvidenceExpansionFlag = featureEnabled('submitEvidenceExpansion')
 
   useBeforeNavBackListener(navigation, () => {
     // if claim is still loading cancel it
@@ -172,6 +176,11 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
     navigateTo('FileRequest', { claimID, claim })
   }
 
+  const submitEvidencePress = () => {
+    logAnalyticsEvent(Events.vama_claim_review(claimID, attributes.claimType, count))
+    navigateTo('SubmitEvidence', { claimID })
+  }
+
   const getActiveClosedClaimInformationAlertOrSubmitButton = () => {
     if (claimType === ClaimTypeConstants.CLOSED) {
       const isDecisionLetterReady =
@@ -225,6 +234,17 @@ function ClaimDetailsScreen({ navigation, route }: ClaimDetailsScreenProps) {
             <AlertWithHaptics {...alertProps} />
           </Box>
         )
+      } else if (submitEvidenceExpansionFlag && attributes?.open) {
+        const buttonProps: ButtonProps = {
+          buttonType: ButtonVariants.Primary,
+          label: t('claimDetails.submitEvidence'),
+          onPress: submitEvidencePress,
+        }
+        return (
+          <Box mt={theme.dimensions.standardMarginBetween} mx={theme.dimensions.gutter}>
+            <Button {...buttonProps} />
+          </Box>
+        )
       }
     }
     return <></>
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/AskForClaimDecision/AskForClaimDecision.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/AskForClaimDecision/AskForClaimDecision.tsx
index 273386eae70..4f0642346a2 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/AskForClaimDecision/AskForClaimDecision.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/AskForClaimDecision/AskForClaimDecision.tsx
@@ -135,7 +135,7 @@ function AskForClaimDecision({ navigation, route }: AskForClaimDecisionProps) {
 
   return (
     <FullScreenSubtask
-      leftButtonText={t('cancel')}
+      leftButtonText={t('back')}
       onLeftButtonPress={onCancelPress}
       title={t('askForClaimDecision.pageTitle')}
       testID="askForClaimDecisionPageTestID">
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequest.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequest.tsx
index 219ce5d7ed3..2750c1bff3a 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequest.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequest.tsx
@@ -10,8 +10,8 @@ import { useClaim } from 'api/claimsAndAppeals'
 import { ClaimEventData } from 'api/types'
 import {
   Box,
-  ChildTemplate,
   ErrorComponent,
+  FullScreenSubtask,
   LoadingComponent,
   SimpleList,
   SimpleListItemObj,
@@ -109,9 +109,9 @@ function FileRequest({ navigation, route }: FileRequestProps) {
   }
 
   return (
-    <ChildTemplate
-      backLabel={t('claim.backLabel')}
-      backLabelOnPress={navigation.goBack}
+    <FullScreenSubtask
+      leftButtonText={t('cancel')}
+      onLeftButtonPress={navigation.goBack}
       title={t('fileRequest.title')}
       testID="fileRequestPageTestID">
       {loadingClaim ? (
@@ -161,7 +161,7 @@ function FileRequest({ navigation, route }: FileRequestProps) {
           </Box>
         </Box>
       )}
-    </ChildTemplate>
+    </FullScreenSubtask>
   )
 }
 
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequestDetails/FileRequestDetails.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequestDetails/FileRequestDetails.tsx
index 64f631bbec3..8960b00576c 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequestDetails/FileRequestDetails.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequestDetails/FileRequestDetails.tsx
@@ -6,7 +6,7 @@ import { StackScreenProps } from '@react-navigation/stack/lib/typescript/src/typ
 import { Button, ButtonVariants } from '@department-of-veterans-affairs/mobile-component-library'
 import { map } from 'underscore'
 
-import { Box, BoxProps, ChildTemplate, TextArea, TextView } from 'components'
+import { Box, BoxProps, FullScreenSubtask, TextArea, TextView } from 'components'
 import { Events } from 'constants/analytics'
 import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
@@ -70,9 +70,9 @@ function FileRequestDetails({ navigation, route }: FileRequestDetailsProps) {
   }
 
   return (
-    <ChildTemplate
-      backLabel={t('request.backLabel')}
-      backLabelOnPress={navigation.goBack}
+    <FullScreenSubtask
+      leftButtonText={t('back')}
+      onLeftButtonPress={navigation.goBack}
       title={displayName || ''}
       testID="fileRequestDetailsID">
       <Box mb={contentMarginBottom} flex={1}>
@@ -132,7 +132,7 @@ function FileRequestDetails({ navigation, route }: FileRequestDetailsProps) {
           </Box>
         </Box>
       )}
-    </ChildTemplate>
+    </FullScreenSubtask>
   )
 }
 
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/SelectFile.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/SelectFile.tsx
index dc6c55ee618..3fc0e053297 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/SelectFile.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/SelectFile.tsx
@@ -43,7 +43,9 @@ function SelectFile({ navigation, route }: SelectFilesProps) {
       types: { images, plainText, pdf },
     } = DocumentPicker
 
-    logAnalyticsEvent(Events.vama_evidence_cont_1(claimID, request.trackedItemId || null, request.type, 'file'))
+    logAnalyticsEvent(
+      Events.vama_evidence_cont_1(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'file'),
+    )
 
     try {
       const document = (await pickSingle({
@@ -102,17 +104,24 @@ function SelectFile({ navigation, route }: SelectFilesProps) {
   const buttonTestId = IS_TEST ? 'selectfilebutton2' : t('fileUpload.selectAFile')
 
   const onCancel = () => {
-    logAnalyticsEvent(Events.vama_evidence_cancel_1(claimID, request.trackedItemId || null, request.type, 'file'))
+    logAnalyticsEvent(
+      Events.vama_evidence_cancel_1(
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
+        'file',
+      ),
+    )
     navigation.goBack()
   }
 
   return (
     <FullScreenSubtask
       scrollViewRef={scrollViewRef}
-      leftButtonText={t('cancel')}
+      leftButtonText={t('back')}
       onLeftButtonPress={onCancel}
       title={t('fileUpload.selectFiles')}>
-      <Box mb={theme.dimensions.contentMarginBottom}>
+      <Box flex={1}>
         {!!error && (
           <Box mb={theme.dimensions.standardMarginBetween}>
             <AlertWithHaptics variant="error" description={error} scrollViewRef={scrollViewRef} />
@@ -120,19 +129,25 @@ function SelectFile({ navigation, route }: SelectFilesProps) {
         )}
         <TextArea>
           <TextView variant="MobileBodyBold" accessibilityRole="header">
-            {t('fileUpload.selectAFileToUpload', { requestTitle: request.displayName || t('fileUpload.theRequest') })}
+            {request
+              ? t('fileUpload.selectAFileToUpload', { requestTitle: request.displayName || t('fileUpload.theRequest') })
+              : t('fileUpload.selectAFileToUploadSubmitEvidence')}
           </TextView>
-          <TextView variant="MobileBody" mt={theme.dimensions.standardMarginBetween} paragraphSpacing={true}>
+          <TextView variant="MobileBody" mt={theme.dimensions.standardMarginBetween}>
             {t('fileUpload.pleaseRequestFromPhoneFiles')}
             <TextView variant="MobileBodyBold">
               {t('fileUpload.pleaseRequestFromPhoneFiles.bolded')}
-              <TextView variant="MobileBody">{t('fileUpload.pleaseRequestFromPhoneFiles.pt2')}</TextView>
+              <TextView variant="MobileBody">
+                {request
+                  ? t('fileUpload.pleaseRequestFromPhoneFiles.pt2')
+                  : t('fileUpload.pleaseRequestFromPhoneFiles.pt2SubmitEvidence')}
+              </TextView>
             </TextView>
           </TextView>
           <TextView variant="MobileBodyBold" accessibilityRole="header" mt={theme.dimensions.standardMarginBetween}>
             {t('fileUpload.maxFileSize')}
           </TextView>
-          <TextView variant="MobileBody" accessibilityLabel={t('fileUpload.50MB.a11y')} paragraphSpacing={true}>
+          <TextView variant="MobileBody" accessibilityLabel={t('fileUpload.50MB.a11y')}>
             {t('fileUpload.50MB')}
           </TextView>
           <TextView variant="MobileBodyBold" accessibilityRole="header" mt={theme.dimensions.standardMarginBetween}>
@@ -140,9 +155,9 @@ function SelectFile({ navigation, route }: SelectFilesProps) {
           </TextView>
           <TextView variant="MobileBody">{t('fileUpload.acceptedFileTypeOptions')}</TextView>
         </TextArea>
-        <Box mt={theme.dimensions.standardMarginBetween} mx={theme.dimensions.gutter}>
-          <Button onPress={onSelectFile} label={t('fileUpload.selectAFile')} testID={buttonTestId} />
-        </Box>
+      </Box>
+      <Box mb={theme.dimensions.contentMarginBottom} mx={theme.dimensions.gutter}>
+        <Button onPress={onSelectFile} label={t('fileUpload.selectAFile')} testID={buttonTestId} />
       </Box>
     </FullScreenSubtask>
   )
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/UploadFile/UploadFile.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/UploadFile/UploadFile.tsx
index e5fb9838722..2dafd8b46d0 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/UploadFile/UploadFile.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SelectFile/UploadFile/UploadFile.tsx
@@ -1,28 +1,34 @@
 import React, { useEffect, useState } from 'react'
+import { useRef } from 'react'
 import { useTranslation } from 'react-i18next'
+import DocumentPicker from 'react-native-document-picker'
+import { ScrollView } from 'react-native/types'
 
 import { StackActions } from '@react-navigation/native'
 import { StackScreenProps } from '@react-navigation/stack/lib/typescript/src/types'
 
-import { Button } from '@department-of-veterans-affairs/mobile-component-library'
+import { Button, ButtonVariants } from '@department-of-veterans-affairs/mobile-component-library'
 
-import { useClaim, useUploadFileToClaim } from 'api/claimsAndAppeals'
+import { useUploadFileToClaim } from 'api/claimsAndAppeals'
 import { ClaimEventData, UploadFileToClaimParamaters } from 'api/types'
-import { Box, FieldType, FormFieldType, FormWrapper, LoadingComponent, TextView } from 'components'
+import { AlertWithHaptics, Box, FieldType, FormFieldType, FormWrapper, LoadingComponent, TextView } from 'components'
 import FileList from 'components/FileList'
 import { SnackbarMessages } from 'components/SnackBar'
 import FullScreenSubtask from 'components/Templates/FullScreenSubtask'
 import { Events } from 'constants/analytics'
+import { ClaimTypeConstants } from 'constants/claims'
 import { DocumentTypes526 } from 'constants/documentTypes'
 import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList, DocumentPickerResponse } from 'screens/BenefitsScreen/BenefitsStackScreens'
-import { logAnalyticsEvent } from 'utils/analytics'
+import { logAnalyticsEvent, logNonFatalErrorToFirebase } from 'utils/analytics'
+import { MAX_TOTAL_FILE_SIZE_IN_BYTES, isValidFileType } from 'utils/claims'
 import { showSnackBar } from 'utils/common'
 import {
   useAppDispatch,
   useBeforeNavBackListener,
   useDestructiveActionSheet,
   useRouteNavigation,
+  useShowActionSheet,
   useTheme,
 } from 'utils/hooks'
 import { getWaygateToggles } from 'utils/waygateConfig'
@@ -33,7 +39,6 @@ function UploadFile({ navigation, route }: UploadFileProps) {
   const { t } = useTranslation(NAMESPACE.COMMON)
   const theme = useTheme()
   const { claimID, request: originalRequest, fileUploaded } = route.params
-  const { data: claim } = useClaim(claimID)
   const [filesUploadedSuccess, setFilesUploadedSuccess] = useState(false)
   const dispatch = useAppDispatch()
   const navigateTo = useRouteNavigation()
@@ -44,22 +49,31 @@ function UploadFile({ navigation, route }: UploadFileProps) {
     filesList,
   )
   const confirmAlert = useDestructiveActionSheet()
-  const [request, setRequest] = useState<ClaimEventData>(originalRequest)
+  const [request, setRequest] = useState<ClaimEventData | undefined>(originalRequest)
   const snackbarMessages: SnackbarMessages = {
     successMsg: t('fileUpload.submitted'),
     errorMsg: t('fileUpload.submitted.error'),
   }
+  const [error, setError] = useState('')
+  const [isActionSheetVisible, setIsActionSheetVisible] = useState(false)
+  const [filesEmptyError, setFilesEmptyError] = useState(false)
+  const showActionSheet = useShowActionSheet()
+  const scrollViewRef = useRef<ScrollView>(null)
 
   const waygate = getWaygateToggles().WG_UploadFile
-
   useBeforeNavBackListener(navigation, (e) => {
+    if (isActionSheetVisible) {
+      e.preventDefault()
+    }
     if (filesList?.length === 0 || filesUploadedSuccess || (!waygate.enabled && waygate.type === 'DenyContent')) {
       return
     }
     e.preventDefault()
     confirmAlert({
       title: t('fileUpload.discard.confirm.title'),
-      message: t('fileUpload.discard.confirm.message'),
+      message: request
+        ? t('fileUpload.discard.confirm.message.requestFile')
+        : t('fileUpload.discard.confirm.message.submitEvidenceFile'),
       cancelButtonIndex: 0,
       destructiveButtonIndex: 1,
       buttons: [
@@ -69,7 +83,11 @@ function UploadFile({ navigation, route }: UploadFileProps) {
         {
           text: t('fileUpload.cancelUpload'),
           onPress: () => {
-            navigation.dispatch(e.data.action)
+            if (request) {
+              navigateTo('FileRequestDetails', { claimID, request })
+            } else {
+              navigateTo('SubmitEvidence', { claimID })
+            }
           },
         },
       ],
@@ -78,48 +96,67 @@ function UploadFile({ navigation, route }: UploadFileProps) {
 
   useEffect(() => {
     if (filesUploadedSuccess) {
-      navigateTo('FileRequest', { claimID: claim?.id || '', claim })
+      navigateTo('ClaimDetailsScreen', { claimID: claimID, claimType: ClaimTypeConstants.ACTIVE })
     }
-  }, [filesUploadedSuccess, claim, navigateTo])
+  }, [filesUploadedSuccess, claimID, navigateTo])
 
   const [documentType, setDocumentType] = useState('')
   const [onSaveClicked, setOnSaveClicked] = useState(false)
   const [confirmed, setConfirmed] = useState(false)
 
   useEffect(() => {
-    setRequest((prevRequest) => {
-      return {
-        ...prevRequest,
+    if (originalRequest) {
+      setRequest({
+        ...originalRequest,
         documentType,
-      }
-    })
-  }, [documentType])
+      })
+    }
+  }, [documentType, originalRequest])
 
   const onUploadConfirmed = () => {
-    logAnalyticsEvent(Events.vama_evidence_cont_3(claim?.id || '', request.trackedItemId || null, request.type, 'file'))
+    logAnalyticsEvent(
+      Events.vama_evidence_cont_3(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'file'),
+    )
     const mutateOptions = {
       onMutate: () => {
-        logAnalyticsEvent(Events.vama_claim_upload_start(claimID, request.trackedItemId || null, request.type, 'file'))
+        logAnalyticsEvent(
+          Events.vama_claim_upload_start(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'file',
+          ),
+        )
       },
       onSuccess: () => {
         setFilesList([])
         setFilesUploadedSuccess(true)
-        logAnalyticsEvent(Events.vama_claim_upload_compl(claimID, request.trackedItemId || null, request.type, 'file'))
+        logAnalyticsEvent(
+          Events.vama_claim_upload_compl(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'file',
+          ),
+        )
         showSnackBar(snackbarMessages.successMsg, dispatch, undefined, true)
       },
       onError: () => showSnackBar(snackbarMessages.errorMsg, dispatch, onUploadConfirmed, false, true),
     }
-    const params: UploadFileToClaimParamaters = { claimID, request, files: filesList }
+    const params: UploadFileToClaimParamaters = { claimID, documentType: documentType, request, files: filesList }
     uploadFileToClaim(params, mutateOptions)
   }
 
   const onUpload = (): void => {
+    if (filesEmptyError) {
+      return
+    }
     const totalSize = filesList.reduce((sum, file) => sum + file.size, 0)
     logAnalyticsEvent(
       Events.vama_evidence_cont_2(
-        claim?.id || '',
-        request.trackedItemId || null,
-        request.type,
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
         'file',
         totalSize,
         filesList.length,
@@ -144,22 +181,85 @@ function UploadFile({ navigation, route }: UploadFileProps) {
   const onDocumentTypeChange = (selectedType: string) => {
     const typeLabel = DocumentTypes526.filter((type) => type.value === selectedType)[0]?.label || selectedType
     logAnalyticsEvent(
-      Events.vama_evidence_type(claim?.id || '', request.trackedItemId || null, request.type, 'file', typeLabel),
+      Events.vama_evidence_type(
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
+        'file',
+        typeLabel,
+      ),
     )
     setDocumentType(selectedType)
   }
 
   const onCheckboxChange = (isChecked: boolean) => {
     if (isChecked) {
-      logAnalyticsEvent(Events.vama_evidence_conf(claim?.id || '', request.trackedItemId || null, request.type, 'file'))
+      logAnalyticsEvent(
+        Events.vama_evidence_conf(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'file'),
+      )
     }
     setConfirmed(isChecked)
   }
 
   const onFileDelete = () => {
     setFilesList([])
-    showSnackBar(t('fileRemoved'), dispatch, undefined, true, false, false)
-    navigateTo('SelectFile', { claimID: claim?.id || '', request, focusOnSnackbar: true })
+  }
+
+  const onFileFolder = async (): Promise<void> => {
+    const {
+      pickSingle,
+      types: { images, plainText, pdf },
+    } = DocumentPicker
+
+    logAnalyticsEvent(
+      Events.vama_evidence_cont_1(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'file'),
+    )
+
+    try {
+      const document = (await pickSingle({
+        type: [images, plainText, pdf],
+      })) as DocumentPickerResponse
+
+      if (document.size > MAX_TOTAL_FILE_SIZE_IN_BYTES) {
+        setError(t('fileUpload.fileSizeError'))
+        return
+      }
+
+      if (!isValidFileType(document.type)) {
+        setError(t('fileUpload.fileTypeError'))
+        return
+      }
+      setFilesEmptyError(false)
+      setError('')
+      setFilesList([document])
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (docError: any) {
+      if (DocumentPicker.isCancel(docError as Error)) {
+        return
+      }
+      logNonFatalErrorToFirebase(docError, 'onFileFolder: SelectFile.tsx Error')
+      setError(docError.code)
+    }
+  }
+
+  const onSelectFile = (): void => {
+    const options = [t('fileUpload.fileFolder'), t('cancel')]
+
+    setIsActionSheetVisible(true)
+    showActionSheet(
+      {
+        options,
+        cancelButtonIndex: 1,
+      },
+      (buttonIndex) => {
+        setIsActionSheetVisible(false)
+        switch (buttonIndex) {
+          case 0:
+            onFileFolder()
+            break
+        }
+      },
+    )
   }
 
   const pickerField: Array<FormFieldType<unknown>> = [
@@ -193,7 +293,12 @@ function UploadFile({ navigation, route }: UploadFileProps) {
       title={t('fileUpload.uploadFiles')}
       onLeftButtonPress={() => {
         logAnalyticsEvent(
-          Events.vama_evidence_cancel_2(claim?.id || '', request.trackedItemId || null, request.type, 'file'),
+          Events.vama_evidence_cancel_2(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'file',
+          ),
         )
         navigation.dispatch(StackActions.pop(2))
       }}>
@@ -201,29 +306,58 @@ function UploadFile({ navigation, route }: UploadFileProps) {
         <LoadingComponent text={t('fileUpload.loading')} />
       ) : (
         <>
-          <Box mb={theme.dimensions.contentMarginBottom} mx={theme.dimensions.gutter}>
-            <TextView variant="MobileBodyBold" accessibilityRole="header">
-              {request.displayName}
-            </TextView>
-          </Box>
-          <FileList files={[fileUploaded]} onDelete={onFileDelete} />
-          <Box mx={theme.dimensions.gutter} mt={theme.dimensions.standardMarginBetween}>
-            <FormWrapper
-              fieldsList={pickerField}
-              onSave={onUpload}
-              onSaveClicked={onSaveClicked}
-              setOnSaveClicked={setOnSaveClicked}
-            />
-            <Box mt={theme.dimensions.textAndButtonLargeMargin}>
-              <Button
-                onPress={() => {
-                  setOnSaveClicked(true)
-                }}
-                label={t('fileUpload.submit')}
-                testID={t('fileUpload.submit')}
+          <Box flex={1}>
+            {!!error && (
+              <Box mb={theme.dimensions.standardMarginBetween}>
+                <AlertWithHaptics variant="error" description={error} scrollViewRef={scrollViewRef} />
+              </Box>
+            )}
+            {request && (
+              <TextView
+                variant="MobileBodyBold"
+                accessibilityRole="header"
+                mb={theme.dimensions.contentMarginBottom}
+                mx={theme.dimensions.gutter}>
+                {request.displayName}
+              </TextView>
+            )}
+            {filesList && filesList.length > 0 ? (
+              <FileList files={filesList} onDelete={onFileDelete} />
+            ) : (
+              <Box mx={theme.dimensions.gutter} mt={theme.dimensions.condensedMarginBetween}>
+                {filesEmptyError && (
+                  <TextView variant="MobileBodyBold" color="error" mb={3}>
+                    {t('fileUpload.requiredFile')}
+                  </TextView>
+                )}
+                <Button
+                  buttonType={ButtonVariants.Secondary}
+                  onPress={onSelectFile}
+                  label={t('fileUpload.selectAFile')}
+                />
+              </Box>
+            )}
+            <Box mx={theme.dimensions.gutter} mt={theme.dimensions.standardMarginBetween}>
+              <FormWrapper
+                fieldsList={pickerField}
+                onSave={onUpload}
+                onSaveClicked={onSaveClicked}
+                setOnSaveClicked={setOnSaveClicked}
               />
             </Box>
           </Box>
+          <Box mx={theme.dimensions.gutter} mb={theme.dimensions.contentMarginBottom}>
+            <Button
+              onPress={() => {
+                if (filesList?.length === 0) {
+                  setFilesEmptyError(true)
+                }
+                setOnSaveClicked(true)
+              }}
+              label={t('fileUpload.submit')}
+              testID={t('fileUpload.submit')}
+            />
+          </Box>
         </>
       )}
     </FullScreenSubtask>
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.test.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.test.tsx
new file mode 100644
index 00000000000..814d853fe98
--- /dev/null
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.test.tsx
@@ -0,0 +1,59 @@
+import React from 'react'
+
+import { context, fireEvent, mockNavProps, render, screen, waitFor } from 'testUtils'
+
+import SubmitEvidence from './SubmitEvidence'
+
+const mockNavigationSpy = jest.fn()
+jest.mock('utils/hooks', () => {
+  const original = jest.requireActual('utils/hooks')
+  return {
+    ...original,
+    useRouteNavigation: () => mockNavigationSpy,
+  }
+})
+
+context('FileRequest', () => {
+  const renderWithData = (): void => {
+    const props = mockNavProps(undefined, undefined, { params: { claimID: '600156928' } })
+
+    render(<SubmitEvidence {...props} />)
+  }
+
+  describe('initializes', () => {
+    it('displays correctly', async () => {
+      renderWithData()
+      await waitFor(() => expect(screen.getByRole('header', { name: 'Submit evidence' })).toBeTruthy())
+      await waitFor(() =>
+        expect(screen.getByRole('header', { name: 'What to know before you submit evidence' })).toBeTruthy(),
+      )
+      await waitFor(() =>
+        expect(
+          screen.getByText(
+            '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.',
+          ),
+        ).toBeTruthy(),
+      )
+      await waitFor(() => expect(screen.getByRole('button', { name: 'Select a file' })).toBeTruthy())
+      await waitFor(() => expect(screen.getByRole('button', { name: 'Take or select photos' })).toBeTruthy())
+    })
+    it('on select file press', async () => {
+      renderWithData()
+      await waitFor(() => fireEvent.press(screen.getByRole('button', { name: 'Select a file' })))
+      await waitFor(() =>
+        expect(mockNavigationSpy).toHaveBeenCalledWith('SelectFile', {
+          claimID: '600156928',
+        }),
+      )
+    })
+    it('on take or select pphotos press', async () => {
+      renderWithData()
+      await waitFor(() => fireEvent.press(screen.getByRole('button', { name: 'Take or select photos' })))
+      await waitFor(() =>
+        expect(mockNavigationSpy).toHaveBeenCalledWith('TakePhotos', {
+          claimID: '600156928',
+        }),
+      )
+    })
+  })
+})
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.tsx
new file mode 100644
index 00000000000..3ed147e397b
--- /dev/null
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/SubmitEvidence.tsx
@@ -0,0 +1,69 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { StackScreenProps } from '@react-navigation/stack'
+
+import { Button, ButtonVariants } from '@department-of-veterans-affairs/mobile-component-library'
+
+import { Box, FullScreenSubtask, TextArea, TextView } from 'components'
+import { Events } from 'constants/analytics'
+import { NAMESPACE } from 'constants/namespaces'
+import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
+import { logAnalyticsEvent } from 'utils/analytics'
+import { useRouteNavigation, useTheme } from 'utils/hooks'
+
+type SubmitEvidenceProps = StackScreenProps<BenefitsStackParamList, 'SubmitEvidence'>
+
+function SubmitEvidence({ navigation, route }: SubmitEvidenceProps) {
+  const theme = useTheme()
+  const { t } = useTranslation(NAMESPACE.COMMON)
+  const navigateTo = useRouteNavigation()
+  const { claimID } = route.params
+
+  const onFilePress = () => {
+    logAnalyticsEvent(Events.vama_evidence_start(claimID, null, 'Submit Evidence', 'file'))
+    navigateTo('SelectFile', { claimID })
+  }
+
+  const onPhotoPress = () => {
+    logAnalyticsEvent(Events.vama_evidence_start(claimID, null, 'Submit Evidence', 'photo'))
+    navigateTo('TakePhotos', { claimID })
+  }
+
+  return (
+    <FullScreenSubtask
+      leftButtonText={t('cancel')}
+      title={t('claimDetails.submitEvidence')}
+      onLeftButtonPress={navigation.goBack}>
+      <Box mb={theme.dimensions.contentMarginBottom} flex={1}>
+        <TextArea>
+          <TextView variant="MobileBodyBold" accessibilityRole="header">
+            {t('claimDetails.submitEvidence.whatToKnow.title')}
+          </TextView>
+          <TextView variant="MobileBody">{t('claimDetails.submitEvidence.whatToKnow.body')}</TextView>
+        </TextArea>
+      </Box>
+      <Box
+        mt={theme.dimensions.standardMarginBetween}
+        mx={theme.dimensions.gutter}
+        mb={theme.dimensions.contentMarginBottom}>
+        <Button
+          onPress={onFilePress}
+          label={t('fileUpload.selectAFile')}
+          testID={t('fileUpload.selectAFile')}
+          buttonType={ButtonVariants.Secondary}
+        />
+        <Box mt={theme.dimensions.condensedMarginBetween}>
+          <Button
+            onPress={onPhotoPress}
+            label={t('fileUpload.takePhotos')}
+            testID={t('fileUpload.takePhotos')}
+            buttonType={ButtonVariants.Secondary}
+          />
+        </Box>
+      </Box>
+    </FullScreenSubtask>
+  )
+}
+
+export default SubmitEvidence
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
index 9567abac2f7..591477e77f0 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
@@ -30,7 +30,6 @@ function TakePhotos({ navigation, route }: TakePhotosProps) {
   const navigateTo = useRouteNavigation()
   const showActionSheetWithOptions = useShowActionSheet()
   const { claimID, request } = route.params
-  const { displayName } = request
   const [error, setError] = useState('')
   const scrollViewRef = useRef<ScrollView>(null)
   const [isActionSheetVisible, setIsActionSheetVisible] = useState(false)
@@ -50,62 +49,77 @@ function TakePhotos({ navigation, route }: TakePhotosProps) {
   }
 
   const onCancel = () => {
-    logAnalyticsEvent(Events.vama_evidence_cancel_1(claimID, request.trackedItemId || null, request.type, 'photo'))
+    logAnalyticsEvent(
+      Events.vama_evidence_cancel_1(
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
+        'photo',
+      ),
+    )
     navigation.goBack()
   }
 
   return (
     <FullScreenSubtask
       scrollViewRef={scrollViewRef}
-      leftButtonText={t('cancel')}
+      leftButtonText={t('back')}
       onLeftButtonPress={onCancel}
       title={t('fileUpload.selectPhotos')}
       testID="takePhotosTestID">
-      {!!error && (
+      <Box flex={1}>
+        {!!error && (
+          <Box mb={theme.dimensions.standardMarginBetween}>
+            <AlertWithHaptics variant="error" description={error} scrollViewRef={scrollViewRef} />
+          </Box>
+        )}
         <Box mb={theme.dimensions.standardMarginBetween}>
-          <AlertWithHaptics variant="error" description={error} scrollViewRef={scrollViewRef} />
+          <AlertWithHaptics
+            variant="info"
+            expandable={true}
+            header={t('fileUpload.accessibilityAlert.title')}
+            description={t('fileUpload.accessibilityAlert.body')}
+            descriptionA11yLabel={a11yLabelVA(t('fileUpload.accessibilityAlert.body'))}>
+            <LinkWithAnalytics
+              type="url"
+              url={LINK_URL_GO_TO_VA_GOV}
+              text={t('goToVAGov')}
+              a11yLabel={a11yLabelVA(t('goToVAGov'))}
+            />
+          </AlertWithHaptics>
         </Box>
-      )}
-      <Box mb={theme.dimensions.standardMarginBetween}>
-        <AlertWithHaptics
-          variant="info"
-          expandable={true}
-          header={t('fileUpload.accessibilityAlert.title')}
-          description={t('fileUpload.accessibilityAlert.body')}
-          descriptionA11yLabel={a11yLabelVA(t('fileUpload.accessibilityAlert.body'))}>
-          <LinkWithAnalytics
-            type="url"
-            url={LINK_URL_GO_TO_VA_GOV}
-            text={t('goToVAGov')}
-            a11yLabel={a11yLabelVA(t('goToVAGov'))}
-          />
-        </AlertWithHaptics>
-      </Box>
-      <TextArea>
-        <TextView variant="MobileBodyBold" accessibilityRole="header">
-          {t('fileUpload.uploadFileUsingCamera', { displayName })}
-        </TextView>
-        <TextView variant="MobileBody" paragraphSpacing={true} mt={theme.dimensions.standardMarginBetween}>
-          {t('fileUpload.takePhotoEachPage')}
-        </TextView>
-        <TextView variant="MobileBody" paragraphSpacing={true} {...testIdProps(t('fileUpload.ifMoreThan10.a11y'))}>
-          {t('fileUpload.ifMoreThan10.1')}
-          <TextView variant="MobileBodyBold">
-            {t('fileUpload.ifMoreThan10.2')}
-            <TextView variant="MobileBody" accessibilityLabel={a11yLabelVA(t('fileUpload.ifMoreThan10.3'))}>
-              {t('fileUpload.ifMoreThan10.3')}
+        <TextArea>
+          <TextView variant="MobileBodyBold" accessibilityRole="header">
+            {request
+              ? t('fileUpload.uploadFileUsingCamera', { displayName: request.displayName || '' })
+              : t('fileUpload.uploadFileUsingCameraSubmitEvidence')}
+          </TextView>
+          <TextView variant="MobileBody" my={theme.dimensions.standardMarginBetween}>
+            {t('fileUpload.takePhotoEachPage')}
+          </TextView>
+          <TextView variant="MobileBody" {...testIdProps(t('fileUpload.ifMoreThan10.a11y'))}>
+            {t('fileUpload.ifMoreThan10.1')}
+            <TextView variant="MobileBodyBold">
+              {t('fileUpload.ifMoreThan10.2')}
+              <TextView variant="MobileBody" accessibilityLabel={a11yLabelVA(t('fileUpload.ifMoreThan10.3'))}>
+                {t('fileUpload.ifMoreThan10.3')}
+              </TextView>
             </TextView>
           </TextView>
-        </TextView>
-        <TextView variant="MobileBodyBold">{t('fileUpload.maxFileSize')}</TextView>
-        <TextView variant="MobileBody" accessibilityLabel={t('fileUpload.50MB.a11y')} paragraphSpacing={true}>
-          {t('fileUpload.50MB')}
-        </TextView>
-        <TextView variant="MobileBodyBold">{t('fileUpload.acceptedFileTypes')}</TextView>
-        <TextView variant="MobileBody">{t('fileUpload.acceptedFileTypeOptions')}</TextView>
-      </TextArea>
+          <TextView variant="MobileBodyBold" mt={theme.dimensions.standardMarginBetween}>
+            {t('fileUpload.maxFileSize')}
+          </TextView>
+          <TextView variant="MobileBody" accessibilityLabel={t('fileUpload.50MB.a11y')}>
+            {t('fileUpload.50MB')}
+          </TextView>
+          <TextView variant="MobileBodyBold" mt={theme.dimensions.standardMarginBetween}>
+            {t('fileUpload.acceptedFileTypes')}
+          </TextView>
+          <TextView variant="MobileBody">{t('fileUpload.acceptedFileTypeOptions')}</TextView>
+        </TextArea>
+      </Box>
       <Box
-        mt={theme.dimensions.contentMarginTop}
+        mt={theme.dimensions.standardMarginBetween}
         mb={theme.dimensions.contentMarginBottom}
         mx={theme.dimensions.gutter}>
         <Button
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/UploadOrAddPhotos/UploadOrAddPhotos.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/UploadOrAddPhotos/UploadOrAddPhotos.tsx
index afb952eed39..8ccf1e82037 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/UploadOrAddPhotos/UploadOrAddPhotos.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/UploadOrAddPhotos/UploadOrAddPhotos.tsx
@@ -9,7 +9,7 @@ import { StackScreenProps } from '@react-navigation/stack/lib/typescript/src/typ
 import { Button } from '@department-of-veterans-affairs/mobile-component-library'
 import _ from 'underscore'
 
-import { useClaim, useUploadFileToClaim } from 'api/claimsAndAppeals'
+import { useUploadFileToClaim } from 'api/claimsAndAppeals'
 import { ClaimEventData, UploadFileToClaimParamaters } from 'api/types'
 import {
   AlertWithHaptics,
@@ -25,7 +25,7 @@ import {
 import { SnackbarMessages } from 'components/SnackBar'
 import FullScreenSubtask from 'components/Templates/FullScreenSubtask'
 import { Events } from 'constants/analytics'
-import { MAX_NUM_PHOTOS } from 'constants/claims'
+import { ClaimTypeConstants, MAX_NUM_PHOTOS } from 'constants/claims'
 import { DocumentTypes526 } from 'constants/documentTypes'
 import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
@@ -51,7 +51,6 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
   const theme = useTheme()
   const showActionSheetWithOptions = useShowActionSheet()
   const { claimID, request: originalRequest, firstImageResponse } = route.params
-  const { data: claim } = useClaim(claimID)
   const [filesUploadedSuccess, setFilesUploadedSuccess] = useState(false)
   const dispatch = useAppDispatch()
   const isPortrait = useOrientation()
@@ -67,12 +66,13 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
   )
   const confirmAlert = useDestructiveActionSheet()
   const navigateTo = useRouteNavigation()
-  const [request, setRequest] = useState<ClaimEventData>(originalRequest)
+  const [request, setRequest] = useState<ClaimEventData | undefined>(originalRequest)
   const scrollViewRef = useRef<ScrollView>(null)
   const snackbarMessages: SnackbarMessages = {
     successMsg: t('fileUpload.submitted'),
     errorMsg: t('fileUpload.submitted.error'),
   }
+  const [imagesEmptyError, setImagesEmptyError] = useState(false)
 
   const waygate = getWaygateToggles().WG_UploadOrAddPhotos
 
@@ -83,7 +83,9 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
     e.preventDefault()
     confirmAlert({
       title: t('fileUpload.discard.confirm.title.photos'),
-      message: t('fileUpload.discard.confirm.message.photos'),
+      message: request
+        ? t('fileUpload.discard.confirm.message.requestPhotos')
+        : t('fileUpload.discard.confirm.message.submitEvidencePhotos'),
       cancelButtonIndex: 0,
       destructiveButtonIndex: 1,
       buttons: [
@@ -94,7 +96,11 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
         {
           text: t('fileUpload.cancelUpload'),
           onPress: () => {
-            navigation.dispatch(e.data.action)
+            if (request) {
+              navigateTo('FileRequestDetails', { claimID, request })
+            } else {
+              navigateTo('SubmitEvidence', { claimID })
+            }
           },
         },
       ],
@@ -103,50 +109,72 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
 
   useEffect(() => {
     if (filesUploadedSuccess) {
-      navigateTo('FileRequest', { claimID: claim?.id || '', claim })
+      navigateTo('ClaimDetailsScreen', { claimID: claimID, claimType: ClaimTypeConstants.ACTIVE })
     }
-  }, [filesUploadedSuccess, claim, navigateTo])
+  }, [filesUploadedSuccess, claimID, navigateTo])
 
   const [documentType, setDocumentType] = useState('')
   const [onSaveClicked, setOnSaveClicked] = useState(false)
   const [confirmed, setConfirmed] = useState(false)
 
   useEffect(() => {
-    setRequest((prevRequest) => {
-      return {
-        ...prevRequest,
+    if (originalRequest) {
+      setRequest({
+        ...originalRequest,
         documentType,
-      }
-    })
-  }, [documentType])
+      })
+    }
+  }, [documentType, originalRequest])
 
   const onUploadConfirmed = () => {
     logAnalyticsEvent(
-      Events.vama_evidence_cont_3(claim?.id || '', request.trackedItemId || null, request.type, 'photo'),
+      Events.vama_evidence_cont_3(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'photo'),
     )
     const mutateOptions = {
       onMutate: () => {
-        logAnalyticsEvent(Events.vama_claim_upload_start(claimID, request.trackedItemId || null, request.type, 'photo'))
+        logAnalyticsEvent(
+          Events.vama_claim_upload_start(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'photo',
+          ),
+        )
       },
       onSuccess: () => {
         setImagesList([])
         setFilesUploadedSuccess(true)
-        logAnalyticsEvent(Events.vama_claim_upload_compl(claimID, request.trackedItemId || null, request.type, 'photo'))
+        logAnalyticsEvent(
+          Events.vama_claim_upload_compl(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'photo',
+          ),
+        )
         showSnackBar(snackbarMessages.successMsg, dispatch, undefined, true)
       },
       onError: () => showSnackBar(snackbarMessages.errorMsg, dispatch, onUploadConfirmed, false, true),
     }
-    const params: UploadFileToClaimParamaters = { claimID, request, files: imagesList || [] }
+    const params: UploadFileToClaimParamaters = {
+      claimID,
+      documentType,
+      request,
+      files: imagesList || [],
+    }
     uploadFileToClaim(params, mutateOptions)
   }
 
   const onUpload = (): void => {
+    if (imagesEmptyError) {
+      return
+    }
     const totalSize = imagesList?.reduce((sum, image) => sum + (image.fileSize || 0), 0)
     logAnalyticsEvent(
       Events.vama_evidence_cont_2(
-        claim?.id || '',
-        request.trackedItemId || null,
-        request.type,
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
         'photo',
         totalSize || 0,
         imagesList?.length || 0,
@@ -172,7 +200,13 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
   const onDocumentTypeChange = (selectedType: string) => {
     const typeLabel = DocumentTypes526.filter((type) => type.value === selectedType)[0]?.label || selectedType
     logAnalyticsEvent(
-      Events.vama_evidence_type(claim?.id || '', request.trackedItemId || null, request.type, 'photo', typeLabel),
+      Events.vama_evidence_type(
+        claimID,
+        request?.trackedItemId || null,
+        request?.type || 'Submit Evidence',
+        'photo',
+        typeLabel,
+      ),
     )
     setDocumentType(selectedType)
   }
@@ -180,7 +214,7 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
   const onCheckboxChange = (isChecked: boolean) => {
     if (isChecked) {
       logAnalyticsEvent(
-        Events.vama_evidence_conf(claim?.id || '', request.trackedItemId || null, request.type, 'photo'),
+        Events.vama_evidence_conf(claimID, request?.trackedItemId || null, request?.type || 'Submit Evidence', 'photo'),
       )
     }
     setConfirmed(isChecked)
@@ -262,7 +296,7 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
                   setErrorMessage,
                   callbackIfUri,
                   totalBytesUsed || 0,
-                  claim?.id || '',
+                  claimID,
                   request,
                 )
               }}
@@ -286,35 +320,29 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
         imagesCopy?.push(asset)
       })
       setImagesList(imagesCopy)
+      setImagesEmptyError(false)
       let fileSizeAdded = 0
       response.assets?.forEach((asset) => {
         if (asset.fileSize) {
           fileSizeAdded = fileSizeAdded + asset.fileSize
         }
       })
-      if (fileSizeAdded && totalBytesUsed) {
+      if (fileSizeAdded && (totalBytesUsed || totalBytesUsed === 0)) {
         setTotalBytesUsed(totalBytesUsed + fileSizeAdded)
       }
     }
   }
 
   const deleteCallbackIfUri = (response: Asset[]): void => {
-    if (response.length === 0) {
-      setImagesList([])
-      showSnackBar(t('photoRemoved'), dispatch, undefined, true, false, false)
-      navigateTo('TakePhotos', { claimID: claim?.id || '', request, focusOnSnackbar: true })
-    } else {
-      setErrorMessage('')
-      setImagesList(response)
-      let bytesUsed = 0
-      response.forEach((image) => {
-        if (image.fileSize) {
-          bytesUsed = bytesUsed + image.fileSize
-        }
-      })
-      setTotalBytesUsed(bytesUsed)
-      showSnackBar(t('photoRemoved'), dispatch, undefined, true, false, false)
-    }
+    setErrorMessage('')
+    setImagesList(response)
+    let bytesUsed = 0
+    response.forEach((image) => {
+      if (image.fileSize) {
+        bytesUsed = bytesUsed + image.fileSize
+      }
+    })
+    setTotalBytesUsed(bytesUsed)
   }
 
   return (
@@ -324,77 +352,95 @@ function UploadOrAddPhotos({ navigation, route }: UploadOrAddPhotosProps) {
       title={t('fileUpload.uploadPhotos')}
       onLeftButtonPress={() => {
         logAnalyticsEvent(
-          Events.vama_evidence_cancel_2(claim?.id || '', request.trackedItemId || null, request.type, 'photo'),
+          Events.vama_evidence_cancel_2(
+            claimID,
+            request?.trackedItemId || null,
+            request?.type || 'Submit Evidence',
+            'photo',
+          ),
         )
         navigation.dispatch(StackActions.pop(2))
       }}>
       {loadingFileUpload ? (
         <LoadingComponent text={t('fileUpload.loading')} />
       ) : (
-        <Box mb={theme.dimensions.contentMarginBottom}>
-          {!!errorMessage && (
-            <Box mb={theme.dimensions.standardMarginBetween}>
-              <AlertWithHaptics
-                variant="error"
-                header={t('fileUpload.PhotosNotUploaded')}
-                description={errorMessage}
-                scrollViewRef={scrollViewRef}
-                focusOnError={onSaveClicked}
+        <>
+          <Box flex={1}>
+            {!!errorMessage && (
+              <Box mb={theme.dimensions.standardMarginBetween}>
+                <AlertWithHaptics
+                  variant="error"
+                  header={t('fileUpload.PhotosNotUploaded')}
+                  description={errorMessage}
+                  scrollViewRef={scrollViewRef}
+                  focusOnError={onSaveClicked}
+                />
+              </Box>
+            )}
+            {request && (
+              <TextView variant="MobileBodyBold" accessibilityRole="header" mx={theme.dimensions.gutter}>
+                {request.displayName}
+              </TextView>
+            )}
+            <Box
+              backgroundColor={'contentBox'}
+              borderTopWidth={1}
+              borderTopColor="primary"
+              borderBottomWidth={1}
+              borderBottomColor="primary"
+              pt={theme.dimensions.standardMarginBetween}
+              pb={theme.dimensions.standardMarginBetween}>
+              {imagesEmptyError && (
+                <TextView variant="MobileBodyBold" color="error" mb={3} ml={theme.dimensions.gutter}>
+                  {t('fileUpload.requiredPhoto')}
+                </TextView>
+              )}
+              <Box display="flex" flexDirection="row" flexWrap="wrap">
+                {displayImages()}
+              </Box>
+            </Box>
+            <Box
+              justifyContent="space-between"
+              flexDirection="row"
+              flexWrap="wrap"
+              mx={theme.dimensions.gutter}
+              mt={theme.dimensions.condensedMarginBetween}
+              mb={theme.dimensions.standardMarginBetween}>
+              <TextView variant="HelperText">
+                {t('fileUpload.ofTenPhotos', { numOfPhotos: imagesList?.length })}
+              </TextView>
+              <TextView
+                variant="HelperText"
+                accessibilityLabel={t('fileUpload.ofFiftyMB.a11y', {
+                  sizeOfPhotos: bytesToFinalSizeDisplayA11y(totalBytesUsed ? totalBytesUsed : 0, t, false),
+                })}>
+                {t('fileUpload.ofFiftyMB', {
+                  sizeOfPhotos: bytesToFinalSizeDisplay(totalBytesUsed ? totalBytesUsed : 0, t, false),
+                })}
+              </TextView>
+            </Box>
+            <Box mx={theme.dimensions.gutter}>
+              <FormWrapper
+                fieldsList={pickerField}
+                onSave={onUpload}
+                onSaveClicked={onSaveClicked}
+                setOnSaveClicked={setOnSaveClicked}
               />
             </Box>
-          )}
-          <TextView variant="MobileBodyBold" accessibilityRole="header" mx={theme.dimensions.gutter}>
-            {request.displayName}
-          </TextView>
-          <Box
-            backgroundColor={'contentBox'}
-            borderTopWidth={1}
-            borderTopColor="primary"
-            borderBottomWidth={1}
-            borderBottomColor="primary"
-            pt={theme.dimensions.standardMarginBetween}
-            pb={theme.dimensions.standardMarginBetween}
-            display="flex"
-            flexDirection="row"
-            flexWrap="wrap">
-            {displayImages()}
-          </Box>
-          <Box
-            justifyContent="space-between"
-            flexDirection="row"
-            flexWrap="wrap"
-            mx={theme.dimensions.gutter}
-            mt={theme.dimensions.condensedMarginBetween}
-            mb={theme.dimensions.standardMarginBetween}>
-            <TextView variant="HelperText">{t('fileUpload.ofTenPhotos', { numOfPhotos: imagesList?.length })}</TextView>
-            <TextView
-              variant="HelperText"
-              accessibilityLabel={t('fileUpload.ofFiftyMB.a11y', {
-                sizeOfPhotos: bytesToFinalSizeDisplayA11y(totalBytesUsed ? totalBytesUsed : 0, t, false),
-              })}>
-              {t('fileUpload.ofFiftyMB', {
-                sizeOfPhotos: bytesToFinalSizeDisplay(totalBytesUsed ? totalBytesUsed : 0, t, false),
-              })}
-            </TextView>
           </Box>
-          <Box mx={theme.dimensions.gutter}>
-            <FormWrapper
-              fieldsList={pickerField}
-              onSave={onUpload}
-              onSaveClicked={onSaveClicked}
-              setOnSaveClicked={setOnSaveClicked}
+          <Box mb={theme.dimensions.contentMarginBottom} mx={theme.dimensions.gutter}>
+            <Button
+              onPress={() => {
+                if (imagesList?.length === 0) {
+                  setImagesEmptyError(true)
+                }
+                setOnSaveClicked(true)
+              }}
+              label={t('fileUpload.submit')}
+              testID={t('fileUpload.submit')}
             />
-            <Box mt={theme.dimensions.textAndButtonLargeMargin}>
-              <Button
-                onPress={() => {
-                  setOnSaveClicked(true)
-                }}
-                label={t('fileUpload.submit')}
-                testID={t('fileUpload.submit')}
-              />
-            </Box>
           </Box>
-        </Box>
+        </>
       )}
     </FullScreenSubtask>
   )
diff --git a/VAMobile/src/translations/en/common.json b/VAMobile/src/translations/en/common.json
index f6e8c6b3ab5..2a72a50f03b 100644
--- a/VAMobile/src/translations/en/common.json
+++ b/VAMobile/src/translations/en/common.json
@@ -418,6 +418,8 @@
   "claimDetails.step5of5": "Step 5 of 5: Complete",
   "claimDetails.step8of8": "Step 8 of 8: Claim decided",
   "claimDetails.submitEvidence": "Submit evidence",
+  "claimDetails.submitEvidence.whatToKnow.title": "What to know before you submit evidence",
+  "claimDetails.submitEvidence.whatToKnow.body": "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.",
   "claimDetails.title": "Claim details",
   "claimDetails.titleWithType": "Your {{type}} claim",
   "claimDetails.viewYourClaim": "Review your claim {{tabName}}",
@@ -743,8 +745,10 @@
   "fileUpload.continueUpload": "Continue upload",
   "fileUpload.delete.a11yHint": "Remove this file",
   "fileUpload.deletePhoto.a11yHint": "Remove this photo",
-  "fileUpload.discard.confirm.message": "We'll remove your file and take you back to the file request.",
-  "fileUpload.discard.confirm.message.photos": "We'll remove your photos and take you back to the file request.",
+  "fileUpload.discard.confirm.message.requestFile": "We'll remove your file and take you back to the file request.",
+  "fileUpload.discard.confirm.message.requestPhotos": "We'll remove your photos and take you back to the file request.",
+  "fileUpload.discard.confirm.message.submitEvidenceFile": "We'll remove your file and take you back to where you can select other files or photos to submit.",
+  "fileUpload.discard.confirm.message.submitEvidencePhotos": "We'll remove your photos and take you back to where you can select other files or photos to submit.",
   "fileUpload.discard.confirm.title": "Cancel file upload?",
   "fileUpload.discard.confirm.title.photos": "Cancel photo upload?",
   "fileUpload.documentType": "Document type",
@@ -770,8 +774,12 @@
   "fileUpload.pleaseRequestFromPhoneFiles": "To submit evidence that supports this claim, please select a file from your phone's files. You can ",
   "fileUpload.pleaseRequestFromPhoneFiles.bolded": "only submit 1 file ",
   "fileUpload.pleaseRequestFromPhoneFiles.pt2": "with this request.",
+  "fileUpload.pleaseRequestFromPhoneFiles.pt2SubmitEvidence": "at a time.",
+  "fileUpload.requiredFile": "File is required",
+  "fileUpload.requiredPhoto": "Photo is required",
   "fileUpload.selectAFile": "Select a file",
   "fileUpload.selectAFileToUpload": "Select a file to upload for {{requestTitle}}",
+  "fileUpload.selectAFileToUploadSubmitEvidence": "Select a file to upload",
   "fileUpload.selectFiles": "Select files",
   "fileUpload.selectPhotos": "Select photos",
   "fileUpload.submit": "Submit file",
@@ -785,6 +793,7 @@
   "fileUpload.theRequest": "the request",
   "fileUpload.tooManyPhotosError": "The selected photos can not be uploaded because they exceed the maximum of 10 photos allowed.",
   "fileUpload.uploadFileUsingCamera": "Select photos to upload for {{displayName}}",
+  "fileUpload.uploadFileUsingCameraSubmitEvidence": "Select photos to upload",
   "fileUpload.uploadFiles": "Upload files",
   "fileUpload.uploadPhotos": "Upload photos",
   "fillDate": "Fill date",
diff --git a/VAMobile/src/utils/claims.tsx b/VAMobile/src/utils/claims.tsx
index 5c780451549..8b007179f92 100644
--- a/VAMobile/src/utils/claims.tsx
+++ b/VAMobile/src/utils/claims.tsx
@@ -231,7 +231,7 @@ export const onAddPhotos = (
   callbackIfUri: (response: ImagePickerResponse) => void,
   totalBytesUsed: number,
   claimID: string,
-  request: ClaimEventData,
+  request?: ClaimEventData,
   setIsActionSheetVisible?: (isVisible: boolean) => void,
 ): void => {
   const options = [t('fileUpload.camera'), t('fileUpload.photoGallery'), t('cancel')]
@@ -246,7 +246,14 @@ export const onAddPhotos = (
       setIsActionSheetVisible && setIsActionSheetVisible(false)
       switch (buttonIndex) {
         case 0:
-          logAnalyticsEvent(Events.vama_evidence_cont_1(claimID, request.trackedItemId || null, request.type, 'camera'))
+          logAnalyticsEvent(
+            Events.vama_evidence_cont_1(
+              claimID,
+              request?.trackedItemId || null,
+              request?.type || 'Submit Evidence',
+              'camera',
+            ),
+          )
           launchCamera(
             { mediaType: 'photo', quality: 0.9, includeBase64: true, presentationStyle: 'fullScreen' },
             (response: ImagePickerResponse): void => {
@@ -256,7 +263,12 @@ export const onAddPhotos = (
           break
         case 1:
           logAnalyticsEvent(
-            Events.vama_evidence_cont_1(claimID, request.trackedItemId || null, request.type, 'gallery'),
+            Events.vama_evidence_cont_1(
+              claimID,
+              request?.trackedItemId || null,
+              request?.type || 'Submit Evidence',
+              'gallery',
+            ),
           )
           launchImageLibrary(
             { selectionLimit: MAX_NUM_PHOTOS, mediaType: 'photo', quality: 0.9, includeBase64: true },
diff --git a/VAMobile/src/utils/remoteConfig.test.ts b/VAMobile/src/utils/remoteConfig.test.ts
index 18dbea85793..16319960db7 100644
--- a/VAMobile/src/utils/remoteConfig.test.ts
+++ b/VAMobile/src/utils/remoteConfig.test.ts
@@ -31,6 +31,7 @@ const mockOverrides = {
   patientCheckInWaygate: true,
   preferredNameGenderWaygate: false,
   prescriptions: true,
+  submitEvidenceExpansion: true,
   testFeature: false,
   whatsNewUI: false,
 }
diff --git a/VAMobile/src/utils/remoteConfig.ts b/VAMobile/src/utils/remoteConfig.ts
index f668624e9bd..71d46c6e7df 100644
--- a/VAMobile/src/utils/remoteConfig.ts
+++ b/VAMobile/src/utils/remoteConfig.ts
@@ -29,6 +29,7 @@ export type FeatureToggleType =
   | 'patientCheckInWaygate'
   | 'preferredNameGenderWaygate'
   | 'prescriptions'
+  | 'submitEvidenceExpansion'
   | 'testFeature'
   | 'whatsNewUI'
 
@@ -46,6 +47,7 @@ type FeatureToggleValues = {
   patientCheckInWaygate: boolean
   preferredNameGenderWaygate: boolean
   prescriptions: boolean
+  submitEvidenceExpansion: boolean
   testFeature: boolean
   whatsNewUI: boolean
 }
@@ -64,6 +66,7 @@ export const defaults: FeatureToggleValues = {
   patientCheckInWaygate: true,
   preferredNameGenderWaygate: true,
   prescriptions: true,
+  submitEvidenceExpansion: true,
   testFeature: false,
   whatsNewUI: true,
 }
diff --git a/VAMobile/src/utils/waygateConfig.ts b/VAMobile/src/utils/waygateConfig.ts
index 7f03896091a..eeb1a733b96 100644
--- a/VAMobile/src/utils/waygateConfig.ts
+++ b/VAMobile/src/utils/waygateConfig.ts
@@ -95,6 +95,7 @@ export type WaygateToggleType =
   | 'WG_FileRequest'
   | 'WG_FileRequestDetails'
   | 'WG_AskForClaimDecision'
+  | 'WG_SubmitEvidence'
   | 'WG_SelectFile'
   | 'WG_TakePhotos'
   | 'WG_UploadFile'
@@ -143,6 +144,7 @@ type WaygateToggleValues = {
   WG_VaccineList: Waygate
   WG_ViewMessage: Waygate
   WG_PrepareForVideoVisit: Waygate
+  WG_SubmitEvidence: Waygate
   WG_StartNewMessage: Waygate
   WG_ReplyMessage: Waygate
   WG_EditDraft: Waygate
@@ -263,6 +265,7 @@ export let waygateConfig: WaygateToggleValues = {
   WG_AppealDetailsScreen: { ...waygateDefault },
   WG_ConsolidatedClaimsNote: { ...waygateDefault },
   WG_WhatDoIDoIfDisagreement: { ...waygateDefault },
+  WG_SubmitEvidence: { ...waygateDefault },
   WG_FileRequest: { ...waygateDefault },
   WG_FileRequestDetails: { ...waygateDefault },
   WG_AskForClaimDecision: { ...waygateDefault },