Merge pull request #19404 from Expensify/OSBotify-cherry-pick-staging…

…-19402 🍒 Cherry pick PR #19402 to staging 🍒
Expensify · May 22, 2023 · 6b73857 · 6b73857
2 parents a4834ad + 0ba5e57
commit 6b73857
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 34 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031606
-        versionName "1.3.16-6"
+        versionCode 1001031607
+        versionName "1.3.16-7"
     }
 
     splits {

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

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.16.6</string>
+	<string>1.3.16.7</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": "new.expensify",
-  "version": "1.3.16-6",
+  "version": "1.3.16-7",
   "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.",

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -1022,10 +1022,7 @@ class ReportActionCompose extends React.Component {
                                                 placeholderTextColor={themeColors.placeholderText}
                                                 onChangeText={(comment) => this.updateComment(comment, true)}
                                                 onKeyPress={this.triggerHotkeyActions}
-                                                style={[
-                                                    this.props.numberOfLines > 1 ? styles.textInputComposeMultiLines : styles.textInputCompose,
-                                                    this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4,
-                                                ]}
+                                                style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]}
                                                 maxLines={this.state.maxLines}
                                                 onFocus={() => this.setIsFocused(true)}
                                                 onBlur={() => {

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -1547,27 +1547,8 @@ const styles = {
             // paddingVertical: 0, alignSelf: 'center', and textAlignVertical: 'center'
 
             paddingHorizontal: variables.avatarChatSpacing,
-            paddingTop: 9,
-            paddingBottom: 9,
-            alignSelf: 'center',
-            textAlignVertical: 'center',
-        },
-        0,
-    ),
-    textInputComposeMultiLines: addOutlineWidth(
-        {
-            backgroundColor: themeColors.componentBG,
-            borderColor: themeColors.border,
-            color: themeColors.text,
-            fontFamily: fontFamily.EMOJI_TEXT_FONT,
-            fontSize: variables.fontSizeNormal,
-            borderWidth: 0,
-            height: 'auto',
-            lineHeight: variables.lineHeightXLarge,
-            ...overflowXHidden,
-            paddingHorizontal: variables.avatarChatSpacing,
-            paddingTop: 5,
-            paddingBottom: 5,
+            paddingTop: 0,
+            paddingBottom: 0,
             alignSelf: 'center',
             textAlignVertical: 'center',
         },
@@ -1588,7 +1569,7 @@ const styles = {
 
     // composer padding should not be modified unless thoroughly tested against the cases in this PR: #12669
     textInputComposeSpacing: {
-        paddingVertical: 0,
+        paddingVertical: 5,
         ...flex.flexRow,
         flex: 1,
     },

diff --git a/web/index.html b/web/index.html
@@ -40,7 +40,7 @@
         #no-drag-area {
             -webkit-app-region: no-drag;
         }
-        input::placeholder, textarea::placeholder {
+        input::placeholder {
             user-select: none;
             -webkit-user-select: none
         }