Merge branch 'main' into fix/61696

Author: dmkt9

.gitignore

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

Mobile-Expensify

@@ -6,13 +6,6 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
-// eslint-disable-next-line no-restricted-syntax
-enum PermissionStatus {
-    Granted = 'granted',
-    Denied = 'denied',
-    NotDetermined = 'not_determined',
-}
-
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS, PermissionStatus};
+export {EventType, iOS};

__mocks__/@ua/react-native-airship.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018901
-        versionName "9.1.89-1"
+        versionCode 1009018920
+        versionName "9.1.89-20"
         // 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

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.5",
+    "electron-updater": "^6.6.6",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

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

desktop/package.json

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.1</string>
+	<string>9.1.89.20</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.1</string>
+	<string>9.1.89.20</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>