Merge remote-tracking branch 'origin/main' into jules-fixHybridGpsSwitchWarning

Author: inimaga

.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:
@@ -177,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
@@ -211,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
@@ -223,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:*)"

Mobile-Expensify

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

@@ -167,6 +167,7 @@
         <activity
                 android:name="com.plaid.internal.link.LinkActivity"
                 android:launchMode="singleTask"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
                 tools:replace="android:launchMode"/>
 
         <meta-data

android/app/src/main/AndroidManifest.xml

@@ -2,9 +2,13 @@ package com.expensify.chat
 
 import com.facebook.react.common.assets.ReactFontManager
 
+import android.app.Activity
 import android.app.ActivityManager
+import android.app.Application
+import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.database.CursorWindow
+import android.os.Bundle
 import android.os.Process
 import androidx.multidex.MultiDexApplication
 import com.expensify.chat.bootsplash.BootSplashPackage
@@ -42,6 +46,24 @@ class MainApplication : MultiDexApplication(), ReactApplication {
 
     override fun onCreate() {
         super.onCreate()
+
+        // Plaid's LinkActivity calls setRequestedOrientation(PORTRAIT) in its own onCreate(),
+        // which forces the UI to portrait even when the device is in landscape. We override it
+        // here so Plaid can render in whichever orientation the device is actually in.
+        registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
+            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+                if (activity.javaClass.name == "com.plaid.internal.link.LinkActivity") {
+                    activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                }
+            }
+            override fun onActivityStarted(activity: Activity) {}
+            override fun onActivityResumed(activity: Activity) {}
+            override fun onActivityPaused(activity: Activity) {}
+            override fun onActivityStopped(activity: Activity) {}
+            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+            override fun onActivityDestroyed(activity: Activity) {}
+        })
+
         ReactFontManager.getInstance().addCustomFont(this, "Custom Emoji Font", R.font.custom_emoji_font)
         ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
         ReactFontManager.getInstance().addCustomFont(this, "Expensify Neue", R.font.expensify_neue)

android/app/src/main/java/com/expensify/chat/MainApplication.kt

@@ -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
 

android/gradle.properties

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.60.17</string>
+	<string>9.3.60.18</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>