Merge remote-tracking branch 'origin/main' into claude-iosFocusDescriptionOnCancel

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>

Author: MelvinBot

.claude/skills/coding-standards/SKILL.md

@@ -53,6 +53,8 @@ Coding standards for the Expensify App. Each standard is a standalone file in `r
 - [CONSISTENCY-12](rules/consistency-12-callback-named-for-action.md) — Name callbacks for what they do, not the event they handle
 - [CONSISTENCY-13](rules/consistency-13-document-props.md) — Document component props with a JSDoc block comment
 - [CONSISTENCY-14](rules/consistency-14-new-file-header.md) — Non-trivial new files start with a header description
+- [CONSISTENCY-15](rules/consistency-15-comment-why.md) — Comments explain why the code exists, not what it does
+- [CONSISTENCY-16](rules/consistency-16-plain-comment-style.md) — Write comments as plain, natural sentences
 
 ### Clean React Patterns
 - [CLEAN-REACT-PATTERNS-0](rules/clean-react-0-compiler.md) — React Compiler compliance

.claude/skills/coding-standards/rules/consistency-15-comment-why.md

@@ -0,0 +1,41 @@
+---
+ruleId: CONSISTENCY-15
+title: Commenting "Why"
+---
+
+## [CONSISTENCY-15] Commenting "Why"
+
+### Reasoning
+
+Comments should explain *why* the code exists, not what it does. Well-named identifiers already say what the code does, so a comment that only restates the code is dead weight.
+
+### Incorrect
+
+```tsx
+// loop through users
+users.forEach(processUser);
+```
+
+### Correct
+
+```tsx
+// We only include active users to avoid reprocessing deactivated ones
+users.forEach(processUser);
+```
+
+---
+
+### Review Metadata
+
+Flag ONLY when BOTH of these are true:
+
+- The changed code adds or modifies a comment
+- The comment restates what the code does instead of explaining why it exists
+
+**DO NOT flag if:**
+
+- The comment is a JSDoc `@param` or `@returns` description, where stating what the parameter or return value is is the expected content, not a why explanation
+- Stating what the code does is genuinely the only way to orient a reader, such as documenting a regex or a bit-flag mask
+
+**Search Patterns** (hints for reviewers):
+- Any newly added or modified `//` or `/* */` comment that only restates the code below it

.claude/skills/coding-standards/rules/consistency-16-plain-comment-style.md

@@ -0,0 +1,66 @@
+---
+ruleId: CONSISTENCY-16
+title: Write comments as plain, natural sentences
+---
+
+## [CONSISTENCY-16] Write comments as plain, natural sentences
+
+### Reasoning
+
+Comments should read like something a person actually wrote: plain sentences without the stylistic tics that make prose harder to read, such as em dashes, redundant parentheticals, stacked hyphenated modifiers, arrows, semicolons, and trailing placement on the same line as the code.
+
+### Incorrect
+
+```tsx
+doThing(); // cache the result
+
+// Set the pendingAction to ADD — this exercises the optimistic-update branch before the API responds
+
+// When the assigned guide (who is not a policy admin) comments, then it succeeds
+
+// the not-yet-validated user-supplied bank-account number
+
+// persisted -> processing transition
+
+// retry once; the token had expired
+```
+
+### Correct
+
+```tsx
+// Cache the result to avoid reading from the database every time
+doThing();
+
+// Set the pendingAction to ADD to go through the optimistic-update branch before the API responds
+
+// The assigned guide isn't a policy admin, but the comment still succeeds
+
+// The bank account number the user supplied, before validation
+
+// SequentialQueue moves the request from persisted to processing
+
+// Retry once because the token had expired
+```
+
+---
+
+### Review Metadata
+
+Flag ONLY when BOTH of these are true:
+
+- The changed code adds or modifies a comment
+- In its own sentence, not inside a quoted code snippet or string literal it's documenting, the comment does at least one of the following:
+  - Uses an em dash or en dash
+  - Uses a redundant parenthetical that just repeats what the surrounding sentence already says
+  - Stacks more than one hyphenated compound modifier in front of a noun
+  - Uses `->` instead of writing the relationship in words
+  - Uses a semicolon instead of two separate sentences
+  - Trails at the end of a code line instead of sitting on its own line directly above it
+
+**DO NOT flag if:**
+
+- The dash, arrow, or semicolon appears inside a quoted code example, string literal, or file path the comment is documenting, rather than in the comment's own sentence
+- A single, ordinary compound modifier like "well-known" or "high-risk" is used. Only a stacked chain of several modifiers in front of one noun is a violation
+
+**Search Patterns** (hints for reviewers):
+- Any newly added or modified `//` or `/* */` comment

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

@@ -12887,7 +12887,7 @@ exports["default"] = Git;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.bold = exports.formatLink = exports.success = exports.errorDetail = exports.error = exports.note = exports.warn = exports.info = void 0;
+exports.setOutputStream = 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';
@@ -12902,32 +12902,58 @@ const EMOJIS = {
     SUCCESS: '✅',
     ERROR: '🔴',
 };
