Merge branch 'develop' into 9464-change-many-components-out-of-link-a…

…nd-button-roles

.github/ISSUE_TEMPLATE/Post_RC_Code_Change.md

@@ -3,7 +3,7 @@ name: Post RC Code Change
 about: Template for Adding Code After RC is Cut requiring a new RC build
 title: Post RC Code Change Template
 labels: release
-assignees: TKDickson, bischoffa
+assignees: TKDickson, SarahHuber_AdHoc
 ---
 <!-- Please fill out all of the relevant sections of this template. Please do not delete any areas of this template. The tickets can be updated as the sections are finished and any section that doesn't need to have info should be labeled as NA -->
 

.github/ISSUE_TEMPLATE/release_ticket.md

@@ -3,7 +3,7 @@ name: Release Review Template
 about: Template for requesting a production release for VA mobile app
 title: "{{ env.releaseDate }} Release Sign-Off: {{ env.versionNumber }}"
 labels: release
-assignees: timwright12, chrisj-usds, dumathane, rachelhanster, kellylein, DonMcCaugheyUSDS, TKDickson
+assignees: timwright12, chrisj-usds, dumathane, rachelhanster, SarahHuber_AdHoc, DonMcCaugheyUSDS, TKDickson
 
 ---
 

.github/workflows/e2e_android.yml

@@ -30,10 +30,6 @@ on:
         description: 'Add results to testRail?'
         type: boolean
         required: false
-      device_specific:
-        description: 'Is your testRail run Android only? (only check if adding results to testRail)'
-        type: boolean
-        required: false
   schedule:
     - cron: '0 4 * * 1,2,3,4,5'
   workflow_run:
@@ -86,7 +82,6 @@ jobs:
       message: 'Starting E2E Android tests. Please see :thread: for results. This process may take a while.'
 
   find_detox_tests_to_run:
-    if: github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     uses: ./.github/workflows/e2e_detox_mapping.yml
 
   output_detox_tests_to_run:
@@ -103,8 +98,8 @@ jobs:
       - name: 'Get Matrix Value'
         id: matrix_value
         run: |
-          if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]]; then
-            if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
+          if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
+            if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
               e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
               echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
               echo "individual_matrix=" >> "$GITHUB_OUTPUT"
@@ -120,7 +115,7 @@ jobs:
             if [[ "${{ needs.find_detox_tests_to_run.outputs.test_run }}" != "" ]]; then
               echo "${{needs.find_detox_tests_to_run.outputs.test_matrix}}"
               if [[ "${{needs.find_detox_tests_to_run.outputs.test_matrix}}" == "[]" ]]; then
-                if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
+                if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
                   e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
                   echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
                   echo "individual_matrix=" >> "$GITHUB_OUTPUT"
@@ -246,7 +241,7 @@ jobs:
         if: failure() || success()
         uses: actions/upload-artifact@v4
         with:
-          name: ${{matrix.testsuite}}-e2e-junit
+          name: e2e-junit-${{matrix.testsuite}}
           path: VAMobile/e2e/test_reports/e2e-junit.xml
 
       - name: Upload artifacts on failure
@@ -353,18 +348,11 @@ jobs:
 
   matrix_send_test_results_to_testrail:
     if: (!cancelled()) && github.event.inputs.run_testRail == 'true'
-    needs: [matrix-e2e-android, output_detox_tests_to_run]
-    strategy:
-      fail-fast: false
-      max-parallel: 1
-      matrix:
-        testsuite: ${{ fromJSON(needs.output_detox_tests_to_run.outputs.output1) }}     
+    needs: [matrix-e2e-android, output_detox_tests_to_run]    
     name: Update testRail Results
     uses: ./.github/workflows/update_testrail_results.yml
     with: 
-      test_names: "${{matrix.testsuite}}"
       testRail_name: ${{ inputs.testRail_name }}
