Fix: Migrated User Modal shows twice by truph01 · Pull Request #58348 · Expensify/App

truph01 · 2025-03-13T08:23:11Z

Explanation of Change

Fixed Issues

Tests

Add this UseEffect in src/hooks/useOnboardingFlow.ts:

 useEffect(() => {
        Onyx.merge('betas', ['productTraining'])
        Onyx.merge('nvp_tryNewDot', {nudgeMigration: {timestamp: Date.now()}})
    }, []);

Or (For QA):

open app and Go to settings Troublshoot > enable Client side logging, then click on "View debug console" execute below command:

        Onyx.merge('betas', ['productTraining'])
        Onyx.merge('nvp_tryNewDot', {nudgeMigration: {timestamp: Date.now()}})

Open app and observe the migration modal appears.
Reload the page
Observe the migration modal appears
Dismiss the modal
Verify modal is dismissed

Verify that no errors appear in the JS console

Offline tests

QA Steps

Add this UseEffect in src/hooks/useOnboardingFlow.ts:

 useEffect(() => {
        Onyx.merge('betas', ['productTraining'])
        Onyx.merge('nvp_tryNewDot', {nudgeMigration: {timestamp: Date.now()}})
    }, []);

Or (For QA):

open app and Go to settings Troublshoot > enable Client side logging, then click on "View debug console" execute below command:

        Onyx.merge('betas', ['productTraining'])
        Onyx.merge('nvp_tryNewDot', {nudgeMigration: {timestamp: Date.now()}})

Open app and observe the migration modal appears.
Reload the page
Observe the migration modal appears
Dismiss the modal
Verify modal is dismissed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-03-13.at.15.45.47.mov

Android: mWeb Chrome

Screen.Recording.2025-03-13.at.15.17.38.mov

iOS: Native

output.mp4

iOS: mWeb Safari

Screen.Recording.2025-03-13.at.15.15.07.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-13.at.15.07.23.mov

MacOS: Desktop

Screen.Recording.2025-03-13.at.15.21.46.mov

melvin-bot · 2025-03-13T08:23:17Z

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

truph01 · 2025-03-13T08:42:47Z

I am updating the video in Android platform

Edit: I updated video in Android platform

ishpaul777 · 2025-03-15T18:58:42Z

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: 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-03-16.at.12.28.11.AM.mov

Android: mWeb Chrome

Screen.Recording.2025-03-16.at.12.23.03.AM.mov

iOS: Native

Screen.Recording.2025-03-16.at.12.13.13.AM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-16.at.12.18.43.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-15.at.11.56.28.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-15.at.11.53.05.PM.mov

ishpaul777 · 2025-03-15T19:02:43Z

+            path?.includes(ROUTES.MIGRATED_USER_WELCOME_MODAL) &&
+            lastVisitedPath &&
+            !CONFIG.IS_HYBRID_APP &&
+            isOnboardingCompleted &&
+            !wasInvitedToNewDot &&
+            authenticated &&
+            !shouldShowRequire2FAModal


why do we need these many conditions ??

I’ve updated the PR to remove the redundant condition. The new condition is:

path?.includes(ROUTES.MIGRATED_USER_WELCOME_MODAL) && lastVisitedPath && !CONFIG.IS_HYBRID_APP && isOnboardingCompleted && authenticated

This ensures the logic only runs if the user is not in a hybrid app (since I can’t test that), the onboarding flow is completed, and the user is authenticated.

the onboarding flow is completed, and the user is authenticated.

how Is this relevant, will such user ever lands on this route?

also I think !CONFIG.IS_HYBRID_APP is not relevant

how Is this relevant, will such user ever lands on this route?

When testing the PR without the isOnboardingCompleted condition, the logic in:

App/src/libs/Navigation/NavigationRoot.tsx

Line 122 in fee6c80

return getAdaptedStateFromPath(getOnboardingInitialPath(isPrivateDomain), linkingConfig.config);

doesn’t run because the new logic causes an early return with:
return getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config)

ishpaul777 · 2025-03-19T12:40:13Z

we have conflicts @truph01

truph01 · 2025-03-20T03:14:47Z

@ishpaul777 I just fixed the conflict and removed !CONFIG.IS_HYBRID_APP condition.

OSBotify · 2025-03-20T17:24:26Z

✋ 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-03-21T22:44:26Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.1.17-0 🚀

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

github-actions · 2025-03-24T21:14:54Z

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

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

truph01 added 3 commits March 13, 2025 14:48

fix: Migrated User Modal shows twice on freshing

d89afa8

fix: update condition to call getAdaptedStateFromPath

23531a1

fix: remove test code

17b1466

truph01 requested a review from a team as a code owner March 13, 2025 08:23

melvin-bot Bot requested review from ishpaul777 and removed request for a team March 13, 2025 08:23

truph01 mentioned this pull request Mar 13, 2025

[Due for payment 2025-03-31] [$250] Migrated User Modal shows twice #58047

Closed

8 tasks

ishpaul777 reviewed Mar 15, 2025

View reviewed changes

truph01 added 2 commits March 17, 2025 09:36

merge main

ee730c7

fix: updated the condition to handle initialState

4e27423

fix: conflict and merge main

6c07f0e

ishpaul777 approved these changes Mar 20, 2025

View reviewed changes

melvin-bot Bot requested a review from neil-marcellini March 20, 2025 13:00

neil-marcellini approved these changes Mar 20, 2025

View reviewed changes

neil-marcellini merged commit a0dea04 into Expensify:main Mar 20, 2025

This was referenced Mar 20, 2025

Investigate workflow job failing on main: e2ePerformanceTests / Build apk from delta ref / Build Android app #58830

Closed

Deploy Checklist: New Expensify 2025-03-21 #58928

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Migrated User Modal shows twice#58348

Fix: Migrated User Modal shows twice#58348
neil-marcellini merged 6 commits into
Expensify:mainfrom
truph01:fix/58047

truph01 commented Mar 13, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Mar 13, 2025

Uh oh!

truph01 commented Mar 13, 2025 •

edited

Loading

Uh oh!

ishpaul777 commented Mar 15, 2025 •

edited

Loading

Uh oh!

ishpaul777 Mar 15, 2025

Uh oh!

truph01 Mar 17, 2025

Uh oh!

ishpaul777 Mar 17, 2025 •

edited

Loading

Uh oh!

truph01 Mar 18, 2025

Uh oh!

ishpaul777 commented Mar 19, 2025

Uh oh!

truph01 commented Mar 20, 2025

Uh oh!

OSBotify commented Mar 20, 2025

Uh oh!

github-actions Bot commented Mar 21, 2025

Uh oh!

github-actions Bot commented Mar 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

truph01 commented Mar 13, 2025 • 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!

melvin-bot Bot commented Mar 13, 2025

Uh oh!

truph01 commented Mar 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ishpaul777 commented Mar 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ishpaul777 Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

truph01 Mar 17, 2025

Choose a reason for hiding this comment

Uh oh!

ishpaul777 Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

truph01 Mar 18, 2025

Choose a reason for hiding this comment

Uh oh!

ishpaul777 commented Mar 19, 2025

Uh oh!

truph01 commented Mar 20, 2025

Uh oh!

OSBotify commented Mar 20, 2025

Uh oh!

github-actions Bot commented Mar 21, 2025

Uh oh!

github-actions Bot commented Mar 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

truph01 commented Mar 13, 2025 •

edited

Loading

truph01 commented Mar 13, 2025 •

edited

Loading

ishpaul777 commented Mar 15, 2025 •

edited

Loading

ishpaul777 Mar 17, 2025 •

edited

Loading