Merge branch 'main' of github.com:Expensify/App into beaman/612787-app-export-explain-button

Author: Beamanator

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

@@ -12647,6 +12647,19 @@ class Git {
             throw new Error(`Failed to get file content from git: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
+    /**
+     * Abbreviated hash for HEAD in the current working directory.
+     *
+     * @returns Short commit hash, or `unknown` when not a git repo or git fails.
+     */
+    static getHeadShort() {
+        try {
+            return execSync('git rev-parse --short HEAD').trim();
+        }
+        catch {
+            return 'unknown';
+        }
+    }
     /**
      * Ensure a git reference is available locally, fetching it if necessary.
      *

.gitignore

@@ -58,6 +58,9 @@ yarn-error.log
 # Bundled code
 dist/
 
+# Generated eslint-report HTML (npm run eslint-report)
+reports/
+
 # BUCK
 buck-out/
 \.buckd/

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036413
-        versionName "9.3.64-13"
+        versionCode 1009036422
+        versionName "9.3.64-22"
         // 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

@@ -19,6 +19,9 @@ npm run lint -- --show-warnings
 
 # Continuously re-lint changed files as you edit:
 npm run lint-watch
+
+# HTML dashboard: seatbelt baseline broken down by rule and by file:
+npm run eslint-report
 ```
 
 Prefer `npm run lint` (or `lint-changed` / `lint -- <files>`) over raw `npx eslint` invocations. Those wrappers increase the memory allocation to prevent OOM errors, and also include caching and concurrency flags for faster linting.
@@ -63,6 +66,18 @@ If you're iterating specifically on a CI failure and you already know which file
 npm run lint -- src/components/Foo/index.tsx src/libs/bar.ts
 ```
 
+### "What if I want to see lint errors broken down by type or by file?"
+
+Use `npm run eslint-report`. It will show an HTML report of current lint errors in the project (populated from `eslint.seatbelt.tsv`)
+
+```bash
+npm run eslint-report
+```
+
+![Seatbelt report: breakdown by ESLint rule](https://github.com/user-attachments/assets/2e1cc9dd-155e-4975-8a1f-365c5a830f27)
+
+![Seatbelt report: breakdown by file](https://github.com/user-attachments/assets/e4b4bf50-ae5b-416d-96ff-0357e5fe5b59)
+
 ### "I fixed an existing baselined error"
 
 Just run `npm run lint` (or `npm run lint-changed`) locally. Seatbelt notices the count went down and passes. **It does not rewrite `config/eslint/eslint.seatbelt.tsv` locally** — the config sets `readOnly: !process.env.CI`, so the TSV is only rewritten in CI. After your PR merges, the lint job on `main` re-runs, writes the tightened TSV, and OSBotify commits it back to `main` for you.
@@ -71,17 +86,30 @@ No TSV commit required on your end.
 
 ### "I added a new error and can't easily fix it right now"
 
-The default assumption is that you fix it. If you genuinely need to land code that trips a baselined rule and the fix is out of scope, you have two options, in order of preference:
+The default assumption is that you fix it. If you genuinely need to land code that trips a baselined rule and the fix is out of scope, you have two options:
 
-1. **Suppress the specific occurrence** with an `eslint-disable-next-line <rule>` comment and a justification. See [`CONSISTENCY-5`](../.claude/skills/coding-standards/rules/consistency-5-justify-eslint-disable.md).
-2. **Widen the seatbelt baseline** for that file/rule with `SEATBELT_INCREASE`:
+1. **Widen the seatbelt baseline** for that file/rule with `SEATBELT_INCREASE` — preferred for **temporary** suppressions (e.g. the fix requires a large refactor that is out of scope for the current PR, or you're intentionally deferring cleanup):
 
     ```bash
     # Allow the new count for one rule:
     SEATBELT_INCREASE=@typescript-eslint/no-deprecated npm run lint
     ```
 
-   That will modify `config/eslint/eslint.seatbelt.tsv`. **Always commit the diff alongside your code**, and expect a reviewer to ask you why a fix wasn't feasible.
+   That will modify `config/eslint/eslint.seatbelt.tsv`. **Always commit the diff alongside your code**, and expect a reviewer to ask you why a fix wasn't feasible. Because the violation stays visible in the baseline, it can still be fixed later.
+
+2. **Suppress the specific occurrence** with an `eslint-disable-next-line <rule>` comment and a justification — preferred for **permanent** suppressions, where you genuinely believe the lint rule is wrong for that specific case and you don't expect the violation to ever be fixed. See [`CONSISTENCY-5`](../.claude/skills/coding-standards/rules/consistency-5-justify-eslint-disable.md).
+
+> **Which should I use?** Reach for `SEATBELT_INCREASE` when the error is merely inconvenient to fix right now. Reach for `eslint-disable-next-line` only when you are making a deliberate, permanent exception — i.e. you're certain the rule simply doesn't apply to this particular case. `eslint-disable` comments hide violations from the baseline entirely, so they should only be used when the suppression is intentional and indefinite.
+
+### "I moved or renamed a file without fixing its existing errors"
+
+When you move or rename a file, seatbelt's baseline entry for the old path is no longer matched. Even though you made no logical change to the code, the violations now appear under a path the baseline doesn't know about, so CI will fail. Use `SEATBELT_INCREASE` to re-baseline the file under its new name:
+
+```bash
+SEATBELT_INCREASE=<rule-id> npm run lint
+```
+
+Commit the updated `config/eslint/eslint.seatbelt.tsv` alongside the rename. The old path will be removed from the TSV automatically by the lint job on `main` after your PR merges.
 
 ### "I'm enabling a new rule repo-wide"
 

contributingGuides/LINTING.md

@@ -422,6 +422,7 @@
         "McAfee",
         "mchmod",
         "MCTEST",
+        "Menlo",
         "mechler",
         "mediumitalic",
         "memberof",
@@ -505,6 +506,7 @@
         "NTSB",
         "Nuevo",
         "nullptr",
+        "nums",
         "numberformat",
         "objc",
         "objdump",
@@ -921,6 +923,7 @@
         "Kolkata"
     ],
     "ignorePaths": [
+        ".gitignore",
         "src/languages/de.ts",
         "src/languages/es.ts",
         "src/languages/fr.ts",

cspell.json

@@ -0,0 +1,90 @@
+---
+title: Integrate Deel and Expensify
+description: Learn how to integrate Expensify with Deel to automate expense syncing for employee reimbursements.
+keywords: [New Expensify, integrate Deel Expensify, Expensify Deel integration, expense syncing Deel, reimbursements Deel Expensify, approval workflow Deel]
+internalScope: Audience is Workspace Admins and Deel Organization Managers. Covers integrating Expensify with Deel and understanding how the sync works. Does not cover employee or contractor usage within Deel.
+---
+
+# Integrate Deel and Expensify
+
+Expensify’s API allows you to integrate with tools like Deel to automate expense syncing and reimbursements.
+
+This integration enables Expensify to act as the source of truth for employee expenses, while Deel handles reimbursement processing. The setup is self-serve and typically managed by your internal team.
+
+To begin, review Expensify's [Integration Server Documentation](https://integrations.expensify.com/Integration-Server/doc/#introduction) to understand how Expensify’s API works and how to authenticate your account.
+
+If you are an employee or contractor using Expensify within your company, refer to:
+
+- [Employee Guide to Using Expensify with Deel](https://help.letsdeel.com/hc/en-gb/articles/7123572847761-Employee-s-Guide-to-Using-Expensify-With-Deel)
+- [Contractor Guide to Using Expensify with Deel](https://help.letsdeel.com/hc/en-gb/articles/9640208314897-How-Contractors-Can-Use-Expensify-With-Deel)
+
+---
+
+## Who can integrate Deel and Expensify
+
+- Workspace Admins in Expensify
+- Organization Manager permissions  in Deel
+
+**Prerequisites:**
+- Deel Organization Manager permissions  
+- Expensify Admin permissions for the selected Workspaces  
+
+---
+
+## How to integrate Deel and Expensify
+
+The integration is configured using Expensify’s API and completed within Deel. For a step-by-step guide, refer to Deel's setup guide: [How To Set Up The Expensify Integration On Deel For EOR Employees And Contractors](https://help.letsdeel.com/hc/en-gb/articles/5871319525521-How-To-Set-Up-The-Expensify-Integration-On-Deel-For-EOR-Employees-And-Contractors).
+
+---
+
+## How the Deel integration with Expensify works
+
+By connecting Expensify to Deel, you can use Expensify’s approval workflows to control which expenses are eligible for reimbursement.
+
+- Deel scans for approved expenses from matched users in selected Workspaces  
+- Only approved expenses in Expensify are eligible for syncing  
+- Expenses are imported into Deel for reimbursement processing  
+
+Key details:
+
+- **One-way sync:** Expenses approved in Expensify sync to Deel. Expenses created in Deel do not sync back to Expensify.  
+- **Approval workflow:** Only approved expenses are synced  
+- **Sync timing:** Expense syncing is not immediate and depends on Deel processing  
+
+---
+
+## What happens after you integrate Deel and Expensify
+
+- Deel continuously scans the connected Expensify Workspaces  
+- Approved expenses are synced to Deel  
+- Expenses are processed in Deel for reimbursement  
+- Expensify remains the system of record for expense data  
+- Sync timing may vary and is not immediate  
+
+---
+
+# FAQ
+
+## Can expenses sync from Deel back to Expensify?
+
+No. This is a one-way integration. Expenses only sync from Expensify to Deel.
+
+## Why aren’t my expenses syncing?
+
+Common reasons include:
+- The expense is not approved in Expensify  
+- The user is not mapped between Deel and Expensify  
+- The Workspace is not connected  
+- The integration setup is incomplete  
+
+## Do employees or contractors need to do anything?
+
+Employees and contractors submit expenses in Expensify as usual. Admins manage the integration and approval workflow.
+
+## Does Expensify support the integration setup?
+
+Expensify can help with basic troubleshooting, but your internal team is responsible for setting up and maintaining the API integration.
+
+## Where can I learn more about the Deel setup process?
+
+Review Deel’s official guide for setting up the Expensify integration and managing expense syncing: [How To Set Up The Expensify Integration On Deel For EOR Employees And Contractors](https://help.letsdeel.com/hc/en-gb/articles/5871319525521-How-To-Set-Up-The-Expensify-Integration-On-Deel-For-EOR-Employees-And-Contractors).

docs/articles/new-expensify/connections/Deel.md

@@ -0,0 +1,59 @@
+---
+title: Egencia
+description: Learn how to integrate Egencia with Expensify to automatically import travel booking receipts and expenses.
+keywords: [Egencia, travel booking, Expensify Classic]
+---
+
+
+Expensify’s API helps connect your account to third-party tools like NetSuite, Xero, and even internal systems like Workday. This guide includes tips, usage examples, and common troubleshooting questions — many sourced from customers who’ve done it before.
+
+---
+
+# Getting Started
+
+To start using the API, review our full [Integration Server Manual](https://integrations.expensify.com/Integration-Server/doc/#introduction).
+
+**Note:** The API is a self-serve tool. Your internal team will need to manage setup and maintenance. While Concierge can assist with basic troubleshooting, hands-on support may vary by team or account manager.
+
+[Egencia](https://www.egencia.com/en/) is a business travel booking platform. Integrating Egencia with Expensify allows travel bookings to be automatically imported as expenses, ensuring seamless expense tracking.
+
+## Requirements
+To use the Egencia integration, you must have:
+- A **Control Workspace**
+- A **verified Domain**
+
+---
+
+# How Egencia Works with Expensify
+When an employee books travel through Egencia:
+- The receipt and itinerary are automatically imported into the traveler’s Expensify account, eliminating the need for manual entry.
+- If the traveler uses a company credit card, the Egencia receipt automatically merges with the corresponding credit card transaction.
+- Travel details are also accessible in the **Trips** section of the Expensify mobile app.
+
+---
+
+# Enabling the Egencia Feed
+A file feed is an automated data transfer from Egencia to Expensify.
+
+To enable the feed:
+1. Contact your Egencia account manager.
+2. Request to enable the Expensify feed for your organization.
+
+**Note:** Egencia controls the feed setup process.
+
+---
+
+# Connecting a Central Purchasing Account
+If your company uses a **central purchasing account**, you can forward all Egencia booking receipts to a single Expensify account.
+
+## Steps to Enable a Central Purchasing Account
+1. **Open a chat with Concierge** in Expensify.
+2. **Provide the central account email** and request activation. Example message:
+   > "Please enable Central Purchasing Account for our Egencia feed. The account email is: `youraccount@yourdomain.com`."
+
+## How It Works
+- Booking receipts will be sent to **both** the traveler and the central account.
+- The receipt in the traveler’s account is marked as a **reservation expense**, which:
+  - Is **non-reimbursable**.
+  - **Will not be exported** to an integrated accounting system.
+