Skip to content

early return in isPayer function when policy does not exits in workspace chat#78421

Merged
mountiny merged 14 commits intoExpensify:mainfrom
marufsharifi:fix/gbr-reappears-on-lhn-when-approver-leaves-workspace
Feb 20, 2026
Merged

early return in isPayer function when policy does not exits in workspace chat#78421
mountiny merged 14 commits intoExpensify:mainfrom
marufsharifi:fix/gbr-reappears-on-lhn-when-approver-leaves-workspace

Conversation

@marufsharifi
Copy link
Contributor

@marufsharifi marufsharifi commented Dec 24, 2025

Explanation of Change

Fixed Issues

$ #75329
PROPOSAL: #75329 (comment)

Tests

Precondition: Owner create workspace and invite employee and approver. Submission frequency in Workflows needs to be disabled

  1. Employee submits 2 expenses in workspace chat
  2. Approver approve the expenses
  3. Approver navigates to workspaces> leave the workspace
  4. Approver navigates back to inbox
  5. Green dot should not appear on workspace chat
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

// 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 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
Screen.Recording.1404-09-11.at.3.00.18.PM.mov
Android: mWeb Chrome
Screen.Recording.1404-09-11.at.3.03.40.PM.mov
iOS: Native
Screen.Recording.1404-09-11.at.2.53.53.PM.mov
iOS: mWeb Safari
Screen.Recording.1404-09-11.at.2.57.06.PM.mov
MacOS: Chrome / Safari
Screen.Recording.1404-09-11.at.2.33.38.PM.mov
Screenshot 1404-10-03 at 10 54 04 AM

@marufsharifi marufsharifi requested review from a team as code owners December 24, 2025 06:20
@melvin-bot melvin-bot bot requested review from rojiphil and removed request for a team December 24, 2025 06:20
@melvin-bot
Copy link

melvin-bot bot commented Dec 24, 2025

@rojiphil 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 requested review from JmillsExpensify, flaviadefaria, heyjennahay, joekaufmanexpensify and trjExpensify and removed request for a team December 24, 2025 06:20
@codecov
Copy link

codecov bot commented Dec 24, 2025

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspaceOverviewPage.tsx 0.00% <ø> (ø)
src/libs/actions/Policy/Policy.ts 39.30% <92.85%> (+2.22%) ⬆️
src/pages/workspace/WorkspacesListPage.tsx 61.63% <0.00%> (ø)
... and 113 files with indirect coverage changes

Copy link
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

@marufsharifi Thanks for PR. I have left a couple of comments for you. Please have a look. Thanks.

@marufsharifi
Copy link
Contributor Author

@rojiphil, I've applied your feedback. Please check again when you get a chance. thanks

Copy link
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

I agree that the GBR shouldn't randomly appear for the approver on the workspace chat of a submitter when they leave the workspace. That said, I'm a bit confused why they seemingly have retained access to the workspace chat at all after leaving the workspace?

Aren't they replaced in the approval chain at the point of taking that action to leave, and thus would not still have access to the workspace chat?

@marufsharifi
Copy link
Contributor Author

@trjExpensify, I think that after leaving the workspace, he should still be able to view the expenses he previously approved, even though he’s no longer a member of the workspace. But after he leaves the workspace, he still has access to the chat to only view expenses, but is no longer wokspace member.

Screenshot 1404-10-16 at 6 34 19 PM Screenshot 1404-10-16 at 6 34 54 PM

@trjExpensify
Copy link
Contributor

Mhm, as an approver, I thought your access to the policyExpenseChat is revoked with the approval chain update, which is what would happen when you leave a collect workspace and the workspace owner becomes the default approver instead.

@marufsharifi
Copy link
Contributor Author

@trjExpensify, thanks. That behavior is exactly what’s happening. However, he still retains access to review the expenses in the chat. Could you please let me know if any additional changes are needed from my side? Thanks!

When you leave a collect workspace, the workspace owner becomes the default approver instead.

@trjExpensify
Copy link
Contributor

Nah, I think there's a bug with the approver leaving a workspace. They should lose access to the workspace chats (apart from their own, which is archived).

In this video, you can see two scenarios:

  1. Approver leaves, retains access to the workspace chat.
  2. Approver is removed, does not retain access to the workspace chat.
2026-01-07_19-16-33.mp4

So I think that's the real fix here, tbh. The workspace chat shouldn't be showing at all in the LHN after the approver leaves the workspace as they should be removed from it.

@marufsharifi
Copy link
Contributor Author

@rojiphil, based on this comment, should we update the pr to do the following:

The workspace chat shouldn't be showing at all in the LHN after the approver leaves the workspace as they should be removed from it.

What is the next step for this PR? It is not clear to me. Thanks for the help.

@marufsharifi
Copy link
Contributor Author

@rojiphil, I updated the pr to remove all workspace chats other than the user's own workspace chat. It's working in offline mode. Let's make BE changes. Then I will continue creating new records for every platform. Thanks for your patience.

Screen.Recording.1404-11-02.at.10.37.27.AM.mov

cc @trjExpensify

@rojiphil
Copy link
Contributor

Okay, let's see how it tests! 👍

@trjExpensify Is the test video aligned with your expectation? LGTM though.

78421-web-chrome-001.mp4

@rojiphil
Copy link
Contributor

It's working in offline mode. Let's make BE changes.

@marufsharifi Does this work for you when online?
To me, it does work although I also think BE should reset such workspaces as part of the API response.

@marufsharifi
Copy link
Contributor Author

It's working in offline mode. Let's make BE changes.

@marufsharifi Does this work for you when online? To me, it does work although I also think BE should reset such workspaces as part of the API response.

@rojiphil, it get remove immeditely, but after refreshing the page, those get's back. This needs to be removed from BE as well.

@rojiphil
Copy link
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
78421-android-hybrid-001.mp4
Android: mWeb Chrome
78421-mweb-chrome-001.mp4
iOS: HybridApp
78421-ios-hybrid-001.mp4
iOS: mWeb Safari
78421-mweb-safari-001.mp4
MacOS: Chrome / Safari
78421-web-chrome-001.mp4

@rojiphil
Copy link
Contributor

@marufsharifi can we add a test case please to ensure that we remove all workspace chats other than the user’s own workspace chat upon leaving the workspace?

@rojiphil
Copy link
Contributor

it get remove immeditely, but after refreshing the page, those get's back. This needs to be removed from BE as well.

Thanks @marufsharifi for the clarification.

@mountiny There is a fix needed in BE when the user is an approver of another user’s workspace and attempts to leave the workspace. After leaving the workspace, the BE is still sending back the other user’s workspace chat as demonstrated below. Please help fix this in BE. Thanks.

78421-online-issue.mp4

@mountiny
Copy link
Contributor

@rojiphil @marufsharifi Can you please clarify the problem that has to be fixed in BE with numbered steps, ideally report it in the original issue and we can get someone to look into this

@trjExpensify
Copy link
Contributor

Video looks good, though just to confirm, do we disappear archived chats from the LHN? That's why the user's own workspace chat disappears as well?

I think we should get the BE fixed first.

@rojiphil
Copy link
Contributor

do we disappear archived chats from the LHN? That's why the user's own workspace chat disappears as well?

That's correct @trjExpensify. We hide archived chats from LHN but user can search and access them.
And thanks for confirming the fix here.

@rojiphil
Copy link
Contributor

Can you please clarify the problem that has to be fixed in BE with numbered steps, ideally report it in the original issue and we can get someone to look into this

@mountiny reported in original issue here

@marufsharifi
Copy link
Contributor Author

@rojiphil, pr is ready for your review. thanks.

@rojiphil
Copy link
Contributor

@marufsharifi Please add unit test as mentioned here

@marufsharifi
Copy link
Contributor Author

@rojiphil, added the test, could you please take another look? thanks.

@rojiphil
Copy link
Contributor

There is a fix needed in BE when the user is an approver of another user’s workspace and attempts to leave the workspace. After leaving the workspace, the BE is still sending back the other user’s workspace chat

This is fixed now.

78421-web-chrome-011.mp4

Copy link
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

Thanks @marufsharifi for the updates.

@mountiny @trjExpensify LGTM.
All yours now. Thanks.

@melvin-bot melvin-bot bot requested a review from mountiny February 20, 2026 06:32
@mountiny mountiny merged commit f068872 into Expensify:main Feb 20, 2026
30 checks passed
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
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
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.24-1 🚀

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

@OSBotify
Copy link
Contributor

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

platform result
🕸 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.

5 participants