Merge branch 'main' into chore/user-avatar-for-single-avatar-usages

Author: jmusial

.github/actions/javascript/isDeployChecklistLocked/index.js

@@ -13031,24 +13031,6 @@ function ReportHistoryStore(API, PubSub) {
      * @returns {Object[]}
      */
     const filterHiddenActions = (historyItems) => historyItems.filter((historyItem) => historyItem.shouldShow);
-    /**
-     * Merges history items into the cache and creates it if it doesn't yet exist.
-     *
-     * @param {Number} reportID
-     * @param {Object[]} newHistory
-     */
-    function mergeItems(reportID, newHistory) {
-        if (newHistory.length === 0) {
-            return;
-        }
-        const newCache = newHistory.reverse().reduce((prev, curr) => {
-            if (!prev.some((item) => item.sequenceNumber === curr.sequenceNumber)) {
-                prev.unshift(curr);
-            }
-            return prev;
-        }, store.cache[reportID] || []);
-        store.cache[reportID] = newCache.sort((a, b) => b.sequenceNumber - a.sequenceNumber);
-    }
     /**
      * Merges history items into the cache and creates it if it doesn't yet exist.
      *
@@ -13086,51 +13068,38 @@ function ReportHistoryStore(API, PubSub) {
         store.cache[reportID] = newCache.sort((a, b) => b.reportActionTimestamp - a.reportActionTimestamp);
     }
     /**
-     * Gets the history.
+     * Gets the history. This flow does not depend on the deprecated sequence number in report actions.
      *
      * @param {Number} reportID
      * @param {Boolean} ignoreCache
      * @returns {Deferred}
      */
-    function get(reportID, ignoreCache) {
+    function getFlatHistory(reportID, ignoreCache) {
         const promise = new simply_deferred_1.Deferred();
         if (ignoreCache) {
             delete store.cache[reportID];
         }
-        const cachedHistory = store.cache[reportID] || [];
-        const firstHistoryItem = cachedHistory[0] || {};
         store.API.Report_GetHistory({
             reportID,
-            offset: firstHistoryItem.sequenceNumber || 0,
         })
             .done((recentHistory) => {
-            mergeItems(reportID, recentHistory);
+            mergeHistoryByReportActionID(reportID, recentHistory);
             promise.resolve(store.cache[reportID]);
         })
             .fail(promise.reject);
         return promise;
     }
     /**
-     * Gets the history. This flow does not depend on the deprecated sequence number in report actions.
+     * Gets the history.
+     *
+     * @deprecated use getFlatHistory instead.
      *
      * @param {Number} reportID
      * @param {Boolean} ignoreCache
      * @returns {Deferred}
      */
-    function getFlatHistory(reportID, ignoreCache) {
-        const promise = new simply_deferred_1.Deferred();
-        if (ignoreCache) {
-            delete store.cache[reportID];
-        }
-        store.API.Report_GetHistory({
-            reportID,
-        })
-            .done((recentHistory) => {
-            mergeHistoryByReportActionID(reportID, recentHistory);
-            promise.resolve(store.cache[reportID]);
-        })
-            .fail(promise.reject);
-        return promise;
+    function get(reportID, ignoreCache) {
+        return getFlatHistory(reportID, ignoreCache);
     }
     /**
      * Gets the history from the cache if it exists. Otherwise fully loads the history.
@@ -13147,6 +13116,15 @@ function ReportHistoryStore(API, PubSub) {
         return promise.resolve(cachedHistory);
     }
     return {
+        /**
+         * Gets the history.
+         *
+         * @deprecated use getFlatHistory instead.
+         *
+         * @param {Number} reportID
+         * @param {Boolean} ignoreCache
+         * @returns {Deferred}
+         */
         get: (reportID, ignoreCache = false) => {
             const promise = new simply_deferred_1.Deferred();
             get(reportID, ignoreCache)
@@ -13165,22 +13143,6 @@ function ReportHistoryStore(API, PubSub) {
                 .fail(promise.reject);
             return promise;
         },
-        insertIntoCache: (reportID, reportAction) => {
-            const promise = new simply_deferred_1.Deferred();
-            getFromCache(reportID)
-                .done((cachedHistory) => {
-                const sequenceNumber = reportAction.sequenceNumber;
-                if (cachedHistory.length >= sequenceNumber) {
-                    mergeItems(reportID, [reportAction]);
-                    return promise.resolve(filterHiddenActions(store.cache[reportID]));
-                }
-                get(reportID)
-                    .done((reportHistory) => promise.resolve(filterHiddenActions(reportHistory)))
-                    .fail(promise.reject);
-            })
-                .fail(promise.reject);
-            return promise;
-        },
         insertIntoCacheByActionID: (reportID, reportAction) => {
             const promise = new simply_deferred_1.Deferred();
             getFromCache(reportID)

.github/workflows/lint.yml

@@ -33,19 +33,32 @@ jobs:
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
 
-      - name: Remove E/App version from package-lock.json
+      # Extract only the lint-affecting dependencies: eslint packages, the parser chain
+      # (espree/acorn) whose bumps can silently change parse results, plus
+      # typescript/ts-api-utils since a TS bump can change type-aware lint results.
+      # The cache key hashes this slice so a cold full re-lint happens only when
+      # the lint config or a lint dependency changes -- not on every dep bump.
+      - name: Extract lint-related deps from package-lock.json
         shell: bash
-        run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
+        run: |
+          jq '{packages: (.packages | to_entries | map(select(.key | test("eslint|espree|acorn|^node_modules/(typescript|ts-api-utils)$"))) | from_entries)}' package-lock.json > lint-deps-lock.json
+
+      # The setupNode sticky disk persists all of node_modules between runs, including
+      # node_modules/.cache/eslint. Clear it so the restore step below is the only cache
+      # source -- a restore miss doesn't delete pre-existing files, so without this a
+      # config change would silently reuse the stale cache carried over by the disk.
+      - name: Clear ESLint cache carried over by the node_modules sticky disk
+        shell: bash
+        run: rm -rf node_modules/.cache/eslint
 
       - name: Restore ESLint cache
         # v5.0.1
         uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb
         with:
           path: node_modules/.cache/eslint
-          key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'normalized-package-lock.json') }}-${{ github.sha }}
+          key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'lint-deps-lock.json') }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'normalized-package-lock.json') }}-
-            ${{ runner.os }}-eslint-
+            ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'lint-deps-lock.json') }}-
 
       # ESLint's cache doesn't track cross-file TypeScript dependencies, which can cause stale errors.
       # If lint fails, we clear the cache and retry to rule out false positives.
