Fix: "Travel and expense" modal not showing for migrated users by rayane-d · Pull Request #55005 · Expensify/App

rayane-d · 2025-01-09T13:35:55Z

cc @allroundexperts @puneetlath @danielrvidal

Explanation of Change

When a migrated user is signed in, we're correctly navigating to the migrated user welcome modal (/onboarding/migrated-user-welcome). However, immediately after that, the app navigates to /home?singleNewDotEntry=false (the initialRoute comes from here and the navigation call is here) once openApp completes and the app finishes loading.
The bug occurs when openApp takes some time to complete, which is why it's not consistently reproducible.
The solution that worked for me is to wait for the app to finish loading before starting the useOnboardingFlowRouter useEffect logic. This can be achieved by adding an early return if ONYXKEYS.IS_LOADING_APP is not false.

https://expensify.slack.com/archives/C02NK2DQWUX/p1736424286423219?thread_ts=1736289390.111259&cid=C02NK2DQWUX

Fixed Issues

$ #54915
$ #55021

https://expensify.slack.com/archives/C02NK2DQWUX/p1736382637828999?thread_ts=1736289390.111259&cid=C02NK2DQWUX

PROPOSAL:

Tests

Test 1 (Migrated account):

Precondition:

You need an account that is opened from oldot and which has some expenses:

Sign in to a new account on OldDot web (expensify.com).
Logout
Sign in again in the same account to validate it with a magic code
Create a workspace.
Create a report with expenses and submit it.
run this script in browse's console to to directly open New Expensify on signin and to migrate the account:

NVP.set('tryNewDot', {classicRedirect: {dismissed: false, completedHybridAppOnboarding: false}, nudgeMigration: {timestamp: '2024-01-07'}});

Test Steps:

Sign in to the same account on Oldot/HybridApp.
New Expensify will open
Verify that the "Welcome to Expensify" modal does not appear.
Confirm that the "Travel and expense, at the speed of chat" modal is displayed.
Ensure that there is no music playing.
Click "Let's go!" and verify:

The "Welcome to Expensify" modal does not load.
The "Hmm... it's not here" modal does not appear.
The search page is displayed in the background and clicking "Let's go!" redirects you to the search page.

Open the expenses.
Verify that you can open expenses and interact with the app without freezing or crashing.
Close the app and reopen it.
Verify that neither the "Welcome to Expensify" modal nor the "Travel and expense, at the speed of chat" modal appear.
Log out and log in again.
Verify that neither the "Welcome to Expensify" modal nor the "Travel and expense, at the speed of chat" modal appear.

Test 2 (Unmigrated account):

Precondition:

You need an account that is opened from oldot and which has some expenses:

Sign in to a new account on OldDot web (expensify.com).
Logout
Sign in again in the same account to validate it with a magic code
Create a workspace.
Create a report with expenses and submit it.
run this script in browse's console to to directly open New Expensify on signin:

NVP.set('tryNewDot', {classicRedirect: {dismissed: false, completedHybridAppOnboarding: false}});

Test Steps:

Sign in to the same account on Oldot/HybridApp.
New Expensify will open
Verify that the "Welcome to Expensify" modal appears.
Confirm that the "Travel and expense, at the speed of chat" modal does not appear.
Click "Get Started!" and verify that the "Welcome to Expensify" modal disappears.

Test 3:

Perform tests related to the onboarding flow
Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests. Additionally, perform these manual tests from the design doc

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-01-09.at.1.24.51.PM.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…dingFlowRouter useEffect logic

github-actions · 2025-01-09T14:38:13Z

🚧 @puneetlath has triggered a test build. You can view the workflow run here.

melvin-bot · 2025-01-09T14:49:25Z

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

github-actions · 2025-01-09T14:50:58Z

🚧 @puneetlath has triggered a test hybrid app build. You can view the workflow run here.

github-actions · 2025-01-09T15:05:55Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55005/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/55005/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/55005/NewExpensify.dmg	https://55005.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

allroundexperts · 2025-01-09T15:35:24Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

