Merge branch 'main' into mkzie2-issue/66714

Author: mkzie2

.github/scripts/checkCoverageChanges.sh

@@ -1,42 +1,76 @@
 #!/bin/bash
+set -euo pipefail
 
-# Ensure upstream/main exists
-git fetch --depth=50 upstream main:upstream/main
+# -----------------------------
+# 1. Ensure upstream remote exists
+# -----------------------------
+# The PR branch comes from either the base repo or a fork.
+# We need the base repository's main branch for comparison.
+git remote add upstream "https://github.com/${GITHUB_REPOSITORY}.git" 2>/dev/null || true
 
-# Determine diff range safely
-if git merge-base upstream/main HEAD >/dev/null 2>&1; then
-  DIFF_RANGE="upstream/main...HEAD"
-else
-  echo "No merge base with upstream/main; falling back to comparing HEAD against upstream/main"
-  DIFF_RANGE="upstream/main HEAD"
+# -----------------------------
+# 2. Attempt shallow fetch first
+# -----------------------------
+# Start with a depth of 50 commits, which covers most PRs.
+DEPTH=50
+echo "Fetching upstream/main with depth=$DEPTH..."
+git fetch upstream main --depth=$DEPTH
+
+# -----------------------------
+# 3. Check if a merge-base exists
+# -----------------------------
+# merge-base finds the common ancestor between the PR branch and main.
+# If this fails, it means our shallow history didn't go back far enough.
+if ! git merge-base upstream/main HEAD >/dev/null 2>&1; then
+  echo "No merge base found with depth=$DEPTH, fetching full history..."
+  
+  # Try unshallowing the entire repo (pulls full commit history).
+  # If already full, this will be a no-op.
+  git fetch --unshallow upstream || git fetch upstream main
 fi
 
-# Get changed files in src directory
-readarray -t ALL_CHANGED_FILES < <(git diff --name-only "$DIFF_RANGE" | grep '^src/' | grep -E '\.(ts|tsx|js|jsx)$' || true)
+# -----------------------------
+# 4. Define the diff range
+# -----------------------------
+# Using three-dot notation (A...B) shows only the commits in HEAD
+# that aren't in upstream/main (i.e. just the PR changes).
+DIFF_RANGE="upstream/main...HEAD"
+
+# -----------------------------
+# 5. Collect changed src/ files
+# -----------------------------
+readarray -t ALL_CHANGED_FILES < <(
+  git diff --name-only "$DIFF_RANGE" \
+    | grep '^src/' \
+    | grep -E '\.(ts|tsx|js|jsx)$' || true
+)
 
-# Filter out excluded directories and files
+# -----------------------------
+# 6. Filter excluded files/dirs
+# -----------------------------
 CHANGED_FILES=()
 for file in "${ALL_CHANGED_FILES[@]}"; do
-  # Skip excluded directories
+  # Exclude directories
   if [[ "$file" =~ ^src/(CONST|languages|setup|stories|styles|types)/ ]]; then
-    echo "Skipping excluded directory: $file"
+    echo "Skipping excluded directory: \"$file\""
     continue
   fi
-  
-  # Skip excluded files in src root
-  filename=$(basename "$file")
+
+  # Exclude specific files in src root
+  filename="$(basename "$file")"
   if [[ "$filename" =~ ^(App\.tsx|CONFIG\.ts|Expensify\.tsx|HybridAppHandler\.tsx|NAICS\.ts|NAVIGATORS\.ts|ONYXKEYS\.ts|ROUTES\.ts|SCREENS\.ts|SplashScreenStateContext\.tsx|TIMEZONES\.ts)$ ]]; then
-    echo "Skipping excluded file: $file"
+    echo "Skipping excluded file: \"$file\""
     continue
   fi
 
-  # Add to coverage collection
   CHANGED_FILES+=("$file")
 done
 
