Skip to content

Fix reordered onboarding accounting flow - #92375

Merged
grgia merged 54 commits into
Expensify:mainfrom
nabi-ebrahimi:reordered-onboarding-accouting-flow
Jul 27, 2026
Merged

grgia merged 54 commits into
Expensify:mainfrom
nabi-ebrahimi:reordered-onboarding-accouting-flow

Conversation

@nabi-ebrahimi

@nabi-ebrahimi nabi-ebrahimi commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR reorders the manage-team onboarding flow so users choose their interested features before selecting an accounting integration. The Accounting screen is now shown only when the user keeps Accounting enabled.

Previously, users could select None because their accounting software was not listed, then re-enable Accounting on the following screen without providing the correct integration. This PR removes that confusing path by removing the None option and allowing users to enter a custom accounting software name when selecting Other.

Fixed Issues

$ #89594
PROPOSAL: #89594 (comment)

Tests

  1. Sign up using a new account.
  2. In the onboarding flow, select Manage my team.
  3. Choose 101–1,000 employees, then click Continue.
  4. Confirm that the Feature Selection page appears before the Accounting Software page.
  • Verify that no errors appear in the JS console

Offline tests

Not applicable

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • 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.
  • 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
Screen_Recording_20260603_142530_New.Expensify.Dev.mp4
Android: mWeb Chrome
Recording_20260602_223933.mp4
iOS: Native
Screen.Recording.2026-06-02.at.11.12.06.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-06-02.at.11.16.07.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-02.at.10.37.10.PM.mov

@codecov

codecov Bot commented Jun 3, 2026

Copy link
Copy Markdown

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/CONST/index.ts 94.81% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
...components/OnboardingMergingAccountBlockedView.tsx 100.00% <ø> (ø)
src/hooks/useAutoCreateTrackWorkspace.ts 86.48% <ø> (ø)
src/hooks/useOnboardingStepCounter.ts 100.00% <100.00%> (ø)
src/libs/ExportOnyxState/common.ts 80.35% <ø> (ø)
src/libs/ReportUtils.ts 86.18% <100.00%> (-0.02%) ⬇️
src/libs/actions/Welcome/OnboardingFeatures.ts 100.00% <100.00%> (ø)
src/libs/actions/Welcome/OnboardingFlow.ts 81.13% <100.00%> (+0.05%) ⬆️
src/libs/actions/Welcome/index.ts 66.21% <100.00%> (+4.78%) ⬆️
... and 7 more
... and 14 files with indirect coverage changes

@nabi-ebrahimi
nabi-ebrahimi marked this pull request as ready for review June 3, 2026 05:02
@nabi-ebrahimi
nabi-ebrahimi requested review from a team as code owners June 3, 2026 05:02
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and parasharrajat and removed request for a team and JmillsExpensify June 3, 2026 05:03
@melvin-bot

melvin-bot Bot commented Jun 3, 2026

Copy link
Copy Markdown

@parasharrajat 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 June 3, 2026 05:03

@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: 1e302f2b8e

ℹ️ 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 thread src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx Outdated
Comment thread src/hooks/useCompleteOnboarding.ts Outdated
Comment thread src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
Reorder the onboarding steps so interested features come before accounting,
share the default onboarding feature configuration, disable the accounting
continue action while offline, and defer onboarding cleanup with Navigation's
afterTransition callback instead of importing TransitionTracker directly.
… update type definitions to pass failed test and typecheck
@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@parasharrajat The PR is ready for review. take a look when you get a chance. thanks

@github-actions

github-actions Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@parasharrajat Gentle bump. thanks

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

let me know once ready.

The PR is ready. thanks

@parasharrajat

Copy link
Copy Markdown
Member

@nabi-ebrahimi let's move forward with removing input for other in this PR. That will be handled in #93290

@parasharrajat parasharrajat left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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 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 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)
  • 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.
  • 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

🔲 iOS / native

10.07.2026_23.59.26_REC.mp4

🔲 iOS / Safari

🔲 MacOS / Chrome

09.07.2026_20.27.06_REC.mp4

🔲 Android / native

23.07.2026_16.37.35_REC.mp4

🎀 👀 🎀 C+ reviewed

@melvin-bot
melvin-bot Bot requested a review from grgia July 23, 2026 10:53
@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@grgia , I'm doing another round of testing. Could you please hold off on merging this for now? Thanks!

Comment thread src/hooks/useCompleteOnboarding.ts Outdated
Comment on lines +132 to +135
afterTransition: () => {
setOnboardingAdminsChatReportID();
setOnboardingPolicyID();
},

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.

NAB. @nabi-ebrahimi should we register the cleanup with TransitionTracker.runAfterTransitions so it runs on every path, like the code this replaces did?
A user who finishes onboarding while a chat is already open never navigates, so the cleanup tied to afterTransition never runs and stale onboarding IDs stick around for the session.

@grgia grgia 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.

@nabi-ebrahimi would you fix conflicts and look at this comment

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@grgia I have addressed the feedback. you can take another look when you get a chance. thanks

@grgia
grgia merged commit fbac632 into Expensify:main Jul 27, 2026
34 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 grgia 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/grgia in version: 9.4.45-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no changes required.

I reviewed this PR against the help site articles in App/docs/articles and did not create a docs PR, because the changes here are scoped to the in-product signup onboarding wizard (the Manage my team flow), which the help site does not document step-by-step.

What this PR changes vs. what the help site documents

This PR changes (onboarding wizard only):

  • Reorders the flow so feature selection comes before the accounting-integration screen, and only shows the accounting screen when Accounting stays enabled.
  • Removes the None accounting option and lets users type a custom name via Other.

What the help site documents (unchanged by this PR):

  • Create-a-company-workspace.md describes creating a workspace manually via the Workspaces tab → New workspace, and connecting accounting via workspace settings — not the signup wizard. That flow is unaffected.
  • Expensify-Home-Overview.md references the manage my team / track and budget my expenses onboarding intents only to explain which home-screen sections appear. The intent behavior is unchanged; only the screen order after it changed.

No article describes the accounting-selection screen, the removed None option, or the ordering of onboarding steps, so nothing needs updating.

@nabi-ebrahimi, please confirm this assessment matches the intended behavior. If you believe a help article should cover this onboarding step (or one already does that I missed), reply with @MelvinBot and point me to it, and I'll draft the docs PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.45-14 🚀

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants