Merge remote-tracking branch 'origin/main' into fix/prevent-auto-approval-held-expense-multi-violations

Author: Nabi

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 1009037400
-        versionName "9.3.74-0"
+        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

@@ -396,10 +396,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 '@selectors': path.resolve(dirname, '../../src/selectors/'),
             },
 
-            // React Native libraries may have web-specific module implementations that appear with the extension `.web.js`
-            // without this, web will try to use native implementations and break in not very obvious ways.
-            // This is also why we have to use .website.js for our own web-specific files...
-            extensions: ['.web.js', '.website.js', '.js', '.jsx', '.web.ts', '.website.ts', '.website.tsx', '.ts', '.web.tsx', '.tsx'],
+            // Resolve web-specific implementations (`.web.*`) before bare files so React Native
+            // libraries and our own app-level overrides both pick up their browser variants.
+            extensions: ['.web.js', '.js', '.jsx', '.web.ts', '.web.tsx', '.ts', '.tsx'],
             fallback: {
                 'process/browser': require.resolve('process/browser'),
                 crypto: false,

config/eslint/eslint.config.mjs

@@ -28,11 +28,11 @@ Put all platform specific code in dedicated files and folders (see below) and re
 In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
 - Mobile => `index.native.js`
 - iOS Native App/Android Native App => `index.ios.js`/`index.android.js`
-- Web => `index.website.js`
+- Web => `index.web.js`
 
 **Note:** `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the web implementation can be contained in a shared `index.js`.
 
-`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.website.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
+`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.web.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
 
 ### Supporting Mobile Web
 The above platform-specific files only work because they are compiled when the app is built for the different platforms. This means that a different mechanism needs to be used for Mobile Web (since "mobile web" and "web" are the same at build time).

config/eslint/eslint.seatbelt.tsv

@@ -268,6 +268,7 @@
         "favicons",
         "Ferroalloy",
         "FinancialForce",
+        "feedcountry",
         "firebaselogging",
         "fireroom",
         "firstname",
@@ -278,6 +279,7 @@
         "FLJZ",
         "fname",
         "fnames",
+        "focusability",
         "focusvisible",
         "fontawesome",
         "foreignamount",
@@ -325,6 +327,7 @@
         "Highlightable",
         "HKBCCATT",
         "Hoverable",
+        "hrefs",
         "HRMS",
         "HSBCSGS",
         "Humpty",
@@ -333,6 +336,7 @@
         "iaco",
         "IBTA",
         "IDEIN",
+        "idempotently",
         "idfa",
         "Idology",
         "ifdef",
@@ -923,7 +927,10 @@
         "CARDFROZEN",
         "CARDUNFROZEN",
         "backgrounded",
-        "Kolkata"
+        "Kolkata",
+        "lintrk",
+        "Fbclid",
+        "Gclid"
     ],
     "ignorePaths": [
         ".gitignore",