Merge branch 'main' into fix/64253-approver-cannot-move-expense

Author: linhvovan29546

.gitignore

@@ -153,3 +153,6 @@ react-compiler-output.txt
 
 # Generated by bob (for Nitro modules)
 modules/*/lib/
+
+# Claude Code files
+.claude/

.storybook/preview.tsx

@@ -10,6 +10,8 @@ import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
 import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
 import {EnvironmentProvider} from '@src/components/withEnvironment';
 import {KeyboardStateProvider} from '@src/components/withKeyboardState';
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
 import './fonts.css';
 
@@ -20,6 +22,8 @@ Onyx.init({
     },
 });
 
+IntlStore.load(CONST.LOCALES.EN);
+
 const decorators = [
     (Story: React.ElementType) => (
         <ComposeProviders

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018917
-        versionName "9.1.89-17"
+        versionCode 1009019001
+        versionName "9.1.90-1"
         // 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

@@ -1269,8 +1269,10 @@ The correct approach is avoid using `ScrollView`. You can add props like `listHe
 </ScrollView>
 ```
 
-### Correct Approach (Using `SelectionList`)
+### Correct Approach 
+The correct approach is to use the list component's built-in header and footer props instead of wrapping in a `ScrollView`:
 
+- Using `SelectionList`
 ```jsx
 <SelectionList
     sections={[{item}]}
@@ -1281,6 +1283,20 @@ The correct approach is avoid using `ScrollView`. You can add props like `listHe
 />
 ```
 
+- If you can't switch to `SelectionList` or `FlatList`, you can use `FlashList` as an alternative approach:
+```jsx
+<ScrollView>
+    <Text>Header Content</Text>
+    <FlashList
+        data={data}
+        renderItem={RadioListItem}
+        estimatedItemSize={variables.optionRowHeight}
+        keyExtractor={keyExtractor}
+    />
+    <Button title="Submit" onPress={handleSubmit} />
+</ScrollView>
+```
+
 This ensures optimal performance and avoids layout issues.
 
 

contributingGuides/STYLE.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.89</string>
+	<string>9.1.90</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.17</string>
+	<string>9.1.90.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.89</string>
+	<string>9.1.90</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.17</string>
+	<string>9.1.90.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.89</string>
+	<string>9.1.90</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.17</string>
+	<string>9.1.90.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.89-17",
+  "version": "9.1.90-1",
   "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=312 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=310 --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",