Merge branch 'main' into refactor-661

Author: DylanDylann

.github/ISSUE_TEMPLATE/Standard.md

@@ -38,29 +38,8 @@ Select the officially supported platforms where the issue was reproduced:
 - [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
-- [ ] MacOS: Desktop
-
-<details>
-  <summary>Platforms Tested:</summary>
-On which of our officially supported platforms was this issue tested:
-
-- [ ] Android: App
-- [ ] Android: mWeb Chrome
-- [ ] iOS: App
-- [ ] iOS: mWeb Safari
-- [ ] iOS: mWeb Chrome
-- [ ] Windows: Chrome
-- [ ] MacOS: Chrome / Safari
-- [ ] MacOS: Desktop
-
-</details>
 
 ## Screenshots/Videos
 
-<details>
-  <summary>Add any screenshot/video evidence</summary>
-
-
-</details>
 
 [View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)

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

@@ -12624,6 +12624,7 @@ class Git {
         const files = [];
         let currentFile = null;
         let currentHunk = null;
+        let oldFilePath = null; // Track old file path to determine fileDiffType
         for (const line of lines) {
             // File header: diff --git a/file b/file
             if (line.startsWith('diff --git')) {
@@ -12636,13 +12637,41 @@ class Git {
                 }
                 currentFile = null;
                 currentHunk = null;
+                oldFilePath = null; // Reset for next file
                 continue;
             }
-            // File path: +++ b/file
-            if (line.startsWith('+++ b/')) {
-                const diffFilePath = line.slice(6); // Remove '+++ b/'
+            // Old file path: --- a/file or --- /dev/null (for new files)
+            // This comes before +++ in git diff output
+            if (line.startsWith('--- ')) {
+                oldFilePath = line.slice(4); // Store the old file path (remove '--- ')
+                continue;
+            }
+            // New file path: +++ b/file or +++ /dev/null (for removed files)
+            if (line.startsWith('+++ ')) {
+                const newFilePath = line.slice(4); // Remove '+++ '
+                // Determine fileDiffType based on old and new file paths
+                // Note: oldFilePath should always be set by the time we see +++, but handle null for type safety
+                let fileDiffType = 'modified';
+                let diffFilePath;
+                const oldPath = oldFilePath ?? '';
+                if (oldPath === '/dev/null') {
+                    // New file: use the new file path
+                    fileDiffType = 'added';
+                    diffFilePath = newFilePath.startsWith('b/') ? newFilePath.slice(2) : newFilePath;
+                }
+                else if (newFilePath === '/dev/null') {
+                    // Removed file: use the old file path
+                    fileDiffType = 'removed';
+                    diffFilePath = oldPath.startsWith('a/') ? oldPath.slice(2) : oldPath;
+                }
+                else {
+                    // Modified file: use the new file path
+                    fileDiffType = 'modified';
+                    diffFilePath = newFilePath.startsWith('b/') ? newFilePath.slice(2) : newFilePath;
+                }
                 currentFile = {
                     filePath: diffFilePath,
+                    diffType: fileDiffType,
                     hunks: [],
                     addedLines: new Set(),
                     removedLines: new Set(),
@@ -12697,6 +12726,10 @@ class Git {
                     // Context line - skip it (we only care about added/removed lines)
                     continue;
                 }
+                else if (firstChar === '\\') {
+                    // "No newline at end of file" marker - skip it (metadata, not content)
+                    continue;
+                }
                 else {
                     throw new Error(`Unknown line type! First character of line is ${firstChar}`);
                 }
@@ -12746,24 +12779,6 @@ class Git {
             hasChanges: files.length > 0,
         };
     }
-    /**
-     * Check if a file from a Git diff is added.
-     *
-     * @param file - The file to check
-     * @returns true if the file is added, false otherwise
-     */
-    static isAddedDiffFile(file) {
-        const hasAddedLines = file.addedLines.size > 0;
-        const hasModifiedLines = file.modifiedLines.size > 0;
-        const hasRemovedLines = file.removedLines.size > 0;
-        if (!hasAddedLines || hasModifiedLines || hasRemovedLines) {
-            return false;
-        }
-        if (file.hunks.length === 1 && file.hunks.at(0)?.oldStart === 0 && file.hunks.at(0)?.oldCount === 0) {
-            return true;
-        }
-        return false;
-    }
     /**
      * Calculate the line number for a diff line based on the hunk and line type.
      */

.github/workflows/validateGithubActions.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
-    paths: ['.github/**', 'package.json', 'package-lock.json', 'tsconfig.json']
+    paths: ['.github/**', 'scripts/**', 'package.json', 'package-lock.json', 'tsconfig.json']
 
 jobs:
   verify:

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027500
-        versionName "9.2.75-0"
+        versionCode 1009027806
+        versionName "9.2.78-6"
         // 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"