Skip to content

Stop the onboarding back button message from blocking Add work email - #103780

Merged
amyevans merged 5 commits into
mainfrom
claude-onboardingBackButtonMessageBlocksAddWorkEmail
Oct 14, 2026
Merged

amyevans merged 5 commits into
mainfrom
claude-onboardingBackButtonMessageBlocksAddWorkEmail

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

During onboarding, pressing back (the browser back button on web, the device back button on Android) or opening an Expensify link shows "Please finish the setup questions to start using the app".

On the work email screen, that message was also added to the email field as an error. The user saw it twice, under the field and above Skip, along with "Please fix the errors in the form before continuing." The form doesn't submit while a field has an error, so "Add work email" did nothing until the user changed the email. Pressing back while the email was being sent also stopped the loading spinner early.

With this change, the work email screen no longer treats that message as an email error:

  • It shows once, above Skip, and the field isn't marked red.
  • "Add work email" works without changing the email.
  • Pressing "Add work email" clears the message, so an invalid email shows only its own error.
  • Pressing back while the email is being sent leaves the spinner running.

Errors about the email itself, such as an account with two-factor authentication or single sign-on, still show on the field and still block "Add work email" until the email changes.

Fixed Issues

$ #101576
$ #102916
PROPOSAL: #101576 (comment)

Tests

Test 1: Back, then the same work email

  1. Sign up with a new gmail address (tap "Continue", then "Join").
  2. On "What’s your work email?", enter an email on a made-up domain.
  3. Press back.
  4. Verify only "Please finish the setup questions to start using the app" appears, once, above "Skip", and the email field isn't red.
  5. Tap "Add work email" without changing the email.
  6. Verify "See if your team's in Expensify" appears.

Test 2: Back, then an invalid email

  1. Sign up with a new gmail address.
  2. On "What’s your work email?", enter not-an-email.
  3. Press back.
  4. Tap "Add work email".
  5. Verify only "Please enter a valid work email from a private domain e.g. mitch@company.com" appears.

Test 3: "Back" on the next screen

  1. Tap "Back" at the top of the screen.
  2. Verify "What’s your work email?" shows the same email.
  3. Tap "Add work email".
  4. Verify "Please enter a different email than the one you signed up with" doesn't appear, and "See if your team's in Expensify" appears.
  • Verify that no errors appear in the JS console

Offline tests

  1. Sign up with a new gmail address and enter a work email on "What’s your work email?".
  2. Go offline, then press back.
  3. Verify "Please finish the setup questions to start using the app" appears once.
  4. Tap "Add work email".
  5. Verify only "We couldn’t add your work email as you appear to be offline" appears.

QA Steps

Same as Tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

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

The back button message no longer goes into the work email form's errors, so it shows once and no longer blocks the submit. Pressing Add work email clears it, so a failed validation shows only the field error.

Co-authored-by: TaduJR <TaduJR@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team October 12, 2026 14:36
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 12, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-onboardingBackButtonMessageBlocksAddWorkEmail
git checkout -b claude-onboardingBackButtonMessageBlocksAddWorkEmail upstream/claude-onboardingBackButtonMessageBlocksAddWorkEmail
git push -u origin claude-onboardingBackButtonMessageBlocksAddWorkEmail

Then you can close this PR and open a new one from your fork.

@MelvinBot

MelvinBot commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ❌ fail

I couldn't run these steps on Android. The test environment finished onboarding before the test started, so the one-time "What's your work email?" screen was already skipped. This is a test environment limit, not a defect in this PR. The PR's Tests section is still a TODO, so I used the steps from the linked issues and the PR description.

Home screen showing onboarding already complete, work email screen unreachable

Step Status
The "What's your work email?" screen is shown.The session started on Home with onboarding already complete. The setup flow had pressed Skip on the work email screen before the test began, and no in-app route reopens it.
Home screen showing onboarding already complete, work email screen unreachable
❌
After typing a private-domain email and pressing Android back once, the screen stays open and the back button message shows once.Not run: the work email screen was unreachable.
❌
Tapping "Add work email" without editing moves forward.Not run: the work email screen was unreachable.
❌
Going back from the next screen shows no "Please enter a different email than the one you signed up with" error.Not run: the work email screen was unreachable.
❌
After Android back, an invalid email shows only the field error.Not run: the work email screen was unreachable.
❌

