Merge remote-tracking branch 'origin/main' into jakubstec/domains/security-group-details-page-group-permissions3

Author: jakubstec

.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 1009036420
+        versionName "9.3.64-20"
         // 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

@@ -71,17 +71,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

@@ -95,7 +95,7 @@ To create a time expense:
 3. Select **Time**.
 4. Enter the number of hours.
 5. Click **Next**.
-6. Choose the recipient and add expense details like description, category, tags, tax, date, and set whether the expense is reimbursable.
+6. Choose the recipient and add expense details like description, category, tags, date, and set whether the expense is reimbursable.
 7. Click **Create expense**.
 
 The total amount will be calculated automatically using the hourly rate set for the workspace.

docs/articles/new-expensify/reports-and-expenses/Create-an-Expense.md

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.13</string>
+	<string>9.3.64.20</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.13</string>
+	<string>9.3.64.20</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>