show blocking screen for work email which has 2FA enabled#64625
show blocking screen for work email which has 2FA enabled#64625blimpich merged 15 commits intoExpensify:mainfrom
Conversation
|
@eVoloshchak 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] |
| @@ -0,0 +1,48 @@ | |||
| import React from 'react'; | |||
There was a problem hiding this comment.
@blimpich since we now use the blocking screen on 2 different pages, I extracted the common code and made a component to keep the code DRY
src/CONST/index.ts
Outdated
| REGISTER_FOR_WEBINAR: 'registerForWebinar', | ||
| }, | ||
|
|
||
| ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE: '401 work account uses 2FA', |
| // Work email to display in the subtitle | ||
| workEmail: string | undefined; | ||
| isVsb: boolean | undefined; | ||
| }; |
There was a problem hiding this comment.
| }; | |
| }; | |
| workEmail: string | undefined; | ||
| isVsb: boolean | undefined; | ||
| }; | ||
| function OnboardingMergingAccountBlocked({workEmail, isVsb}: OnboardingMergingAccountBlockedProps) { |
There was a problem hiding this comment.
I think the name could be improved, something like OnboardingMergingAccountBlockedView or OnboardingMergingAccountBlockedBanner would be more descriptive, what do you think?
There was a problem hiding this comment.
nice catch, I will update this later today!
@allgandalf, is there a way for C+/QA to do this? |
you can use https://temp-mail.org/en/ to generate a temp email |
|
Fixed the merge conflict @eVoloshchak |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppScreen.Recording.2025-07-14.at.13.23.38.movAndroid: mWeb ChromeScreen.Recording.2025-07-14.at.13.27.11.moviOS: HybridAppScreen.Recording.2025-07-14.at.13.28.16.moviOS: mWeb SafariScreen.Recording.2025-07-14.at.13.29.12.movMacOS: Chrome / SafariScreen.Recording.2025-07-14.at.13.25.32.movMacOS: DesktopScreen.Recording.2025-07-14.at.13.30.50.mov |
|
@allgandalf, this doesn't look right,
|
|
@eVoloshchak issue should be fixed, can you retest please |
|
@eVoloshchak can you test again please, updated the expected result to show blocking screen for all of failure cases |
|
hmm, these look bad, I'll take a look at them today, thanks for reporting |
|
@eVoloshchak can you test again, the issues should be fixed now ! |
|
Jest failure is flaky , lets ignore it for now |
|
✋ 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/blimpich 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
$ #63704
PROPOSAL: N/A
Tests
Offline tests
QA Steps
Verify that The "couldn't add work email" error page appears and clicking Got it moves the user forward to the next step of the onboarding modal
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.Screen.Recording.2025-06-20.at.11.25.09.AM.mov
Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop