diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index 9917965054fb..36c7349fe914 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx @@ -5,6 +5,7 @@ import type {TNode} from 'react-native-render-html'; import useThemeStyles from '@hooks/useThemeStyles'; import convertToLTR from '@libs/convertToLTR'; import FontUtils from '@styles/utils/FontUtils'; +import variables from '@styles/variables'; import type ChildrenProps from '@src/types/utils/ChildrenProps'; import {computeEmbeddedMaxWidth, isChildOfTaskTitle} from './htmlEngineUtils'; import htmlRenderers from './HTMLRenderers'; @@ -150,7 +151,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim 'account-manager-link': HTMLElementModel.fromCustomModel({tagName: 'account-manager-link', contentModel: HTMLContentModel.textual}), 'next-step': HTMLElementModel.fromCustomModel({ tagName: 'next-step', - mixedUAStyles: {...styles.textLabelSupporting, ...styles.lh16}, + mixedUAStyles: {...styles.textLabelSupporting, paddingVertical: variables.labelPaddingVertical}, contentModel: HTMLContentModel.textual, }), 'next-step-email': HTMLElementModel.fromCustomModel({tagName: 'next-step-email', contentModel: HTMLContentModel.textual}), diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 0744d17ecc73..137fa38bd66e 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -717,7 +717,7 @@ function MoneyRequestReportPreviewContent({ {reportStatus} )} - {expenseCount} + {expenseCount} ) )} diff --git a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx index 93dee4191b99..5059c7a3f853 100644 --- a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx +++ b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx @@ -375,7 +375,15 @@ function TransactionPreviewContent({ /> {RBRMessage} diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx index d5a08a512400..2b800aba8682 100644 --- a/src/pages/home/report/ReportActionsList.tsx +++ b/src/pages/home/report/ReportActionsList.tsx @@ -855,7 +855,7 @@ function ReportActionsList({ onClick={scrollToBottomAndMarkReportAsRead} /> {shouldScrollToEndAfterLayout && topReportAction ? renderTopReportActions() : undefined} diff --git a/src/styles/index.ts b/src/styles/index.ts index ffeb578b3192..5f05ee2157ea 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -357,7 +357,7 @@ const staticStyles = (theme: ThemeColors) => alignItems: 'center', justifyContent: 'center', borderRadius: variables.componentBorderRadiusSmall, - height: 16, + minHeight: 16, }, reportStatusText: { @@ -1451,6 +1451,10 @@ const staticStyles = (theme: ThemeColors) => lineHeight: '140%', }, + lhUndefined: { + lineHeight: undefined, + }, + formHelp: { color: theme.textSupporting, fontSize: variables.fontSizeLabel, @@ -4091,7 +4095,7 @@ const staticStyles = (theme: ThemeColors) => }, tabSelectorButton: { - height: variables.tabSelectorButtonHeight, + minHeight: variables.tabSelectorButtonHeight, padding: variables.tabSelectorButtonPadding, flexDirection: 'row', alignItems: 'center', @@ -4426,6 +4430,10 @@ const staticStyles = (theme: ThemeColors) => padding: 20, }, + textMicroSupportingPadding: { + padding: variables.paddingSmall, + }, + mapViewContainer: { ...flex.flex1, minHeight: 300, diff --git a/src/styles/variables.ts b/src/styles/variables.ts index a1b85244680a..c0dc5a854fca 100644 --- a/src/styles/variables.ts +++ b/src/styles/variables.ts @@ -52,6 +52,7 @@ export default { defaultAvatarPreviewSize: 360, fabBottom: 25, breadcrumbsFontSize: getValueUsingPixelRatio(19, 32), + labelPaddingVertical: Math.abs((getValueUsingPixelRatio(13, 19) - 16) / 2), fontSizeXXSmall: 7, fontSizeSmall: getValueUsingPixelRatio(11, 17), fontSizeExtraSmall: 9, @@ -132,6 +133,7 @@ export default { inputHeightSmall: 28, inputIconMarginTopSmall: getValueUsingPixelRatio(8, 11), inputIconMarginTopLarge: getValueUsingPixelRatio(16, 21), + paddingSmall: getValueUsingPixelRatio(7, 8), formErrorLineHeight: getValueUsingPixelRatio(18, 23), communicationsLinkHeight: getValueUsingPixelRatio(20, 30), alternateTextHeight: getValueUsingPixelRatio(20, 24),