InteractionManager migration - MoneyRequestConfirmationList, useDialogContainerFocus, useAutoFocusInput by GCyganek · Pull Request #92057 · Expensify/App

GCyganek · 2026-05-29T10:07:00Z

Explanation of Change

Migrates InteractionManager.runAfterInteractions to TransitionTracker.runAfterTransitions in useAutoFocusInput, useDialogContainerFocus, and removes it from MoneyRequestConfirmationList. Adds a skipDialogContainerFocus prop to HeaderWithBackButton/Header, used in IOURequestStepConfirmation to prevent the header back button from stealing focus when Keyboard navigation is used to get to the confirmation page, so the Enter key submits the expense instead of navigating back, and to allow removal of the InteractionManager usage in MoneyRequestConfirmationList which was basically calling blur to remove focus triggered in useDialogContainerFocus.

Fixed Issues

$ #83069
$ #71913
PROPOSAL: N/A

Tests

SelfDM (web):

Go to the SelfDM chat
Click on the plus button > Create expense
Enter a valid amount and go to the next step
Verify that the confirm button is not focused and that tapping Enter submits the expense

SelfDM with Keyboard navigation (web):

Go to SelfDM chat
Click on the plus button > Create expense
Enter a valid amount
Using Keyboard navigation focus the Next button and tap Enter
Verify that the back button is not focused and the expense can be submitted by tapping Enter again

Keyboard navigation (web):

Go to Account > Profile > Status
Verify that Message input gets focused
Use Keyboard navigation to focus the Clear after field and tap Enter
Verify that Back button is focused and tap Enter to go back to the Status screen
Verify that the Clear after field is still focused

Mobile native apps:

Go to Account > Profile > Phone number
Verify that the input field gets focused correctly after transition

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-06-03.at.08.41.25.mov

iOS: Native

Screen.Recording.2026-06-03.at.08.55.04.mov

Android: mWeb Chrome

Screen.Recording.2026-05-29.at.12.01.05.mov

iOS: mWeb Safari

Screen.Recording.2026-05-29.at.11.59.57.mov

MacOS: Chrome / Safari

MoneyRequestConfirmationList:

Screen.Recording.2026-05-29.at.11.54.51.mov

MoneyRequestConfirmationList with Keyboard navigation (skipDialogContainerFocus used to skip focus in useDialogContainerFocus):

Screen.Recording.2026-06-02.at.16.09.10.mov

Screen.Recording.2026-06-02.at.16.12.49.mov

melvin-bot · 2026-06-01T13:30:47Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a5336b6b23

ℹ️ 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".

chatgpt-codex-connector · 2026-06-01T13:36:04Z

-        }, [isNewManualExpenseFlowEnabled]),
-    );
-
    const isCompactMode = !showMoreFields && isScanRequest && !isInLandscapeMode;


Restore the delayed blur after keyboard navigation

When the old money-request flow is advanced by keyboard (for example, tab to the previous step's Next button and press Enter/Space), React Navigation's stack can leave that previous control focused while the confirmation screen is pushed. The confirmation CTA relies on pressOnEnter/useKeyboardShortcuts, and Button disables its Enter shortcut whenever useActiveElementRole() reports a focused button/textbox, so without the deleted delayed blurActiveElement() the user can land on confirmation with focus still on a hidden prior control and Enter won't submit until they click elsewhere. The removed focus effect was the only cleanup that handled this non-mouse path after the transition in the old flow.

Useful? React with 👍 / 👎.

True, now it keeps back button focused after entering the confirmation screen via keyboard. Will restore the blur then

Screen.Recording.2026-06-01.at.16.04.56.mov

…gContainerFocus

GCyganek · 2026-06-02T13:59:05Z

@codex review please

chatgpt-codex-connector · 2026-06-02T14:02:50Z

Codex Review: Didn't find any major issues. 🎉

ℹ️ 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".

codecov · 2026-06-02T14:08:50Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/components/Header.tsx	`100.00% <100.00%> (ø)`
src/components/HeaderWithBackButton/index.tsx	`89.10% <100.00%> (+0.10%)`	⬆️
src/components/MoneyRequestConfirmationList.tsx	`94.53% <ø> (+2.05%)`	⬆️
...es/iou/request/step/IOURequestStepConfirmation.tsx	`64.44% <ø> (ø)`
src/hooks/useDialogContainerFocus/index.ts	`46.15% <12.50%> (ø)`
src/hooks/useAutoFocusInput.ts	`63.63% <0.00%> (ø)`
... and 13 files with indirect coverage changes

joekaufmanexpensify · 2026-06-03T19:49:07Z

No product review needed

GCyganek · 2026-06-09T09:42:46Z

@ikevin127 in case you missed this 😅 I'll fix conflict shortly

…yRequestConfirmationList

GCyganek · 2026-06-09T10:46:00Z

errors unrelated to this pr

ikevin127 · 2026-06-10T01:33:01Z

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

iOS: Native

Simulator.Screen.Recording.-.iPhone.17.Pro.Max.-.2026-06-09.at.20.09.47.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-09.at.19.43.28.mov

ikevin127 · 2026-06-10T02:17:03Z

-    const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    useFocusEffect(
-        useCallback(() => {
-            // Blurring the active element after transition fights AmountField focus in the new manual flow (RHP reopen).
-            if (isNewManualExpenseFlowEnabled) {
-                return undefined;
-            }
-            focusTimeoutRef.current = setTimeout(() => {
-                InteractionManager.runAfterInteractions(() => {
-                    blurActiveElement();
-                });
-            }, CONST.ANIMATED_TRANSITION);
-            return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current);
-        }, [isNewManualExpenseFlowEnabled]),
-    );


⚠️ Issue: Potential Regression for Other Flows Using MoneyRequestConfirmationList

Important: The removed useFocusEffect + blurActiveElement logic was running for all consumers of MoneyRequestConfirmationList (when !isNewManualExpenseFlowEnabled). By removing this blurring behavior entirely without replacing it on a per-flow basis, any other flow using this component that does not also pass shouldSkipFocusAfterTransition to its header will now retain focus on the first interactive element in the header (e.g., the back button), which could break keyboard/screen reader navigation in flows that previously relied on the blur.

Why this matters: The old code was a global workaround for a local problem. Removing it is correct, but the fix (shouldSkipFocusAfterTransition) is currently only applied in IOURequestStepConfirmation.tsx. If MoneyRequestConfirmationList is used within other modals or RHP panels, they might now exhibit incorrect focus behavior.

Suggested fix / verification: Add a quick audit or grep to identify all direct consumers of MoneyRequestConfirmationList. For example:

grep -rn "MoneyRequestConfirmationList" src/pages/ --include="*.tsx"

For any other non-deprecated consumers, verify if the focus landing on the back button is problematic. If it is, those flows should also receive shouldSkipFocusAfterTransition on their respective HeaderWithBackButton (or their wrapper should handle focus differently).

Severity: Medium — could cause keyboard navigation regressions in untested flows.

Other components using MoneyRequestConfirmationList:

SubmitDetailsPage - native mobile app only, so no need to handle keyboard navigation

SplitBillDetailsPage - no submit button that could be triggered by tapping Enter, currently on prod after opening RHP with keyboard navigation there is a blur and tapping Enter does nothing, after these changes there is no blur so focus stays on Back button and Enter closes RHP which IMO is better than what we currently have considering the content of the RHP:

Screen.Recording.2026-06-10.at.08.35.15.mov

ikevin127

🟢 LGTM

Just one mention here to be mindful-of before merging 🙌

…yRequestConfirmationList

GCyganek · 2026-06-15T13:44:48Z

@roryabraham in case you missed it 🫡

github-actions · 2026-06-15T19:57:51Z

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

OSBotify · 2026-06-15T20:02:27Z

✋ 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 · 2026-06-15T20:04:01Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e12017b0b51-d12cd93-5bfdf2fbd6b61d26df62a0e4ecc329053b8b6cf9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e12017b-d12cd93-473c8c4f32d26c826536223299d5fff474c25fa7/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-16T20:09:27Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.9-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-16T20:12:06Z

🤖 I reviewed the changes in this PR and no help site documentation changes are required.

Why: This is an internal focus-management refactor with no user-facing behavior change to document:

Migrates the deprecated InteractionManager.runAfterInteractions to TransitionTracker.runAfterTransitions in useAutoFocusInput and useDialogContainerFocus, and removes it from MoneyRequestConfirmationList.
Adds an internal skipDialogContainerFocus / shouldSkipFocusAfterTransition prop on Header / HeaderWithBackButton, used by IOURequestStepConfirmation to keep the back button from stealing focus during keyboard navigation.

These are implementation-level changes to focus/keyboard-navigation timing and screen-reader announcement behavior. The help site articles under App/docs/articles document user-facing product features, settings, and workflows — none of which are altered here. There's no new feature, renamed UI label, or changed workflow that an end user would need documented.

Since no docs changes are needed, I did not create a draft help site PR.

@GCyganek, if you believe a specific user-facing behavior here should be documented (e.g., a keyboard-navigation/accessibility help article), let me know which article and I'll draft the update.

InteractionManager migration - MoneyRequestConfirmationList

a5336b6

melvin-bot Bot assigned GCyganek May 29, 2026

war-in approved these changes Jun 1, 2026

View reviewed changes

GCyganek marked this pull request as ready for review June 1, 2026 13:30

GCyganek requested review from a team as code owners June 1, 2026 13:30

melvin-bot Bot requested review from ikevin127 and joekaufmanexpensify and removed request for a team June 1, 2026 13:30

chatgpt-codex-connector Bot reviewed Jun 1, 2026

View reviewed changes

GCyganek marked this pull request as draft June 1, 2026 14:16

migrate useDialogContainerFocus and useAutoFocusInput + add skipDialo…

8bcb53d

…gContainerFocus

GCyganek changed the title ~~InteractionManager migration - MoneyRequestConfirmationList~~ InteractionManager migration - MoneyRequestConfirmationList, useDialogContainerFocus, useAutoFocusInput Jun 2, 2026

shouldSkipFocusAfterTransition

7208654

war-in approved these changes Jun 3, 2026

View reviewed changes

GCyganek marked this pull request as ready for review June 3, 2026 10:04

joekaufmanexpensify removed their request for review June 3, 2026 19:49

GCyganek added 2 commits June 9, 2026 11:58

Merge branch 'main' into @GCyganek/interaction-manager-migration/Mone…

f2fbdcd

…yRequestConfirmationList

Re-run tests

1e4df07

ikevin127 reviewed Jun 10, 2026

View reviewed changes

ikevin127 approved these changes Jun 10, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham June 10, 2026 03:20

GCyganek added 2 commits June 10, 2026 08:26

Merge branch 'main' into @GCyganek/interaction-manager-migration/Mone…

538aca0

…yRequestConfirmationList

Merge branch 'main' into @GCyganek/interaction-manager-migration/Mone…

3e76e51

…yRequestConfirmationList

roryabraham approved these changes Jun 15, 2026

View reviewed changes

roryabraham merged commit e12017b into Expensify:main Jun 15, 2026
32 checks passed

collectioneur mentioned this pull request Jun 16, 2026

Migrate InteractionManager - batch 9, part 1 #92378

Draft

51 tasks

OSBotify mentioned this pull request Jun 16, 2026

Deploy Checklist: New Expensify 2026-06-16 #93740

Open

46 tasks

Conversation

GCyganek commented May 29, 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!

melvin-bot Bot commented Jun 1, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek commented Jun 2, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 2, 2026

Uh oh!

codecov Bot commented Jun 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!

joekaufmanexpensify commented Jun 3, 2026

Uh oh!

GCyganek commented Jun 9, 2026

Uh oh!

GCyganek commented Jun 9, 2026

Uh oh!

ikevin127 commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ikevin127 Jun 10, 2026

Choose a reason for hiding this comment

⚠️ Issue: Potential Regression for Other Flows Using MoneyRequestConfirmationList

Uh oh!

GCyganek Jun 10, 2026

Choose a reason for hiding this comment

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

GCyganek commented Jun 15, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

MelvinBot commented Jun 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

GCyganek commented May 29, 2026 •

edited

Loading

codecov Bot commented Jun 2, 2026 •

edited by github-actions Bot

Loading

ikevin127 commented Jun 10, 2026 •

edited

Loading

⚠️ Issue: Potential Regression for Other Flows Using `MoneyRequestConfirmationList`