Fix: Invoiced Billing Account can be merged into another account#65834
Fix: Invoiced Billing Account can be merged into another account#65834arosiclair merged 5 commits intoExpensify:mainfrom
Conversation
| beforeEmail: 'No puedes fusionar ', | ||
| afterEmail: ' en otras cuentas porque es el propietario de facturación de una cuenta facturada. Por favor, fusiona otras cuentas en esta en su lugar.', | ||
| beforeEmail: 'No puedes fusionar cuentas en ', | ||
| afterEmail: ' porque esta cuenta tiene una relación de facturación con factura emitida.', |
There was a problem hiding this comment.
asked for spanish translations here:
https://expensify.slack.com/archives/C01GTK53T8Q/p1752142112966169
There was a problem hiding this comment.
How did you generate translations for each of these files?
|
bump for review @c3024 |
|
If we navigate via deeplink to the link https://dev.new.expensify.com:8082/settings/security/merge-accounts it directs the user to the Screen.Recording.2025-07-14.at.10.23.36.AM.mov |
|
@c3024 fixed |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromemergeAndroidmWeb.moviOS: HybridAppmergeiOS.moviOS: mWeb SafarimergeiOSmWeb.movMacOS: Chrome / SafarimergeChrome.movMacOS: DesktopmergeDesktop.mov |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.81-0 🚀
|
|
🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.81-7 🚀
|
Explanation of Change
Fixed Issues
$ #64666
PROPOSAL: #64666 (comment)
Tests
Offline tests
QA Steps
Pre-requisite: Invoiced billing account is needed
Verify that blocking RHP is displayed with text:
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))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
Screen.Recording.2025-07-13.at.4.49.01.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-07-13.at.3.59.23.PM.mov
iOS: Native
Screen.Recording.2025-07-13.at.4.00.29.PM.mov
iOS: mWeb Safari
Screen.Recording.2025-07-13.at.4.01.27.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-07-13.at.3.47.14.PM.mov
MacOS: Desktop
Screen.Recording.2025-07-13.at.3.51.34.PM.mov