Screen.Recording.2025-01-09.at.11.59.43.PM.mov

Screen.Recording.2025-01-10.at.12.01.49.AM.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2025-01-09.at.7.50.00.PM.mov

Screen.Recording.2025-01-09.at.7.59.51.PM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allroundexperts

Works well.

Fixes #55021 as well.

Screen.Recording.2025-01-09.at.11.40.10.PM.mov

…splaying Fix: "Travel and expense" modal not showing for migrated users (cherry picked from commit ab139e1) (CP triggered by thienlnam)

OSBotify · 2025-01-09T19:34:12Z

✋ 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 · 2025-01-09T20:02:13Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.82-6 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-01-10T03:39:45Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.82-12 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

Fix: wait for the app to finish loading before starting the useOnboar…

09af2ce

…dingFlowRouter useEffect logic

rayane-d changed the title ~~Fix: Travel and expense modal not showing for migrated users~~ Fix: "Travel and expense" modal not showing for migrated users Jan 9, 2025

puneetlath added the Ready To Build label Jan 9, 2025

rayane-d marked this pull request as ready for review January 9, 2025 14:49

rayane-d requested a review from a team as a code owner January 9, 2025 14:49

melvin-bot Bot requested review from sobitneupane and removed request for a team January 9, 2025 14:49

This comment has been minimized.

Sign in to view

puneetlath requested review from allroundexperts and puneetlath and removed request for sobitneupane January 9, 2025 15:07

allroundexperts approved these changes Jan 9, 2025

View reviewed changes

aldo-expensify mentioned this pull request Jan 9, 2025

[HOLD for payment 2025-01-18] [HOLD for payment 2025-01-17] Hybrid - Android - Onboarding - "Travel and expense, at the speed of chat" modal appears after every login #55021

Closed

8 tasks

puneetlath approved these changes Jan 9, 2025

View reviewed changes

blimpich approved these changes Jan 9, 2025

View reviewed changes

puneetlath merged commit ab139e1 into Expensify:main Jan 9, 2025

OSBotify pushed a commit that referenced this pull request Jan 9, 2025

Merge pull request #55005 from rayane-djouah/fix-welcome-modal-not-di…

c3a3477

…splaying Fix: "Travel and expense" modal not showing for migrated users (cherry picked from commit ab139e1) (CP triggered by thienlnam)

github-actions Bot added the CP Staging marks PRs that have been CP'd to staging label Jan 9, 2025

github-actions Bot mentioned this pull request Jan 9, 2025

Deploy Checklist: New Expensify 2025-01-08 #54928

Closed

60 tasks

melvin-bot Bot mentioned this pull request Jan 10, 2025

[HOLD for payment 2025-01-18] [HOLD for payment 2025-01-17] [HOLD for payment 2025-01-15] [$500] We're playing and showing the "Welcome to Expensify" modal/video when newly migrated users come over #54915

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix: "Travel and expense" modal not showing for migrated users#55005

Fix: "Travel and expense" modal not showing for migrated users#55005
puneetlath merged 1 commit into
Expensify:mainfrom
rayane-d:fix-welcome-modal-not-displaying

rayane-d commented Jan 9, 2025 •

edited

Loading

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

melvin-bot Bot commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

This comment has been minimized.

github-actions Bot commented Jan 9, 2025

Uh oh!

allroundexperts commented Jan 9, 2025 •

edited

Loading

Uh oh!

allroundexperts left a comment

Uh oh!

OSBotify commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

rayane-d commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Test 1 (Migrated account):

Precondition:

Test Steps:

Test 2 (Unmigrated account):

Precondition:

Test Steps:

Test 3:

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

melvin-bot Bot commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

This comment has been minimized.

github-actions Bot commented Jan 9, 2025

Uh oh!

allroundexperts commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 9, 2025

Uh oh!

github-actions Bot commented Jan 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rayane-d commented Jan 9, 2025 •

edited

Loading

allroundexperts commented Jan 9, 2025 •

edited

Loading