Merge remote-tracking branch 'upstream/main' into perf/remove-draft-transactions-collection-subscriptions

Author: BartekObudzinski

.claude/commands/review-code-pr.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(gh pr diff:*),Bash(gh pr view:*)
+allowed-tools: Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)
 description: Review a code contribution pull request
 ---
 

.claude/scripts/check-compiler.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Secure proxy script to run React Compiler compliance check on a single file.
+# Validates the filepath before passing it to the underlying npm script.
+set -eu
+
+if [[ $# -lt 1 ]]; then
+    echo "Usage: $0 <filepath>" >&2
+    exit 1
+fi
+
+readonly FILEPATH="$1"
+
+# Strict filepath validation - reject shell metacharacters
+if ! [[ "$FILEPATH" =~ ^[a-zA-Z0-9_./@-]+$ ]]; then
+    echo "Error: Invalid filepath (contains disallowed characters)" >&2
+    exit 1
+fi
+
+npm run react-compiler-compliance-check -- check "$FILEPATH"

.claude/skills/coding-standards/rules/clean-react-0-compiler.md

@@ -98,7 +98,7 @@ function Avatar({source, size}: AvatarProps) {
 Before flagging, verify that the file actually compiles with React Compiler:
 
 ```bash
-npx react-compiler-healthcheck --src "<filepath>" --verbose
+check-compiler.sh <filepath>
 ```
 
 If the output contains **"Failed to compile"** for the file under review, the rule **does not apply** — the author may have no alternative to manual memoization until the compilation issue is resolved.

.github/workflows/cherryPick.yml

@@ -211,6 +211,79 @@ jobs:
             git push origin ${{ inputs.TARGET }}
           fi
 
+      - name: Find deploy workflow run
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        id: findDeployRun
+        run: |
+          PUSH_SHA=$(git rev-parse HEAD)
+          echo "Push SHA: $PUSH_SHA"
+
+          DEPLOY_RUN_URL=""
+          for i in 1 2 3 4 5 6; do
+            echo "Polling for deploy run (attempt $i)..."
+            sleep 10
+            DEPLOY_RUN_URL=$(gh api \
+              "repos/${{ github.repository }}/actions/workflows/deploy.yml/runs?head_sha=$PUSH_SHA&per_page=1" \
+              --jq '.workflow_runs[0].html_url // empty' 2>/dev/null || true)
+            if [ -n "$DEPLOY_RUN_URL" ]; then
+              echo "Found deploy run: $DEPLOY_RUN_URL"
+              break
+            fi
+          done
+
+          FALLBACK_URL="https://github.com/${{ github.repository }}/actions/workflows/deploy.yml"
+          if [ -z "$DEPLOY_RUN_URL" ]; then
+            echo "::warning::Could not find deploy workflow run for SHA $PUSH_SHA"
+            {
+              echo "DEPLOY_RUN_FOUND=false"
+              echo "DEPLOY_RUN_URL=$FALLBACK_URL"
+              echo "DEPLOY_RUN_MESSAGE=⚠️ Could not locate deploy run — check $FALLBACK_URL"
+            } >> "$GITHUB_OUTPUT"
+          else
+            {
+              echo "DEPLOY_RUN_FOUND=true"
+              echo "DEPLOY_RUN_URL=$DEPLOY_RUN_URL"
+              echo "DEPLOY_RUN_MESSAGE=$DEPLOY_RUN_URL"
+            } >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Announce successful CP in #deployer
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: 'good',
+                text: `🍒 Cherry-pick to *${{ inputs.TARGET }}* successful\nPR: ${{ inputs.PULL_REQUEST_URL || '(version bump only)' }}\nDeploy workflow: ${{ steps.findDeployRun.outputs.DEPLOY_RUN_MESSAGE }}`
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+      - name: Write workflow summary
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        run: |
+          {
+            echo "## Cherry-pick successful"
+            echo ""
+            echo "**Target:** \`${{ inputs.TARGET }}\`"
+            echo "**PR:** ${{ inputs.PULL_REQUEST_URL || 'N/A (version bump only)' }}"
+            if [[ "${{ steps.findDeployRun.outputs.DEPLOY_RUN_FOUND }}" == "true" ]]; then
+              echo "**Deploy workflow:** ${{ steps.findDeployRun.outputs.DEPLOY_RUN_URL }}"
+            else
+              echo "**Deploy workflow:** :warning: Could not locate deploy run — check [${{ inputs.TARGET }} deploy runs](${{ steps.findDeployRun.outputs.DEPLOY_RUN_URL }})"
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
       - name: Create Pull Request to manually finish CP
         if: steps.cherryPick.outputs.HAS_CONFLICTS == 'true'
         id: createPullRequest

.github/workflows/claude-review.yml

@@ -74,7 +74,7 @@ jobs:
           prompt: "/review-code-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }}"
           claude_args: |
             --model claude-opus-4-6
-            --allowedTools "Task,Glob,Grep,Read,Bash(gh pr diff:*),Bash(gh pr view:*)" --json-schema '${{ steps.schema.outputs.json }}'
+            --allowedTools "Task,Glob,Grep,Read,Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)" --json-schema '${{ steps.schema.outputs.json }}'
 
       - name: Post code review results
         if: steps.code-review.outcome == 'success' && steps.filter.outputs.code == 'true'

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009033710
-        versionName "9.3.37-10"
+        versionCode 1009033903
+        versionName "9.3.39-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"