Skip to content

[BATCH 2] Migrate Navigation usage, part 1#88538

Merged
luacmartins merged 29 commits into
Expensify:mainfrom
software-mansion-labs:collectioneur/transition-tracker-batch-2
May 28, 2026
Merged

[BATCH 2] Migrate Navigation usage, part 1#88538
luacmartins merged 29 commits into
Expensify:mainfrom
software-mansion-labs:collectioneur/transition-tracker-batch-2

Conversation

@collectioneur
Copy link
Copy Markdown
Contributor

@collectioneur collectioneur commented Apr 22, 2026

Explanation of Change

Migrates 15 InteractionManager.runAfterInteractions usages to TransitionTracker-based APIs. All entries are navigation-related, replaces fire-and-forget post-navigation callbacks with structured afterTransition options on Navigation.goBack, Navigation.dismissModal, Navigation.navigate, and closeSidePanel. Ensures cleanup callbacks run only after transitions complete, preventing stale UI flashes.

Fixed Issues

$ #83062

Tests

  • Verify that no errors appear in the JS console

Test 1: Delete a single-expense report from Search

  1. Create a new expense report with one expense
  2. Navigate to the Search page and locate the newly created report entry
  3. Open the report and delete the expense (via the More button → Delete)
  4. Verify that the report entry in Search disappears only after the closing/navigation animation has fully completed (i.e., the entry should not vanish while the screen is still animating away)

Test 2: Delete an entire report with multiple expenses from Search

  1. Create a new expense report with two expenses
  2. Navigate to the Search page and locate the report entry
  3. Open the report, tap the More button, and delete the entire report along with both expenses
  4. Verify that the report entry in Search is removed only after the report screen has fully closed (the entry should remain visible during the closing transition and disappear afterward)

Test 3: Delete a single transaction from within a transaction thread

  1. Create a new expense report with two expenses
  2. Navigate to the Search page and open the report
  3. Tap on one of the expenses to enter its transaction thread
  4. Inside the transaction thread, tap More → Delete
  5. Verify that the transaction thread screen closes first, and only then the transaction entry disappears from the report view (the entry should not vanish while the transaction thread is still animating closed)

Offline tests

N/A

QA Steps

Same as tests

  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Test 1

Screen.Recording.2026-05-21.at.14.41.22.mov

Test 2

Screen.Recording.2026-05-21.at.14.41.51.mov

Test 3

Screen.Recording.2026-05-21.at.14.42.49.mov

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 22, 2026

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/components/MoneyRequestHeader.tsx 0.00% <ø> (ø)
src/components/MoneyRequestHeaderActions.tsx 6.66% <ø> (ø)
.../components/SidePanel/SidePanelContextProvider.tsx 87.75% <100.00%> (+1.75%) ⬆️
...ges/inbox/DeleteTransactionNavigateBackHandler.tsx 80.00% <ø> (ø)
src/pages/inbox/ReportHeader.tsx 71.05% <100.00%> (ø)
...space/companyCards/assignCard/ConfirmationStep.tsx 79.54% <ø> (ø)
.../components/MoneyRequestHeaderSecondaryActions.tsx 0.53% <0.00%> (-0.01%) ⬇️
src/hooks/useExpenseActions.ts 0.00% <0.00%> (ø)
...report/ContextMenu/BaseReportActionContextMenu.tsx 85.53% <0.00%> (+0.53%) ⬆️
src/libs/Navigation/TransitionTracker.ts 96.92% <60.00%> (-3.08%) ⬇️
... and 7 more
... and 28 files with indirect coverage changes

@collectioneur collectioneur changed the title Collectioneur/transition tracker batch 2 [BATCH 2] Migrate Navigation usage, part 1 May 20, 2026

onCloseCompleteRef.current = options?.afterTransition;
setIsSidePanelTransitionEnded(false);
SidePanelActions.closeSidePanel(!isExtraLargeScreenWidth || shouldUpdateNarrow);
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.

I don't get why we no longer need shouldUpdateNarrow here 🤔

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I noticed that we never use this flag when calling closeSidePanel, so I just removed it

Comment on lines +476 to +480
if (isInNarrowPaneModal) {
Navigation.navigateBackToLastSuperWideRHPScreen({afterTransition: afterDelete});
return;
}
onBackButtonPress(false, {afterTransition: afterDelete});
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.

Why do we change the logic here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I probably messed up resolving the merge conflicts 😓 , I'll double-check

