Merge branch 'main' into fix/19187-2fa_fixes

Expensify · May 31, 2023 · 023e5d9 · 023e5d9
2 parents 48a90a9 + 4cf66ee
commit 023e5d9
Show file tree

Hide file tree

Showing 43 changed files with 2,711 additions and 445 deletions.
diff --git a/.gitignore b/.gitignore
@@ -94,3 +94,4 @@ storybook-static
 
 # E2E test reports
 tests/e2e/results/
+.reassure
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032002
-        versionName "1.3.20-2"
+        versionCode 1001032005
+        versionName "1.3.20-5"
     }
 
     splits {

diff --git a/dangerfile.js b/dangerfile.js
@@ -0,0 +1,7 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import path from 'path';
+import {dangerReassure} from 'reassure';
+
+dangerReassure({
+    inputFilePath: path.join(__dirname, './.reassure/output.md'),
+});
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.20.2</string>
+	<string>1.3.20.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.20.2</string>
+	<string>1.3.20.5</string>
 </dict>
 </plist>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,3 +94,4 @@ storybook-static

		# E2E test reports
		tests/e2e/results/
		.reassure