Merge branch 'Expensify:main' into fix/53770

.github/workflows/authorChecklist.yml

@@ -5,6 +5,7 @@ on:
   # Warning: – when using the pull_request_target event, DO NOT checkout code from an untrusted branch: https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
   pull_request_target:
     types: [opened, edited, reopened, synchronize]
+    branches: [main]
 
 jobs:
   # Note: PHP specifically looks for the name of this job, "checklist", so if the name of the job is changed,

.github/workflows/cherryPick.yml

@@ -95,34 +95,42 @@ jobs:
         if: fromJSON(steps.cherryPick.outputs.HAS_CONFLICTS)
         id: createPullRequest
         run: |
-          gh pr create \
-            --title "🍒 Cherry pick PR #${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒" \
-            --body \
-              "🍒 Cherry pick https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒
-              This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
+          AUTHOR_CHECKLIST=$(sed -n '/### PR Author Checklist/,$p' .github/PULL_REQUEST_TEMPLATE.md)
+
+          PR_DESCRIPTION=$(cat <<EOF
+          🍒 Cherry pick https://github.com/Expensify/App/pull/56382 to staging 🍒
+
+          This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
+
+          \`\`\`bash
+          git fetch
+          git checkout ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}
+          git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}
+          \`\`\`
 
-              \`\`\`bash
-              git fetch
-              git checkout ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}
-              git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}
-              \`\`\`
+          Then manually resolve conflicts, and commit the change with \`git cherry-pick --continue\`. Lastly, please run:
 
-              Then manually resolve conflicts, and commit the change with \`git cherry-pick --continue\`. Lastly, please run:
+          \`\`\`bash
+          git commit --amend -m "\$(git log -1 --pretty=%B)" -m "(CP triggered by ${{ github.actor }})"
+          \`\`\`
 
-              \`\`\`bash
-              git commit --amend -m \"$(git log -1 --pretty=%B)\" -m \"(CP triggered by ${{ github.actor }})\"
-              \`\`\`
+          That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}\`, and then open this PR for review.
 
-              That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}\`, and then open this PR for review.
-          
-              Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main." \
+          Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.
+
+          _Pro-tip:_ If this PR appears to have conflicts against the _staging_ base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.
+
+          $AUTHOR_CHECKLIST
+          EOF
+          )
+
+          # Create PR
+          gh pr create \
+            --title "🍒 Cherry pick PR #${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒" \
+            --body "$PR_DESCRIPTION" \
             --label "Engineering,Hourly" \
             --base "staging"
           sleep 5
-          gh pr comment --body \
-            "This pull request has merge conflicts and can not be automatically merged. :disappointed:
-             Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
-             **Important:** There may be conflicts that GitHub is not able to detect, so please _carefully_ review this pull request before approving."
           ORIGINAL_PR_AUTHOR="$(gh pr view ${{ github.event.inputs.PULL_REQUEST_NUMBER }} --json author --jq .author.login)"
           gh pr edit --add-assignee "${{ github.actor }},${{ steps.getCPMergeCommit.outputs.MERGE_ACTOR }},$ORIGINAL_PR_AUTHOR"
         env:

.github/workflows/cla.yml

@@ -5,6 +5,7 @@ on:
     types: [created]
   pull_request_target:
     types: [opened, synchronize]
+    branches: [main]
 
 jobs:
   CLA:

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ concurrency:
 jobs:
   lint:
     name: ESLint check
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    if: ${{ github.event.head_commit.author.name != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/postBuildStartedComment.yml

@@ -27,7 +27,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: ${{ inputs.APP_PULL_REQUEST_NUMBER }},
-                body: `🚧 @${{ github.actor }} has triggered a test hybrid app build. You can view the [workflow run here](${workflowURL}).`
+                body: `🚧 @${{ github.actor }} has triggered a test app build. You can view the [workflow run here](${workflowURL}).`
                 });
 
         - name: Add build start comment to OD PR

.github/workflows/sendReassurePerfData.yml

@@ -33,6 +33,9 @@ jobs:
         with:
           github_token: ${{ github.token }}
 
+      - name: Test connectivity to stats.expensify.com server
+        run: nc -zv stats.expensify.com 3003
+
       - name: Get and save graphite string
         id: saveGraphiteString
         uses: ./.github/actions/javascript/getGraphiteString

.github/workflows/test.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   jest:
-    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
+    if: ${{ github.event.head_commit.author.name != 'OSBotify' && github.event.head_commit.author.name != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     env:
       CI: true
@@ -44,7 +44,7 @@ jobs:
         run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   storybookTests:
-    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
+    if: ${{ github.event.head_commit.author.name != 'OSBotify' && github.event.head_commit.author.name != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     name: Storybook tests
     steps:

.github/workflows/testBuildHybrid.yml

@@ -45,15 +45,18 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate that user is an Expensify employee
-        if: github.event_name == 'workflow_dispatch'
+        if: ${{ github.event_name == 'workflow_dispatch' }}
         uses: ./.github/actions/composite/validateActor
         with:
           REQUIRE_APP_DEPLOYER: false
           OS_BOTIFY_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
 
       - name: Validate input
-        if: github.event_name == 'workflow_dispatch'
         run: |
+          if [[ "${{ github.event_name }}" == "workflow_call" ]]; then
+            exit 0
+          fi
+
           if [[ -z "${{ github.event.inputs.APP_PULL_REQUEST_NUMBER }}" && -z "${{ github.event.inputs.HYBRIDAPP_PULL_REQUEST_NUMBER }}" ]]; then
             echo "Invalid input. You have to pass at least one PR number"
             exit 1

.github/workflows/verifyHybridApp.yml

@@ -19,7 +19,7 @@ on:
       - 'ios/project.pbxproj'
   pull_request_target:
     types: [opened, synchronize]
-    branches-ignore: [staging, production]
+    branches: [main]
     paths:
       - '**.kt'
       - '**.java'
@@ -52,7 +52,7 @@ jobs:
       - name: Comment on forks
         run: |
           gh pr comment ${{github.event.pull_request.html_url }} --body \
-          ":warning: This PR is possibly changing native code, it may cause problems with HybridApp. Please run an AdHoc build to verify that HybridApp will not break. :warning:"
+          ":warning: This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. :warning:"
         env:
           GITHUB_TOKEN: ${{ github.token }}
   verify_android:

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009010902
-        versionName "9.1.9-2"
+        versionCode 1009011003
+        versionName "9.1.10-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"