fix: mount a single discard-changes guard on the avatar screen

[yusufdeveloper2903]

Explanation of Change

For agent accounts, the avatar screen (AvatarPage.tsx) previously rendered the agent
avatar content (EditAgentAvatarContent) from inside the same ProfileAvatar component
that also set up the full ProfileUserAvatar screen wrapper. Because the agent branch was
an early return inside ProfileAvatar, both the parent screen and the
EditAgentAvatarContent mounted their own discard-changes guards. This double guard caused
the brief blank screen when navigating back from the Edit avatar screen on an agent account.

This PR splits ProfileAvatar into two dedicated components:

• ProfileAgentAvatar â�� renders only EditAgentAvatarContent (with its single guard) for agent accounts.
• ProfileUserAvatar â�� the original regular-user avatar screen.

ProfileAvatar now just checks useIsAgentAccount() and renders the correct component, so
only a single discard-changes guard is ever mounted. This removes the blank flash when going
back from the Edit avatar screen.

Fixed Issues

$ #93256
PROPOSAL: #93256 (comment)

Tests

1. Login with an expensifail account and create an agent.
2. Open the app.
3. Go to Account.
4. Tap the 2-arrow (switch) icon next to the account section.
5. Select an Agent.
6. Go to Profile.
7. Tap the avatar.
8. Tap the back button.
9. Verify the previous screen is displayed immediately, without a blank screen flashing in between.
10. Re-open the avatar screen, change the avatar (upload a file or pick a default agent avatar), and verify the save still works correctly.

• Verify that no errors appear in the JS console

Offline tests

1. Follow steps 1�7 above to open the agent Edit avatar screen.
2. Turn off the network connection.
3. Tap the back button and verify the previous screen appears immediately with no blank flash.
4. Change the avatar while offline and verify the optimistic update is reflected; reconnect and verify it syncs.

QA Steps

1. Login with an expensifail account and create an agent.
2. Open the app.
3. Go to Account.
4. Tap the 2-arrow (switch) icon next to the account section.
5. Select an Agent.
6. Go to Profile.
7. Tap the avatar.
8. Tap the back button.
9. Verify the previous screen is displayed immediately when navigating back from the Edit avatar screen, without showing a blank screen.

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

After fix:

after-fix-android.mp4

Android: mWeb Chrome

After fix:

After-fix-android-chrome.mp4

iOS: Native

After fix:

After-fix-ios-app.mp4

iOS: mWeb Safari

After fix:

After-fix-ios-safari.mp4

MacOS: Chrome / Safari

After fix MacOS Chrome:

After-fix-MacOS-chrome.mp4

After fix MacOS Safari:

After-fix-MacOS-safari.mp4

After fix Windows Chrome:

After-fix-windows-chrome.mp4

[melvin-bot]

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

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/settings/Profile/Avatar/AvatarPage.tsx	0.00% <0.00%> (ø)
.../settings/Profile/Avatar/EditUserAvatarContent.tsx	0.00% <0.00%> (ø)
... and 10 files with indirect coverage changes

[thelullabyy]

Please update the PR to follow the suggestion #93256 (comment) @yusufdeveloper2903

[yusufdeveloper2903]

@thelullabyy Updated as suggested — extracted EditUserAvatarContent as a mirror of EditAgentAvatarContent, so ProfileAvatar now just selects between the two. Only a single discard-changes guard is mounted now

[trjExpensify]

I'm a bit confused here, shouldn't this be a default bot avatar in the first place?

[thelullabyy]

@trjExpensify it looks like @yusufdeveloper2903 used the mock data account since agents feature is under beta flag. It should work fine when we use real account

[thelullabyy]

@yusufdeveloper2903 Please add recording to all other platforms

[yusufdeveloper2903]

@thelullabyy updated the PR recordings for all platforms are now added in the Screenshots/Videos section. The blank-screen flash is gone when navigating back from the agent Edit avatar screen on every platform.��

[trjExpensify]

@trjExpensify it looks like @yusufdeveloper2903 used the mock data account since agents feature is under beta flag. It should work fine when we use real account

I believe that's unnecessary now, as of the last couple of days.

[thelullabyy]

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 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 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.
• 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-06-17.at.19.32.21.mov

Android: mWeb Chrome

Screen.Recording.2026-06-17.at.19.33.12.mov

iOS: HybridApp

Screen.Recording.2026-06-17.at.19.29.07.mov

iOS: mWeb Safari

Screen.Recording.2026-06-17.at.19.27.27.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-17.at.19.26.07.mov

[thelullabyy]

LGTM

[thelullabyy]

@codex review

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Keep them coming!

Reviewed commit: 99fd36902a

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

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-476088f0a8e-3ab817a-73851c4247a4cc878b0b1af9a45bc51773bc1db1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-476088f-3ab817a-908deef258ee3ab1f74ccd85b54b45e4113a774f/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/grgia in version: 9.4.15-0 🚀

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

[MelvinBot]

🤖 No help site changes required.

I reviewed the changes in this PR against the help articles under App/docs/articles and no documentation updates are needed.

Why: This PR is a pure internal refactor. It splits ProfileAvatar into ProfileAgentAvatar and EditUserAvatarContent so that only a single discard-changes guard is mounted, eliminating the brief blank-screen flash when navigating back from the Edit avatar screen on an agent account.

• No new features, settings, tabs, or buttons were added.
• No UI labels or copy changed.
• The avatar-editing flow itself (uploading a photo, picking a preset/agent avatar, saving) behaves exactly as before.

The avatar-related help articles (e.g. Add-profile-photo.md) document how to set a profile photo, and those steps remain accurate. Since this is strictly a navigation-glitch bug fix with no user-facing behavior change, there is nothing to update on the help site and no draft docs PR was created.

@yusufdeveloper2903, if you believe a behavior or label changed that I missed, reply with the specifics and I'll re-check and create a docs PR if warranted.

[OSBotify]

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.15-3 🚀

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