From dcd2f091be73f3588dda5c8316ed2fc9fc49cab1 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 19 Nov 2025 11:25:45 +0800 Subject: [PATCH 1/7] chore: remove height config --- src/styles/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index 551aef9ed44e..03b3747600b9 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -4088,7 +4088,6 @@ const staticStyles = (theme: ThemeColors) => }, tabSelectorButton: { - height: variables.tabSelectorButtonHeight, padding: variables.tabSelectorButtonPadding, flexDirection: 'row', alignItems: 'center', From c0ef4040ad211e634473494b3bb4f3453b78138c Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 19 Nov 2025 11:43:39 +0800 Subject: [PATCH 2/7] chore: adjust padding --- src/styles/index.ts | 2 +- src/styles/variables.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index 03b3747600b9..a93b58064924 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -4088,7 +4088,7 @@ const staticStyles = (theme: ThemeColors) => }, tabSelectorButton: { - padding: variables.tabSelectorButtonPadding, + padding: variables.tabSelectorButtonEffectivePadding, flexDirection: 'row', alignItems: 'center', justifyContent: 'center', diff --git a/src/styles/variables.ts b/src/styles/variables.ts index e83efc833375..dff309d798d4 100644 --- a/src/styles/variables.ts +++ b/src/styles/variables.ts @@ -178,6 +178,7 @@ export default { signInLogoWidthPill: 132, tabSelectorButtonHeight: 40, tabSelectorButtonPadding: 12, + tabSelectorButtonEffectivePadding: 26, // (tabSelectorButtonHeight - tabSelectorButtonPadding) / 2 + tabSelectorButtonPadding lhnLogoWidth: 95.09, lhnLogoHeight: 22.33, signInLogoWidthLargeScreenPill: 162, From 361d9eb7599e42acc1af1c45b7d3c6143a2a5eee Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 19 Nov 2025 12:31:41 +0800 Subject: [PATCH 3/7] fix: red err message --- .../TransactionPreview/TransactionPreviewContent.tsx | 10 +++++++++- src/styles/index.ts | 12 ++++++++++-- src/styles/variables.ts | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx index 76a9ed9fd268..08675faa2134 100644 --- a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx +++ b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx @@ -369,7 +369,15 @@ function TransactionPreviewContent({ /> {RBRMessage} diff --git a/src/styles/index.ts b/src/styles/index.ts index a93b58064924..63fae541c87b 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -353,11 +353,10 @@ const staticStyles = (theme: ThemeColors) => }, reportStatusContainer: { - paddingHorizontal: 4, + paddingHorizontal: 10, alignItems: 'center', justifyContent: 'center', borderRadius: variables.componentBorderRadiusSmall, - height: 16, }, reportStatusText: { @@ -1447,6 +1446,10 @@ const staticStyles = (theme: ThemeColors) => lineHeight: '140%', }, + lhUndefined: { + lineHeight: undefined, + }, + formHelp: { color: theme.textSupporting, fontSize: variables.fontSizeLabel, @@ -4422,6 +4425,11 @@ 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 dff309d798d4..54becfba7832 100644 --- a/src/styles/variables.ts +++ b/src/styles/variables.ts @@ -129,6 +129,7 @@ export default { inputHeight: getValueUsingPixelRatio(52, 72), inputPaddingTop: getValueUsingPixelRatio(15, 21), inputPaddingBottom: getValueUsingPixelRatio(8, 11), + paddingSmall: getValueUsingPixelRatio(7, 8), inputHeightSmall: 28, inputIconMarginTopSmall: getValueUsingPixelRatio(8, 11), inputIconMarginTopLarge: getValueUsingPixelRatio(16, 21), From bd66c53fa1d285994306a2661c84a8ee5d2a2fc2 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 19 Nov 2025 19:51:11 +0800 Subject: [PATCH 4/7] fix: padding: --- .../HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 3 ++- .../MoneyRequestReportPreviewContent.tsx | 2 +- src/styles/index.ts | 7 ++++--- src/styles/variables.ts | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index 5b890761fa33..49d144e89bca 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'; @@ -149,7 +150,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim 'concierge-link': HTMLElementModel.fromCustomModel({tagName: 'concierge-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 26830e8db39b..184b2e25c150 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -712,7 +712,7 @@ function MoneyRequestReportPreviewContent({ {reportStatus} )} - {expenseCount} + {expenseCount} ) )} diff --git a/src/styles/index.ts b/src/styles/index.ts index 63fae541c87b..0c297fc89b5e 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -353,10 +353,11 @@ const staticStyles = (theme: ThemeColors) => }, reportStatusContainer: { - paddingHorizontal: 10, + paddingHorizontal: 4, alignItems: 'center', justifyContent: 'center', borderRadius: variables.componentBorderRadiusSmall, + minHeight: 16, }, reportStatusText: { @@ -4091,7 +4092,8 @@ const staticStyles = (theme: ThemeColors) => }, tabSelectorButton: { - padding: variables.tabSelectorButtonEffectivePadding, + minHeight: variables.tabSelectorButtonHeight, + padding: variables.tabSelectorButtonPadding, flexDirection: 'row', alignItems: 'center', justifyContent: 'center', @@ -4425,7 +4427,6 @@ const staticStyles = (theme: ThemeColors) => padding: 20, }, - textMicroSupportingPadding: { padding: variables.paddingSmall, }, diff --git a/src/styles/variables.ts b/src/styles/variables.ts index 54becfba7832..13b34381a6c3 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, @@ -179,7 +180,6 @@ export default { signInLogoWidthPill: 132, tabSelectorButtonHeight: 40, tabSelectorButtonPadding: 12, - tabSelectorButtonEffectivePadding: 26, // (tabSelectorButtonHeight - tabSelectorButtonPadding) / 2 + tabSelectorButtonPadding lhnLogoWidth: 95.09, lhnLogoHeight: 22.33, signInLogoWidthLargeScreenPill: 162, From 3843923329025518b456bb10de5fe862b0ae3b96 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Thu, 20 Nov 2025 00:34:45 +0800 Subject: [PATCH 5/7] rerun test --- src/styles/variables.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/variables.ts b/src/styles/variables.ts index 13b34381a6c3..a4871ea07b4e 100644 --- a/src/styles/variables.ts +++ b/src/styles/variables.ts @@ -130,10 +130,10 @@ export default { inputHeight: getValueUsingPixelRatio(52, 72), inputPaddingTop: getValueUsingPixelRatio(15, 21), inputPaddingBottom: getValueUsingPixelRatio(8, 11), - paddingSmall: getValueUsingPixelRatio(7, 8), 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), From 3c419bf1dc007d8f26785378fa17b5a2f56c562e Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Mon, 24 Nov 2025 20:34:43 +0800 Subject: [PATCH 6/7] fix: gap --- src/pages/home/report/ReportActionsList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} From 77ca8ab7fd898859dacfd8553d7ba7ed91409e90 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 26 Nov 2025 23:21:23 +0800 Subject: [PATCH 7/7] fix: styles --- .../TransactionPreview/TransactionPreviewContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx index 9bece8d0b4eb..5059c7a3f853 100644 --- a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx +++ b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx @@ -382,7 +382,7 @@ function TransactionPreviewContent({ styles.textMicroSupportingPadding, styles.pre, styles.flexShrink1, - {color: theme.danger}, + styles.textDanger, ]} > {RBRMessage}