From cfe4479af96c78c0c6381570993da58d03f5c90e Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 25 Jul 2022 21:52:20 -0400
Subject: [PATCH 1/2] Merge pull request #10102 from
 Expensify/version-BUILD-364A8999-423E-490A-A71E-3D41DFBF131F

Update version to 1.1.86-1 on main

(cherry picked from commit 151ec1ad3355cfa162ad490030f19a7134bbc076)
---
 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 f7930bb567eb..cac112c6f850 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 1001018600
-        versionName "1.1.86-0"
+        versionCode 1001018601
+        versionName "1.1.86-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 194d53bdf2b8..a387c8193c29 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.86.0</string>
+	<string>1.1.86.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1fb4f6291291..71f8517e1ede 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.86.0</string>
+	<string>1.1.86.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index e63778fa80c4..6f6bb1423f79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.86-0",
+  "version": "1.1.86-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 866ff84bd47b..0188fb39d5b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.86-0",
+  "version": "1.1.86-1",
   "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 a45c4b4354dbe2552612e3233c19155d9edf83f8 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 25 Jul 2022 18:44:27 -0700
Subject: [PATCH 2/2] Merge pull request #10096 from
 Expensify/revert-9294-white_gap_textinput_autofill
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "7470 - added onLayout to textinput perent component & used dynamic he…"

(cherry picked from commit 9c99a0d2138657a5f7d82fa441e54a817e33a75f)
---
 src/components/TextInput/BaseTextInput.js | 4 ----
 src/styles/styles.js                      | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index 2a79f6b0a055..a083af0f2e16 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -14,7 +14,6 @@ import * as Expensicons from '../Icon/Expensicons';
 import Text from '../Text';
 import * as styleConst from './styleConst';
 import * as StyleUtils from '../../styles/StyleUtils';
-import variables from '../../styles/variables';
 import getSecureEntryKeyboardType from '../../libs/getSecureEntryKeyboardType';
 
 class BaseTextInput extends Component {
@@ -31,7 +30,6 @@ class BaseTextInput extends Component {
             passwordHidden: props.secureTextEntry,
             textInputWidth: 0,
             prefixWidth: 0,
-            height: variables.componentSizeLarge,
 
             // Value should be kept in state for the autoGrow feature to work - https://github.com/Expensify/App/pull/8232#issuecomment-1077282006
             value,
@@ -214,7 +212,6 @@ class BaseTextInput extends Component {
                     >
                         <TouchableWithoutFeedback onPress={this.onPress} focusable={false}>
                             <View
-                                onLayout={event => this.setState({height: event.nativeEvent.layout.height})}
                                 style={[
                                     textInputContainerStyles,
 
@@ -267,7 +264,6 @@ class BaseTextInput extends Component {
                                             !hasLabel && styles.pv0,
                                             this.props.prefixCharacter && StyleUtils.getPaddingLeft(this.state.prefixWidth + styles.pl1.paddingLeft),
                                             this.props.secureTextEntry && styles.secureInput,
-                                            {height: this.state.height},
                                         ]}
                                         multiline={this.props.multiline}
                                         maxLength={this.props.maxLength}
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 443718683190..31efe3cb6be2 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -736,6 +736,7 @@ const styles = {
         paddingBottom: 8,
         paddingHorizontal: 11,
         borderWidth: 0,
+        borderRadius: variables.componentBorderRadiusNormal,
     },
 
     textInputMultiline: {