updated

.github/workflows/qa_required_approvals.yml

@@ -50,10 +50,10 @@ jobs:
  
           if [[ $(jq '. | length' <<< "$approvals") -ge $required_approval_count ]]
             then
-              if [[ $(jq '[.[] | select(. | IN("timwright12", "alexandec", "theodur", "dumathane", "cadibemma", "Sparowhawk"))] | length' <<< "$approvals") -gt 0 ]]
+              if [[ $(jq '[.[] | select(. | IN("timwright12", "alexandec", "theodur", "dumathane", "cadibemma", "Sparowhawk", "narin"))] | length' <<< "$approvals") -gt 0 ]]
                 then
                 echo 'This PR has at least one engineer approval. Now checking for QA approval...'
-                if [[ $(jq '[.[] | select(. | IN("timwright12", "IsraelleHub", "rbontrager", "DJUltraTom", "TKDickson"))] | length' <<< "$approvals") -gt 0 ]]
+                if [[ $(jq '[.[] | select(. | IN("timwright12", "IsraelleHub", "rbontrager", "DJUltraTom", "TKDickson", "brea11y", "narin"))] | length' <<< "$approvals") -gt 0 ]]
                   then
                   echo 'This PR has QA and engineer approval to merge'
                   exit 0

.github/workflows/release_branch_issue.yml

@@ -20,7 +20,7 @@ jobs:
       - run: echo "VA_DUE_DATE=$(date -d "+6 days" '+%A %b %d, %Y')" >> $GITHUB_ENV
       - run: echo "RELEASE_DATE=$(date -d "+13 days" '+%A %b %d, %Y')" >> $GITHUB_ENV
       - uses: actions/checkout@v3
-      - run: echo "${{ secrets.GITHUB_TOKEN }}" >> token.txt
+      - run: echo "${{ secrets.GH_ACTIONS_PAT }}" > token.txt
       - run: gh auth login --with-token < token.txt
       - run: |
           sev1=$(gh issue list -l "sev-1" --jq 'map("|#\(.number)|\(.title)|") | join("\n") ' --json number,title)
@@ -32,7 +32,8 @@ jobs:
           echo 'TABLE<<EOF' >> $GITHUB_ENV
           echo "${table}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: JasonEtco/create-an-issue@v2
+      - name: Create Release Ticket
+        uses: JasonEtco/create-an-issue@v2
         with:
           filename: .github/ISSUE_TEMPLATE/release_ticket.md
         env:
@@ -43,7 +44,17 @@ jobs:
           releaseDate: ${{ env.RELEASE_DATE }}
           issues: ${{ env.TABLE }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        id: create-issue
+        id: create_issue
+      - name: Assign Users to Release Ticket
+        if: ${{ success() }}
+        run: |
+          # Fetch GitHub Group Members
+          TEAM_MEMBERS=$(gh api orgs/department-of-veterans-affairs/teams/flagship-mobile-release-approvers/members --jq 'map(.login) | join(",")')
+          ASSIGNEES=$(echo $TEAM_MEMBERS | paste -sd "," -)
+          ISSUE_NUMBER=${{ steps.create_issue.outputs.number }}
+          gh issue edit $ISSUE_NUMBER --add-assignee $ASSIGNEES
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PAT }}  
   create_testrail_milestone:
     uses: department-of-veterans-affairs/va-mobile-app/.github/workflows/create_testrail_milestone.yml@develop
     needs: release_ticket

VAMobile/e2e/tests/Claims.e2e.ts

@@ -48,7 +48,6 @@ export const ClaimsE2eIdConstants = {
   TAKE_OR_SELECT_PHOTOS_TEXT: 'Take or select photos',
   ACCEPTED_FILE_TYPES_TEXT: 'PDF (unlocked), GIF, JPEG, JPG, BMP, TXT',
   MAXIMUM_FILE_SIZE_LABEL: '50 megabytes',
-  CLAIMS_DETAILS_SCREEN_ID: 'ClaimDetailsScreen',
   CLAIMS_HISTORY_SCREEN_ID: 'claimsHistoryID',
   CLAIMS_DETAILS_BACK_ID: 'claimsDetailsBackTestID',
   CLAIMS_STATUS_ID: 'claimsStatusID',
@@ -97,7 +96,7 @@ describe('Claims Screen', () => {
     await expect(element(by.id(ClaimsE2eIdConstants.CLAIM_4_STATUS_STEP_6_ID))).toExist()
     await expect(element(by.id(ClaimsE2eIdConstants.CLAIM_4_STATUS_STEP_7_ID))).toExist()
     await expect(element(by.id(ClaimsE2eIdConstants.CLAIM_4_STATUS_STEP_8_ID))).toExist()
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
+    await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_BACK_ID)).tap()
   })
 
@@ -126,7 +125,7 @@ describe('Claims Screen', () => {
     await setTimeout(2000)
     await waitFor(element(by.id(ClaimsE2eIdConstants.CLAIM_3_STATUS_STEP_2_ID)))
       .toBeVisible()
-      .whileElement(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
+      .whileElement(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
       .scroll(100, 'down')
     await setTimeout(2000)
     await element(by.text('Step 2')).tap()
@@ -139,7 +138,7 @@ describe('Claims Screen', () => {
   })
 
   it('Verify what you claimed section', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
+    await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
     await expect(element(by.text("What you've claimed"))).toExist()
   })
 
@@ -241,7 +240,7 @@ describe('Claims Screen', () => {
 
   //flag has been turned off per slack convo in DSVA, commenting tests out until it is turned back on
   // it('should verify submit evidence button exists', async () => {
-  //   await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
+  //   await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
   //   await element(by.text('Submit evidence')).tap()
   // })
 
@@ -330,7 +329,7 @@ describe('Claims Screen', () => {
       element(by.id('Step 3 of 5. Evidence gathering, review, and decision. Current step. Step 1 through 2 complete.')),
     )
       .toBeVisible()
-      .whileElement(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
+      .whileElement(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
       .scroll(100, 'down')
     await element(
       by.id('Step 3 of 5. Evidence gathering, review, and decision. Current step. Step 1 through 2 complete.'),
@@ -361,7 +360,7 @@ describe('Claims Screen', () => {
   it('should verify details of claim on step 5', async () => {
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_HISTORY_SCREEN_ID)).scrollTo('top')
     await element(by.id(ClaimsE2eIdConstants.CLAIM_2_ID)).tap()
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
+    await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
     await element(by.id('Step 5 of 5. Complete. Complete.')).tap()
     await expect(element(by.text('Complete')).atIndex(1)).toExist()
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_BACK_ID)).tap()
@@ -393,7 +392,7 @@ describe('Claims Screen', () => {
   })
 
   it('Verify what should I do if disagreement information', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
+    await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_LEARN_WHAT_TO_DO)).atIndex(0).tap()
     await expect(element(by.text('What to do if you disagree with our decision')).atIndex(0)).toExist()
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_DECISION_REVIEW_OPTIONS)).tap()
@@ -411,7 +410,7 @@ describe('Claims Screen', () => {
     ).toExist()
     await expect(element(by.id(CommonE2eIdConstants.CALL_VA_PHONE_NUMBER_ID))).toExist()
     if (device.getPlatform() === 'android') {
-      await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
+      await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('bottom')
       await device.disableSynchronization()
       await element(by.id(CommonE2eIdConstants.CALL_VA_PHONE_NUMBER_ID)).tap()
       await setTimeout(5000)
@@ -422,7 +421,7 @@ describe('Claims Screen', () => {
   })
 
   it('verify files tab infomation', async () => {
-    await element(by.id(ClaimsE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
+    await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
     await element(by.id(ClaimsE2eIdConstants.CLAIMS_FILES_ID)).tap()
     await expect(element(by.text("This claim doesn't have any files yet."))).toExist()
   })

VAMobile/e2e/tests/Navigation.e2e.ts

@@ -216,17 +216,17 @@ const navigateToPage = async (key, navigationDicValue) => {
     const subNavigationArray = navigationArray[1]
     for (let k = 0; k < subNavigationArray.length - 1; k++) {
       if (subNavigationArray[k] === 'Review file requests') {
-        await waitFor(element(by.text('Review file requests')))
+        await waitFor(element(by.id(CommonE2eIdConstants.ALERT_FILE_REQUEST_BUTTON_ID)))
           .toBeVisible()
-          .whileElement(by.id('ClaimDetailsScreen'))
+          .whileElement(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
           .scroll(100, 'up')
       } else if (subNavigationArray[k] === 'Received July 17, 2008') {
         await waitFor(element(by.text('Received July 17, 2008')))
           .toBeVisible()
-          .whileElement(by.id('claimsHistoryID'))
+          .whileElement(by.id(CommonE2eIdConstants.CLAIMS_HISTORY_SCROLL_ID))
           .scroll(100, 'down')
       } else if (subNavigationArray[k] === 'Files') {
-        await element(by.id('ClaimsDetailsScreen')).scrollTo('top')
+        await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
       }
 
       if (k == 0 && key in featureID) {
@@ -248,22 +248,22 @@ const navigateToPage = async (key, navigationDicValue) => {
     }
 
     if (subNavigationArray.slice(-1)[0] === 'Review file requests') {
-      await waitFor(element(by.text('Review file requests')))
+      await waitFor(element(by.id(CommonE2eIdConstants.ALERT_FILE_REQUEST_BUTTON_ID)))
         .toBeVisible()
-        .whileElement(by.id('ClaimDetailsScreen'))
+        .whileElement(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID))
         .scroll(100, 'up')
     } else if (subNavigationArray.slice(-1)[0] === 'Get prescription details') {
       await waitFor(element(by.label('CAPECITABINE 500MG TAB.')))
         .toBeVisible()
-        .whileElement(by.id('PrescriptionHistory'))
+        .whileElement(by.id(CommonE2eIdConstants.PRESCRIPTION_HISTORY_SCROLL_ID))
         .scroll(50, 'down')
     } else if (subNavigationArray.slice(-1)[0] === 'Received June 12, 2008') {
       await waitFor(element(by.text('Received June 12, 2008')))
         .toBeVisible()
-        .whileElement(by.id('claimsHistoryID'))
+        .whileElement(by.id(CommonE2eIdConstants.CLAIMS_HISTORY_SCROLL_ID))
         .scroll(100, 'down')
     } else if (subNavigationArray.slice(-1)[0] === 'Files' || subNavigationArray.slice(-1)[0] === 'Submit evidence') {
-      await element(by.id('ClaimDetailsScreen')).scrollTo('top')
+      await element(by.id(CommonE2eIdConstants.CLAIMS_DETAILS_SCREEN_ID)).scrollTo('top')
     }
 
     if (subNavigationArray.slice(-1)[0] in featureID) {