Skip to content

fix: Reports - More menu on expense RHP blocks primary and secondary button. - #72530

Merged
dangrous merged 11 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/71869-2
Oct 30, 2025
Merged

dangrous merged 11 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/71869-2

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Oct 14, 2025 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #70364
PROPOSAL: #70364 (comment)

Tests

Precondition:

  • Have at least two workspaces.

Test 1:

  1. Go to workspace chat (any workspace).
  2. Create an expense in the workspace chat.
  3. Click Submit.
  4. Go to Reports > Reports.
  5. Expand the report row.
  6. Click View on the expense.
  7. Click More.
  8. Verify more menu is scrollable and does not block the primary and secondary button.

Test 2:

  1. Go to workspace settings > Per diem (enable it in More features).
  2. Click Import spreadsheet.
  3. Upload a valid file.
  4. Click dropdown button on Rate Amount.
  5. Verify dropdown menu shows all the options.

Test 3 (Native platform):

  1. Go to Reports.
  2. Tap on the menu.
  3. Scroll down the menu.
  • Verify that no errors appear in the JS console

Offline tests

  • Requires internet connection to perform step 2 to 6.

QA Steps

Precondition:

  • Have at least two workspaces.

Test 1:

  1. Go to workspace chat (any workspace).
  2. Create an expense in the workspace chat.
  3. Click Submit.
  4. Go to Reports > Reports.
  5. Expand the report row.
  6. Click View on the expense.
  7. Click More.
  8. Verify more menu is scrollable and does not block the primary and secondary button.

Test 2:

  1. Go to workspace settings > Per diem (enable it in More features).
  2. Click Import spreadsheet.
  3. Upload a valid file.
  4. Click dropdown button on Rate Amount.
  5. Verify dropdown menu shows all the options.

Test 3 (Native platform):

  1. Go to Reports.
  2. Tap on the menu.
  3. Scroll down the menu.
  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

…button.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@codecov

codecov Bot commented Oct 14, 2025 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/components/PopoverMenu.tsx 91.66% 1 Missing ⚠️
Files with missing lines Coverage Δ
src/CONST/index.ts 85.71% <ø> (ø)
src/components/MoneyReportHeaderKYCDropdown.tsx 11.11% <ø> (-1.39%) ⬇️
src/components/PopoverMenu.tsx 93.04% <91.66%> (-2.96%) ⬇️

... and 1430 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Krishna2323 marked this pull request as ready for review October 21, 2025 06:16
@Krishna2323
Krishna2323 requested a review from a team as a code owner October 21, 2025 06:16
@melvin-bot
melvin-bot Bot requested review from ikevin127 and removed request for a team October 21, 2025 06:16
@melvin-bot

melvin-bot Bot commented Oct 21, 2025

Copy link
Copy Markdown

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

@ikevin127

ikevin127 commented Oct 21, 2025 •

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • 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 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

Android: HybridApp
Case 1 Case 2
android-hybrid-1.mp4
android-hybrid-2.mp4
Android: mWeb Chrome
Case 1 Case 2
android-mweb-1.mp4
android-mweb-2.mp4
iOS: HybridApp
Case 1 Case 2
ios-hybrid-1.MP4
ios-hybrid-2.MP4
iOS: mWeb Safari
Case 1 Case 2
ios-mweb-1.MP4
ios-mweb-2.MP4
MacOS: Chrome / Safari web

Test 2

Screenshot 2025-10-21 at 13 56 14
MacOS: Desktop desktop

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

✅ Besides the main issue fix, the two regression issues were resolved in this follow-up:

@melvin-bot
melvin-bot Bot requested a review from dangrous October 21, 2025 21:07
dangrous
dangrous previously approved these changes Oct 24, 2025

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

This looks good from a tech perspective. Do we need one last look from @Expensify/design?

@dannymcclain

Copy link
Copy Markdown
Contributor

Is this the latest? I still personally think we need to make these menus much shorter and have them clip one of the menu items so it's obvious the container scrolls like I suggested here. cc @dubielzyk-expensify

I think what we have technically fulfills the requirements, but on desktop, when the menu is that tall, it gets confusing when there's an RHP behind it. And on both platforms, if we don't clip the one of the menu items, it's not obvious enough that there's more to see IMO.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@dannymcclain the recordings in @ikevin127's checklist is wrong. Maybe he has recorded a different branch.

Here's the recording from this branch:

Monosnap.screencast.2025-10-25.18-06-21.mp4

@ikevin127

Copy link
Copy Markdown
Contributor

ℹ️ Besides testing the 2 regression issues from the last PR, I used the recordings from the last PR (reverted) as well since I didn't expect changes to the height of the scroll list between the 2 PRs, since the first PR was reverted due to 2 regression issues and not due to scroll list height.

I'm retaking the screenshots right now and will be reporting back 👍

@ikevin127

Copy link
Copy Markdown
Contributor

@Expensify/design This is how things look on my side, just retook the screenshots on this PR:

Android: HybridApp (took on real device OnePlus 7T - Android 15)

Case 1 Case 2
android-hybrid-1.mp4
android-hybrid-2.mp4

Android: mWeb Chrome (took on real device OnePlus 7T - Android 15)

Case 1 Case 2
android-mweb-1.mp4
android-mweb-2.mp4

iOS: HybridApp (took on real device iPhone 17 Pro Max - iOS 26.0.1)

Case 1 Case 2
ios-hybrid-1.MP4
ios-hybrid-2.MP4

iOS: mWeb Safari (took on real device iPhone 17 Pro Max - iOS 26.0.1)

Case 1 Case 2
ios-mweb-1.MP4
ios-mweb-2.MP4

MacOS: Chrome (took on MacBook Air 13" M1 2020 - Tahoe 26.0.1)

web

MacOS: Desktop

desktop

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Ideally we'd want the clipping here too cause it's not super obvious that there's more content:
CleanShot 2025-10-27 at 09 55 38@2x

The beautify of this on desktop is that you can clearly see something is being clipped which invites the user to scroll:

CleanShot 2025-10-27 at 09 56 03@2x

I'd love to have that on mobile too 👍

@ikevin127

ikevin127 commented Oct 27, 2025 •

Copy link
Copy Markdown
Contributor

The "cut halfway through item X" is not reliable, it only works well when the maxHeight of the scroll container has the viewport height to expand fully, if the device's viewport height is smaller than that maxHeight of the scroll container -> the "cut at item X" line won't be there anymore, and depending on device's viewport height we can end up with the same issue: looking like there's nothing below since the line cuts right in between item X and item Y.

Not sure whether this idea would fit in with Expensify's design, but we could implement a fade top / bottom that would show based on scroll position.

This way if the list is longer than its maxHeight (has scroll overflow), by default we show fade bottom, once scrolled down -> fade top appears as well -> if scroll bottom is reached -> fade bottom goes away and we're left with fade top (since that's where we have hidden items).

This is just an idea, probably design experts have a few more of these tricks up their sleeve.

Edit - Example

Screen.Recording.2025-10-28.at.17.25.50.mov

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

I guess looking at the height of the mobile viewport, I'd expect the max-height to be smaller than 600-700px. On desktop it's showing 7.5 items and I guess what I'm suggesting is maybe make it 6.5 items so that we can get that max-height crop on mobile by default as well. Thoughts on that?

@dannymcclain

Copy link
Copy Markdown
Contributor

Totally agree with Jon. Desktop is looking super nice though.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@Expensify/design If we want to show the 7th item clipped, we need to use a fixed max height instead of a dynamic max height, which currently is windowHeight - 250px. In the demo below, I used a max height of 432px. What do you think?

Monosnap.screencast.2025-10-28.14-08-10.mp4

@dannymcclain

Copy link
Copy Markdown
Contributor

If we want to show the 7th item clipped, we need to use a fixed max height instead of a dynamic max height... In the demo below, I used a max height of 432px. What do you think?

I think this looks pretty dang good! I think this is more clear than how it was before. cc @dubielzyk-expensify for his thoughts as well.

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Agree with that. It's only really this menu that has so many options, right?

Can you send a video with the (+) button on the home screen? I wanna just make sure we don't clip that one.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323

Copy link
Copy Markdown
Contributor Author

@Expensify/design:

Monosnap.screencast.2025-10-29.19-59-47.mp4

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Legend! That looks good to me. @dannymcclain for last check

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@ikevin127 please review the latest changes and proceed if everything tests well. Thanks!

@melvin-bot
melvin-bot Bot requested a review from dangrous October 30, 2025 10:23
@dannymcclain

Copy link
Copy Markdown
Contributor

Looks good to me too!

@dangrous

Copy link
Copy Markdown
Contributor

This looks great! Test failure seems unrelated so trying a rerun, will merge if we get all green

@dangrous
dangrous merged commit 0619e4c into Expensify:main Oct 30, 2025
2 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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 9.2.42-0 🚀

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

@OSBotify

OSBotify commented Nov 3, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.42-11 🚀

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

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