Skip to content

Fix back button loop on Profile after copiloting into an agent - #100686

Merged
chuckdries merged 1 commit into
Expensify:mainfrom
yusufdeveloper2903:fix/99074-agent-copilot-back-loop
Sep 15, 2026
Merged

chuckdries merged 1 commit into
Expensify:mainfrom
yusufdeveloper2903:fix/99074-agent-copilot-back-loop

Conversation

@yusufdeveloper2903

Copy link
Copy Markdown
Contributor

Explanation of Change

Copiloting into an agent from the agent chat header leaves 4 root stack entries, two of which hold owner-only screens guarded by withAgentAccessDenied. The redirect to Profile only dismissed the topmost modal, and because it started from the Reports tab linkTo's cross-tab rule turned the REPLACE back into a PUSH, discarding forceReplace. So the stale guarded routes survived underneath, and pressing back re-focused one, which fired redirectAgentAway and pushed Profile again — the loop.

Calling Navigation.popRootToTop() before the redirect drops every root entry created during the owner's session, so nothing guarded is left to re-fire and forceReplace can finally replace the guarded pane: root entries go 4 → 1, the split under Profile becomes [Settings_Root, Settings_Profile], and back lands on the Account page instead of Home. dismissModal is kept so the RHP still animates away, and linkTo is untouched. Added tests/navigation/AgentCopilotRedirectTests.tsx, which fails on main with Expected: 1, Received: 4.

Fixed Issues

$ #99074
PROPOSAL: #99074 (comment)

Tests

Precondition: an account with an agent created under Account > Agents.

  1. Go to Account > Agents and tap the agent.
  2. Tap Chat with agent.
  3. Tap the chat header.
  4. Tap Copilot into account.
  5. Verify you land on the Profile page.
  6. Tap the back button.
  7. Verify the Account page opens and Profile does not reopen.
  8. Repeat pressing back and verify you are never redirected to Profile again.
  9. Regression (short path, [Due for payment 2026-07-23] Android & iOS - Back button on Profile opens Profile after copilotting into agent #94088): Account > Agents → tap the agent → Copilot into account → back → verify the Account page opens.
  10. Regression (normal copilot): copilot into a regular member account and verify the current page is not reset and back behaves as before.
  • Verify that no errors appear in the JS console

Offline tests

Copiloting is blocked while offline (useSwitchToDelegator short-circuits when the network is offline), so this flow cannot be started offline and the change has no offline-specific behavior.

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

Before fix:

REC-20260909124538.mp4

After fix Native:

REC-20260909124657.mp4
Android: mWeb Chrome
REC-20260909130201.mp4
iOS: Native

After fix:

REC-20260909125401.mp4
iOS: mWeb Safari

After fix:

REC-20260909125617.mp4
MacOS: Chrome / Safari

@yusufdeveloper2903
yusufdeveloper2903 requested review from a team as code owners September 9, 2026 08:10
@melvin-bot
melvin-bot Bot requested review from eVoloshchak and trjExpensify and removed request for a team September 9, 2026 08:10
@melvin-bot

melvin-bot Bot commented Sep 9, 2026

Copy link
Copy Markdown

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

@trjExpensify trjExpensify left a comment

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.

simple navigation fix 👍

@eVoloshchak

eVoloshchak commented Sep 11, 2026 •

Copy link
Copy Markdown
Contributor

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 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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.
  • 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-20260911-141913-1789129133752.mp4
Android: mWeb Chrome
Screen.Recording.2026-09-11.at.13.08.43.mov
iOS: HybridApp
Screen.Recording.2026-09-11.at.13.10.58.mov
iOS: mWeb Safari
Screen.Recording.2026-09-11.at.12.57.51.mov
MacOS: Chrome / Safari
Screen.Recording.2026-09-11.at.12.54.01.mov

@eVoloshchak eVoloshchak left a comment

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.

LGTM!

@melvin-bot
melvin-bot Bot requested a review from chuckdries September 11, 2026 12:22
@chuckdries
chuckdries merged commit fd177b3 into Expensify:main Sep 15, 2026
37 of 39 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.4.80-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review for this PR

The fix itself needs no help site change — it's a navigation correction with no new feature, setting, or copy. But reviewing it surfaced a real gap in the agents article, so I opened a draft PR for that:

Docs updates for E/A#100686 Document all agent Copilot entry points (Expensify/App#101264) — draft, labelled HelpDot.

What was missing

Create and Use Agents documents only one of the three ways to start a Copilot session with an agent — the Copilot button on the agent's row. The flow this PR fixes (chat header → Copilot into account) isn't described anywhere on the help site, and neither is the Edit agent page path.

The docs PR adds a ## Where else you can Copilot into an agent's account section covering both, notes Chat with agent as a second way into the agent chat, and states that back navigation after Copiloting lands on the Account page — the behavior withAgentAccessDenied.tsx:39-44 now guarantees via popRootToTop().

UI label verification and what I checked

I verified every label against the running app on web rather than trusting the existing article. Confirmed exact strings:

Location Exact labels
Account sidebar Agents (with a Beta badge)
Agent row on Agents chat icon, Copilot, Edit
Agent detail page title Edit agent; Chat with agent, Copilot into account, Delete agent
Chat header page title Profile; Copilot into account

The article's existing step "click Copilot" is accurate — that pill really is labelled Copilot. Nothing existing needed correcting; the gap was omission only.

I also checked the rest of the article against this PR. The ## Why does the Security page look different when I Copilot into an agent? FAQ and the delete-agent steps are unaffected by the navigation change.

Written against docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md.

Two things to fix on the docs PR

  1. I couldn't assign you. GitHub reports yusufdeveloper2903 as not assignable on Expensify/App (read permission only, HTTP 404 on the assignee check). Comment on the docs PR once and you become assignable, or ask someone with write access to assign you.
  2. Fixed Issues is intentionally blank. This is a help site follow-up, not a fix for an open issue, and Android & iOS - Agents - Back button on Profile reopens Profile after copiloting into agent is already closed by this PR. Fill it in if a docs tracking issue is preferred.

@yusufdeveloper2903, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.4.80-0 🚀

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

Bundle Size Analysis (Sentry):

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.

6 participants