Fix descender character clipping in merchant rule rows by MelvinBot · Pull Request #84187 · Expensify/App

MelvinBot · 2026-03-04T21:05:46Z

Explanation of Change

The descriptionTextStyle in MerchantRulesSection.tsx overrides the description font size to 15px (via styles.fontSizeNormal) but doesn't provide a matching lineHeight. The MenuItem component internally applies a default lineHeight of 16px (textLineHeightNormal) for description text when a title is present. This creates a lineHeight-to-fontSize ratio of only 1.067 (16/15), which is too tight for letters with descenders (g, y, p, q, j). Combined with overflow: clip from React Native Web's numberOfLines={2} implementation, descender strokes on the last visible line get clipped.

This PR adds styles.lh20 (lineHeight: 20) to the descriptionTextStyle array. The value 20px is the fontSizeNormalHeight specifically designed for fontSizeNormal (15px), giving a proper ratio of 1.33 that comfortably accommodates descenders.

Fixed Issues

$ #84176

Tests

Go to a workspace's Settings > Rules
Enable Rules in "More features" if not already enabled
Click "Add merchant rule"
Create a merchant rule that changes merchant to "anything" when merchant is "google"
Verify the rule row text displays correctly — the letters 'g' in "google" and 'y' in "anything" should NOT be cut off
Verify that descender letters (g, y, p, q, j) are fully visible in both the description and title text

Verify that no errors appear in the JS console

Offline tests

This is a styling-only change. No network requests are involved — the merchant rule row renders from local state regardless of connectivity.

QA Steps

Go to a workspace's Settings > Rules
Enable Rules in "More features" if not already enabled
Click "Add merchant rule"
Create a merchant rule that changes merchant to "anything" when merchant is "google"
Verify the rule row description text (e.g., "If merchant contains 'google'") shows letters with descenders (g, y) fully visible, not clipped

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A — styling change only affects web (lineHeight with overflow:clip). Native platforms don't use -webkit-line-clamp.

Android: mWeb Chrome

Same fix applies — styles.lh20 sets proper lineHeight on all platforms.

iOS: Native

N/A — styling change only affects web (lineHeight with overflow:clip). Native platforms don't use -webkit-line-clamp.

iOS: mWeb Safari

Same fix applies — styles.lh20 sets proper lineHeight on all platforms.

MacOS: Chrome / Safari

Verified via automated browser testing — descender characters (g, y) in merchant rule row text are fully visible after adding styles.lh20.

…ping The descriptionTextStyle overrides fontSize to 15px but relies on the default lineHeight of 16px from MenuItem, creating a ratio too tight for descender characters (g, y, p, q, j). Adding lh20 (lineHeight: 20) provides the proper lineHeight for fontSizeNormal (15px). Co-authored-by: Carlos Martins <luacmartins@users.noreply.github.com>

src/pages/workspace/rules/MerchantRulesSection.tsx

Co-authored-by: Situ Chandra Shil <108292595+situchan@users.noreply.github.com>

luacmartins · 2026-03-04T21:51:11Z

Updated

melvin-bot · 2026-03-04T21:54:43Z

@thesahindia @luacmartins One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

situchan · 2026-03-04T21:57:05Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Before:

After:

Co-authored-by: Carlos Martins <luacmartins@users.noreply.github.com>

melvin-bot · 2026-03-04T22:09:36Z

@sobitneupane @luacmartins One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

MelvinBot · 2026-03-04T22:09:42Z

The failing checks (test (job 7) and test (job 8)) are not related to this PR's changes. Both jobs timed out during the Jest test step (ran for 17m with no test output — the runner was killed before completing). The same code passed all tests in a previous run (run 22689293244).

This PR only modifies src/pages/workspace/rules/MerchantRulesSection.tsx (a UI styling change), which wouldn't cause test timeouts.

I've pushed an empty commit to retrigger CI.

github-actions · 2026-03-04T23:03:34Z

🚧 @luacmartins has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-04T23:08:57Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84187.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8b45d79-34c44ab-559517d484b71b38021b706d5f651f2491e6b44f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8b45d79-34c44ab-03677b4667338034365195a66f5f3749c1886768/index.html

Web 🕸️
https://84187.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-04T23:12:06Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-03-06T04:16:49Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.32-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-03-06T22:46:01Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

MelvinBot assigned luacmartins Mar 4, 2026

MelvinBot requested a review from a team March 4, 2026 21:05

MelvinBot mentioned this pull request Mar 4, 2026

Rules - 'g' is cut off on the rule row #84176

Closed

7 tasks

situchan reviewed Mar 4, 2026

View reviewed changes

src/pages/workspace/rules/MerchantRulesSection.tsx Outdated Show resolved Hide resolved

Update src/pages/workspace/rules/MerchantRulesSection.tsx

7018559

Co-authored-by: Situ Chandra Shil <108292595+situchan@users.noreply.github.com>

luacmartins requested a review from situchan March 4, 2026 21:51

luacmartins marked this pull request as ready for review March 4, 2026 21:54

luacmartins requested a review from a team as a code owner March 4, 2026 21:54

melvin-bot bot requested review from luacmartins and thesahindia March 4, 2026 21:54

melvin-bot bot removed the request for review from a team March 4, 2026 21:54

luacmartins removed the request for review from thesahindia March 4, 2026 21:54

melvin-bot bot requested review from trjExpensify and removed request for a team March 4, 2026 21:58

JS00001 approved these changes Mar 4, 2026

View reviewed changes

luacmartins approved these changes Mar 4, 2026

View reviewed changes

situchan approved these changes Mar 4, 2026

View reviewed changes

melvin-bot bot requested a review from luacmartins March 4, 2026 21:59

luacmartins approved these changes Mar 4, 2026

View reviewed changes

Retrigger CI: test jobs 7 and 8 timed out (flaky)

5378f7c

Co-authored-by: Carlos Martins <luacmartins@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner March 4, 2026 22:09

melvin-bot bot requested review from luacmartins and sobitneupane March 4, 2026 22:09

melvin-bot bot removed the request for review from a team March 4, 2026 22:09

luacmartins merged commit 8b45d79 into main Mar 4, 2026
28 checks passed

luacmartins deleted the claude-fixMerchantRuleDescenderClipping branch March 4, 2026 23:03

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-06 #84352

Closed

92 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix descender character clipping in merchant rule rows#84187

Fix descender character clipping in merchant rule rows#84187
luacmartins merged 3 commits intomainfrom
claude-fixMerchantRuleDescenderClipping

MelvinBot commented Mar 4, 2026 •

edited by luacmartins

Loading

Uh oh!

Uh oh!

luacmartins commented Mar 4, 2026

Uh oh!

melvin-bot bot commented Mar 4, 2026

Uh oh!

situchan commented Mar 4, 2026 •

edited

Loading

Uh oh!

melvin-bot bot commented Mar 4, 2026

Uh oh!

MelvinBot commented Mar 4, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

MelvinBot commented Mar 4, 2026 • edited by luacmartins Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

luacmartins commented Mar 4, 2026

Uh oh!

melvin-bot bot commented Mar 4, 2026

Uh oh!

situchan commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 4, 2026

Uh oh!

MelvinBot commented Mar 4, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MelvinBot commented Mar 4, 2026 •

edited by luacmartins

Loading

situchan commented Mar 4, 2026 •

edited

Loading