Merge remote-tracking branch 'upstream/main' into certinia/r1-pr1-scaffolding

Author: ChavdaSachin

Mobile-Expensify

@@ -101,7 +101,6 @@ const VideoView = forwardRef((props: VideoViewProps, ref: ForwardedRef<View>) =>
     <View
         ref={ref}
         accessibilityLabel="MockVideoView"
-        // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
     />
 ));

__mocks__/expo-video.tsx

@@ -23,7 +23,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
     function WithSafeAreaInsets(props: WithSafeAreaInsetsProps & {ref: React.ForwardedRef<unknown>}) {
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={props.ref}
                 insets={insets}
@@ -34,7 +33,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
     function WithSafeAreaInsetsWithRef(props: WithSafeAreaInsetsProps & {ref: ForwardedRef<unknown>}) {
         return (
             <WithSafeAreaInsets
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={props.ref}
             />

__mocks__/react-native-safe-area-context.tsx

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009037401
-        versionName "9.3.74-1"
+        versionCode 1009037404
+        versionName "9.3.74-4"
         // 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

@@ -766,6 +766,7 @@ const config = defineConfig([
         'web/snippets/gib.js',
         // Generated language files - excluded from ESLint but still type-checked
         'src/languages/de.ts',
+        'src/languages/es.ts',
         'src/languages/fr.ts',
         'src/languages/it.ts',
         'src/languages/ja.ts',

assets/images/integrationicons/trinet-icon-square.svg

@@ -926,7 +926,10 @@
         "CARDFROZEN",
         "CARDUNFROZEN",
         "backgrounded",
-        "Kolkata"
+        "Kolkata",
+        "lintrk",
+        "Fbclid",
+        "Gclid"
     ],
     "ignorePaths": [
         ".gitignore",

config/eslint/eslint.config.mjs

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

cspell.json

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.74</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.74.1</string>
+	<string>9.3.74.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.74</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.74.1</string>
+	<string>9.3.74.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>