Skip to content

Expense-Scan and Manual Options Partially Hidden at Maximum Font Size #76976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 3 commits into from
Dec 18, 2025
Merged

Expense-Scan and Manual Options Partially Hidden at Maximum Font Size #76976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f636e7
fix: revert the revert of 74676
thelullabyy Dec 8, 2025
d375fc9
fix: useMemo dep
thelullabyy Dec 8, 2025
4283f3f
fix: merge main
thelullabyy Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
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';
Expand Down Expand Up @@ -151,7 +152,7 @@
'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}),
Expand All @@ -177,7 +178,7 @@
},
}),
}),
[

Check warning on line 181 in src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx

View workflow job for this annotation

GitHub Actions / ESLint check 

React Hook useMemo has an unnecessary dependency: 'styles.lh16'. Either exclude it or remove the dependency array

Check warning on line 181 in src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

React Hook useMemo has an unnecessary dependency: 'styles.lh16'. Either exclude it or remove the dependency array
styles.taskTitleMenuItem,
styles.formError,
styles.mb0,
Expand All @@ -194,6 +195,7 @@
styles.taskTitleMenuItemItalic,
styles.em,
styles.h1,
styles.lh16,
styles.blockquote,
styles.onlyEmojisTextLineHeight,
styles.subTextFileUpload,
Expand Down
2 changes: 1 addition & 1 deletion ...omponents/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ function MoneyRequestReportPreviewContent({
<Text style={[styles.reportStatusText, {color: reportStatusColorStyle?.textColor}]}>{reportStatus}</Text>
</View>
)}
{!shouldShowAccessPlaceHolder && <Text style={[styles.textLabelSupporting, styles.lh16]}>{expenseCount}</Text>}
{!shouldShowAccessPlaceHolder && <Text style={[styles.textLabelSupporting]}>{expenseCount}</Text>}
</View>
)
)}
Expand Down
10 changes: 9 additions & 1 deletion src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,15 @@ function TransactionPreviewContent({
/>
<Text
numberOfLines={1}
style={[isDeleted && styles.lineThrough, styles.textMicroSupporting, styles.pre, styles.flexShrink1, {color: theme.danger}]}
style={[
isDeleted && styles.lineThrough,
styles.textMicroSupporting,
styles.lhUndefined,
styles.textMicroSupportingPadding,
styles.pre,
styles.flexShrink1,
styles.textDanger,
]}
>
{RBRMessage}
</Text>
Expand Down
12 changes: 10 additions & 2 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ const staticStyles = (theme: ThemeColors) =>
alignItems: 'center',
justifyContent: 'center',
borderRadius: variables.componentBorderRadiusSmall,
height: 16,
minHeight: 16,
},

reportStatusText: {
Expand Down Expand Up @@ -1452,6 +1452,10 @@ const staticStyles = (theme: ThemeColors) =>
color: theme.textSupporting,
},

lhUndefined: {
lineHeight: undefined,
},

Comment on lines +1456 to +1458

@grgia grgia Dec 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thelullabyy I remember from the past that this does not work in react native the same on android and IOS, can you confirm?

@thelullabyy thelullabyy Dec 11, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested again, it works fine on react native @grgia

Please see the RBR Message only
Without lhUndefined
image

With lhUndefined
image

lh14: {
lineHeight: variables.lineHeightSmall,
},
Expand Down Expand Up @@ -4111,8 +4115,12 @@ const staticStyles = (theme: ThemeColors) =>
height: 450,
},

textMicroSupportingPadding: {
padding: variables.paddingSmall,
},

tabSelectorButton: {
height: variables.tabSelectorButtonHeight,
minHeight: variables.tabSelectorButtonHeight,
padding: variables.tabSelectorButtonPadding,
flexDirection: 'row',
alignItems: 'center',
Expand Down
2 changes: 2 additions & 0 deletions src/styles/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -134,6 +135,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),
Expand Down
Loading