-      test_specific_OS_needed: ${{ inputs.device_specific}}
       test_OS_name: "Android"
     secrets: inherit
 

.github/workflows/e2e_detox_mapping.yml

@@ -93,7 +93,7 @@ jobs:
             select(contains(["auth"])) += ["SignIn"] |
             select(contains(["authorizedServices"])) += ["Appeals", "AppealsExpanded", "Appointments", "AppointmentsExpanded", "Claims", "DirectDeposit", "DisabilityRatings", "PersonalInformationScreen", "VALetters", "MilitaryInformation", "Payments", "Prescriptions", "Messages", "VeteranStatusCard"] |
             select(contains(["contactInformation"]) or contains(["ContactInformationScreen"])) += ["ContactInformation", "VALetters"] |
-            select(contains(["NotificationManager"])) += ["SettingsScreen", "PushNotifications"] |
+            select(contains(["NotificationManager"])) += ["SettingsScreen", "PushNotifications", "Onboarding"] |
             select(contains(["Types"]) or contains(["VAImage"])) +=
               ["AvailabilityFramework", "Cerner", "ContactInformation", "VALetters", "LoginScreen", "Onboarding", "ProfileScreen", "PushNotifications", "SettingsScreen", "SignIn", "VaccineRecords", "Claims", "Appeals", "AppealsExpanded", "DisabilityRatings", "Appointments", "AppointmentsExpanded", "Prescriptions", "Messages", "MilitaryInformation", "HomeScreen", "VeteransCrisisLine", "VeteranStatusCard", "DirectDeposit", "Payments", "PersonalInformationScreen"]
             | unique')

.github/workflows/e2e_ios.yml

@@ -30,10 +30,6 @@ on:
         description: 'Add results to testRail?'
         type: boolean
         required: false
-      device_specific:
-        description: 'Is your testRail run iOS only? (only check if adding results to testRail)'
-        type: boolean
-        required: false
   schedule:
     - cron: '0 4 * * 1,2,3,4,5'
   workflow_run:
@@ -77,7 +73,6 @@ jobs:
       message: 'Starting E2E iOS tests. Please see :thread: for results. This process may take a while.'
 
   find_detox_tests_to_run:
-    if: github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     uses: ./.github/workflows/e2e_detox_mapping.yml
 
   output_detox_tests_to_run:
@@ -94,8 +89,8 @@ jobs:
       - name: 'Get Matrix Value'
         id: matrix_value
         run: |
-          if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]]; then
-            if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
+          if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
+            if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
               e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
               echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
               echo "individual_matrix=" >> "$GITHUB_OUTPUT"
@@ -111,7 +106,7 @@ jobs:
             if [[ "${{ needs.find_detox_tests_to_run.outputs.test_run }}" != "" ]]; then
               echo "${{needs.find_detox_tests_to_run.outputs.test_matrix}}"
               if [[ "${{needs.find_detox_tests_to_run.outputs.test_matrix}}" == "[]" ]]; then
-                if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
+                if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
                   e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
                   echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
                   echo "individual_matrix=" >> "$GITHUB_OUTPUT"
@@ -143,7 +138,6 @@ jobs:
       IOS_PROJ_FILE: 'VAMobile.xcodeproj'
       # Xcode scheme to build
       IOS_SCHEME: 'VAMobileRelease'
-
     strategy:
       fail-fast: false
       matrix:
@@ -224,8 +218,8 @@ jobs:
         if: failure() || success()
         uses: actions/upload-artifact@v4
         with: 
-            name: ${{matrix.testsuite}}-e2e-junit
-            path: VAMobile/e2e/test_reports/e2e-junit.xml
+          name: e2e-junit-${{matrix.testsuite}}
+          path: VAMobile/e2e/test_reports/e2e-junit.xml
 
       - name: Upload artifacts on failure
         if: failure() || steps.run_e2e_tests.outcome == 'failure'
@@ -332,18 +326,11 @@ jobs:
 
   matrix_send_test_results_to_testrail:
     if: (!cancelled()) && github.event.inputs.run_testRail == 'true'
-    needs: [matrix-e2e-ios, output_detox_tests_to_run]
-    strategy:
-      fail-fast: false
-      max-parallel: 1
-      matrix:
-        testsuite: ${{ fromJSON(needs.output_detox_tests_to_run.outputs.output1) }}     
+    needs: [matrix-e2e-ios, output_detox_tests_to_run]    
     name: Update testRail Results
     uses: ./.github/workflows/update_testrail_results.yml
     with: 
-      test_names: "${{matrix.testsuite}}"
       testRail_name: ${{ inputs.testRail_name }}
-      test_specific_OS_needed: ${{ inputs.device_specific}}
       test_OS_name: "iOS"
     secrets: inherit
 

.github/workflows/release_branch_issue.yml

@@ -94,7 +94,7 @@ jobs:
         run: |
           declare -A GITHUB_TO_SLACK_MAP
           GITHUB_TO_SLACK_MAP["TKDickson"]="U02PJLJ0H6H"
-          GITHUB_TO_SLACK_MAP["kellylein"]="UJHA49K6X"
+          GITHUB_TO_SLACK_MAP["SarahHuber_AdHoc"]="U07U9EDGAFP"
           GITHUB_TO_SLACK_MAP["dumathane"]="U02RC1BRZBP"
           GITHUB_TO_SLACK_MAP["timwright12"]="U01DBDAJZ18"
           GITHUB_TO_SLACK_MAP["ala_yna"]="UQC180926"
@@ -111,7 +111,7 @@ jobs:
         env:
           SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }}
           SLACK_TKDickson: $TKDickson
-          SLACK_kellylein: $kellylein
+          SLACK_SarahHuberAdHoc: $SarahHuber_AdHoc
           SLACK_dumathane: $dumathane
           SLACK_timwright12: $timwright12
           SLACK_alayna: $ala_yna
@@ -133,7 +133,7 @@ jobs:
           - *Tickets Tagged Appropriately:* ${{ needs.release_ticket.outputs.qaDueDate }}\n\n\
           *Contacts:*\n\
           - *Release Testing:* <@${SLACK_TKDickson}>\n\
-          - *Release Manager:* <@${SLACK_kellylein}>\n\
+          - *Release Manager:* <@${SLACK_SarahHuberAdHoc}>\n\
           - *Release Ticket Validation:* <@${SLACK_dumathane}>\n\
           - *Engineering:* <@${SLACK_dumathane}>, <@${SLACK_timwright12}>\n\
           - *Mobile Product Approvers:* H&B and Global - <@${SLACK_alayna}> Global - <@${SLACK_ajsarkar28}>\n\
@@ -148,4 +148,4 @@ jobs:
                -H 'Authorization: Bearer '"$SLACK_API_TOKEN" \
                -H 'Content-type: application/json' \
                -d @- \
-               https://slack.com/api/chat.postMessage
+               https://slack.com/api/chat.postMessage

.github/workflows/update_testrail_results.yml

@@ -10,15 +10,9 @@ on:
         description: "TestRail api key"
         required: true
     inputs:
-      test_names:
-        type: string
-        default: ''
       testRail_name:
         type: string
         default: ''
-      test_specific_OS_needed:
-        type: boolean
-        default: false
       test_OS_name:
         type: string
         default: ''
@@ -42,7 +36,7 @@ jobs:
       - name: Download junit file
         uses: actions/download-artifact@v4
         with: 
-          name: ${{inputs.test_names}}-e2e-junit
+          pattern: e2e-junit-*
       - name: 'Find run ID in testRail'
         id: run-id-selection
         run: | 
@@ -53,18 +47,13 @@ jobs:
           echo "TEST_RUN_ID=$resp" >> "$GITHUB_OUTPUT"
           if [ "$resp" == '' ]; then
             if [[ "${{ inputs.testRail_name }}" == "" ]]; then
