[CP Staging] Revert "fix: [Web] Focus restoration mechanism on back navigation (#76921)" by marcaaron · Pull Request #85887 · Expensify/App

marcaaron · 2026-03-19T23:30:30Z

$ #85866
$ #85874
$ #85878
$ #85886
$ #85896
$ #85895

github-actions · 2026-03-19T23:31:26Z

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

codecov · 2026-03-19T23:49:27Z

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/App.tsx	`100.00% <ø> (ø)`
src/components/ApprovalWorkflowSection.tsx	`0.00% <ø> (ø)`
src/components/ConfirmModal.tsx	`100.00% <100.00%> (ø)`
src/components/PopoverMenu.tsx	`81.86% <100.00%> (+0.88%)`	⬆️
src/components/ThreeDotsMenu/index.tsx	`90.90% <ø> (+14.07%)`	⬆️
...c/hooks/useSyncFocus/useSyncFocusImplementation.ts	`100.00% <ø> (ø)`
src/libs/Navigation/NavigationRoot.tsx	`76.92% <ø> (-0.26%)`	⬇️
...omposerWithSuggestions/ComposerWithSuggestions.tsx	`58.40% <ø> (+0.84%)`	⬆️
src/pages/tasks/NewTaskPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/WorkspaceNamePage.tsx	`0.00% <ø> (ø)`
... and 7 more
... and 11 files with indirect coverage changes

melvin-bot · 2026-03-20T05:25:24Z

@cristipaval 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: 6baa39b1c4

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-20T05:37:04Z

src/hooks/useAutoFocusInput.ts

-                }
-                inputRef.current?.focus();
-            });
+            isWindowReadyToFocus().then(() => inputRef.current?.focus());


Avoid stealing focus in deferred auto-focus

The hook now always executes inputRef.current?.focus() after isWindowReadyToFocus() resolves, even if focus has already moved to another interactive element in the meantime. On web, this causes back-navigation/restored-focus flows (and any user-initiated focus change during the delay) to be overridden by the input, producing unexpected focus jumps across the many screens that use useAutoFocusInput.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-03-20T05:37:04Z

src/hooks/useSyncFocus/useSyncFocusImplementation.ts

-            return;
-        }
-
        ref.current?.focus({preventScroll: true});


Prevent useSyncFocus from overriding existing DOM focus

useSyncFocusImplementation now calls ref.current?.focus(...) unconditionally whenever isFocused is true, without checking whether another element is already focused. In keyboard-navigation and modal-close scenarios, this can immediately steal focus from the element that was intentionally restored, breaking expected tab order and causing visible focus flicker.

Useful? React with 👍 / 👎.

melvin-bot · 2026-03-20T05:44:24Z

@MonilBhavsar looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

MonilBhavsar · 2026-03-20T05:44:40Z

Straight revert

github-actions · 2026-03-20T05:45:08Z

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

github-actions · 2026-03-20T05:49:29Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a56df80-c58bf3c-85a0504ac1e2c2261939f77ac30c28f0a9bcc461/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a56df80-c58bf3c-55f68a5cf836d8a8634336d73ef8dcc8bec35925/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-20T05:52:39Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…-restoration-clean [CP Staging] Revert "fix: [Web] Focus restoration mechanism on back navigation (#76921)" (cherry picked from commit a56df80) (cherry-picked to staging by cristipaval)

OSBotify · 2026-03-20T09:42:06Z

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.3.41-2 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-23T09:31:42Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

OSBotify · 2026-03-23T09:52:03Z

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.3.42-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Revert "fix: [Web] Focus restoration mechanism on back navigation (#7…

6baa39b

…6921)"

melvin-bot bot assigned marcaaron Mar 19, 2026

marcaaron added the Ready To Build label Mar 19, 2026

This comment has been minimized.

Sign in to view

ikevin127 mentioned this pull request Mar 20, 2026

[$500] Keyboard Navigation: Many Pages: The focus is lost and does not return to triggering element #76921

Open

MonilBhavsar marked this pull request as ready for review March 20, 2026 05:24

MonilBhavsar requested review from a team as code owners March 20, 2026 05:24

melvin-bot bot requested review from JmillsExpensify and cristipaval and removed request for a team March 20, 2026 05:24

MonilBhavsar approved these changes Mar 20, 2026

View reviewed changes

MonilBhavsar changed the title ~~Revert "fix: [Web] Focus restoration mechanism on back navigation (#76921)"~~ [CP Staging] Revert "fix: [Web] Focus restoration mechanism on back navigation (#76921)" Mar 20, 2026

chatgpt-codex-connector bot reviewed Mar 20, 2026

View reviewed changes

MonilBhavsar merged commit a56df80 into main Mar 20, 2026
41 of 48 checks passed

MonilBhavsar deleted the revert-79834-fix/76921-focus-restoration-clean branch March 20, 2026 05:44

melvin-bot bot added the Emergency label Mar 20, 2026

MonilBhavsar removed the Emergency label Mar 20, 2026

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: build (developmentDebug, false) #85897

Closed

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: build (New Expensify Dev, DebugDevelopment, false) #85899

Closed

OSBotify mentioned this pull request Mar 20, 2026

mWeb - Onboarding - App freezes when create new account #85895

Closed

7 tasks

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 20, 2026

OSBotify mentioned this pull request Mar 20, 2026

Deploy Checklist: New Expensify 2026-03-19 #85862

Closed

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: build (developmentDebug, false) #85978

Closed

Conversation

marcaaron commented Mar 19, 2026 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 19, 2026

Uh oh!

This comment has been minimized.

codecov bot commented Mar 19, 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!

melvin-bot bot commented Mar 20, 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 Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Mar 20, 2026

Uh oh!

MonilBhavsar commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

marcaaron commented Mar 19, 2026 •

edited by mountiny

Loading

codecov bot commented Mar 19, 2026 •

edited by github-actions bot

Loading