From 2a9c585b92396a0e951fc44839eef2c8dfb34fe8 Mon Sep 17 00:00:00 2001
From: Tim Szot <tim@expensify.com>
Date: Thu, 14 Oct 2021 15:48:45 -0700
Subject: [PATCH] Merge pull request #5858 from
 AlfredoAlc/alfredo-fix-textinput-area

(cherry picked from commit 1ace10c8b64fc511646d9a6159f3066193a1d28b)
---
 .../ExpensiTextInput/ExpensiTextInputLabel/index.js       | 4 ++++
 src/styles/styles.js                                      | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/components/ExpensiTextInput/ExpensiTextInputLabel/index.js b/src/components/ExpensiTextInput/ExpensiTextInputLabel/index.js
index b0ed11c58bb7..ed57f4bf87e9 100644
--- a/src/components/ExpensiTextInput/ExpensiTextInputLabel/index.js
+++ b/src/components/ExpensiTextInput/ExpensiTextInputLabel/index.js
@@ -19,6 +19,10 @@ const ExpensiTextInputLabel = ({
                 labelScale,
             ),
         ]}
+<<<<<<< HEAD
+=======
+        pointerEvents="none"
+>>>>>>> 1ace10c8b (Merge pull request #5858 from AlfredoAlc/alfredo-fix-textinput-area)
     >
         {label}
     </Animated.Text>
diff --git a/src/styles/styles.js b/src/styles/styles.js
index a201891724ca..1f0630c5661c 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -526,7 +526,15 @@ const styles = {
         fontFamily: fontFamily.GTA,
         fontSize: variables.fontSizeNormal,
         color: themeColors.text,
+<<<<<<< HEAD
         ...spacing.pv0,
+=======
+        height: '100%',
+        paddingTop: 25,
+        paddingBottom: 8,
+        paddingHorizontal: 11.5,
+        borderRadius: variables.componentBorderRadiusNormal,
+>>>>>>> 1ace10c8b (Merge pull request #5858 from AlfredoAlc/alfredo-fix-textinput-area)
     },
     expensiTextInputDesktop: addOutlineWidth({}, 0),
     expensiTextInputAndroid: left => ({