Merge pull request #3997 from Expensify/cherry-pick-staging-3966

Expensify · Jul 13, 2021 · 415841b · 415841b
2 parents 8a90b30 + 3d07b7a
commit 415841b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001007701
-        versionName "1.0.77-1"
+        versionCode 1001007702
+        versionName "1.0.77-2"
     }
     splits {
         abi {

diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.77.1</string>
+	<string>1.0.77.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.77.1</string>
+	<string>1.0.77.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.77-1",
+  "version": "1.0.77-2",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/components/Text.js b/src/components/Text.js
@@ -54,12 +54,15 @@ const Text = React.forwardRef(({
     const componentStyle = {
         color,
         fontSize,
-        lineHeight: 20,
         textAlign,
         fontFamily: fontFamily[family],
         ...mergedStyles,
     };
 
+    if (componentStyle.fontSize === variables.fontSizeNormal) {
+        componentStyle.lineHeight = 20;
+    }
+
     return (
         // eslint-disable-next-line react/jsx-props-no-spreading
         <RNText ref={ref} style={[componentStyle]} {...props}>{children}</RNText>