Merge branch 'main' into VickyStash/refactor/82871-bump-onyx-3.0.46

Author: VickyStash

.claude/agents/deploy-blocker-investigator.md

@@ -1,7 +1,7 @@
 ---
 name: deploy-blocker-investigator
 description: Investigates deploy blockers to find the causing PR and recommend resolution.
-tools: Glob, Grep, Read, Bash, BashOutput
+tools: Glob, Grep, Read, Write, Bash, BashOutput
 model: inherit
 ---
 
@@ -114,11 +114,9 @@ See Decision Tree below for label actions.
 
 ### Step 7: Post comment and update labels
 
-Post your findings (use single quotes for the body to handle special characters):
+Write the comment body to a temp file using the Write tool, then post it:
 ```bash
-gh issue comment "$ISSUE_URL" --body '## 🔍 Investigation Summary
-...your comment here...
-'
+gh issue comment "$ISSUE_URL" --body-file /tmp/investigation-summary.md
 ```
 
 Remove label only if the decision tree warrants it:
@@ -131,7 +129,12 @@ Call scripts by name only (e.g., `removeDeployBlockerLabel.sh`), not with full p
 
 ### Step 8: Assign contributors
 
-When a causing PR is identified with medium or high confidence, assign the PR author and all approving reviewers to the deploy blocker issue using `gh issue edit "$ISSUE_URL" --add-assignee`. Extract approving reviewers from `gh pr view <PR_NUMBER> --json reviews`.
+If the primary causing PR has at least medium confidence, assign its author and approving reviewers to the deploy blocker issue. Only assign contributors from this single PR.
+
+```bash
+gh pr view <PR_NUMBER> --json reviews
+gh issue edit "$ISSUE_URL" --add-assignee <logins>
+```
 
 ---
 
@@ -172,7 +175,7 @@ Choose ONE:
 
 ## Comment Format
 
-Post ONE comment using this exact format:
+Use the Write tool to create `/tmp/investigation-summary.md` with the following markdown structure. Every field and heading must be present.
 
 ```markdown
 ## 🔍 Investigation Summary
@@ -186,7 +189,7 @@ Post ONE comment using this exact format:
 Brief explanation of why this recommendation (1-2 sentences).
 
 
-**Assigned**: @author (PR author), @reviewer (approving reviewer) — or omit if no causing PR identified
+**Assigned**: @author (PR author), @reviewer (approving reviewer) from highest-confidence causing PR only — omit if no causing PR identified
 **Labels**: [Describe any label changes made]
 
 <details>
@@ -206,6 +209,8 @@ Technical explanation of what went wrong in the code.
 
 </details>
 ```
+
+Then post with: `gh issue comment "$ISSUE_URL" --body-file /tmp/investigation-summary.md`
 ---
 
 ## Constraints
@@ -218,7 +223,7 @@ Technical explanation of what went wrong in the code.
 - Make assumptions about code you haven't read
 - Recommend DEMOTE for bugs affecting core functionality (auth, payments, data loss)
 - Close the issue—only update labels and comment
-- Use heredocs, temp files, or shell redirects for comments
+- Use heredocs or shell redirects for comments
 
 **DO:**
 - Always verify the causing PR touches the affected code before concluding

.claude/commands/investigate-deploy-blocker.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read
+allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read,Write
 description: Investigate a deploy blocker issue to find the causing PR and recommend resolution
 ---
 

.github/actions/javascript/getPullRequestIncrementalChanges/index.js

@@ -12658,7 +12658,7 @@ class Git {
             return; // Reference is already available locally
         }
         try {
-            (0, Logger_1.log)(`🔄 Fetching missing ref: ${ref}`);
+            console.log(`🔄 Fetching missing ref: ${ref}`);
             await exec(`git fetch ${remote} ${ref} --no-tags --depth=1 --quiet`);
             // Verify the ref is now available
             if (!this.isValidRef(ref)) {
@@ -12869,7 +12869,7 @@ exports["default"] = Git;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.bold = exports.formatLink = exports.success = exports.error = exports.note = exports.warn = exports.info = exports.log = void 0;
+exports.bold = exports.formatLink = exports.success = exports.errorDetail = exports.error = exports.note = exports.warn = exports.info = void 0;
 const COLOR_DIM = '\x1b[2m';
 const COLOR_RESET = '\x1b[0m';
 const COLOR_YELLOW = '\x1b[33m';
@@ -12884,40 +12884,34 @@ const EMOJIS = {
     SUCCESS: '✅',
     ERROR: '🔴',
 };
-const log = (...args) => {
-    console.debug(...args);
-};
-exports.log = log;
 const info = (...args) => {
-    const lines = [EMOJIS.INFO, ...args];
-    log(...lines);
+    console.log(EMOJIS.INFO, ...args);
 };
 exports.info = info;
 const bold = (...args) => {
-    const lines = [COLOR_BOLD, ...args, COLOR_RESET];
-    log(...lines);
+    console.log(COLOR_BOLD, ...args, COLOR_RESET);
 };
 exports.bold = bold;
 const success = (...args) => {
-    const lines = [`${EMOJIS.SUCCESS}${COLOR_GREEN}`, ...args, COLOR_RESET];
-    log(...lines);
+    console.log(`${EMOJIS.SUCCESS}${COLOR_GREEN}`, ...args, COLOR_RESET);
 };
 exports.success = success;
 const warn = (...args) => {
-    const lines = [`${EMOJIS.WARN}${COLOR_YELLOW}`, ...args, COLOR_RESET];
-    log(...lines);
+    console.warn(`${EMOJIS.WARN}${COLOR_YELLOW}`, ...args, COLOR_RESET);
 };
 exports.warn = warn;
 const note = (...args) => {
-    const lines = [COLOR_DIM, ...args, COLOR_RESET];
-    log(...lines);
+    console.log(COLOR_DIM, ...args, COLOR_RESET);
 };
 exports.note = note;
 const error = (...args) => {
-    const lines = [`${EMOJIS.ERROR}${COLOR_RED}`, ...args, COLOR_RESET];
-    log(...lines);
+    console.error(`${EMOJIS.ERROR}${COLOR_RED}`, ...args, COLOR_RESET);
 };
 exports.error = error;
+const errorDetail = (...args) => {
+    console.error(`   ${COLOR_RED}↳`, ...args, COLOR_RESET);
+};
+exports.errorDetail = errorDetail;
 const formatLink = (name, url) => `\x1b]8;;${url}\x1b\\${name}\x1b]8;;\x1b\\`;
 exports.formatLink = formatLink;
 

.github/workflows/deployBlockerInvestigation.yml

@@ -77,4 +77,4 @@ jobs:
           github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
           prompt: "/investigate-deploy-blocker ISSUE_URL: ${{ env.ISSUE_URL }}"
           claude_args: |
-            --allowedTools "Task,Glob,Grep,Read,Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*)"
+            --allowedTools "Task,Glob,Grep,Read,Write,Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*)"

.github/workflows/syncVersions.yml

@@ -36,32 +36,56 @@ jobs:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
           SETUP_AS_APP: false
 
-      - name: Update submodule to latest Mobile-Expensify main
-        run: git submodule update --remote
+      - name: Record submodule gitlink and update Mobile-Expensify to latest main
+        id: submoduleRemote
+        run: |
+          RECORDED_SHA=$(git rev-parse HEAD:Mobile-Expensify)
+          echo "Submodule commit recorded on App: $RECORDED_SHA"
+          echo "RECORDED_SHA=$RECORDED_SHA" >> "$GITHUB_OUTPUT"
+
+          git submodule update --remote
+
+          ACTUAL_SHA=$(git -C Mobile-Expensify rev-parse HEAD)
+          echo "Mobile-Expensify after remote update: $ACTUAL_SHA"
+          echo "ACTUAL_SHA=$ACTUAL_SHA" >> "$GITHUB_OUTPUT"
 
-      - name: Check current versions
+      - name: Check sync state (versions + submodule pointer)
         id: checkVersions
         run: |
           APP_VERSION=$(jq -r .version package.json)
           ME_VERSION=$(jq -r .meta.version Mobile-Expensify/app/config/config.json)
+          RECORDED_SHA="${{ steps.submoduleRemote.outputs.RECORDED_SHA }}"
+          ACTUAL_SHA="${{ steps.submoduleRemote.outputs.ACTUAL_SHA }}"
+
           echo "E/App version: $APP_VERSION"
           echo "Mobile-Expensify version: $ME_VERSION"
           echo "APP_VERSION=$APP_VERSION" >> "$GITHUB_OUTPUT"
           echo "ME_VERSION=$ME_VERSION" >> "$GITHUB_OUTPUT"
-          
-          if [ "$APP_VERSION" == "$ME_VERSION" ]; then
-            echo "::notice::✅ Versions are already in sync: $APP_VERSION"
+
+          if [[ "$RECORDED_SHA" != "$ACTUAL_SHA" ]]; then
+            echo "::warning::⚠️ Submodule pointer is behind Mobile-Expensify main (recorded $RECORDED_SHA, latest $ACTUAL_SHA)"
+          fi
+
+          if [[ "$APP_VERSION" == "$ME_VERSION" && "$RECORDED_SHA" == "$ACTUAL_SHA" ]]; then
+            echo "::notice::✅ Versions and submodule are in sync ($APP_VERSION @ $ACTUAL_SHA)"
             echo "IN_SYNC=true" >> "$GITHUB_OUTPUT"
+            echo "NEED_FULL_VERSION_SYNC=false" >> "$GITHUB_OUTPUT"
           else
-            echo "::warning::⚠️ Versions are out of sync - E/App: $APP_VERSION, Mobile-Expensify: $ME_VERSION"
             echo "IN_SYNC=false" >> "$GITHUB_OUTPUT"
+            if [[ "$APP_VERSION" != "$ME_VERSION" ]]; then
+              echo "::warning::⚠️ Versions are out of sync - E/App: $APP_VERSION, Mobile-Expensify: $ME_VERSION"
+              echo "NEED_FULL_VERSION_SYNC=true" >> "$GITHUB_OUTPUT"
+            else
+              echo "::notice::Versions match ($APP_VERSION) but App must record the latest submodule commit"
+              echo "NEED_FULL_VERSION_SYNC=false" >> "$GITHUB_OUTPUT"
+            fi
           fi
 
       - name: Determine target version
-        if: steps.checkVersions.outputs.IN_SYNC != 'true'
+        if: steps.checkVersions.outputs.IN_SYNC != 'true' && steps.checkVersions.outputs.NEED_FULL_VERSION_SYNC == 'true'
         id: targetVersion
         run: |
-          if [ -n "${{ inputs.TARGET_VERSION }}" ]; then
+          if [[ -n "${{ inputs.TARGET_VERSION }}" ]]; then
             echo "Using provided target version: ${{ inputs.TARGET_VERSION }}"
             echo "VERSION=${{ inputs.TARGET_VERSION }}" >> "$GITHUB_OUTPUT"
           else
@@ -71,69 +95,109 @@ jobs:
           fi
 
       - name: Setup Node
-        if: steps.checkVersions.outputs.IN_SYNC != 'true'
+        if: steps.checkVersions.outputs.IN_SYNC != 'true' && steps.checkVersions.outputs.NEED_FULL_VERSION_SYNC == 'true'
         uses: ./.github/actions/composite/setupNode
 
       - name: Sync E/App to target version
-        if: steps.checkVersions.outputs.IN_SYNC != 'true'
+        if: steps.checkVersions.outputs.IN_SYNC != 'true' && steps.checkVersions.outputs.NEED_FULL_VERSION_SYNC == 'true'
         run: |
           TARGET="${{ steps.targetVersion.outputs.VERSION }}"
           echo "::notice::Syncing E/App to version $TARGET"
-          
+
           # Update version using npm (this updates package.json and package-lock.json)
           npm --no-git-tag-version version "$TARGET"
-          
+
           # Extract version components for native file updates
           SHORT_VERSION="${TARGET%-*}"  # e.g., "9.3.11" from "9.3.11-48"
           BUILD_NUMBER="${TARGET#*-}"   # e.g., "48" from "9.3.11-48"
           CF_VERSION="${SHORT_VERSION}.${BUILD_NUMBER}"  # e.g., "9.3.11.48"
-          
+
           # Pad build number components for Android version code (prefix 10 for E/App)
           IFS='.' read -r MAJOR MINOR PATCH <<< "$SHORT_VERSION"
           ANDROID_VERSION_CODE="10$(printf '%02d' "$MAJOR")$(printf '%02d' "$MINOR")$(printf '%02d' "$PATCH")$(printf '%02d' "$BUILD_NUMBER")"
-          
+
           echo "Updating Android build.gradle with versionName=$TARGET, versionCode=$ANDROID_VERSION_CODE"
           sed -i '' "s/versionName \"[0-9.-]*\"/versionName \"$TARGET\"/" android/app/build.gradle
           sed -i '' "s/versionCode [0-9]*/versionCode $ANDROID_VERSION_CODE/" android/app/build.gradle
-          
+
           echo "Updating iOS plists with CFBundleShortVersionString=$SHORT_VERSION, CFBundleVersion=$CF_VERSION"
           /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_VERSION" ios/NewExpensify/Info.plist
           /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $CF_VERSION" ios/NewExpensify/Info.plist
           /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_VERSION" ios/NotificationServiceExtension/Info.plist
           /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $CF_VERSION" ios/NotificationServiceExtension/Info.plist
           /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_VERSION" ios/ShareViewController/Info.plist
           /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $CF_VERSION" ios/ShareViewController/Info.plist
-          
+
           # Commit version changes
           git add package.json package-lock.json android/app/build.gradle ios/*/Info.plist
           git commit -m "Update version to $TARGET (sync recovery)"
-          
+
           # Update submodule reference
           git add Mobile-Expensify
           git commit -m "Update Mobile-Expensify submodule version to $TARGET (sync recovery)"
-          
+
           # Push changes
           if ! git push origin main; then
             echo "::warning::Push failed, attempting rebase..."
             git fetch origin main
             git rebase origin/main
             git push origin main
           fi
-          
+
           echo "::notice::✅ Successfully synced E/App to version $TARGET"
 
+      - name: Bump Mobile-Expensify submodule only
+        if: steps.checkVersions.outputs.IN_SYNC != 'true' && steps.checkVersions.outputs.NEED_FULL_VERSION_SYNC != 'true'
+        run: |
+          EXPECTED_SHA="${{ steps.submoduleRemote.outputs.ACTUAL_SHA }}"
+          CURRENT_SHA=$(git -C Mobile-Expensify rev-parse HEAD)
+          if [[ "$CURRENT_SHA" != "$EXPECTED_SHA" ]]; then
+            echo "::error::Mobile-Expensify checkout ($CURRENT_SHA) does not match expected main ($EXPECTED_SHA)"
+            exit 1
+          fi
+
+          echo "::notice::Recording Mobile-Expensify submodule at $CURRENT_SHA (versions already matched ${{ steps.checkVersions.outputs.APP_VERSION }})"
+          git add Mobile-Expensify
+          git commit -m "Bump Mobile-Expensify submodule to latest main ($CURRENT_SHA)"
+
+          if ! git push origin main; then
+            echo "::warning::Push failed, attempting rebase..."
+            git fetch origin main
+            git rebase origin/main
+            git submodule update --remote
+            git add Mobile-Expensify
+            if ! git diff --staged --quiet; then
+              git commit -m "Bump Mobile-Expensify submodule to latest main after rebase ($(git -C Mobile-Expensify rev-parse HEAD))"
+            fi
+            git push origin main
+          fi
+
+          echo "::notice::✅ Submodule pointer updated on App main"
+
       - name: Verify sync completed
+        id: verifySync
         if: steps.checkVersions.outputs.IN_SYNC != 'true'
         run: |
           APP_VERSION=$(jq -r .version package.json)
           ME_VERSION=$(jq -r .meta.version Mobile-Expensify/app/config/config.json)
-          
-          if [ "$APP_VERSION" != "$ME_VERSION" ]; then
+
+          if [[ "$APP_VERSION" != "$ME_VERSION" ]]; then
             echo "::error::Sync failed! Versions still don't match"
             echo "::error::E/App: $APP_VERSION, Mobile-Expensify: $ME_VERSION"
             exit 1
           fi
-          echo "::notice::✅ Versions verified: $APP_VERSION"
+
+          git -C Mobile-Expensify fetch origin
+
+          RECORDED=$(git rev-parse HEAD:Mobile-Expensify)
+          REMOTE_SHA=$(git -C Mobile-Expensify rev-parse origin/main)
+          if [[ "$RECORDED" != "$REMOTE_SHA" ]]; then
+            echo "::error::Submodule on App main ($RECORDED) still differs from Mobile-Expensify origin/main ($REMOTE_SHA)"
+            exit 1
+          fi
+
+          echo "POST_SYNC_APP_VERSION=$APP_VERSION" >> "$GITHUB_OUTPUT"
+          echo "::notice::✅ Verified versions ($APP_VERSION) and submodule match Mobile-Expensify main ($RECORDED)"
 
       - name: Announce sync in Slack
         if: steps.checkVersions.outputs.IN_SYNC != 'true'
@@ -146,7 +210,7 @@ jobs:
               channel: '#deployer',
               attachments: [{
                 color: "good",
-                text: `✅ Version sync completed. E/App and Mobile-Expensify are now both at version ${{ steps.targetVersion.outputs.VERSION }}`
+                text: `✅ Version sync completed. E/App and Mobile-Expensify are at ${{ steps.verifySync.outputs.POST_SYNC_APP_VERSION }}; submodule matches Mobile-Expensify main.`
               }]
             }
         env:

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036002
-        versionName "9.3.60-2"
+        versionCode 1009036017
+        versionName "9.3.60-17"
         // 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"

android/app/build.gradle

@@ -44,6 +44,9 @@ newArchEnabled=true
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
 
+# Use this property to enable or disable Hermes V1.
+hermesV1Enabled=true
+
 # Key Store Information
 MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore