From f4f458b58d6a5cb66ee55387146d1a1e2e79c34d Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:01:25 -0700
Subject: [PATCH 1/2] Merge pull request #4151 from
Expensify/version-BUILD-029ed175ecaaed0704bada0de67c6b9a24b51844
(cherry picked from commit bdf611141c93da010b8e1c7847c3d91e7dd4c9b3)
---
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 e1729d83f5d8..fd124e105c38 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001007902
- versionName "1.0.79-2"
+ versionCode 1001007903
+ versionName "1.0.79-3"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index c014a4806eca..3eaef316f6bc 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.79.2
+ 1.0.79.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 9986aa0999ed..e6582c016909 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.79.2
+ 1.0.79.3
diff --git a/package-lock.json b/package-lock.json
index ef762ac472c0..75fbd6ea5307 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.79-2",
+ "version": "1.0.79-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 11d53009dea8..1b572fa0755e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.79-2",
+ "version": "1.0.79-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 a6796dc778270b92a02a211c8194d1a12ec438d7 Mon Sep 17 00:00:00 2001
From: Yuwen Memon
Date: Tue, 20 Jul 2021 10:59:15 -0700
Subject: [PATCH 2/2] Merge pull request #4143 from Expensify/yuwen-lineHeight
Modify line height so text does not get cut off in LHN
(cherry picked from commit 029ed175ecaaed0704bada0de67c6b9a24b51844)
---
src/styles/styles.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 2671bb581c56..b8caacafd319 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -800,8 +800,8 @@ const styles = {
optionDisplayName: {
fontFamily: fontFamily.GTA,
- height: 18,
- lineHeight: 18,
+ height: 20,
+ lineHeight: 20,
...whiteSpace.noWrap,
},