Migration navigation from InteractionManager to TransitionTracker V2 by collectioneur · Pull Request #83899 · Expensify/App

collectioneur · 2026-03-02T15:20:57Z

Explanation of Change

This PR introduces the TransitionTracker and migrates the first batch of InteractionManager usages in navigation code to use it.

TransitionTracker (src/libs/Navigation/TransitionTracker.ts) is a new module that explicitly tracks active transitions (navigation, modal, keyboard, focus) using a counted map. It exposes startTransition/endTransition to mark transition boundaries, and runAfterTransitions to queue callbacks that fire once all transitions are idle. A safety timeout (1s) auto-ends transitions that are never explicitly closed.

On top of TransitionTracker, existing APIs gain transition-aware options:

*Navigation.navigate, goBack, and dismissModal now accept waitForTransition (defer the navigation until ongoing transitions finish) and afterTransition (run a callback after the triggered transition completes). This replaces the old pattern of wrapping navigation calls in InteractionManager.runAfterInteractions.

dismissModalWithReport uses afterTransition instead of the old DeviceEventEmitter-based MODAL_EVENTS.CLOSED callback pattern. The MODAL_EVENTS.CLOSED constant and its associated DeviceEventEmitter emissions in BaseModal and RightModalNavigator are removed.
KeyboardUtils.dismiss now accepts { afterTransition, shouldSkipSafari } instead of a bare boolean, and tracks keyboard show/hide as a transition type.
ScreenLayout (src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx) is a new component wired into the web stack navigator via screenLayout prop. It listens to transitionStart/transitionEnd events to feed TransitionTracker.
ReanimatedModal now calls TransitionTracker.startTransition('modal') / endTransition('modal') alongside the existing InteractionManager handles.

Concrete migration examples in this PR:

WorkspaceCategoriesSettingsPage and WorkspaceCreateTagPage replace Keyboard.dismiss() + InteractionManager with KeyboardUtils.dismiss({ afterTransition }).
WorkspaceInviteMessageComponent, NewChatPage, TransactionReceiptModalContent, and Report/index.ts replace dismissModal({ callback }) with dismissModal({ afterTransition }).

Fixed Issues

$ #71913
$ #83727
$ #83755
$ #83759
$ #83711

Tests

Replace Reciept:

Tap on any expense.
Tap on the receipt.
Tap 3-dot menu.
Tap Replace.
Verify that attachment modal is closed as on production and then RHP is opened

Workspace Invite

Create workspace
Go to overview page and click Invite button
On Confirm details page click 'Invite'
Verify that modal is closed and user is navigated to Members page afterwards

Create group

Click on FAB > Start chat
choose a user and click 'Add to group'
On Group details page simply click 'Start group'
Verify that modal is closed and user is navigated to that report afterwards

Navigate to a chat from FAB (RHP)

Click on FAB > Start chat
Choose a person (other than self and not the chat that is opened underneath)
Click on that person
Verify that modal is closed and user is navigated to that report afterwards

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

iOS: Native

Start new chat:

Screen.Recording.2026-03-03.at.16.17.56.mov

Workspace invite:

Screen.Recording.2026-03-03.at.16.19.09.mov

Create group:

Screen.Recording.2026-03-03.at.16.21.00.mov

Replace receipt:

Screen.Recording.2026-03-03.at.16.14.02.mov

Keyboard behaviour:

Screen.Recording.2026-03-03.at.16.15.22.mov

MacOS: Chrome / Safari

Start new chat:

Screen.Recording.2026-03-03.at.16.41.24.mov

Workspace invite:

Screen.Recording.2026-03-03.at.16.42.14.mov

Create group:

Screen.Recording.2026-03-03.at.16.43.08.mov

Replace receipt:

Screen.Recording.2026-03-03.at.16.43.50.mov

…acker" This reverts commit 7f4df01.

codecov · 2026-03-02T15:43:53Z

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	`93.60% <ø> (+4.79%)`	⬆️
src/components/Modal/BaseModal.tsx	`86.40% <ø> (-0.11%)`	⬇️
...on/AppNavigator/Navigators/RightModalNavigator.tsx	`5.55% <ø> (+0.06%)`	⬆️
...avigation/PlatformStackNavigation/ScreenLayout.tsx	`100.00% <100.00%> (ø)`
...tePlatformStackNavigatorComponent/index.native.tsx	`100.00% <ø> (ø)`
...on/createPlatformStackNavigatorComponent/index.tsx	`0.00% <ø> (ø)`
src/libs/Navigation/TransitionTracker.ts	`100.00% <100.00%> (ø)`
src/pages/NewChatPage.tsx	`73.11% <ø> (ø)`
src/utils/keyboard/index.ts	`96.15% <100.00%> (+43.77%)`	⬆️
src/components/EmojiPicker/EmojiPicker.tsx	`45.26% <0.00%> (ø)`
... and 9 more
... and 120 files with indirect coverage changes