-              if [[ ${{ inputs.test_specific_OS_needed}} == true ]]; then
-                OS_name="${{inputs.test_OS_name}}: "
-              else
-                OS_name=''
-              fi
               resp=$(curl -X POST -H 'Content-Type: application/json' \
                   -u "${{secrets.TEST_RAIL_USER}}:${{secrets.TEST_RAIL_KEY}}" \
-                  -d '{"suite_id": 92, "include_all": false, "name": "'"${OS_name}$(date +'%Y-%m-%d')"'"}' \
+                  -d '{"suite_id": 92, "include_all": false, "name": "'"$(date +'%Y-%m-%d')"'"}' \
                   "https://dsvavsp.testrail.io//index.php?/api/v2/add_run/29" )
               resp=$(curl -X GET -H 'Content-Type: application/json' \
                   -u "${{secrets.TEST_RAIL_USER}}:${{secrets.TEST_RAIL_KEY}}" \
-                  "https://dsvavsp.testrail.io//index.php?/api/v2/get_runs/29&is_completed=0" | jq '.runs[] | select(.name =="'"${OS_name}$(date +'%Y-%m-%d')"'") | .id')
+                  "https://dsvavsp.testrail.io//index.php?/api/v2/get_runs/29&is_completed=0" | jq '.runs[] | select(.name =="'"$(date +'%Y-%m-%d')"'") | .id')
               echo "$resp"
               echo "TEST_RUN_ID=$resp" >> "$GITHUB_OUTPUT"
             else
@@ -94,15 +83,19 @@ jobs:
           python-version: '3.x'
       - name: TestRail CLI upload results
         if: always()
-        run: |      
+        run: |
           pip install trcli
-          trcli -y \
-            -h https://dsvavsp.testrail.io/ \
-            --project "VA Mobile App" \
-            --project-id 29 \
-            -u ${{secrets.TEST_RAIL_USER}} \
-            -k ${{secrets.TEST_RAIL_KEY}} \
-            parse_junit \
-            --run-id ${{steps.run-id-selection.outputs.TEST_RUN_ID}} \
-            --section-id ${{steps.section-id-selection.outputs.SECTION_RUN_ID}} \
-            -f "/home/runner/work/va-mobile-app/va-mobile-app/e2e-junit.xml"
+          for dir in /home/runner/work/va-mobile-app/va-mobile-app/e2e-junit-*/; do
+              echo "$dir"
+              trcli -y \
+                -h https://dsvavsp.testrail.io/ \
+                --project "VA Mobile App" \
+                --project-id 29 \
+                -u ${{secrets.TEST_RAIL_USER}} \
+                -k ${{secrets.TEST_RAIL_KEY}} \
+                parse_junit \
+                --run-id ${{steps.run-id-selection.outputs.TEST_RUN_ID}} \
+                --section-id ${{steps.section-id-selection.outputs.SECTION_RUN_ID}} \
+                -f "${dir}e2e-junit.xml"            
+          done
+

VAMobile/android/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.993.0)
+    aws-partitions (1.1001.0)
     aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -113,7 +113,7 @@ GEM
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     fastlane-plugin-slack_bot (1.4.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.73.0)
+    google-apis-androidpublisher_v3 (0.74.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -127,7 +127,7 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-firebaseappdistribution_v1alpha (0.2.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iamcredentials_v1 (0.21.0)
+    google-apis-iamcredentials_v1 (0.22.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-playcustomapp_v1 (0.16.0)
       google-apis-core (>= 0.15.0, < 2.a)
@@ -148,7 +148,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.11.1)
+    googleauth (1.11.2)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -160,15 +160,15 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.6)
     jwt (2.9.3)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.2.0)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
     optparse (0.5.0)
@@ -181,7 +181,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -205,12 +205,12 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.1)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
+      nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)