@@ -69,7 +82,7 @@ jobs:
         if: always()
         with:
           path: node_modules/.cache/eslint
-          key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'normalized-package-lock.json') }}-${{ github.sha }}
+          key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.mjs', 'config/eslint/**', 'lint-deps-lock.json') }}-${{ github.sha }}
 
       # If lint tightened the seatbelt baseline (i.e. fewer baselined errors than last time),
       # commit the updated TSV back to `main` as OSBotify. Only runs under `workflow_call`

CLAUDE.md

@@ -157,6 +157,13 @@ Major action categories:
 - `Search.ts`: Search operations
 - `Travel.ts`: Travel features
 
+### Reading Onyx data (`useOnyx` vs `Onyx.connectWithoutView`)
+There are only two ways to read Onyx data:
+1. **`useOnyx`** (`@hooks/useOnyx`) — the default for anything a component renders.
+2. **`Onyx.connectWithoutView`** — only for non-render logic (module-level state in actions/libraries) that genuinely can't use `useOnyx`.
+
+Before either, prefer a **pure function** that receives the data as parameters: it does not read Onyx itself — the caller reads (with `useOnyx` or `Onyx.connectWithoutView`) and passes the data in. Do not add a new `Onyx.connectWithoutView` by copying existing usage — justify each one on its own with a comment explaining why it is needed. Using it in a component for performance requires `@frontend-performance` approval on Slack (link it in the PR description). See [Onyx Data Management](contributingGuides/philosophies/ONYX-DATA-MANAGEMENT.md#reading-onyx-data-useonyx-vs-onyxconnectwithoutview).
+
 ## Build & Deployment
 
 ### CI/CD Workflows

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009044800
-        versionName "9.4.48-0"
+        versionCode 1009045000
+        versionName "9.4.50-0"
         // 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

@@ -746,6 +746,7 @@ const config = defineConfig([
         'web/snippets/gib.js',
         // Generated language files - excluded from ESLint but still type-checked
         'src/languages/de.ts',
+        'src/languages/el.ts',
         'src/languages/es.ts',
         'src/languages/fr.ts',
         'src/languages/it.ts',