From 595f6c7371586d6788642b0fad4bf9029a3c5888 Mon Sep 17 00:00:00 2001 From: Sid Ferreira <143615+sidferreira@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:36:44 -0800 Subject: [PATCH 1/3] Emoji fixes on iOS - optionAlternateText --- src/pages/ReportDetailsPage.js | 2 +- src/pages/home/HeaderView.js | 3 +-- src/pages/home/sidebar/OptionRow.js | 2 +- src/styles/optionAlternateTextPlatformStyles/index.ios.js | 2 -- src/styles/styles.js | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index 3c794698c881..37f8f6abd5bd 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -149,7 +149,7 @@ class ReportDetailsPage extends Component { styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, - styles.mb6, + styles.mb5, ]} numberOfLines={1} > diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index a214bf3fade3..4915cd136e3e 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -123,7 +123,7 @@ const HeaderView = (props) => { > { - if (ReportUtils.isDefaultRoom(props.report)) { + if (isDefaultChatRoom) { return Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID)); } if (participants.length === 1) { @@ -154,7 +154,6 @@ const HeaderView = (props) => { styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, - styles.mt1, ]} numberOfLines={1} > diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js index 26cc11c936fa..ae5d5b9b4eed 100644 --- a/src/pages/home/sidebar/OptionRow.js +++ b/src/pages/home/sidebar/OptionRow.js @@ -92,7 +92,7 @@ const OptionRow = (props) => { : [styles.optionDisplayName, ...textUnreadStyle]; const alternateTextStyle = props.mode === 'compact' ? [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.optionAlternateTextCompact] - : [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.mt1]; + : [textStyle, styles.optionAlternateText, styles.textLabelSupporting]; const contentContainerStyles = props.mode === 'compact' ? [styles.flex1, styles.flexRow, styles.overflowHidden, styles.alignItemsCenter] : [styles.flex1]; diff --git a/src/styles/optionAlternateTextPlatformStyles/index.ios.js b/src/styles/optionAlternateTextPlatformStyles/index.ios.js index ec4323018977..0f506d6675a8 100644 --- a/src/styles/optionAlternateTextPlatformStyles/index.ios.js +++ b/src/styles/optionAlternateTextPlatformStyles/index.ios.js @@ -1,5 +1,3 @@ export default { - height: 20, - lineHeight: 20, paddingTop: 1, }; diff --git a/src/styles/styles.js b/src/styles/styles.js index 62de97203640..87c07e95b31c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1111,8 +1111,8 @@ const styles = { }, optionAlternateText: { - height: 16, - lineHeight: 16, + height: 20, + lineHeight: 20, }, optionAlternateTextCompact: { From ee5b6601331b038b5f59e11e10eee58e24e1d305 Mon Sep 17 00:00:00 2001 From: Sid Ferreira <143615+sidferreira@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:04:09 -0800 Subject: [PATCH 2/3] Emoji fixes on iOS - Inputs --- src/styles/expensiTextInputPlatformStyles/index.ios.js | 3 +++ src/styles/expensiTextInputPlatformStyles/index.js | 1 + src/styles/styles.js | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 src/styles/expensiTextInputPlatformStyles/index.ios.js create mode 100644 src/styles/expensiTextInputPlatformStyles/index.js diff --git a/src/styles/expensiTextInputPlatformStyles/index.ios.js b/src/styles/expensiTextInputPlatformStyles/index.ios.js new file mode 100644 index 000000000000..88adeb48fafd --- /dev/null +++ b/src/styles/expensiTextInputPlatformStyles/index.ios.js @@ -0,0 +1,3 @@ +export default { + paddingTop: 19, +}; diff --git a/src/styles/expensiTextInputPlatformStyles/index.js b/src/styles/expensiTextInputPlatformStyles/index.js new file mode 100644 index 000000000000..ff8b4c56321a --- /dev/null +++ b/src/styles/expensiTextInputPlatformStyles/index.js @@ -0,0 +1 @@ +export default {}; diff --git a/src/styles/styles.js b/src/styles/styles.js index 87c07e95b31c..b2cc2d55d6f5 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -15,6 +15,7 @@ import textInputAlignSelf from './utilities/textInputAlignSelf'; import positioning from './utilities/positioning'; import codeStyles from './codeStyles'; import visibility from './utilities/visibility'; +import expensiTextInputPlatformStyles from './expensiTextInputPlatformStyles'; import optionAlternateTextPlatformStyles from './optionAlternateTextPlatformStyles'; const expensiPicker = { @@ -646,11 +647,13 @@ const styles = { paddingHorizontal: 11, borderWidth: 0, borderRadius: variables.componentBorderRadiusNormal, + ...expensiTextInputPlatformStyles, }, expensiTextInputAndIconContainer: { zIndex: -1, flexDirection: 'row', + height: '100%', }, expensiTextInputDesktop: addOutlineWidth({}, 0), From 89257862055833f34401b41d264ef03fa20b7457 Mon Sep 17 00:00:00 2001 From: Sid Ferreira <143615+sidferreira@users.noreply.github.com> Date: Wed, 15 Dec 2021 09:05:44 -0800 Subject: [PATCH 3/3] Revert "Emoji fixes on iOS - Inputs" This reverts commit ee5b6601331b038b5f59e11e10eee58e24e1d305. --- src/styles/expensiTextInputPlatformStyles/index.ios.js | 3 --- src/styles/expensiTextInputPlatformStyles/index.js | 1 - src/styles/styles.js | 3 --- 3 files changed, 7 deletions(-) delete mode 100644 src/styles/expensiTextInputPlatformStyles/index.ios.js delete mode 100644 src/styles/expensiTextInputPlatformStyles/index.js diff --git a/src/styles/expensiTextInputPlatformStyles/index.ios.js b/src/styles/expensiTextInputPlatformStyles/index.ios.js deleted file mode 100644 index 88adeb48fafd..000000000000 --- a/src/styles/expensiTextInputPlatformStyles/index.ios.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - paddingTop: 19, -}; diff --git a/src/styles/expensiTextInputPlatformStyles/index.js b/src/styles/expensiTextInputPlatformStyles/index.js deleted file mode 100644 index ff8b4c56321a..000000000000 --- a/src/styles/expensiTextInputPlatformStyles/index.js +++ /dev/null @@ -1 +0,0 @@ -export default {}; diff --git a/src/styles/styles.js b/src/styles/styles.js index b2cc2d55d6f5..87c07e95b31c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -15,7 +15,6 @@ import textInputAlignSelf from './utilities/textInputAlignSelf'; import positioning from './utilities/positioning'; import codeStyles from './codeStyles'; import visibility from './utilities/visibility'; -import expensiTextInputPlatformStyles from './expensiTextInputPlatformStyles'; import optionAlternateTextPlatformStyles from './optionAlternateTextPlatformStyles'; const expensiPicker = { @@ -647,13 +646,11 @@ const styles = { paddingHorizontal: 11, borderWidth: 0, borderRadius: variables.componentBorderRadiusNormal, - ...expensiTextInputPlatformStyles, }, expensiTextInputAndIconContainer: { zIndex: -1, flexDirection: 'row', - height: '100%', }, expensiTextInputDesktop: addOutlineWidth({}, 0),