collectioneur · 2026-03-03T15:37:55Z

All deploy blockers are fixed, we're good to go 😄

#83711 :

83711.mov

#83727 :

83727.mov

#83755 :

83755.mov

#83759 :

83759.mov

blazejkustra

LGTM! 🚀

melvin-bot · 2026-03-03T16:29:57Z

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

src/utils/keyboard/index.website.ts

joekaufmanexpensify

Fixing DBs

… match the other platform implementations

Pujan92 · 2026-03-07T12:22:41Z

@ikevin127 needs to be assigned here. cc: @roryabraham

ikevin127 · 2026-03-08T08:30:19Z

I'll get to this sometime by the EOW next week when I'll be back at full capacity 🙏

If this is urgent - feel free to ask for another reviewer 🙌

Pujan92 · 2026-03-09T12:45:21Z

I'll get to this sometime by the EOW next week when I'll be back at full capacity 🙏

If this is urgent - feel free to ask for another reviewer 🙌

I can review in that case

collectioneur · 2026-03-10T11:11:56Z

Hey @Pujan92! 👋 I’ve just resolved the conflicts so the PR can be reviewed already!

collectioneur · 2026-03-12T12:45:11Z

@Pujan92 friendly bump 🙂

Pujan92 · 2026-03-13T12:30:33Z

Yes @collectioneur, I am about to go through the issue conversion and then start the review 🙂

Pujan92 · 2026-03-15T13:12:11Z

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: 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

m1.webm

p2.webm

p3.webm

Android: mWeb Chrome

iOS: HybridApp

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-03-16.at.23.27.18.mov

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-03-16.at.23.32.43.mov

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-03-16.at.23.35.37.mov

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-03-16.at.23.38.15.mov

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-03-16.at.23.41.19.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-16.at.23.43.54.mov

Pujan92 · 2026-03-16T12:22:34Z

src/libs/Navigation/Navigation.ts

+        TransitionTracker.runAfterTransitions({
+            callback: () => {
+                ref.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL});

-        ref.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL});
+                if (afterTransition) {
+                    TransitionTracker.runAfterTransitions({callback: afterTransition, waitForUpcomingTransition: true});
+                }
+            },
+            runImmediately,
+        });


Suggested change

TransitionTracker.runAfterTransitions({

callback: () => {

ref.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL});

ref.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL});

if (afterTransition) {

TransitionTracker.runAfterTransitions({callback: afterTransition, waitForUpcomingTransition: true});

}

},

runImmediately,

});

TransitionTracker.runAfterTransitions({

callback: () => {

if (afterTransition) {

afterTransition();

}

},

runImmediately,

waitForUpcomingTransition: true

});

ref.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL});

Can't we do it like this by using waitForUpcomingTransition?

Good idea! The only catch here is that ref.dispatch will fire synchronously right away. While this code ensures the afterTransition callback waits for the modal to dismiss, we also need to delay the DISMISS_MODAL action itself until all current active transitions are fully complete (if waitForTransition === true).

We basically need to chain them: [Wait for current transitions] -> [Dismiss Modal] -> [Run callback] 😄

srikarparsi · 2026-03-16T22:33:44Z

Hey @collectioneur, looks like conflicts just came up, do you think you could resolve them when you have a chance

collectioneur · 2026-03-17T10:42:50Z

@srikarparsi conflicts resolved ✅

github-actions · 2026-03-18T07:59:35Z

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

github-actions · 2026-03-18T08:03:41Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-c4d00e1-84e475f-77d09b73609720c3600ee9a5e3eae06352e51080/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-c4d00e1-84e475f-504ddab03ed9b6fbb0e6cb65555a77d56cfbdb77/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-18T08:08:16Z

✋ 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 · 2026-03-18T13:29:12Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.40-0 🚀

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

OSBotify · 2026-03-18T14:05:13Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.40-0 🚀

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

jponikarchuk · 2026-03-18T18:54:23Z

Deploy Blocker #85687 was identified to be related to this PR.

…oneur/transition-tracker-v2" This reverts commit c4d00e1, reversing changes made to fd3c052.

The revert conflict resolution incorrectly dropped the nanoid import, which was added by a separate PR (dynamic-routes suffix layering) after the TransitionTracker PR merged. nanoid is still used in goUp() to generate unique route keys. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ker-v2 Revert "Merge pull request #83899 from software-mansion-labs/collecti…

…ker-v2 Revert "Merge pull request #83899 from software-mansion-labs/collecti… (cherry picked from commit b46f4b6) (cherry-picked to staging by francoisl)

…s/collectioneur/transition-tracker-v2" This reverts commit a6b928b.