-# Check if any files remain for coverage
+# -----------------------------
+# 7. Output results
+# -----------------------------
 if [ ${#CHANGED_FILES[@]} -eq 0 ]; then
-  echo "No relevant src files changed (all changes were in excluded directories/files), skipping coverage"
+  echo "No relevant src files changed, skipping coverage"
   echo "run_coverage=false" >> "$GITHUB_OUTPUT"
   exit 0
 fi
@@ -45,5 +79,5 @@ echo "Changed src files for coverage:"
 printf '%s\n' "${CHANGED_FILES[@]}"
 echo "run_coverage=true" >> "$GITHUB_OUTPUT"
 
-# Save changed files for coverage collection
+# Save changed files for later coverage steps
 printf '%s\n' "${CHANGED_FILES[@]}" > changed_files.txt

.github/workflows/testCoverage.yml

@@ -45,11 +45,6 @@ jobs:
           repository: ${{ steps.get_pr.outputs.repo }}
           ref: ${{ steps.get_pr.outputs.ref }}
 
-      - name: Fetch Upstream Remote for Base Repository
-        run: |
-          git remote add upstream https://github.com/${{ github.repository }}.git
-          git fetch upstream main
-
       - name: Setup Git for OSBotify
         uses: Expensify/GitHub-Actions/setupGitForOSBotify@main
         id: setupGitForOSBotify

__mocks__/react-native-nitro-modules.ts

@@ -0,0 +1,10 @@
+const NitroModules = {
+    createHybridObject: jest.fn(() => ({
+        getAll: jest.fn(() => Promise.resolve([])),
+    })),
+};
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    NitroModules,
+};

config/webpack/ForceGarbageCollectionPlugin.ts

@@ -15,18 +15,15 @@ class ForceGarbageCollectionPlugin {
             compiler.hooks.done.tap(this.constructor.name, () => {
                 this.compilationCount++;
 
-                // Log memory usage every compilation
                 const memUsage = process.memoryUsage();
                 const heapUsedMB = Math.round(memUsage.heapUsed / 1024 / 1024);
                 const heapTotalMB = Math.round(memUsage.heapTotal / 1024 / 1024);
 
                 console.log(`📊 Compilation #${this.compilationCount} - Heap: ${heapUsedMB}MB/${heapTotalMB}MB`);
                 if (this.compilationCount % 5 === 0) {
                     console.log(`🗑️ Forcing garbage collection after ${this.compilationCount} compilations`);
-                    // @ts-expect-error - gc is a global function provided when Node.js is started with --expose-gc flag
-                    gc();
+                    gc?.();
 
-                    // Log memory after garbage collection
                     const memAfterGC = process.memoryUsage();
                     const heapAfterMB = Math.round(memAfterGC.heapUsed / 1024 / 1024);
                     console.log(`✅ Post-GC heap size: ${heapAfterMB}MB (freed ${heapUsedMB - heapAfterMB}MB)`);

package.json

@@ -46,7 +46,7 @@
     "test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
-    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=332 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=331 --cache --cache-location=node_modules/.cache/eslint",
     "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

scripts/start-dev-with-auto-restart.sh

@@ -4,25 +4,25 @@
 # This script monitors for heap out of memory errors and automatically restarts
 # Usage: ./start-dev-with-auto-restart.sh [webpack-dev-server arguments]
 
-WDS_ARGS=("$@")
+WEBPACK_DEV_SERVER_ARGS=("$@")
+readonly RESTART_DELAY=1
 MAX_RESTARTS=10
 RESTART_COUNT=0
-RESTART_DELAY=1
 
 echo "🚀 Starting webpack-dev-server with auto-restart (max restarts: $MAX_RESTARTS)"
 
 run_wds () {
     # Check if platform is Desktop to determine open behavior
-    if [[ "${WDS_ARGS[*]}" == *"--env platform=desktop"* ]]; then
+    if [[ "${WEBPACK_DEV_SERVER_ARGS[*]}" == *"--env platform=desktop"* ]]; then
         # For Desktop, always use --no-open since app is handled by Electron
-        node --expose-gc --max-old-space-size=1100 ./node_modules/.bin/webpack-dev-server --no-open "${WDS_ARGS[@]}" --config config/webpack/webpack.dev.ts
+        node --expose-gc ./node_modules/.bin/webpack-dev-server --no-open "${WEBPACK_DEV_SERVER_ARGS[@]}" --config config/webpack/webpack.dev.ts
     else
         # For Web, use the provided open flag
-        node --expose-gc ./node_modules/.bin/webpack-dev-server "$1" "${WDS_ARGS[@]}" --config config/webpack/webpack.dev.ts
+        node --expose-gc ./node_modules/.bin/webpack-dev-server "$1" "${WEBPACK_DEV_SERVER_ARGS[@]}" --config config/webpack/webpack.dev.ts
     fi
 }
 
-while [ $RESTART_COUNT -lt $MAX_RESTARTS ]; do
+while [[ $RESTART_COUNT -lt $MAX_RESTARTS ]]; do
     echo "📊 Attempt #$((RESTART_COUNT + 1)) - Starting webpack-dev-server..."
 
     if [ $RESTART_COUNT -eq 0 ]; then

src/CONST/index.ts

@@ -656,6 +656,7 @@ const CONST = {
         TRACK_FLOWS: 'trackFlows',
         EUR_BILLING: 'eurBilling',
         MANUAL_DISTANCE: 'manualDistance',
+        VACATION_DELEGATE: 'vacationDelegate',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -1122,7 +1123,6 @@ const CONST = {
                 CHRONOS_OOO_LIST: 'CHRONOSOOOLIST',
                 CLOSED: 'CLOSED',
                 CREATED: 'CREATED',
-                DELEGATE_SUBMIT: 'DELEGATESUBMIT', // OldDot Action
                 DELETED_ACCOUNT: 'DELETEDACCOUNT', // Deprecated OldDot Action
                 DELETED_TRANSACTION: 'DELETEDTRANSACTION',
                 DISMISSED_VIOLATION: 'DISMISSEDVIOLATION',
@@ -1275,6 +1275,7 @@ const CONST = {
                 RECEIPT: 'receipt',
                 DATE: 'date',
                 MERCHANT: 'merchant',
+                DESCRIPTION: 'description',
                 FROM: 'from',
                 TO: 'to',
                 CATEGORY: 'category',
@@ -1593,6 +1594,7 @@ const CONST = {
         UNABLE_TO_RETRY: 'unableToRetry',
         UPDATE_REQUIRED: 426,
         INCORRECT_MAGIC_CODE: 451,
+        POLICY_DIFF_WARNING: 305,
     },
     HTTP_STATUS: {
         // When Cloudflare throttles
@@ -6451,6 +6453,9 @@ const CONST = {
             UNAPPROVED_CASH: 'unapprovedCash',
             UNAPPROVED_CARD: 'unapprovedCard',
         },
+        ANIMATION: {
+            FADE_DURATION: 200,
+        },
     },
 
     EXPENSE: {

src/ONYXKEYS.ts

@@ -513,6 +513,9 @@ const ONYXKEYS = {
     /** Stores the information about the state of side panel */
     NVP_SIDE_PANEL: 'nvp_sidePanel',
 
+    /** Information about vacation delegate */
+    NVP_PRIVATE_VACATION_DELEGATE: 'nvp_private_vacationDelegate',
+
     /** Stores draft information while user is scheduling the call. */
     SCHEDULE_CALL_DRAFT: 'scheduleCallDraft',
 
@@ -1199,6 +1202,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.SHOULD_BILL_WHEN_DOWNGRADING]: boolean | undefined;
     [ONYXKEYS.BILLING_RECEIPT_DETAILS]: OnyxTypes.BillingReceiptDetails;
     [ONYXKEYS.NVP_SIDE_PANEL]: OnyxTypes.SidePanel;
+    [ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE]: OnyxTypes.VacationDelegate;
     [ONYXKEYS.SCHEDULE_CALL_DRAFT]: OnyxTypes.ScheduleCallDraft;
     [ONYXKEYS.IS_FORCED_TO_CHANGE_CURRENCY]: boolean | undefined;
     [ONYXKEYS.IS_COMING_FROM_GLOBAL_REIMBURSEMENTS_FLOW]: boolean | undefined;

src/ROUTES.ts

@@ -354,6 +354,7 @@ const ROUTES = {
     SETTINGS_STATUS_CLEAR_AFTER: 'settings/profile/status/clear-after',
     SETTINGS_STATUS_CLEAR_AFTER_DATE: 'settings/profile/status/clear-after/date',
     SETTINGS_STATUS_CLEAR_AFTER_TIME: 'settings/profile/status/clear-after/time',
+    SETTINGS_VACATION_DELEGATE: 'settings/profile/status/vacation-delegate',
     SETTINGS_TROUBLESHOOT: 'settings/troubleshoot',
     SETTINGS_CONSOLE: {
         route: 'settings/troubleshoot/console',

src/SCREENS.ts

@@ -102,6 +102,7 @@ const SCREENS = {
             STATUS_CLEAR_AFTER: 'Settings_Status_Clear_After',
             STATUS_CLEAR_AFTER_DATE: 'Settings_Status_Clear_After_Date',
             STATUS_CLEAR_AFTER_TIME: 'Settings_Status_Clear_After_Time',
+            VACATION_DELEGATE: 'Settings_Status_Vacation_Delegate',
             STATUS: 'Settings_Status',
             PRONOUNS: 'Settings_Pronouns',
             TIMEZONE: 'Settings_Timezone',