Return to the intent list from work email Back after a refresh by MelvinBot · Pull Request #103532 · Expensify/App

MelvinBot · 2026-10-08T21:47:13Z

Explanation of Change

The Back button on the onboarding work email step (shown for the "Join my company workspace" intent) called Navigation.goBack() with no fallback route. Without a refresh, the onboarding stack is [PURPOSE, WORK_EMAIL], so Back pops to the intent list. After a refresh, the stack is rebuilt from the URL with only the work email screen, so Back popped the whole onboarding modal.

This passes ROUTES.ONBOARDING_PURPOSE.getRoute() as the fallback, matching the other onboarding steps. If the intent list is still on the stack, Back pops to it as before. If not, goUp replaces the work email screen with the intent list inside the modal.

Also adds a regression test in tests/ui/WorkEmailOnboardingNavigation.tsx that renders the work email screen alone on the stack (the post-refresh state) and asserts Back lands on the intent list. The test fails without the fix.

Fixed Issues

$ #103530
PROPOSAL: #103530 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".
// Please describe what QA needs to do to validate your changes and what areas do they need to test for regressions.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

AI Tests

npm run typecheck: passed
npm run lint-changed and ESLint on both changed files: passed
npm run spell-changed: passed (0 issues)
Jest tests/ui/WorkEmailOnboarding.tsx, tests/ui/WorkEmailOnboardingNavigation.tsx, tests/ui/WorkEmailOnboardingNativeBack.tsx: 55/55 passed. The new test fails on main without the fix.
Not run locally: full npm test, npm run storybook smoke test, oxfmt format check, and react-compiler-compliance-check (the last could not resolve its base ref in this environment). The source change only adds an argument to an existing callback.

The work email Back button called Navigation.goBack() with no fallback route. After a refresh the onboarding modal only holds the work email screen, so Back popped the whole modal. Pass ONBOARDING_PURPOSE so goUp replaces into the intent list when it is no longer on the stack. Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

chatgpt-codex-connector · 2026-10-08T21:54:11Z

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-08T22:03:22.973486Z	`33889f3`	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.

melvin-bot · 2026-10-08T21:54:41Z

@Pujan92 @iwiznia @carlosmiceli One of you needs to 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]

carlosmiceli · 2026-10-08T22:25:49Z

@MelvinBot fix eslint

MelvinBot · 2026-10-08T22:32:50Z

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

… so popover cells pass ESLint Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

melvin-bot · 2026-10-08T22:44:58Z

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

MelvinBot · 2026-10-08T22:44:59Z

Fixed the ESLint check in 6252ada.

The 3 no-misused-promises errors in DateCell, CategoryCell, and TagCell came from main, not this PR. fix: follow-up #100567 widened EditableProps.onSave to return void | boolean | Promise<boolean>. usePopoverEditState still typed onSave as returning void, so every popover cell failed the rule.

I changed both onSave types in usePopoverEditState.ts to the shared InlineEditSaveResult type. ESLint (no cache) and typecheck pass locally on all files that call the hook.

view run

MelvinBot · 2026-10-08T22:57:29Z

All checks now pass on 6252ada. I didn't push anything new.

ESLint failed on the first commit with 3 no-misused-promises errors in DateCell, CategoryCell, and TagCell. The fix in 6252ada widened onSave in usePopoverEditState to return InlineEditSaveResult. The ESLint check passed on that commit.

The only remaining failure is Check independent approval. It clears once a reviewer approves the PR.

view run

hungvu193 · 2026-10-09T00:41:45Z

I'll take a look later today

hungvu193 · 2026-10-09T02:57:37Z

    canEdit: boolean | undefined;
    value?: T;
-    onSave?: (value: T) => void;
+    onSave?: (value: T) => InlineEditSaveResult;


@MelvinBot Do we really need to use generic here?

Oh nevermind, that's ok

Yes, this line on the generic type is the change ESLint needs. The change to the non-generic type isn't needed.

UsePopoverEditStateOptionsGeneric<T> already exists on main. DateCell, CategoryCell, and TagCell call usePopoverEditState<T>, so their onSave is checked against this type. The non-generic impl exists only because OXC can't compile hooks with type params (lines 44-45).

I tested both changes locally. With only this line changed, ESLint and typecheck pass. With only the non-generic onSave at line 26 changed, all 3 no-misused-promises errors return.

I kept line 26 aligned so the two option types match, but it can go back to void.

carlosmiceli, should I revert line 26?

view run

hungvu193 · 2026-10-09T03:02:05Z

It's fixed:

Screen.Recording.2026-10-09.at.10.00.57.mov

hungvu193 · 2026-10-09T03:02:49Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-10-09.at.10.00.57.mov

hungvu193

LGTM

hungvu193 · 2026-10-09T03:03:42Z

All yours @iwiznia

OSBotify · 2026-10-09T14:19:15Z

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

github-actions · 2026-10-09T14:30:16Z

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

github-actions · 2026-10-09T14:35:09Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #103532.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-aed4cfc-a7c42c1-b53661bfe3107ded60ce70613d75cb5ce9512581/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-aed4cfc-a7c42c1-d386086f222ee2dc930c4120e81ce36c70ae9331/index.html

Web 🕸️
https://103532.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

…OnboardingWorkEmailBackAfterRefresh" This reverts commit aed4cfc, reversing changes made to c9b044a.

MelvinBot assigned carlosmiceli Oct 8, 2026

MelvinBot requested a review from a team October 8, 2026 21:47

melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 8, 2026

MelvinBot mentioned this pull request Oct 8, 2026

Onboarding - Onboarding exits after refreshing work email and tapping back button #103530

Open

2 of 7 tasks

carlosmiceli requested review from abzokhattab and hungvu193 October 8, 2026 21:53

carlosmiceli marked this pull request as ready for review October 8, 2026 21:54

carlosmiceli requested a review from a team as a code owner October 8, 2026 21:54

melvin-bot Bot requested review from Pujan92, carlosmiceli and iwiznia October 8, 2026 21:54

melvin-bot Bot removed the request for review from a team October 8, 2026 21:54

carlosmiceli removed the request for review from Pujan92 October 8, 2026 21:56

carlosmiceli assigned MelvinBot Oct 8, 2026

Fix: accept the shared inline-edit save result in usePopoverEditState…

6252ada

… so popover cells pass ESLint Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner October 8, 2026 22:44

melvin-bot Bot requested review from DylanDylann and removed request for a team October 8, 2026 22:44

hungvu193 removed the request for review from DylanDylann October 9, 2026 02:50

hungvu193 reviewed Oct 9, 2026

View reviewed changes

hungvu193 approved these changes Oct 9, 2026

View reviewed changes

MelvinBot mentioned this pull request Oct 9, 2026

Onboarding-Onboarding modal does not appear until clearing cache #103545

Closed

1 of 7 tasks

iwiznia approved these changes Oct 9, 2026

View reviewed changes

iwiznia merged commit aed4cfc into main Oct 9, 2026
44 of 50 checks passed

iwiznia deleted the claude-fixOnboardingWorkEmailBackAfterRefresh branch October 9, 2026 14:14

This was referenced Oct 9, 2026

Revert "Return to the intent list from work email Back after a refresh" #103646

Closed

Revert join-workspace onboarding changes #103649

Merged

allgandalf pushed a commit to allgandalf/App that referenced this pull request Oct 9, 2026

Revert "Merge pull request Expensify#103532 from Expensify/claude-fix…

16e4444

…OnboardingWorkEmailBackAfterRefresh" This reverts commit aed4cfc, reversing changes made to c9b044a.

Conversation

MelvinBot commented Oct 8, 2026 • edited by carlosmiceli Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

AI Tests

Uh oh!

chatgpt-codex-connector Bot commented Oct 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

melvin-bot Bot commented Oct 8, 2026

Uh oh!

carlosmiceli commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

melvin-bot Bot commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

hungvu193 commented Oct 9, 2026

Uh oh!

hungvu193 Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

hungvu193 Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented Oct 9, 2026

Uh oh!

hungvu193 commented Oct 9, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented Oct 9, 2026

Uh oh!

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MelvinBot commented Oct 8, 2026 •

edited by carlosmiceli

Loading

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

edited

Loading