Merge branch 'main' into fix/58588-2

Author: daledah

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018800
-        versionName "9.1.88-0"
+        versionCode 1009018802
+        versionName "9.1.88-2"
         // 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

@@ -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)`);

config/webpack/ForceGarbageCollectionPlugin.ts

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.88</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.88.0</string>
+	<string>9.1.88.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.88</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.88.0</string>
+	<string>9.1.88.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.88-0",
+  "version": "9.1.88-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -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=331 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=329 --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",

package-lock.json

@@ -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

package.json

@@ -890,7 +890,6 @@ const CONST = {
     EMPTY_ARRAY,
     EMPTY_OBJECT,
     DEFAULT_NUMBER_ID,
-    FAKE_REPORT_ID: 'FAKE_REPORT_ID',
     USE_EXPENSIFY_URL,
     EXPENSIFY_URL,
     EXPENSIFY_MOBILE_URL,
@@ -1463,6 +1462,8 @@ const CONST = {
         ANIMATION_TIMING: {
             DEFAULT_IN: 300,
             DEFAULT_OUT: 200,
+            DEFAULT_RIGHT_DOCKED_IOS_IN: 500,
+            DEFAULT_RIGHT_DOCKED_IOS_OUT: 400,
             FAB_IN: 350,
             FAB_OUT: 200,
         },