Merge pull request #5858 from AlfredoAlc/alfredo-fix-textinput-area

(cherry picked from commit 1ace10c)
Expensify · Oct 14, 2021 · 2a9c585 · 2a9c585
1 parent 1a4ea1a
commit 2a9c585
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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 => ({