Comment thread src/libs/actions/Session/index.ts Outdated
Comment on lines +1414 to +1417
TransitionTracker.runAfterTransitions({
callback: () => {
waitForUserSignIn().then(() => {
Navigation.waitForProtectedRoutes().then(() => {
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.

We wait 3 times here 😓 Can't this logic be simplified a bit?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I simplified it with async/await, looks like the best approach here

@@ -24,10 +23,11 @@ function DeleteTransactionNavigateBackHandler() {
return;
}
// Clear the URL only after we navigate away to avoid a brief Not Found flash.
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.

that sounds like the use-case for afterTransition. Do we have to use transition tracker here?

@@ -102,10 +101,11 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
return;
}
// Clear the URL only after we navigate away to avoid a brief Not Found flash.
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.

Same here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I feel like doing it that way in these two cases might be a bit tricky. Since the report has quite a few flows where a transaction can be deleted, we'd have to track down every single goBack/other navigation call triggered after a deletion and manually insert the same afterTransition everywhere.
Also, the report data gets deleted before the navigation starts. Because of this, using a useEffect with transitionTracker works better here. It catches the exact moment when the data is gone and the screen loses focus, and only then queues up the callback (which safely runs after the navigation completes). Plus, the navigation method after a deletion can vary quite a bit (dismissModal, goBack, etc), so this approach handles all those cases more cleanly imo

Navigation.dismissModal();
if (backTo) {
Navigation.navigate(backTo);
Navigation.dismissModal();
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.

I wonder if we should put the next navigate in afterTransition callback here 🤔

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The navigation already has internal mechanisms that put navigation calls onto the stack, so there will be no conflicts. React Navigation will dismiss the modal first and then navigate using the afterTransition callback

@collectioneur collectioneur marked this pull request as ready for review May 26, 2026 11:00
@collectioneur collectioneur requested review from a team as code owners May 26, 2026 11:00
@melvin-bot melvin-bot Bot requested review from daledah and flaviadefaria May 26, 2026 11:00
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 26, 2026

@daledah 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 request for a team May 26, 2026 11:00
@daledah
Copy link
Copy Markdown
Contributor

daledah commented May 27, 2026

on it now

@daledah
Copy link
Copy Markdown
Contributor

daledah commented May 27, 2026

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
Screen.Recording.2026-05-27.at.14.05.21.mov
Android: mWeb Chrome
am.mov
iOS: HybridApp
ios.mov
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari

Test 1

web-1.mov

Test 2

web-2.mov

Test 3

web-3.mov

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.

flushCallbacks() calls callback() without await, so the try/catch block won't catch errors from async callbacks. I think we should consider making flushCallbacks async-aware

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added error handling for async callbacks, thanks for the suggestion!

@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 28, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to #83062 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot Bot requested a review from luacmartins May 28, 2026 03:18
@luacmartins luacmartins merged commit 6768020 into Expensify:main May 28, 2026
40 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @luacmartins 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/luacmartins in version: 9.3.89-1 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

🤖 Help site review: No changes required.

This PR is an internal refactor — it migrates 15 InteractionManager.runAfterInteractions callbacks to TransitionTracker-based APIs (afterTransition on Navigation.goBack, Navigation.dismissModal, Navigation.navigate, etc.) to prevent stale UI flashes during navigation transitions.

There are no user-facing changes:

  • No new or renamed features, tabs, settings, or buttons
  • No changes to user flows or workflows
  • No new functionality customers would need documented
  • Only timing improvements for transition cleanup (smoother animations)

No corresponding App/docs/articles updates are needed.

@mitarachim
Copy link
Copy Markdown

@collectioneur This PR is failing in Test 2 and Test 3 because of a regression issue #92036

Screenshot 2026-05-29 at 11 03 12 AM Screenshot 2026-05-29 at 11 03 20 AM

The issue is reproducible in: Web

Bug7165846_1780008223260.Report_disappears.mp4

@collectioneur
Copy link
Copy Markdown
Contributor Author

@miratachim I'm already looking into it. I'll try to release a fix today 🙌

@collectioneur
Copy link
Copy Markdown
Contributor Author

@mitarachim after investigating, I discovered that the goBack animation for RHPs (both wide and Super Wide) is now much faster. I tested these two flows using my reverted PR and an AdHoc build. The transaction/report does get deleted after the animation ends, exactly as intended. However, due to the increased speed of the transition, it creates a visual illusion that the deletion happens before the transition finishes. I've attached two videos demonstrating that the transaction correctly waits for the transition to end:

2.mov

Also, when the transition starts, an unrelated bug occurs (the overlay's opacity doesn't animate with the transition). This also contributes to the illusion that the transaction deletes before transitionEnd. As shown in the video, this is not the case, the transaction properly deletes after the transition:

1.mov

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.

8 participants