OSBotify · 2026-03-19T20:23:57Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

collectioneur added 2 commits March 2, 2026 16:15

Reapply "Migration navigation from InteractionManager to TransitionTr…

c2d4fc8

…acker" This reverts commit 7f4df01.

conflict fix

f71433f

melvin-bot bot assigned collectioneur Mar 2, 2026

collectioneur changed the title ~~Migration navigation from InteractionManager to TransitionTracker~~ Migration navigation from InteractionManager to TransitionTracker V2 Mar 2, 2026

fix transitionTracker bugs

6ecbb2b

blazejkustra approved these changes Mar 3, 2026

View reviewed changes

collectioneur marked this pull request as ready for review March 3, 2026 16:29

collectioneur requested review from a team as code owners March 3, 2026 16:29

melvin-bot bot requested review from Pujan92 and joekaufmanexpensify and removed request for a team March 3, 2026 16:29

melvin-bot bot removed the request for review from a team March 3, 2026 16:29

github-actions bot reviewed Mar 3, 2026

View reviewed changes

src/utils/keyboard/index.website.ts Show resolved Hide resolved

joekaufmanexpensify previously approved these changes Mar 3, 2026

View reviewed changes

move TransitionTracker.startTransition() before Keyboard.dismiss() to…

9c0cd5e

… match the other platform implementations

collectioneur dismissed joekaufmanexpensify’s stale review via 9c0cd5e March 4, 2026 08:13

Merge branch 'main' into collectioneur/transition-tracker-v2

2e6571d

Merge branch 'main' into collectioneur/transition-tracker-v2

3ef984b

Pujan92 reviewed Mar 16, 2026

View reviewed changes

melvin-bot bot requested a review from srikarparsi March 16, 2026 18:47

Merge branch 'main' into collectioneur/transition-tracker-v2

85da06c

srikarparsi approved these changes Mar 18, 2026

View reviewed changes

srikarparsi merged commit c4d00e1 into Expensify:main Mar 18, 2026
31 checks passed

OSBotify mentioned this pull request Mar 18, 2026

Deploy Checklist: New Expensify 2026-03-18 #85646

Closed

100 tasks

MelvinBot mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] [$250] Expenses - Uploaded receipt is not displayed when create manual expense #85669

Open

7 tasks

jponikarchuk mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Android - Chat does not open after closing chat and opening another chat from FAB #85687

Closed

7 tasks

lanitochka17 mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Android - Scan - App returns to confirm page after tapping Replace #85696

Closed

7 tasks

srikarparsi added a commit that referenced this pull request Mar 18, 2026

Revert "Merge pull request #83899 from software-mansion-labs/collecti…

a6b928b

…oneur/transition-tracker-v2" This reverts commit c4d00e1, reversing changes made to fd3c052.

MelvinBot mentioned this pull request Mar 18, 2026

[CP Staging] Revert "Merge pull request #83899 from software-mansion-labs/collecti… #85700

Merged

52 tasks

srikarparsi added a commit that referenced this pull request Mar 19, 2026

Merge pull request #85700 from Expensify/revert-83899-transition-trac…

b46f4b6

…ker-v2 Revert "Merge pull request #83899 from software-mansion-labs/collecti…

collectioneur added a commit to software-mansion-labs/expensify-app-fork that referenced this pull request Mar 19, 2026

Reapply "Merge pull request Expensify#83899 from software-mansion-lab…

6e6912a

…s/collectioneur/transition-tracker-v2" This reverts commit a6b928b.

dominictb mentioned this pull request Mar 19, 2026

[HOLD E/E issue 594594 and App PR 85759] fix: navigation issue after adding Plaid feed in Collect workspace #85688

Draft

52 tasks

collectioneur mentioned this pull request Mar 23, 2026

[$250] [BATCH 1] Migrate ConfirmModals & ReanimatedModals #83061

Open

Conversation

collectioneur commented Mar 2, 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 Mar 2, 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!

collectioneur commented Mar 3, 2026

Uh oh!

blazejkustra left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 3, 2026

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Pujan92 commented Mar 7, 2026

Uh oh!

ikevin127 commented Mar 8, 2026

Uh oh!

Pujan92 commented Mar 9, 2026

Uh oh!

collectioneur commented Mar 10, 2026

Uh oh!

collectioneur commented Mar 12, 2026

Uh oh!

Pujan92 commented Mar 13, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Pujan92 Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

collectioneur Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

srikarparsi commented Mar 16, 2026

Uh oh!

collectioneur commented Mar 17, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

jponikarchuk commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

collectioneur commented Mar 2, 2026 •

edited

Loading

codecov bot commented Mar 2, 2026 •

edited by github-actions bot

Loading

Pujan92 commented Mar 15, 2026 •

edited

Loading