To test this flow, the run needs a session that stops at the work email screen instead of skipping it.


view run · view recording

@MelvinBot

MelvinBot commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

The work email screen loads, "Add work email" moves forward with a private-domain email, and going back shows no "different email" error. I couldn't run the two browser back steps, which are the core of this fix, because the web test tool can't press the browser back button. These two need a manual check.

Work email screen after going back, no different-email error

Step Status
The "What's your work email?" screen is shown.The screen showed the "What's your work email?" heading, the Work email field, and the Skip and "Add work email" buttons.
Work email onboarding screen
✅
After typing a private-domain email and pressing browser back once, the screen stays open and the back button message shows once.Not run. The test tool can't trigger a browser back on web: its back command, a keyboard shortcut, and running history.back() were all unavailable. I did not substitute the in-app Back button.
❌
Clicking "Add work email" without editing the email moves forward.With melvintester38264145309@test.com in the field, the click went straight to the "See if your team's in Expensify" code screen. This ran without the browser back message showing first, so it confirms normal submit only.
Verify screen reached after clicking Add work email
✅
Going back from the next screen shows no "Please enter a different email than the one you signed up with" error.I used the in-app Back button. The work email screen kept the entered email and showed no "different email" error.
Work email screen after going back, no different-email error
✅
After browser back, an invalid email shows only the field error.Not run. This step starts with a browser back press, which the test tool can't do on web.
❌

view run · view recording

@TaduJR

TaduJR commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot

Please merge main

…orkEmail

Co-authored-by: TaduJR <TaduJR@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I merged main into this branch and pushed it as dcfcc39. The branch was 408 commits behind, and there were no conflicts.

None of this PR's 3 files changed on main. The work email flow also calls Session/index.ts, which did change, but that change only affects short-lived token sign-in. I couldn't run the Jest tests here, so CI will be the first test run on the merged branch.


view run

@TaduJR

TaduJR commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-13T03:05:45.171765Z dcfcc39 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

The failing typecheck check is unrelated to this PR. main currently has the same error, so I didn't push a change here.

Analysis: Thread report drafts explicitly through the split-transaction update flow merged into main on 2026-10-12. It made reportDrafts a required field of UpdateSplitTransactionsParams. Three updateSplitTransactionsFromSplitExpensesFlow calls in tests/actions/IOUTest/SplitTest.ts don't pass it. The latest main merge into this branch brought that error in.

Evidence:

  • This PR changes only BaseOnboardingWorkEmail.tsx, tests/ui/WorkEmailOnboarding.tsx, and tests/ui/WorkEmailOnboardingNativeBack.tsx.
  • The errors are TS2741: Property 'reportDrafts' is missing at tests/actions/IOUTest/SplitTest.ts lines 3323, 3420, and 3529.
  • That test file is identical on this branch and on main (00b8f69).

Next step: Once a fix for that test lands on main, merge main into this branch again and the check should pass. Check independent approval is a review-gate check, not a code failure.


view run

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dcfcc39e12

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment on lines +143 to 145
if (!workEmailErrorTranslationKey) {
clearWorkEmailFormErrors();
return;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve blocking email errors when back is pressed

When AddWorkEmail has produced a blocking 2FA, SSO, or closed-account error and the user then triggers the protected device/browser back action, the global key changes from that error to errorBackButton. This makes workEmailErrorTranslationKey become undefined, so this branch clears the existing form error; the back message is non-blocking, and the same rejected email can immediately be submitted again without being edited. Previously the back action replaced the form error with another blocking error, so this newly permits retries and discards the actionable response; the back-message path should preserve any existing work-email error instead of clearing it.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resend is intended, and it doesn't lose anything that main keeps.

On main, the back press already replaces the 2FA, SSO or closed-account message, because they share one Onyx key, so the reason is gone from the screen there too. The block after it only lasts until an edit: typing a character and deleting it resends the same email.

With this PR, one press after back resends the email, the backend rejects it with the same error, and the field blocks again. That costs one extra request, and the user sees the reason again without editing.

Keeping the old error through a back press needs a separate key for the back message, which is a follow-up.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Nothing has changed since my last comment. The typecheck failure still comes from main, so I didn't push a change to this PR.

Next step: The fix belongs on main. Once it lands there, merge main into this branch or re-run typecheck.


view run

@TaduJR

TaduJR commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot

Please replace the PR description with the below one

Description

Explanation of Change

During onboarding, pressing back (the browser back button on web, the device back button on Android) or opening an Expensify link shows "Please finish the setup questions to start using the app".

On the work email screen, that message was also added to the email field as an error. The user saw it twice, under the field and above Skip, along with "Please fix the errors in the form before continuing." The form doesn't submit while a field has an error, so "Add work email" did nothing until the user changed the email. Pressing back while the email was being sent also stopped the loading spinner early.

With this change, the work email screen no longer treats that message as an email error:

  • It shows once, above Skip, and the field isn't marked red.
  • "Add work email" works without changing the email.
  • Pressing "Add work email" clears the message, so an invalid email shows only its own error.
  • Pressing back while the email is being sent leaves the spinner running.

Errors about the email itself, such as an account with two-factor authentication or single sign-on, still show on the field and still block "Add work email" until the email changes.

Fixed Issues

$ #101576
$ #102916
PROPOSAL: #101576 (comment)

Tests

Test 1: Back, then the same work email

  1. Sign up with a new gmail address (tap "Continue", then "Join").
  2. On "What’s your work email?", enter an email on a made-up domain.
  3. Press back.
  4. Verify only "Please finish the setup questions to start using the app" appears, once, above "Skip", and the email field isn't red.
  5. Tap "Add work email" without changing the email.
  6. Verify "See if your team's in Expensify" appears.

Test 2: Back, then an invalid email

  1. Sign up with a new gmail address.
  2. On "What’s your work email?", enter not-an-email.
  3. Press back.
  4. Tap "Add work email".
  5. Verify only "Please enter a valid work email from a private domain e.g. mitch@company.com" appears.

Test 3: "Back" on the next screen

  1. Tap "Back" at the top of the screen.
  2. Verify "What’s your work email?" shows the same email.
  3. Tap "Add work email".
  4. Verify "Please enter a different email than the one you signed up with" doesn't appear, and "See if your team's in Expensify" appears.
  • Verify that no errors appear in the JS console

Offline tests

  1. Sign up with a new gmail address and enter a work email on "What’s your work email?".
  2. Go offline, then press back.
  3. Verify "Please finish the setup questions to start using the app" appears once.
  4. Tap "Add work email".
  5. Verify only "We couldn’t add your work email as you appear to be offline" appears.

QA Steps

Same as Tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

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

@TaduJR

TaduJR commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Screen.Recording.2026-10-13.at.3.27.03.PM.mov
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
iOS-mWeb.mp4
MacOS: Chrome / Safari
Mac-Chrome.mp4

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 I replaced the PR description with the text inside your "Description" block. I didn't change any wording, quote characters, or checkboxes.


view run

@TaduJR

TaduJR commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot

Please mark the PR as ready for review

@MelvinBot
MelvinBot marked this pull request as ready for review October 13, 2026 03:01
@MelvinBot
MelvinBot requested a review from a team as a code owner October 13, 2026 03:01
@melvin-bot
melvin-bot Bot requested a review from TaduJR October 13, 2026 03:01
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I marked this PR as ready for review.

The Tests and QA Steps sections are still TODO. Please fill them in before review.


view run

@melvin-bot
melvin-bot Bot requested review from flaviadefaria and removed request for a team October 13, 2026 03:01
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

@TaduJR 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team October 13, 2026 03:01
@TaduJR

TaduJR commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot

Please merge main

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Merged main into this branch in 45dc1ae. It brought in 38 commits with no conflicts, and none of them touch this PR's files.

One change from main is related: OnboardingGuard now also shows the back button message when you press browser back. This PR already stops that message from blocking "Add work email". I couldn't run the tests locally, so CI will confirm.


view run

@TaduJR TaduJR left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

amyevans
amyevans previously approved these changes Oct 14, 2026

@amyevans amyevans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, there are conflicts to fix though please @TaduJR

@TaduJR

TaduJR commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot

Please resolve conflicts.

…ButtonMessageBlocksAddWorkEmail

Co-authored-by: TaduJR <TaduJR@users.noreply.github.com>

# Conflicts:
#	src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
#	tests/ui/WorkEmailOnboarding.tsx
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I fixed the merge conflicts by merging main into this branch. The merge is commit 73fc399.

Both conflicts came from separate additions, so I kept both sides:

  • BaseOnboardingWorkEmail.tsx: I kept this PR's clearBackButtonMessage, which onBeforeSubmit still uses. I also kept main's new merge-blocked confirm handlers.
  • tests/ui/WorkEmailOnboarding.tsx: I kept both import lists, the SIDE_EFFECT_REQUEST_COMMANDS import from this PR and the SessionActions / TaskActions imports from main.

All 56 tests in WorkEmailOnboarding and WorkEmailOnboardingNativeBack pass, and typecheck and lint are clean.

@amyevans

Copy link
Copy Markdown
Contributor

ESLint check failed

@MelvinBot

Copy link
Copy Markdown
Contributor Author

The failing ESLint check is unrelated to this PR, so I didn't push a change. The same two errors come from main, and they also fail unrelated PRs opened today.

Errors:

Next step: Merge main again and re-run the checks after a fix lands on main. Every other check on this PR passed.

Evidence
  • This PR only changes BaseOnboardingWorkEmail.tsx, tests/ui/WorkEmailOnboarding.tsx, and tests/ui/WorkEmailOnboardingNativeBack.tsx. Neither flagged file is in the diff.
  • The failing ESLint runs for the insights/average-baseline and claude-removeUnreportedExpenseFromCarousel branches report the same two errors at the same lines.
  • [NoQA] Fix import/no-cycle - part 16 merged at 14:53 UTC today. It edited swapBackgroundTabForRHPTarget.ts and getMatchingFullScreenRoute.ts, so it likely caused the first error. I haven't confirmed this.
  • The PR picked up these errors in today's merge of main (commit 73fc399b).

view run

@MelvinBot

Copy link
Copy Markdown
Contributor Author

The ESLint check still fails for the same reason: a lint error on main, not in this PR. I didn't push a change.

[No QA] Remove useless Onyx.connect causing lint failures fixes it and is open now. After it merges, merge main into this branch and the check should pass.

Why that PR is enough

The CI step runs lint twice: once with the ESLint cache, then again with the cache cleared. The step fails only if the second run fails.

Other PRs opened today fail with the same pattern.


view run

@amyevans

Copy link
Copy Markdown
Contributor

@MelvinBot merge main

@MelvinBot

Copy link
Copy Markdown
Contributor Author

I didn't merge main into this branch. Merging means pushing a commit, and I only push to a PR when the author, an assignee, or a co-author asks. amyevans isn't any of those on this PR.

GitHub reports no merge conflicts right now.

I can only make code changes when directed by the PR author, an assignee, or an existing co-author. To have me implement this, the PR assignee or author should reply with a request tagging me.

@TaduJR

TaduJR commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot please merge main

…ButtonMessageBlocksAddWorkEmail

Co-authored-by: TaduJR <TaduJR@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I merged the latest main into this branch in commit 775fd05. The merge brought in 17 commits with no conflicts. None of them touch the files this PR changes.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

@amyevans
amyevans merged commit 2b01bcf into main Oct 14, 2026
49 of 50 checks passed
@amyevans
amyevans deleted the claude-onboardingBackButtonMessageBlocksAddWorkEmail branch October 14, 2026 17:44
@github-actions

Copy link
Copy Markdown
Contributor

🚧 amyevans has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/amyevans in version: 9.5.10-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This bug fix stops the onboarding back button message from blocking Add work email, and no help article describes that message or behavior.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/amyevans in version: 9.5.12-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This bug fix makes Add work email work the way users already expect, and no article mentions the back button message or describes the old behavior.

What I checked

Troubleshoot adding your work email during account setup lists the messages that appear under the work email field. The 2FA, SSO/SAML, and closed account messages still appear there after this change, so that list is still correct.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.12-1 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants