From 1a4ea1a9b769ffab9d1a053490db11350331d9ad Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 14 Oct 2021 15:51:08 -0700
Subject: [PATCH 1/2] Merge pull request #5862 from
Expensify/version-BUILD-1ace10c8b64fc511646d9a6159f3066193a1d28b
(cherry picked from commit bf660aab7f2ece77df8a8bbf4f4bd4151ea5737a)
---
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 448c3d947c2e..caa5c6517828 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 1001010722
- versionName "1.1.7-22"
+ versionCode 1001010723
+ versionName "1.1.7-23"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2889cb1114d3..37cd6a5c64c3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.7.22
+ 1.1.7.23
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1ceef5f1d0c5..28eb092f08e0 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.7.22
+ 1.1.7.23
diff --git a/package-lock.json b/package-lock.json
index 26f677888bc2..85383f273aa5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-22",
+ "version": "1.1.7-23",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 6cfcc1b5326e..5a78ed0a8baa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-22",
+ "version": "1.1.7-23",
"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 2a9c585b92396a0e951fc44839eef2c8dfb34fe8 Mon Sep 17 00:00:00 2001
From: Tim Szot
Date: Thu, 14 Oct 2021 15:48:45 -0700
Subject: [PATCH 2/2] 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}
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 => ({