Merge remote-tracking branch 'origin' into fix/70809-per-diem-workspaces

Author: mukhrr

Mobile-Expensify

@@ -45,7 +45,7 @@ jest.doMock('react-native', () => {
             NativeModules: {
                 ...ReactNative.NativeModules,
                 BootSplash: {
-                    hide: jest.fn(),
+                    hide: jest.fn().mockResolvedValue(undefined),
                     logoSizeRatio: 1,
                     navigationBarHeight: 0,
                 },

__mocks__/react-native.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009022905
-        versionName "9.2.29-5"
+        versionCode 1009023001
+        versionName "9.2.30-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

@@ -62,4 +62,4 @@ org.gradle.parallel=true
 patchedArtifacts.packageName=react-standalone
 
 # Change this property to false if you want to use prebuilt react-native artifacts.
-patchedArtifacts.forceBuildFromSource=true
+patchedArtifacts.forceBuildFromSource=false

android/gradle.properties

@@ -760,6 +760,8 @@
         "moveElemsAttrsToGroup",
         "removeHiddenElems",
         "moveGroupAttrsToElems",
+        "Dtype",
+        "Areport",
         "mple",
         "Selec"
     ],

cspell.json

@@ -132,7 +132,7 @@ settings.extensions.configure(PatchedArtifactsConfig) { config ->
 
     if(config.version == null || config.packageName == null || config.githubUsername == null || config.githubToken == null) {
         config.buildFromSource = true
-        ExpensiLog.lifecycle("No matching artifacts version found for ${config.packageName}. Building react-native from source.")
+        ExpensiLog.error("No matching artifacts version found for ${config.packageName}. Building react-native from source.")
     }
     else {
         config.buildFromSource = false

gradleUtils/PatchedArtifactsSettings.gradle

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.29</string>
+	<string>9.2.30</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.29.5</string>
+	<string>9.2.30.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.2.29</string>
+	<string>9.2.30</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.29.5</string>
+	<string>9.2.30.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.2.29</string>
+	<string>9.2.30</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.29.5</string>
+	<string>9.2.30.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>