+/** Mirrors the console API: informational levels on stdout, warnings and errors on stderr. */
+const outputStreams = {
+    info: 'stdout',
+    bold: 'stdout',
+    success: 'stdout',
+    note: 'stdout',
+    warn: 'stderr',
+    error: 'stderr',
+    errorDetail: 'stderr',
+};
+/**
+ * Redirects individual levels; levels left out keep whatever they are set to. Call this at startup
+ * from a script whose stdout carries machine-readable output (e.g. JSON parsed by another process),
+ * where a stray log line would corrupt the payload: `setOutputStream({info: 'stderr'})`.
+ */
+const setOutputStream = (streams) => {
+    Object.assign(outputStreams, streams);
+};
+exports.setOutputStream = setOutputStream;
+const write = (level, ...args) => {
+    if (outputStreams[level] === 'stderr') {
+        console.error(...args);
+        return;
+    }
+    console.log(...args);
+};
 const info = (...args) => {
-    console.log(EMOJIS.INFO, ...args);
+    write('info', EMOJIS.INFO, ...args);
 };
 exports.info = info;
 const bold = (...args) => {
-    console.log(COLOR_BOLD, ...args, COLOR_RESET);
+    write('bold', COLOR_BOLD, ...args, COLOR_RESET);
 };
 exports.bold = bold;
 const success = (...args) => {
-    console.log(`${EMOJIS.SUCCESS}${COLOR_GREEN}`, ...args, COLOR_RESET);
+    write('success', `${EMOJIS.SUCCESS}${COLOR_GREEN}`, ...args, COLOR_RESET);
 };
 exports.success = success;
 const warn = (...args) => {
-    console.warn(`${EMOJIS.WARN}${COLOR_YELLOW}`, ...args, COLOR_RESET);
+    write('warn', `${EMOJIS.WARN}${COLOR_YELLOW}`, ...args, COLOR_RESET);
 };
 exports.warn = warn;
 const note = (...args) => {
-    console.log(COLOR_DIM, ...args, COLOR_RESET);
+    write('note', COLOR_DIM, ...args, COLOR_RESET);
 };
 exports.note = note;
 const error = (...args) => {
-    console.error(`${EMOJIS.ERROR}${COLOR_RED}`, ...args, COLOR_RESET);
+    write('error', `${EMOJIS.ERROR}${COLOR_RED}`, ...args, COLOR_RESET);
 };
 exports.error = error;
 const errorDetail = (...args) => {
-    console.error(`   ${COLOR_RED}↳`, ...args, COLOR_RESET);
+    write('errorDetail', `   ${COLOR_RED}↳`, ...args, COLOR_RESET);
 };
 exports.errorDetail = errorDetail;
 const formatLink = (name, url) => `\x1b]8;;${url}\x1b\\${name}\x1b]8;;\x1b\\`;

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -59,9 +59,9 @@ jobs:
         id: computePatchesHash
         run: |
           if [[ '${{ matrix.is_hybrid }}' == 'true' ]]; then
-            echo "PATCHES_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+            echo "PATCHES_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
           else
-            echo "PATCHES_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
+            echo "PATCHES_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Setup Node

.github/workflows/publishReactNativeArtifacts.yml

@@ -38,7 +38,7 @@ on:
       - patches/react-native/react-native+*.patch
       - patches/react-native/@react-native+*.patch
       - Mobile-Expensify
-      - scripts/compute-patches-hash.sh
+      - scripts/artifacts-utils/compute-patches-hash.sh
 
 jobs:
   verifyPatches:
@@ -62,8 +62,8 @@ jobs:
         if: ${{ github.event.after != '' }}
         id: getOldPatchesHash
         run: |
-          echo "HYBRID_APP_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
-          echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
+          echo "HYBRID_APP_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+          echo "STANDALONE_APP_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get previous react-native version
         if: ${{ github.event.after != '' }}
@@ -80,8 +80,8 @@ jobs:
       - name: Get new patches hash
         id: getNewPatchesHash
         run: |
-          echo "HYBRID_APP_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
-          echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
+          echo "HYBRID_APP_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+          echo "STANDALONE_APP_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get new react-native version
         if: ${{ github.event.after != '' }}

.github/workflows/publishReactNativeiOSArtifacts.yml

@@ -211,9 +211,9 @@ jobs:
         id: computePatchesHash
         run: |
           if [[ '${{ matrix.is_hybrid }}' == 'true' ]]; then
-            echo "PATCHES_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+            echo "PATCHES_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
           else
-            echo "PATCHES_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
+            echo "PATCHES_HASH=$(./scripts/artifacts-utils/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Determine new patched RN version

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009044902
-        versionName "9.4.49-2"
+        versionCode 1009045101
+        versionName "9.4.51-1"
         // 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

@@ -16,7 +16,7 @@ buildscript {
         // "mapbox" indicates the usage of the Mapbox SDK.
         RNMapboxMapsImpl = "mapbox"
         reactNativeIncludedBuild = gradle.getIncludedBuilds().find { it.name == 'react-native' }
-        // This is our custom extension that we defined in gradleUtils/PatchedArtifactsSettings.gradle
+        // This is our custom extension that we defined in scripts/artifacts-utils/android/PatchedArtifactsSettings.gradle
         // It enables us to use custom artifacts of patched react-native
         patchedArtifactsConfig = project.gradle.settings.extensions.findByName('patchedArtifacts')
     }