-
Notifications
You must be signed in to change notification settings - Fork 3.5k
fix: Merge - Inconsistent merge flow for same phone number #76226
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
base: main
Are you sure you want to change the base?
Conversation
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
@dukenv0307 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] |
|
@paulnjs Let's update |
|
@dukenv0307 I updated. Please help to check. Thanks |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppScreen.Recording.2025-11-28.at.16.56.28.movAndroid: mWeb ChromeScreen.Recording.2025-11-28.at.16.55.01.moviOS: HybridAppScreen.Recording.2025-11-28.at.16.57.32.moviOS: mWeb SafariScreen.Recording.2025-11-28.at.16.36.06.movMacOS: Chrome / SafariScreen.Recording.2025-11-28.at.16.33.31.mov |
|
@dukenv0307 I updated |
|
@paulnjs Can you please merge main? |
Explanation of Change
Fixed Issues
$#75293
PROPOSAL:#75293 (comment)
Tests
Offline tests
QA Steps
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
Android: Native
android.mov
Android: mWeb Chrome
android_chorme.mov
iOS: Native
Screen.Recording.2025-11-27.at.18.14.23.mov
iOS: mWeb Safari
ios_sfr.mov
MacOS: Chrome / Safari
chorme.mov