Delete restore-old-line-height-algorithm React Native patch v2 #67176

war-in · 2025-07-25T14:37:22Z

Explanation of Change

We introduced this patch during the migration to React Native 0.79 to fix this issue.
The issue occurred because React Native 0.79 changed the line height algorithm, so we decided to restore the old algorithm (the one from RN 0.77) to fix the issue asap.

It turns out that the bug is on our side and after removing the patch and height style prop from affected components (e.g. AmountForm) the issue is not reproducible.

Fixed Issues

$ #65284
$ #67144 - previous deploy blocker
PROPOSAL:

Tests

Open the Expensify app
Tap on the FAB
Tap on "Create Expense"
Enter any amount
Note that amount and currency are displayed on the same line
Change font size
Rerun steps 2-6

Offline tests

QA Steps

Open the Expensify app
Tap on the FAB
Tap on "Create Expense"
Enter any amount
Note that amount and currency are displayed on the same line
Change font size
Rerun steps 2-6

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.Jul.28.2025.from.Marcin.Warchol.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-07-25T14:37:26Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

github-actions · 2025-07-25T14:37:32Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

github-actions · 2025-07-25T14:40:32Z

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

melvin-bot · 2025-07-28T09:18:40Z

@shubham1206agra Please 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]

github-actions · 2025-07-28T10:35:49Z

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

github-actions · 2025-07-28T10:54:30Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67176/NewExpensify.dmg	https://67176.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mountiny · 2025-07-28T10:58:16Z

Asked QA for a retest of the blocker

war-in · 2025-07-28T10:58:22Z

I think I need to merge main, will do that soon

war-in · 2025-07-28T11:37:27Z

@mountiny could you retrigger the build? 🙏

mountiny · 2025-07-28T12:03:24Z

@shubham1206agra the previous blocker is not reproducible

github-actions · 2025-07-28T12:03:42Z

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

github-actions · 2025-07-28T12:46:31Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/67176/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67176/NewExpensify.dmg	https://67176.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

shubham1206agra · 2025-07-28T14:46:09Z

@war-in Currency looks misaligned here. Also, currency box is smaller than prod.

github-actions · 2025-07-31T14:34:08Z

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

github-actions · 2025-07-31T15:16:56Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/67176/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/67176/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67176/NewExpensify.dmg	https://67176.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

war-in · 2025-07-31T15:43:57Z

@shubham1206agra The issue is fixed! But, it seems like the latest adhoc didn't refresh or upload properly? 🤔
I can still reproduce the issue you reported on the adhoc build, but it works fine locally

Screen.Recording.Jul.31.2025.from.Marcin.Warchol.mp4

Any ideas what's going on here? cc @mountiny
We encountered this issue earlier today on some web adhoc build

mountiny · 2025-08-04T12:51:43Z

that should should happen only on web with cdn cache

war-in · 2025-08-04T12:59:04Z

Hmm, so I'm not sure why the bug is still there 🤔
I merged main, can I get an adhoc build here? 🙏

cc @mountiny

github-actions · 2025-08-04T13:01:14Z

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

shubham1206agra · 2025-08-04T13:13:42Z

I will review this PR today

github-actions · 2025-08-04T13:25:45Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/67176/index.html
The QR code can't be generated, because the Android build failed

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67176/NewExpensify.dmg	https://67176.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

github-actions · 2025-08-04T13:26:31Z

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

github-actions · 2025-08-04T14:14:19Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/67176/index.html	⏩ SKIPPED ⏩
	The build for iOS was skipped

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67176/NewExpensify.dmg	https://67176.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

war-in · 2025-08-04T14:22:54Z

Ok, the latest build went well and the issue is fixed 🎉

mountiny · 2025-08-04T16:29:43Z

@shubham1206agra All yours please

shubham1206agra · 2025-08-04T18:08:13Z

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
xIf 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

MacOS: Desktop

mountiny

Thank you

OSBotify · 2025-08-04T20:00:40Z

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

github-actions · 2025-08-06T20:16:01Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.90-0 🚀

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

github-actions · 2025-08-08T02:08:16Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.90-11 🚀

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

war-in added 2 commits July 25, 2025 16:34

remove patch

8925ba9

adjust styles

8b914c0

This comment has been minimized.

Sign in to view

war-in marked this pull request as ready for review July 28, 2025 09:18

war-in requested review from a team as code owners July 28, 2025 09:18

melvin-bot bot requested review from shubham1206agra and removed request for a team July 28, 2025 09:18

mountiny assigned war-in Jul 28, 2025

Merge branch 'refs/heads/main' into war-in/remove-line-height-patch-v2

2ec98ec

izarutskaya mentioned this pull request Jul 28, 2025

[Due for payment 2025-08-15] Android-Expense-Amount and currency are not on the same line when device font size is minimum #67144

Closed

8 tasks

war-in mentioned this pull request Jul 29, 2025

[Due for payment 2025-08-22] [$1000] Update patches after the react native update #65284

Closed

war-in added 2 commits July 31, 2025 14:32

Merge branch 'refs/heads/main' into war-in/remove-line-height-patch-v2

f9da8da

move undefined height to correct places

50d0e5b

Merge branch 'refs/heads/main' into war-in/remove-line-height-patch-v2

1012209

shubham1206agra approved these changes Aug 4, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny August 4, 2025 18:08

mountiny changed the title ~~"Delete restore-old-line-height-algorithm React Native patch" v2~~ Delete restore-old-line-height-algorithm React Native patch v2 Aug 4, 2025

mountiny approved these changes Aug 4, 2025

View reviewed changes

mountiny merged commit 7ba5fc8 into Expensify:main Aug 4, 2025
28 checks passed

github-actions bot mentioned this pull request Aug 6, 2025

Deploy Checklist: New Expensify 2025-08-06 #68050

Closed

Delete restore-old-line-height-algorithm React Native patch v2 #67176

Delete restore-old-line-height-algorithm React Native patch v2 #67176

Uh oh!

Conversation

war-in commented Jul 25, 2025 • edited 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!

melvin-bot bot commented Jul 25, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

This comment has been minimized.

melvin-bot bot commented Jul 28, 2025

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

mountiny commented Jul 28, 2025

Uh oh!

war-in commented Jul 28, 2025

Uh oh!

war-in commented Jul 28, 2025

Uh oh!

mountiny commented Jul 28, 2025

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

shubham1206agra commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

war-in commented Jul 31, 2025

Uh oh!

mountiny commented Aug 4, 2025

Uh oh!

war-in commented Aug 4, 2025

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

shubham1206agra commented Aug 4, 2025

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

war-in commented Aug 4, 2025

Uh oh!

mountiny commented Aug 4, 2025

Uh oh!

shubham1206agra commented Aug 4, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Aug 4, 2025

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 8, 2025

Uh oh!

war-in commented Jul 25, 2025 •

edited

Loading

shubham1206agra commented Jul 28, 2025 •

edited

Loading