Show GBR if manager w/out parent access on procesing report by Beamanator · Pull Request #48226 · Expensify/App

Beamanator · 2024-08-28T21:24:29Z

cc @marcochavezf in case you can help review 🙏

Details

If a report's approver gets removed from a submitter's approval chain, the approver won't have access to the workspace chat, but they'll still need to approve old linked expense reports where they were the approver.

In this case, we want to show GBR to the expense report for that approver, since they won't have access through the workspace chat anymore.

I'm also working on an Auth PR to fix this in GetChats and to live update the GBR status

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/422963

Tests

Create a Control policy in OldDot, make sure it has policy expense chats enabled, make sure it has "Advanced Approvals" enabled in members tab
In OldDot, invite 3 people as users (non-admins): A submitter and 2 approvers
In members tab in OldDot, make sure the submitter's submitsTo is set to Approver 1. Approver 1 and Approver 2 should NOT have a forwardsTo set.
As the submitter, log in to NewDot & go to the workspace chat that was just created for you
- Submit an expense and submit the report to Approver 1
- Keep this tab open! Keep track of the reportID so you have it for later.
In a new tab / device, as the policy owner, go to OldDot, to the workspace settings page, to the members settings
- Change the submitter's submitsTo to Approver 2
Verify Approver 1 no longer has access to the workspace chat
As Approver 1, Open the previously created report
Verify Approver 1 sees GBR to that report in the LHN & that Approver 1 sees the Approve button in the report header
~~Click Approver, make sure it works w/out errors~~
- ~~Note: You may not be able to pay yet, that's fine~~
- Note: This won't be possible until https://github.com/Expensify/Auth/pull/12211 is deployed to prod

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-08-28T21:24:34Z

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

dylanexpensify · 2024-08-29T12:17:04Z

@Pujan92 can you please prioritize this one today? 🙇‍♂️

src/libs/ReportUtils.ts

Pujan92 · 2024-08-29T18:20:18Z

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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-08-30.at.00.38.16.mp4

MacOS: Desktop

Pujan92 · 2024-08-29T19:17:05Z

@Beamanator I get an error while approving from Approver 1.

Screen.Recording.2024-08-30.at.00.38.16.mp4

Beamanator · 2024-08-29T20:01:07Z

Oh shit @Pujan92 that's actually expected until https://github.com/Expensify/Auth/pull/12211 gets to prod 🙃

Beamanator · 2024-08-29T20:06:51Z

I updated the test steps, @Pujan92 can you please test again without clicking Approve (step 9)?

Pujan92 · 2024-08-30T03:37:29Z

I updated the test steps, @Pujan92 can you please test again without clicking Approve (step 9)?

Yes, that approve button shows in the report header.

Pujan92

LGTM!

melvin-bot · 2024-08-30T03:42:45Z

@marcochavezf 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 · 2024-08-30T03:42:48Z

🎯 @Pujan92, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #48310.

OSBotify · 2024-08-30T04:10:12Z

✋ 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 · 2024-08-30T18:50:06Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.0.27-0 🚀

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

OSBotify · 2024-09-02T23:27:48Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.27-1 🚀

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

DylanDylann · 2025-03-24T07:54:02Z

src/libs/ReportUtils.ts


-    if (isOpenTaskReport(report, parentReportAction) && !report?.hasParentAccess && isReportManager(report)) {
-        return true;
+    if (!report?.hasParentAccess && isReportManager(report)) {


come from #54472, we need to check hasParentAccess with false only

ooh nice, this got fixed in the linked issue yeah?

Show GBR if manager w/out parent access on procesing report

4d71acc

Beamanator self-assigned this Aug 28, 2024

Beamanator requested a review from a team as a code owner August 28, 2024 21:24

melvin-bot bot requested review from Pujan92 and removed request for a team August 28, 2024 21:24

Remove console logs

5fdb9bb

Beamanator marked this pull request as draft August 29, 2024 14:50

Beamanator commented Aug 29, 2024

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

Rename and reuse function

4395c98

Beamanator marked this pull request as ready for review August 29, 2024 15:11

puneetlath approved these changes Aug 29, 2024

View reviewed changes

marcochavezf approved these changes Aug 29, 2024

View reviewed changes

Pujan92 approved these changes Aug 30, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf August 30, 2024 03:42

melvin-bot bot mentioned this pull request Aug 30, 2024

Payment issue for E/App PR#48226 #48310

Closed

marcochavezf approved these changes Aug 30, 2024

View reviewed changes

marcochavezf merged commit 489312e into main Aug 30, 2024

marcochavezf deleted the beaman-showGBRForKickedApprover branch August 30, 2024 03:52

github-actions bot mentioned this pull request Aug 30, 2024

Deploy Checklist: New Expensify 2024-08-30 #48360

Closed

45 tasks

nkdengineer mentioned this pull request Dec 25, 2024

[Due for payment 2025-03-24] [$250] GBR displayed for held expenses #54472

Closed

8 tasks

DylanDylann reviewed Mar 24, 2025

View reviewed changes

Conversation

Beamanator commented Aug 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 28, 2024

Uh oh!

dylanexpensify commented Aug 29, 2024

Uh oh!

Uh oh!

Pujan92 commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Pujan92 commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Beamanator commented Aug 29, 2024

Uh oh!

Beamanator commented Aug 29, 2024

Uh oh!

Pujan92 commented Aug 30, 2024

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Aug 30, 2024

Uh oh!

melvin-bot bot commented Aug 30, 2024

Uh oh!

OSBotify commented Aug 30, 2024

Uh oh!

OSBotify commented Aug 30, 2024

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

DylanDylann Mar 24, 2025

Choose a reason for hiding this comment

Uh oh!

Beamanator Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Beamanator commented Aug 28, 2024 •

edited

Loading

Pujan92 commented Aug 29, 2024 •

edited

Loading

Pujan92 commented Aug 29, 2024 •

edited

Loading