Skip to content

Fix: Circle icon showing behind back button on workspace pages in landscape mode#94218

Merged
mountiny merged 5 commits into
Expensify:mainfrom
samranahm:90374/circle-icon-in-landscape-mode
Jul 10, 2026
Merged

Fix: Circle icon showing behind back button on workspace pages in landscape mode#94218
mountiny merged 5 commits into
Expensify:mainfrom
samranahm:90374/circle-icon-in-landscape-mode

Conversation

@samranahm

@samranahm samranahm commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

On native, split navigator central screens and their header/list areas are transparent, so the workspace sidebar show through the back button on landscape mode in workspace pages after we move header buttons inline. This PR adds opaque appBG backgrounds to split navigator native screens, headerBar, and BaseSelectionList so the central pane fully covers the sidebar underneath.

Fixed Issues

$ #90374
PROPOSAL: #90374 (comment)

Tests

  1. Open Expensify in landscape mode.
  2. Navigate to the "Workspaces" tab.
  3. Select a workspace and open following pages one by one
    • Members
    • Categories
    • Taxes
    • Company Cards
    • Distance Rates
  4. Verify that no circle icon is visible behind the Back button in the upper-left corner.
  • Verify that no errors appear in the JS console

Offline tests

Same as test

QA Steps

Same as test
// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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 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.
  • 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
Android.Native.mp4
Android.Native.landscape.mp4
Android: mWeb Chrome
Android.mWeb.mp4
iOS: Native
IOS.Native.mp4
IOS.Native.landscape.mp4
iOS: mWeb Safari
IOS.mWeb.mp4
MacOS: Chrome / Safari
macOS.Chrome.mp4

@samranahm samranahm requested review from a team as code owners June 22, 2026 21:40
@melvin-bot melvin-bot Bot requested review from trjExpensify and truph01 and removed request for a team June 22, 2026 21:40
@melvin-bot

melvin-bot Bot commented Jun 22, 2026

Copy link
Copy Markdown

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

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Videos looking good on my end 👍

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@samranahm

Copy link
Copy Markdown
Contributor Author

@truph01 Gentle bump.

@truph01

truph01 commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

@samranahm Could you merge main?

Copilot AI review requested due to automatic review settings July 1, 2026 09:17

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

Pull request overview

This PR addresses a native (landscape) workspace-settings UI layering issue where the split navigator’s central pane can be visually transparent, allowing the workspace sidebar (including a circular icon) to show behind the Back button. It does so by making key containers/screens explicitly render an opaque appBG background.

Changes:

  • Adds theme.appBG background to the headerBar style so the header area is no longer transparent.
  • Sets native split-navigator screen contentStyle to themeStyles.appBG so split navigator panes render opaquely on native.
  • Applies styles.appBG to BaseSelectionList container and list to prevent see-through areas in list-based workspace settings pages.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
src/styles/index.ts Makes headerBar opaque via backgroundColor: theme.appBG.
src/libs/Navigation/AppNavigator/useSplitNavigatorScreenOptions.ts Sets native split navigator contentStyle to appBG for opaque split panes.
src/components/SelectionList/BaseSelectionList.tsx Forces selection list containers/lists to use appBG to avoid transparency bleed-through.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/libs/Navigation/AppNavigator/useSplitNavigatorScreenOptions.ts
Comment thread src/libs/Navigation/AppNavigator/useSplitNavigatorScreenOptions.ts
@codecov

codecov Bot commented Jul 1, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...ion/AppNavigator/useSplitNavigatorScreenOptions.ts 100.00% <100.00%> (ø)
src/styles/index.ts 60.30% <ø> (ø)
... and 536 files with indirect coverage changes

@samranahm

Copy link
Copy Markdown
Contributor Author

Done.

@truph01

truph01 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@samranahm Could you check all AI' comments above?

@samranahm

Copy link
Copy Markdown
Contributor Author

@truph01 I added the comments, please take a look.

@truph01

truph01 commented Jul 9, 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 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
Android: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-07-09.at.17.20.44.mov
Screen.Recording.2026-07-09.at.17.22.18.mov
Screen.Recording.2026-07-09.at.17.22.50.mov
Screen.Recording.2026-07-09.at.17.23.31.mov
iOS: mWeb Safari
MacOS: Chrome / Safari


return (
<View style={[styles.flex1, addBottomSafeAreaPadding && !hasFooter && paddingBottomStyle, style?.containerStyle]}>
<View style={[styles.flex1, styles.appBG, addBottomSafeAreaPadding && !hasFooter && paddingBottomStyle, style?.containerStyle]}>

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.

appBG on BaseSelectionList may be redundant with the screen-level fix

The contentStyle: themeStyles.appBG on native screen options already gives every screen a solid background. Adding appBG directly to the selection list container and scroll view extends the change to all ~343 consumers, including web where this bug doesn't occur, and would need overriding if a future caller expects a different background (e.g. inside a highlightBG bottom sheet). Could you confirm whether the contentStyle fix alone resolves the issue?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@truph01 Yes, after removing appBG change from BaseSelectionList, the circle didn't appear on any page. I'll remove these changes and keep only the contentStyle and headerBar fix.

@samranahm samranahm requested a review from truph01 July 10, 2026 01:25
@melvin-bot melvin-bot Bot requested a review from mountiny July 10, 2026 02:51

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

Lets give it a go

@mountiny mountiny merged commit 88a0e4a into Expensify:main Jul 10, 2026
36 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

🚧 mountiny 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/mountiny in version: 9.4.33-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against Expensify's help site content under App/docs/articles.

No help site changes are required.

This PR is a purely visual/rendering fix. It adds opaque appBG backgrounds to:

  • Split navigator native screens (useSplitNavigatorScreenOptions.ts)
  • The headerBar style (styles/index.ts)

so the workspace sidebar no longer shows through behind the Back button in landscape mode on native.

There is no change to feature behavior, user-facing workflows, settings labels, tab names, or button copy — nothing that the public help articles document. Help site articles cover how features work and how to use them, and a background-color/z-order fix has no documentable user-facing behavior change. Accordingly, I did not create a draft docs PR.

@samranahm, since no help site changes are needed here, there's no linked help site PR to review. If you believe there's a user-facing behavior change I missed that should be documented, let me know and I'll create the docs PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #95863 was identified to be related to this PR

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.

8 participants