From d79cf3fe3b62a93a591f05081791ed6d2a5f63a2 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 Aug 2021 13:28:03 -0700
Subject: [PATCH 1/2] Merge pull request #4626 from
 Expensify/version-BUILD-ff62078baf05801bce5a5c3ebffb20f89b25bf0d

(cherry picked from commit 2b48ffbceec6029d7817b6746cecd1596559aa64)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/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 22d8ebfd7090..37fc56e0e04f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008502
-        versionName "1.0.85-2"
+        versionCode 1001008503
+        versionName "1.0.85-3"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 2d857dc62285..ad1206c58aab 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.2</string>
+	<string>1.0.85.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 305910f1b687..c02b84afec90 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.2</string>
+	<string>1.0.85.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6eb2cf4e4d12..8479da40a44a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.85-2",
+  "version": "1.0.85-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1862b13094ec..941b6ed3e667 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.85-2",
+  "version": "1.0.85-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 52e92f63cab38b1abf8a344ddfce0a1d29faef1f Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 12 Aug 2021 13:25:32 -0700
Subject: [PATCH 2/2] Merge pull request #4593 from parasharrajat/newInput

Fix ExpensiInput autoFocus & tab Focus

(cherry picked from commit ff62078baf05801bce5a5c3ebffb20f89b25bf0d)
---
 .../ExpensiTextInput/BaseExpensiTextInput.js           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js
index 0dde92a16a96..1b025e177804 100644
--- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js
+++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js
@@ -34,6 +34,13 @@ class BaseExpensiTextInput extends Component {
         this.onBlur = this.onBlur.bind(this);
     }
 
+    componentDidMount() {
+        // We are manually managing focus to prevent this issue: https://github.com/Expensify/App/issues/4514
+        if (this.props.autoFocus && this.input) {
+            this.input.focus();
+        }
+    }
+
     onFocus() {
         if (this.props.onFocus) { this.props.onFocus(); }
         this.setState({isFocused: true});
@@ -84,13 +91,14 @@ class BaseExpensiTextInput extends Component {
             inputStyle,
             ignoreLabelTranslateX,
             innerRef,
+            autoFocus,
             ...inputProps
         } = this.props;
 
         const hasLabel = Boolean(label.length);
         return (
             <View style={[styles.componentHeightLarge, ...containerStyles]}>
-                <TouchableWithoutFeedback onPress={() => this.input.focus()}>
+                <TouchableWithoutFeedback onPress={() => this.input.focus()} focusable={false}>
                     <View
                         style={[
                             styles.expensiTextInputContainer,