[CP Staging] Show Unapprove button only for expense reports & not in transaction thread header if > 1 transaction #45049

Beamanator · 2024-07-09T09:34:30Z

cc @rushatgabhane as we missed these cases in #44229

Details

Fixed Issues

$ #44966
$ #44969
$ #44991
$ https://github.com/Expensify/Expensify/issues/410822

Tests

Go to any DM.
Go to + > Pay <person>.
Enter amount and pay them.
Click on the expense preview.
Click on the report header.
Verify you cannot see the Unapprove button.

Next test:

Create an expense report on a collect policy chat report
Add at least 2 expenses (2 or more)
Submit the report (this might happen automatically)
As the report approver, approve the report
Click on the report header, verify you can see the Unapprove button
Now click on one of the expenses, then click the transaction thread report header
Verify you can NOT see the Unapprove button
Now go back and create an expense report on the policy chat report w/ only 1 expense - submit it
As the approver, approve the report
Now as the approver, click on the report (which will bring up the transaction view since there's only 1 report) and verify you can still see the Unapprove button

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

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-07-09T09:34:35Z

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

ishpaul777 · 2024-07-09T09:38:34Z

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

Screen.Recording.2024-07-09.at.3.59.23.PM.mov

iOS: Native

Screen.Recording.2024-07-09.at.4.10.29.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-07-09.at.4.07.46.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-09.at.3.55.48.PM.mov

MacOS: Desktop

Screen.Recording.2024-07-09.at.4.16.09.PM.mov

Beamanator · 2024-07-09T09:39:58Z

Oops sorry @ishpaul777 I removed you b/c I thought this PR would be easy enough it would need a C+, but if you're already reviewing let me know 😅

ishpaul777 · 2024-07-09T09:42:23Z

sorry, I assumed this needs a C+ review i just pulled the branch haven't started yet, lmk if you want me to continue : )

Beamanator · 2024-07-09T09:44:37Z

No worries at all! So actually if you could review & let me know if you think there's any other cases I might be missing (for NOT showing the unapprove button) that would be helpful!

Beamanator · 2024-07-09T09:52:32Z

@ishpaul777 I've got one more change coming soon

src/pages/ReportDetailsPage.tsx

Beamanator · 2024-07-09T10:08:01Z

@ishpaul777 ok added 2nd case

Beamanator · 2024-07-09T10:11:18Z

Ok ya i think we're pretty good with these changes to review & move forward, let me know if you have any more comments / concerns please @ishpaul777 🙏

ishpaul777 · 2024-07-09T10:24:32Z

looks pretty good to me too, just completing screenshots..

ishpaul777

melvin-bot · 2024-07-09T10:47:45Z

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

[CP Staging] Show Unapprove button only for expense reports & not in transaction thread header if > 1 transaction (cherry picked from commit e4e7baa)

Beamanator · 2024-07-09T10:55:31Z

CP running

OSBotify · 2024-07-09T10:58:38Z

✋ 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-07-09T11:30:06Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.0.5-6 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-09T12:23:33Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.0.5-7 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-10T11:07:53Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

OSBotify · 2024-07-15T20:27:53Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

Show unapprove only for expense reports

0f881b0

Beamanator self-assigned this Jul 9, 2024

Beamanator requested a review from a team as a code owner July 9, 2024 09:34

melvin-bot bot removed the request for review from a team July 9, 2024 09:34

melvin-bot bot requested a review from ishpaul777 July 9, 2024 09:34

Beamanator removed the request for review from ishpaul777 July 9, 2024 09:39

Also don't show unapproved for archived rooms duh

37b2fe0

Beamanator requested a review from ishpaul777 July 9, 2024 09:45

Wait that's not necessary

8a8e5cd

ishpaul777 reviewed Jul 9, 2024

View reviewed changes

src/pages/ReportDetailsPage.tsx Outdated Show resolved Hide resolved

Look at current report, not parent

9fafd6b

Beamanator mentioned this pull request Jul 9, 2024

Expense - "Unapprove" option is available in report with deleted expense that has comments #44991

Closed

6 tasks

Beamanator changed the title ~~Show Unapprove button only for expense reports~~ [CP Staging Show Unapprove button only for expense reports Jul 9, 2024

Beamanator changed the title ~~[CP Staging Show Unapprove button only for expense reports~~ [CP Staging] Show Unapprove button only for expense reports & not in transaction thread header if > 1 transaction Jul 9, 2024

robertjchen approved these changes Jul 9, 2024

View reviewed changes

ishpaul777 approved these changes Jul 9, 2024

View reviewed changes

melvin-bot bot requested a review from Julesssss July 9, 2024 10:47

Beamanator merged commit e4e7baa into main Jul 9, 2024

Beamanator deleted the beaman-unapproveButtonFixes branch July 9, 2024 10:49

github-actions bot mentioned this pull request Jul 9, 2024

Deploy Checklist: New Expensify 2024-07-08 #44947

Closed

86 tasks

Beamanator mentioned this pull request Jul 9, 2024

[$250] IOU - Multiple IOUs are unapproved when a single IOU is unapproved #44969

Closed

6 tasks

ishpaul777 mentioned this pull request Jul 15, 2024

[$250] Pay someone - Unapprove option is available for "Pay someone" expense, which gives error #44966

Closed

6 tasks

[CP Staging] Show Unapprove button only for expense reports & not in transaction thread header if > 1 transaction #45049

[CP Staging] Show Unapprove button only for expense reports & not in transaction thread header if > 1 transaction #45049

Uh oh!

Conversation

Beamanator commented Jul 9, 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 Jul 9, 2024

Uh oh!

ishpaul777 commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

ishpaul777 commented Jul 9, 2024

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

ishpaul777 commented Jul 9, 2024

Uh oh!

ishpaul777 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jul 9, 2024

Uh oh!

Beamanator commented Jul 9, 2024

Uh oh!

OSBotify commented Jul 9, 2024

Uh oh!

OSBotify commented Jul 9, 2024

Uh oh!

OSBotify commented Jul 9, 2024

Uh oh!

OSBotify commented Jul 10, 2024

Uh oh!

OSBotify commented Jul 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Beamanator commented Jul 9, 2024 •

edited

Loading

ishpaul777 commented Jul 9, 2024 •

edited

Loading