Merge branch 'main' into georgia-cards

Author: grgia

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009034902
-        versionName "9.3.49-2"
+        versionCode 1009035006
+        versionName "9.3.50-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"

__mocks__/Illustrations.ts

@@ -65,7 +65,7 @@ class ModuleInitTimingPlugin {
                     continue;
                 }
                 const resource = 'resource' in module ? (module as NormalModule).resource : undefined;
-                if (!resource || resource.includes('node_modules')) {
+                if (!resource) {
                     continue;
                 }
                 const relativePath = `./${path.relative(compiler.context, resource).replaceAll('\\', '/')}`;

android/app/build.gradle

@@ -99,7 +99,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
         mode: isDevelopment ? 'development' : 'production',
         devtool: 'source-map',
         entry: {
-            main: ['babel-polyfill', './index.js'],
+            main: './index.js',
         },
         output: {
             // Use simple filenames in development to prevent memory leaks from contenthash changes