From 0bf8ef7e8b556e55cdf9f5a5c895210bfc65f559 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:57:03 -0400
Subject: [PATCH 1/2] Merge pull request #10280 from
 Expensify/version-BUILD-10D75816-82AF-4318-9365-1F22BFCA8895

Update version to 1.1.88-3 on main

(cherry picked from commit 503cd54a587dec6841adeabe69431d38d9293dd5)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9d3cf23b6855..8986207b293e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018802
-        versionName "1.1.88-2"
+        versionCode 1001018803
+        versionName "1.1.88-3"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index d4d695fb5131..59c385c7f981 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.88.2</string>
+	<string>1.1.88.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c75702f011ff..759ef3db5bab 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.88.2</string>
+	<string>1.1.88.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index f1275999430a..96861f4422db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.88-2",
+  "version": "1.1.88-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f8f34af65730..7ffe1b2c419b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.88-2",
+  "version": "1.1.88-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 8096a3475841af6e6fcca37067b27303ac4dac10 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:46:49 +0200
Subject: [PATCH 2/2] Merge pull request #10276 from
 Expensify/vit-fixCrashOnStaging

Add missing parameter from the propTypes

(cherry picked from commit 80a9046f0dfffc9857a2f191bd2b68c29986dd90)
---
 src/pages/home/report/ReportTypingIndicator.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportTypingIndicator.js b/src/pages/home/report/ReportTypingIndicator.js
index 2ee31974690d..552e126b9c5c 100755
--- a/src/pages/home/report/ReportTypingIndicator.js
+++ b/src/pages/home/report/ReportTypingIndicator.js
@@ -78,7 +78,6 @@ class ReportTypingIndicator extends React.Component {
                         style={[
                             styles.chatItemComposeSecondaryRowSubText,
                             styles.chatItemComposeSecondaryRowOffset,
-                            ...this.props.containerStyles,
                         ]}
                         numberOfLines={1}
                     >