Merge branch 'main' into arosiclair-transition-fix

Author: arosiclair

.github/PULL_REQUEST_TEMPLATE.md

@@ -157,8 +157,11 @@ For example:
 #### Web
 <!-- Insert screenshots of your changes on the web platform-->
 
-#### Mobile Web
-<!-- Insert screenshots of your changes on the web platform (from a mobile browser)-->
+#### Mobile Web - Chrome
+<!-- Insert screenshots of your changes on the web platform (from chrome mobile browser)-->
+
+#### Mobile Web - Safari
+<!-- Insert screenshots of your changes on the web platform (from safari mobile browser)-->
 
 #### Desktop
 <!-- Insert screenshots of your changes on the desktop platform-->

android/app/build.gradle

@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020200
-        versionName "1.2.2-0"
+        versionCode 1001020401
+        versionName "1.2.4-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

fastlane/Fastfile

@@ -141,6 +141,7 @@ platform :ios do
     end
 
     upload_symbols_to_crashlytics(
+      app_id: "1:921154746561:ios:216bd10ccc947659027c40",
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
       gsp_path: "./ios/GoogleService-Info.plist",
       binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols"

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.0</string>
+	<string>1.2.4.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.0</string>
+	<string>1.2.4.1</string>
 </dict>
 </plist>

jest/setup.js

@@ -23,6 +23,19 @@ jest.mock('../src/libs/BootSplash', () => ({
     getVisibilityStatus: jest.fn().mockResolvedValue('hidden'),
 }));
 
+jest.mock('react-native-blob-util', () => ({}));
+
+// Turn off the console logs for timing events. They are not relevant for unit tests and create a lot of noise
+jest.spyOn(console, 'debug').mockImplementation((...params) => {
+    if (params[0].indexOf('Timing:') === 0) {
+        return;
+    }
+
+    // Send the message to console.log but don't re-used console.debug or else this mock method is called in an infinite loop. Instead, just prefix the output with the word "DEBUG"
+    // eslint-disable-next-line no-console
+    console.log('DEBUG', ...params);
+});
+
 // Local notifications (a.k.a. browser notifications) do not run in native code. Our jest tests will also run against
 // any index.native.js files as they are using a react-native plugin. However, it is useful to mock this behavior so that we
 // can test the expected web behavior and see if a browser notification would be shown or not.