Merge branch 'main' into follow-up/86646

Author: daledah

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036427
-        versionName "9.3.64-27"
+        versionCode 1009036506
+        versionName "9.3.65-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"

android/app/build.gradle

@@ -76,7 +76,6 @@
 "../../src/components/ImportSpreadsheet.tsx"	"react-hooks/refs"	1
 "../../src/components/InteractiveStepSubPageHeader.tsx"	"no-restricted-syntax"	1
 "../../src/components/KYCWall/BaseKYCWall.tsx"	"react-hooks/refs"	2
-"../../src/components/LHNOptionsList/OptionRowLHN.tsx"	"react-hooks/preserve-manual-memoization"	1
 "../../src/components/LoadingIndicator.tsx"	"@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject"	1
 "../../src/components/LocaleContextProvider.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Lottie/index.tsx"	"react-hooks/set-state-in-effect"	1
@@ -347,7 +346,6 @@
 "../../src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/subSteps/BeneficialOwnerDetailsFormSubSteps/ConfirmationUBO.tsx"	"no-restricted-syntax"	1
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/ReportDescriptionPage.tsx"	"no-restricted-syntax"	1
-"../../src/pages/ReportDetailsPage.tsx"	"react-hooks/exhaustive-deps"	1
 "../../src/pages/ReportDetailsPage.tsx"	"react-hooks/preserve-manual-memoization"	4
 "../../src/pages/ReportParticipantsPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/RoomMembersPage.tsx"	"react-hooks/preserve-manual-memoization"	1

assets/images/bot.svg

@@ -1,4 +1,5 @@
 import {sentryWebpackPlugin} from '@sentry/webpack-plugin';
+import {execSync} from 'child_process';
 import {CleanWebpackPlugin} from 'clean-webpack-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
 import dotenv from 'dotenv';
@@ -29,6 +30,16 @@ const dirname = path.dirname(filename);
 
 dotenv.config();
 
+function getCurrentBranchName(): string {
+    try {
+        return execSync('git rev-parse --abbrev-ref HEAD', {encoding: 'utf-8'}).trim();
+    } catch {
+        return '';
+    }
+}
+
+const localBranchName = getCurrentBranchName();
+
 type Options = {
     rel: string;
     as: string;
@@ -202,6 +213,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 // react-native-render-html uses variable to log exclusively during development.
                 // See https://reactnative.dev/docs/javascript-environment
                 __DEV__: /staging|prod|adhoc/.test(file) === false,
+                // Expose the current git branch so the debug menu can display it in the browser tab title.
+                // Empty string in non-development builds.
+                __GIT_BRANCH__: JSON.stringify(isDevelopment ? localBranchName : ''),
             }),
             ...(isDevelopment ? [] : [new MiniCssExtractPlugin()]),
 

assets/images/product-illustrations/tv-screen-robot.svg

@@ -847,6 +847,7 @@
         "workshopping",
         "workspacename",
         "worktree",
+        "worktrees",
         "writeitdown",
         "xcconfig",
         "xcodeproj",

assets/images/simple-illustrations/simple-illustration__ai-bot.svg

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.64</string>
+	<string>9.3.65</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.27</string>
+	<string>9.3.65.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>