Repository navigation
Description
If you haven’t already, check out our contributing guidelines for onboarding. To join our Slack channel, fill out this form.
Version Number: Not specified in the follow-up report.
Reproducible in staging?: Needs confirmation.
Reproducible in production?: Reported as affecting customers; not independently reproduced for this issue.
If this was caught during regression testing, add the test name, ID and link from BrowserStack: Not provided.
Email or phone of affected tester (no customers): Not provided.
Logs: No logs attached for this case.
Expensify/Expensify Issue URL: Not provided for this case.
Issue reported by: @neerajbachani and team.
Slack conversation (hyperlinked to channel name): Not provided for this case.
Action Performed:
Preconditions: The user owns a workspace on a free trial, has no payment card, and belongs to a domain that requires 2FA. The trial payment reminder is eligible to appear.
- Log in with that user before completing 2FA setup.
- Wait for the required 2FA screen to appear.
- Attempt to click Enable two-factor authentication while the Stay ahead of the deadline trial reminder appears.
Expected Result:
The trial payment reminder is deferred while the required 2FA screen is open. Clicking Enable opens 2FA setup.
Actual Result:
The reminder opens over the required 2FA screen and intercepts the click. Enable appears unresponsive, blocking setup and access to the account.
Workaround:
No workaround confirmed for this specific case in the source report.
Additional Context:
Split from problem 1 in the follow-up report on #91985. The original onboarding fix was handled in #94486; this follow-up concerns the trial reminder.
The report identifies the modal visibility check in TrialPaymentReminderModalManager.tsx: it checks for another modal, but the required 2FA screen is a full-screen view. Suggested fix: suppress the reminder while required 2FA is active.
Regression coverage should confirm that Enable remains usable for an eligible trial owner and that the reminder can still appear after required 2FA is completed.
Platforms:
The follow-up report does not specify the exact reproduced platforms.
- Android: App
- Android: mWeb Chrome
- iOS: App
- iOS: mWeb Safari
- iOS: mWeb Chrome
- Windows: Chrome
- MacOS: Chrome / Safari
Screenshots/Videos
None attached to this case in the source report.
Upwork Automation - Do Not Edit
- Upwork Job URL: https://www.upwork.com/jobs/~022104998079870830599
- Upwork Job ID: 2104998079870830599
- Last Price Increase: 2026-09-29
Activity
neerajbachani commentedon Sep 29, 2026
Hello!!
MelvinBot commentedon Sep 29, 2026
Proposal
Please re-state the problem that we are trying to solve in this issue.
The trial payment reminder opens on top of the required 2FA screen and blocks the Enable button.
What is the root cause of that problem?
The reminder only waits for other modals, and the required 2FA screen doesn't count as one.
TrialPaymentReminderModalManager.tsx:21-25opens the reminder whenisOtherModalActiveis false. That flag checks onlyONYXKEYS.MODALand whether a modal navigator is the top route.RequireTwoFactorAuthenticationOverlay.tsx:122-125, is a plain full-screenView. It is mounted outside the navigator atAuthScreens.tsx:403. It sets neither signal.useTrialPaymentReminder.ts:225-257has no 2FA check either.The reminder therefore opens as a
BaseModalabove the overlay and takes the click meant for Enable.What changes do you think we should make in order to solve the problem?
In
TrialPaymentReminderModalManager, defer the reminder while required 2FA is active. Use the same gate asProductMarketingWindowManager.tsx:87-106:useShouldShowRequire2FAPage(), plusisIn2FASetupFlowfromuseRootNavigationStatewithisTwoFactorSetupScreen.isOtherModalActiveso the reminder never opens while they are true.dismiss(). This way the reminder can show again after setup.Add a unit test with these cases:
needsTwoFactorAuthSetupis true.What alternative solutions did you explore? (Optional)
Add the 2FA check to
isEligibleToShowinuseTrialPaymentReminder. I don't recommend this. Eligibility is about trial and billing state, and the manager already owns the "wait for something else on screen" logic.Confidence and related issues
ProductMarketingWindowManageralready suppresses itself this way, so the pattern is proven.Next Steps for Contributor+ team:
To accept:
@MelvinBot implement [this](https://github.com/Expensify/App/issues/102576)to create a draft PR.To refine:
@MelvinBot <your feedback>To reject: Explain why you are rejecting Melvin's proposal.
view run
melvin-bot commentedon Sep 29, 2026
Triggered auto assignment to Contributor-plus team member for initial proposal review - @Krishna2323 (
External)[-]2FA - Trial payment reminder blocks Enable on the required setup screen[/-][+][$175] 2FA - Trial payment reminder blocks Enable on the required setup screen[/+]melvin-bot commentedon Sep 29, 2026
Job added to Upwork: https://www.upwork.com/jobs/~022104998079870830599
bonnhatnguyen commentedon Sep 29, 2026
Proposal
Please re-state the problem that we are trying to solve in this issue.
When a user on a free trial with no payment card belongs to a domain requiring 2FA, the "Stay ahead of the deadline" trial payment reminder modal displays directly on top of the full-screen required 2FA overlay, intercepting clicks and preventing the user from clicking "Enable two-factor authentication".
What is the root cause of that problem?
RequireTwoFactorAuthenticationOverlay.tsxis rendered outside the RootStack navigator as a full-screen view directly insideAuthScreens.tsx:403. It does not setONYXKEYS.MODAL, nor is it a modal navigator route.TrialPaymentReminderModalManager.tsx:21-25:isOtherModalActiveonly checks for active modal navigators ormodal.isVisible. Because the required 2FA overlay is a full-screen component rather than a modal navigator route,isOtherModalActiveevaluates tofalse.TrialPaymentReminderModalopens on top of the 2FA required overlay, stealing focus and blocking user interaction with the "Enable" button.What changes do you think we should make in order to solve the problem?
In
src/components/TrialPaymentReminderModalManager.tsx:Follow the established pattern already implemented in
ProductMarketingWindowManager.tsx:87-106:shouldShowRequire2FAPageandisIn2FASetupFlowin the condition:shouldShowRequire2FAPage || isIn2FASetupFlowbecomes active while the trial reminder is open, close the modal without callingdismiss(), allowing the reminder to appear normally once the user completes the mandatory 2FA setup.What alternative solutions did you explore? (Optional)
Adding 2FA checks directly into
useTrialPaymentReminder. However,useTrialPaymentRemindermanages billing eligibility and countdown timers, whereasTrialPaymentReminderModalManageris specifically responsible for view presentation coordination and avoiding modal collisions.franklincg commentedon Sep 29, 2026
Proposal
Root cause
The trial payment reminder only defers when another modal or navigation modal is active. The required 2FA screen is a full-screen overlay rendered outside the navigator, so it does not trip that check. The reminder can therefore mount above the 2FA overlay and intercept the click on Enable two-factor authentication.
Fix
In
TrialPaymentReminderModalManager, include the required-2FA state in the same blocking decision used for other active surfaces, and also suppress the reminder while the current route is part of the 2FA setup flow.If the reminder is already open when required 2FA becomes active, hide it without permanently dismissing it so it can appear again after setup complete
melvin-bot commentedon Sep 29, 2026
📣 @neerajbachani You have been assigned to this job!
Please apply to the Upwork job and leave a comment on the Github issue letting us know when we can expect a PR to be ready for review 🧑💻
Once you apply to this job, your Upwork ID will be stored and you will be automatically hired for future jobs!
Keep in mind: Code of Conduct | Contributing 📖
16 remaining items
melvin-bot commentedon Oct 12, 2026
@thelullabyy Whoops! This issue is 2 days overdue. Let's get this updated quick!
melvin-bot commentedon Oct 13, 2026
Triggered auto assignment to @mallenexpensify (
Awaiting Payment)melvin-bot commentedon Oct 15, 2026
Payment Summary
Resolving PRs:
Upwork Job
BugZero Checklist (@mallenexpensify)
melvin-bot commentedon Oct 16, 2026
@mallenexpensify Uh oh! This issue is overdue by 2 days. Don't forget to update your issues!
mallenexpensify commentedon Oct 18, 2026
Payment Summary
Contributor: @neerajbachani paid $250 via Upwork
Contributor+: @thelullabyy due $250 via NewDot
@neerajbachani can you please accept the job below? Please reply here and tag me once you have.
https://www.upwork.com/jobs/~022104998079870830599
@thelullabyy plz complete the Contributor+ checklist and tag me in a post once you have. Thx
neerajbachani commentedon Oct 18, 2026
@mallenexpensify I've accepted the job offer, thanks!
thelullabyy commentedon Oct 18, 2026
Contributor+ Checklist:
[Contributor] The offending PR and associated issue have been commented on, pointing out the bug it caused and why, so the author and reviewers can learn from the mistake.
Link to the comment on the PR: NA
Link to the comment on the Issue:
[Contributor] If the regression was CRITICAL (e.g. interrupts a core flow) A discussion in #expensify-open-source has been started about whether any other steps should be taken (e.g. updating the PR review checklist) in order to catch this type of bug sooner.
Link to discussion:
[Contributor] If it was decided to create a regression test for the bug, please propose the regression test steps using the template below to ensure the same bug will not reach production again.
Regression Test Proposal
Precondition:
Test:
Do we agree 👍 or 👎
thelullabyy commentedon Oct 18, 2026
Checklist posted. Thanks @mallenexpensify
mallenexpensify commentedon Oct 18, 2026
@neerajbachani paid, summary updated above. Thx.
^ Test case created. Thx