fix onboarding modal from OD and bac button flow by sumo-slonik · Pull Request #89071 · Expensify/App

sumo-slonik · 2026-04-28T09:07:00Z

Explanation of Change

Fixed Issues

$ #89010
$ #89006

PROPOSAL:

Tests

Verify the bug 89010 reproduction

Prerequisite: A new account that has not yet signed in to NewDot.

Open a fresh incognito window.
Go to OldDot.
Select "Manage my company's expenses 1-9".
Sign up with a new account without a "+" (e.g. <anything>@tstsg.com).
Click "Get Started", then "Join".
Verify that you are redirected to NewDot and the onboarding modal is displayed.

Verify the bug 89006 reproduction (narrow layout):

On a workspace with the Collect plan and a commercial company-card feed already added, go to Workspace settings → Company cards.
Tap the feed selector.
Tap "Add cards".
Tap the "learn more" link in the upgrade page.
Tap the search button in the top right.
Open any chat from the search results.
Tap the back button four times to return to the feed selector.
Tap "Add cards" again.
Verify the app does not crash and lands on the upgrade page.

Verify that no errors appear in the JS console

Offline tests

Unnesesary

QA Steps

Same as Tests.

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

codecov · 2026-04-28T09:15:07Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/hooks/useOnboardingFlow.ts	`87.50% <100.00%> (ø)`
src/libs/Navigation/guards/OnboardingGuard.ts	`100.00% <100.00%> (ø)`
src/libs/Navigation/helpers/linkTo/index.ts	`94.11% <100.00%> (+0.20%)`	⬆️
src/libs/Navigation/Navigation.ts	`51.03% <33.33%> (-0.12%)`	⬇️
...ator/useCustomRootStackNavigatorState/index.ios.ts	`69.56% <40.00%> (-24.88%)`	⬇️
... and 32 files with indirect coverage changes

melvin-bot · 2026-04-28T14:05:13Z

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

luacmartins

LGTM

ZhenjaHorbach · 2026-04-28T15:06:58Z

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 proper code patterns were followed (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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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

ZhenjaHorbach · 2026-04-28T15:54:37Z

Looks like on mobile web navigation is a bit broken

2026-04-28.17.52.38.mov

trjExpensify

Tab navigator refactor deploy blockers, agree we should fix these. 👍

sumo-slonik · 2026-04-29T07:46:20Z

Looks like on mobile web navigation is a bit broken

2026-04-28.17.52.38.mov

im on it :)

sumo-slonik · 2026-04-29T11:20:43Z

Screen.Recording.2026-04-29.at.12.03.52.mov

It already works with my mock data. Please make sure it also works with a real card as well.

sumo-slonik · 2026-04-29T11:22:42Z

@ZhenjaHorbach @luacmartins
If you don’t find any new issues here, I think it’s ready to merge and we’ve fixed the onboarding, the swipe gesture in credit cards, and the crash in the credit card section.

sumo-slonik · 2026-04-29T12:14:39Z

Let’s hold off on the merge for now, @WojtekBoman will take a look to see if this fix logic can be simplified

luacmartins · 2026-04-29T14:16:21Z

@sumo-slonik @WojtekBoman any updates here?

Krishna2323 · 2026-04-29T14:54:30Z

Reviewing...

Krishna2323 · 2026-04-29T15:24:47Z

@sumo-slonik please merge main

sumo-slonik · 2026-04-29T15:35:01Z

Merged, thanks for the reminder!

Krishna2323 · 2026-04-29T15:37:46Z

@sumo-slonik

How did you test the OD → ND redirect (Onboarding-Onboarding modal is not shown after redirecting from OD #89010)? staging.expensify.com redirects to staging NewDot.
I think we should add unit tests for the guard changes.

sumo-slonik · 2026-04-29T16:02:52Z

How did you test the OD → ND redirect (#89010)? staging.expensify.com redirects to staging NewDot.

Regarding the flow with OD, I’m not able to reproduce it, but I went back and looked at the previous flow we had, and checked which conditions used to trigger it but are now being ignored. I’m not entirely sure how to perform that redirection to the development environment.

I think we should add unit tests for the guard changes.

I’ll add a test suite that covers this scenario.

Krishna2323 · 2026-04-29T16:19:15Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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_hybrid.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: HybridApp

ios_hybrid.mp4

iOS: mWeb Safari

ios_mWeb.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Krishna2323 · 2026-04-29T16:28:05Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 95352e3826

ℹ️ 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".

chatgpt-codex-connector · 2026-04-29T16:38:14Z

+    if ((minimalAction.payload as {name?: string} | undefined)?.name === NAVIGATORS.TAB_NAVIGATOR) {
+        navigationRef.current.dispatch({...minimalAction, type: CONST.NAVIGATION.ACTION_TYPE.POP_TO, target: targetState.key});
+        return;


Preserve exact tab instance when handling goUp

When the root stack contains multiple TAB_NAVIGATOR entries (which this file explicitly creates for cross-tab flows), this branch switches from index-based popping to POP_TO by route name only. goUp() has already computed indexOfBackToRoute using doesRouteMatchToMinimalActionPayload(..., compareParams=true), but POP_TO does not use that index and can stop at a different TAB_NAVIGATOR instance than the one that matched params. In those multi-instance stacks, back navigation can return to the wrong tab context/state.

Useful? React with 👍 / 👎.

@sumo-slonik could you please check this? Probably a false positive.

(isRootNavigatorState(targetState) && distanceToPop > 1) already catches multi-instance scenarios earlier via REPLACE, so only distanceToPop ≤ 1 remains here and matching by name=name is sufficient.

Krishna2323

LGTM!

OSBotify · 2026-04-29T17:48:43Z

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

…bugfix/tab_navi_blockers fix onboarding modal from OD and bac button flow (cherry picked from commit 7c1f47e) (cherry-picked to staging by luacmartins)

OSBotify · 2026-04-29T18:42:43Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.64-20 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-29T18:45:28Z

I reviewed all changes in this PR. The fixes are purely internal navigation bug fixes:

Onboarding modal fix (Onboarding-Onboarding modal is not shown after redirecting from OD #89010) — adjusts the onboarding guard so OldDot → NewDot signup users who are invited/group members but haven't completed onboarding still see the onboarding flow.
iOS back-button crash fix (Android & iOS - Company card - App crashes after tapping Add cards #89006) — fixes tab navigator state slicing and goUp navigation logic to preserve nested state on iOS swipe-back.

These changes affect internal navigation state management only. They do not alter any user-facing feature names, settings labels, workflows, or UI copy.

No help site changes are required — existing articles under docs/articles/ remain accurate.

github-actions · 2026-04-29T18:54:24Z

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

github-actions · 2026-04-29T18:58:54Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7c1f47e-802f150-079198f8602e3c83a38b6a683696444b3195a455/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7c1f47e-802f150-1ef2501acb165ea20c345f4fe1ff0a37dbc4d7dc/index.html

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

👀 View the workflow run that generated this build 👀

fix onboarding modal from OD

25cf873

melvin-bot Bot assigned sumo-slonik Apr 28, 2026

fix card goback flow ###Expensify#89006

2306d3e

sumo-slonik changed the title ~~fix onboarding modal from OD~~ fix onboarding modal from OD and bac button flow Apr 28, 2026

fix comments

64da542

sumo-slonik marked this pull request as ready for review April 28, 2026 14:05

sumo-slonik requested review from a team as code owners April 28, 2026 14:05

melvin-bot Bot requested review from bernhardoj and trjExpensify and removed request for a team April 28, 2026 14:05

luacmartins requested review from ZhenjaHorbach and luacmartins and removed request for bernhardoj April 28, 2026 14:15

luacmartins previously approved these changes Apr 28, 2026

View reviewed changes

trjExpensify previously approved these changes Apr 28, 2026

View reviewed changes

fix swipe problem

cb30cfb

sumo-slonik dismissed stale reviews from trjExpensify and luacmartins via cb30cfb April 29, 2026 11:20

sumo-slonik mentioned this pull request Apr 29, 2026

Replace SKIP_SLICE_TAB_THRESHOLD magic number in useCustomRootStackNavigatorState/index.ios.ts with proper TAB_NAVIGATOR state rehydration #89179

Open

fix swipe problem and tag issue for refactor

134150c

luacmartins requested a review from Krishna2323 April 29, 2026 14:53

Merge branch 'main' into kuba_nowakowski/bugfix/tab_navi_blockers

95352e3

add test for onboarding modal fix

6899d99

chatgpt-codex-connector Bot reviewed Apr 29, 2026

View reviewed changes

Krishna2323 approved these changes Apr 29, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham April 29, 2026 17:34

luacmartins approved these changes Apr 29, 2026

View reviewed changes

luacmartins merged commit 7c1f47e into Expensify:main Apr 29, 2026
50 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 29, 2026

OSBotify mentioned this pull request Apr 29, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

arosiclair mentioned this pull request Apr 29, 2026

PR checklist #89226

Open

Conversation

sumo-slonik commented Apr 28, 2026 • edited 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

Uh oh!

codecov Bot commented Apr 28, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Apr 28, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

luacmartins commented Apr 29, 2026

Uh oh!

Krishna2323 commented Apr 29, 2026

Uh oh!

Krishna2323 commented Apr 29, 2026

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

Krishna2323 commented Apr 29, 2026

Uh oh!

sumo-slonik commented Apr 29, 2026

Uh oh!

Krishna2323 commented Apr 29, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented Apr 29, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

sumo-slonik Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 29, 2026

Uh oh!

OSBotify commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026

sumo-slonik commented Apr 28, 2026 •

edited

Loading

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Apr 28, 2026 •

edited

Loading