Skip to content

fix: Reports - Filters become unresponsive after deleting the workspace. - #74856

Merged
luacmartins merged 18 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/74616
Dec 3, 2025
Merged

luacmartins merged 18 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/74616

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Nov 11, 2025 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #74616
PROPOSAL: #74616 (comment)

Tests

Steps to Reproduce:

  1. Create a new account
  2. Go to workspaces page and create a workspace
  3. Go to Reports
  4. Tap on any filter (e.g., Status, From)
  5. Note that the filter works correctly and the bottom modal opens
  6. Go to workspace list page → 3 dots → Delete Workspace
  7. Return to Reports
  8. Tap on any filter again (e.g., Status, From, Date, etc.)
  9. Verify all filter modals opens correctly
  10. Repeat steps from 2 to 9 but this time delete the workspace from workspace overview page
  • Verify that no errors appear in the JS console

Offline tests

  • Same as tests

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

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

codecov Bot commented Nov 11, 2025 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspacePageWithSections.tsx 78.26% <ø> (ø)
src/pages/workspace/WorkspacesListPage.tsx 76.12% <100.00%> (+0.97%) ⬆️
src/pages/workspace/WorkspaceOverviewPage.tsx 0.00% <0.00%> (ø)
... and 44 files with indirect coverage changes

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

Krishna2323 commented Nov 16, 2025 •

Copy link
Copy Markdown
Contributor Author

What was actually broken

  • If you navigated away while a ConfirmModal was still animating, it was unmounted before cleanup, leaving global modal state “stuck” so popovers wouldn’t open.
    • Blocking logic in the filter dropdown:
      const [willAlertModalBecomeVisible] = useOnyx(ONYXKEYS.MODAL, {selector: willAlertModalBecomeVisibleSelector, canBeMissing: true});
      /**
      * Toggle the overlay between open & closed
      */
      const toggleOverlay = useCallback(() => {
      setIsOverlayVisible((previousValue) => {
      if (!previousValue && willAlertModalBecomeVisible) {
      return false;
      }
      return !previousValue;
      });
      }, [willAlertModalBecomeVisible]);
  • On WorkspaceOverviewPage, we flipped to Not Found immediately after delete, unmounting the modal before it finished hiding and causing the same stuck state and inconsistent next steps.
    <WorkspacePageWithSections

    <FullPageNotFoundView
    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACES_LIST.route)}
    onLinkPress={goBackFromInvalidPolicy}
    shouldShow={shouldShow}
    subtitleKey={shouldShowPolicy ? 'workspace.common.notAuthorized' : undefined}
    shouldForceFullScreen
    shouldDisplaySearchRouter
    >

Root cause in simple words

  • We navigated faster than the modal could close; the cleanup that resets global modal state runs after the hide animation.
  • WorkspaceOverviewPage replaced the screen (shouldShowNotFoundPage={policy === undefined}), tearing out the modal mid-animation.

What changed in this branch

  • WorkspacesListPage: Confirm modals render at the screen level, so they don’t disappear when the list empties and can complete their lifecycle (resetting global modal state).
  • WorkspaceOverviewPage + WorkspacePageWithSections: All ConfirmModals are passed via the modals prop and rendered outside FullPageNotFoundView, so they aren’t unmounted by the Not Found flip and can fully close.

Why this fixes both issues

  • Modals now complete their hide animation and BaseModal clears global modal state, so popovers can open again.
  • Modals aren’t force-unmounted by the Not Found view, removing the race between view change and modal cleanup.

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

Copy link
Copy Markdown
Contributor

The analysis sounds good to me. But we need to fix this:

We now see a not found page for a moment because we wait for the modal to close properly.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

I need some time to find a solution. I’ll try to resolve it over the weekend and provide updates on Monday.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

I was unable to find a solution for the bug above, will share my findings today.

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

Copy link
Copy Markdown
Contributor Author

I was finally able to get a solution for the "not found" page bug and pushed the changes. I'll share the recordings for confirmation today.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Krishna2323 marked this pull request as ready for review November 26, 2025 19:14
@Krishna2323
Krishna2323 requested review from a team as code owners November 26, 2025 19:14
@melvin-bot
melvin-bot Bot requested review from dominictb and heyjennahay and removed request for a team November 26, 2025 19:14
@melvin-bot

melvin-bot Bot commented Nov 26, 2025

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team November 26, 2025 19:14
@Krishna2323

Copy link
Copy Markdown
Contributor Author

@dominictb everything is fixed now and this is ready for review. Thanks for waiting.

heyjennahay
heyjennahay previously approved these changes Nov 27, 2025

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

No concern with product change

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@dominictb bump

@luacmartins

Copy link
Copy Markdown
Contributor

@Krishna2323 we have a couple of tests failing. @dominictb let's please review this PR when you're online

@dominictb

dominictb commented Dec 2, 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 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.ts 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.
  • 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.2025-12-02.at.17.31.02.mov
Android: mWeb Chrome
Screen.Recording.2025-12-02.at.17.33.17.mov
iOS: HybridApp
Screen.Recording.2025-12-02.at.17.23.32.mov
iOS: mWeb Safari
Screen.Recording.2025-12-02.at.17.25.01.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-02.at.17.19.46.mov

@dominictb

Copy link
Copy Markdown
Contributor

@Krishna2323 You might have missed these comments #74856 (comment)

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

Copy link
Copy Markdown
Contributor Author

@dominictb handles all. Thanks!

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

🎀

@melvin-bot
melvin-bot Bot requested a review from luacmartins December 3, 2025 12:21

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

@luacmartins
luacmartins merged commit 3d868d7 into Expensify:main Dec 3, 2025
34 checks passed
@OSBotify

OSBotify commented Dec 3, 2025

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 OSBotify mentioned this pull request Dec 4, 2025
60 tasks done
@mhawryluk mhawryluk mentioned this pull request Dec 4, 2025
51 tasks done
@OSBotify

OSBotify commented Dec 4, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.72-0 🚀

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

@OSBotify

OSBotify commented Dec 5, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.2.72-2 🚀

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

return;
}
setIsDeleteModalOpen(false);

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.

Coming from this issue #78514, removing setIsDeleteModalOpen from here caused that issue.

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