-
Notifications
You must be signed in to change notification settings - Fork 3.5k
🍒 Cherry pick PR #72106 to staging 🍒 #72124
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.
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
Conversation
(cherry picked from commit 4ecfbb4) (cherry-picked to staging by lakchote)
…Fix-console-errors-related-to-forwardRef-batch7 [CP Staging] Revert "Jakubkalinski0/fix console errors related to forward ref batch7" (cherry picked from commit d005353) (cherry-picked to staging by mountiny)
|
Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers! |
| ref, | ||
| ...rest | ||
| }: AmountFormProps) { | ||
| function AmountWithoutCurrencyInput( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The conflict was here because in main, the component had 2 more props
|
🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.27-4 🚀
|
…354377550-1 🍒 Cherry pick PR #72124 to staging 🍒
|
🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.27-5 🚀
|
🍒 Cherry pick #72106 to staging 🍒
This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
Then manually resolve conflicts, and commit the change with
git cherry-pick --continue. Lastly, please run:This last part is important. It will help us keep track of who triggered this CP, and will ensure that version bumps are tracked correctly. Once all that's done, push your changes with
git push origin cherry-pick-staging-72106-18353794631-1, and then open this PR for review.Note that you must test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.
Pro-tip: If this PR appears to have conflicts against the staging base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Clicking around the app works fine

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop