conflicts

.gitignore

@@ -94,3 +94,4 @@ storybook-static
 
 # E2E test reports
 tests/e2e/results/
+.reassure

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 1001032200
+        versionName "1.3.22-0"
     }
 
     splits {

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'),
+});

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.20</string>
+	<string>1.3.22</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.20.2</string>
+	<string>1.3.22.0</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.3.20</string>
+	<string>1.3.22</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.20.2</string>
+	<string>1.3.22.0</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -16,7 +16,7 @@ PODS:
     - Airship/Core
   - Airship/PreferenceCenter (16.11.3):
     - Airship/Core
-  - AirshipFrameworkProxy (2.0.5):
+  - AirshipFrameworkProxy (2.0.8):
     - Airship (= 16.11.3)
     - Airship/MessageCenter (= 16.11.3)
     - Airship/PreferenceCenter (= 16.11.3)
@@ -495,8 +495,8 @@ PODS:
   - React-jsinspector (0.71.2-alpha.3)
   - React-logger (0.71.2-alpha.3):
     - glog
-  - react-native-airship (15.2.3):
-    - AirshipFrameworkProxy (= 2.0.5)
+  - react-native-airship (15.2.6):
+    - AirshipFrameworkProxy (= 2.0.8)
     - React-Core
   - react-native-blob-util (0.17.3):
     - React-Core
@@ -1018,8 +1018,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Airship: c70eed50e429f97f5adb285423c7291fb7a032ae
-  AirshipFrameworkProxy: 2eefb77bb77b5120b0f48814b0d44439aa3ad415
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  AirshipFrameworkProxy: 7bc4130c668c6c98e2d4c60fe4c9eb61a999be99
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ff54429f0110d3c722630a98096ba689c39f6d5f
@@ -1062,7 +1062,7 @@ SPEC CHECKSUMS:
   Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4
   Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
   RCTRequired: e9e7b8b45aa9bedb2fdad71740adf07a7265b9be
   RCTTypeSafety: 9ae0e9206625e995f0df4d5b9ddc94411929fb30
   React: a71c8e1380f07e01de721ccd52bcf9c03e81867d
@@ -1076,7 +1076,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 6f986feb67cf66edff7f98090ca797a67d0a44fb
   React-jsinspector: 31517b1de3fadf93ad8558840a8974c7a7160bd3
   React-logger: b90aa6ed0dbc30717dc72d843af3cf4550297b22
-  react-native-airship: 25045092934bf6eabf483e803af0a6e31826b8b9
+  react-native-airship: 5d19f4ba303481cf4101ff9dee9249ef6a8a6b64
   react-native-blob-util: 99f4d79189252f597fe0d810c57a3733b1b1dea6
   react-native-cameraroll: 8ffb0af7a5e5de225fd667610e2979fc1f0c2151
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e