[Unapprove] Add unapprove feature to approved reports #44229

rushatgabhane · 2024-06-24T03:32:55Z

Details

Fixed Issues

$ #44066
PROPOSAL:

Tests

Go to a control policy as an admin.
Make yourself the approver
Submit an expense to the policy
Approve the expense and go the expense
Click report header
Verify you can see unapprove button
Click unapprove and verify that you see "unapproved $x" message in the chat

Connect to an accounting integration

Connect to Xero / Quickbooks / Sage / Netsuite
Submit an expense to the policy
Approve the expense and go the expense
Click report header
Verify you can see unapprove button
Click unapprove and verify a modal showing you a warning that you're connected to an accounting integration
Verify that after clicking unapprove you see "unapproved $x" message in the chat

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-07-06.at.04.28.14.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-07-06.at.04.09.06.mov

MacOS: Chrome / Safari

With accounting

Screen.Recording.2024-07-06.at.03.53.57.mov

Without accounting

Screen.Recording.2024-07-06.at.03.51.53.mov

MacOS: Desktop

Screen.Recording.2024-07-06.at.04.26.37.mov

melvin-bot · 2024-06-24T03:33:00Z

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

rushatgabhane · 2024-06-24T03:36:19Z

src/pages/ReportDetailsPage.tsx

@@ -217,6 +223,13 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
        Report.leaveGroupChat(report.reportID);
    }, [isChatRoom, isPolicyEmployee, isPolicyExpenseChat, report.reportID, report.visibility]);

+    const unapproveExpenseReportOrShowModal = useCallback(() => {
+        // TODO: show modal if report is exported to accounting


someone else is working on it. i will integrate whenever it's ready - https://expensify.slack.com/archives/C06ML6X0W9L/p1718955793112739?thread_ts=1718663737.743339&cid=C06ML6X0W9L

Beamanator

First review looking pretty good! I'll do a more detailed review once the backend PR is up, hopefully end of this week 🙏

src/languages/es.ts

src/libs/ReportUtils.ts

src/libs/actions/IOU.ts

jayeshmangwani · 2024-07-06T20:50:37Z

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.mov

Android: mWeb Chrome

mWeb-chrome.mov

iOS: Native

iOS.mov

iOS: mWeb Safari

mWeb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

jayeshmangwani · 2024-07-06T21:01:29Z

@Beamanator We're encountering an inconsistency with the search page alternate text. When we are offline, it optimistically sets to unapproved ${amount}, but when we go online, it changes to unapproved this report.

Offline

Online

jayeshmangwani · 2024-07-06T21:11:11Z

@rushatgabhane I encountered a bug in a specific edge case. While offline, go to the report, approve it, and then unapprove it. Now, open the report details page and go online. Observe that first, we see the unapprove button, and then it disappears.

Though it is an edge case, we can choose to ignore it in this PR.

pretty-edge-case.mov

rushatgabhane · 2024-07-06T21:17:49Z

I encountered a bug in a specific edge case. While offline, go to the report, approve it, and then unapprove it. Now, open the report details page and go online. Observe that first, we see the unapprove button, and then it disappears.

Though it is an edge case, we can choose to ignore it in this PR.

That is how the network queue behaves right? It has a "replaying effect"

The successData of approve merges to onyx, which meets the conditions for showing unapprove button
The successData of unapprove merges hiding the unapprove button

rushatgabhane · 2024-07-06T21:19:14Z

We're encountering an inconsistency with the search page alternate text. When we are offline, it optimistically sets to unapproved ${amount}, but when we go online, it changes to unapproved this report.

will require a backend fix. I think the correct text is unapproved x amount because that is how it works with approve action

jayeshmangwani · 2024-07-07T20:32:02Z

Overall, the changes work well for me.

One last thing: @Beamanator you added a note here that says, For the "show warning modal if report has already been exported to accounting package" stuff, don't implement that here! However, in this PR, we have added logic that shows a ConfirmModal if the policy has an active accounting integration.

@rushatgabhane I'm unsure if we need to keep the ConfirmModal part in this PR or not

rushatgabhane · 2024-07-08T07:55:57Z

However, in this PR, we have added logic that shows a ConfirmModal if the policy has an active accounting integration.

yes that is the plan. We'll swap the logic whenever its ready

Beamanator · 2024-07-08T07:59:05Z

Ok so looks like what we've got is:

Non-manager admin not able to unapprove
- This is being fixed in the backend here: https://github.com/Expensify/Auth/pull/11507. Hopefully will get merged today & deployed tomorrow 🙏
inconsistency with the search page alternate text
- This is innnteresting, can y'all give me some super basic reproduction steps? I haven't tested the search result code often 😓 It's weird that that's the only place we're seeing "unapproved this report" - which is the wording for OldDot, not NewDot :/
- If this only happens in this weird edge case, I would be super happy to merge & handle that case separately
Adding the accounting package modal warning, even though we haven't implemented the code that checks if the report has been exported yet (waiting on [HOLD for payment 2024-08-02] [Unapprove in NewDot - Collect] Show warning modal if Report has been exported to connected accounting integration #44884)
- I think best practice would say we should remove the code we're not using YET, since we're not sure how long it'll be till we do implement the "report exported" code in the related issue 🤷 However I'm happy to take that as a follow-up so we can at least get this out the door ASAP!

Beamanator

Left my thoughts above - LGTM & let's discuss the follow-ups in slack if needed!

rushatgabhane · 2024-07-08T08:05:43Z

inconsistency with search page

This is a backend bug.

Repro steps

Approve an expense
Unapprove the expense
Go to LHN and see the last message.

Expected: unapproved $x
Actual: Person A unapproved this report

rushatgabhane · 2024-07-08T08:11:45Z

Adding the accounting package modal warning, even though we haven't implemented the code that checks if the report has been exported yet

@Beamanator agree but the modal is being used. It'll popup if we unapprove a report where its policy is connected to accounting. It's a good enough assumption which oldDot also has. please correct me if im wrong

Beamanator · 2024-07-08T08:18:27Z

@rushatgabhane aah so you're saying that we'll use PolicyUtils.hasAccountingConnections() for now, until #44884 where we'll swap out the logic, eh?

rushatgabhane · 2024-07-08T08:19:21Z

correctt

Beamanator · 2024-07-08T08:19:40Z

yalla i like it

rushatgabhane · 2024-07-08T08:20:42Z

habibi

OSBotify · 2024-07-08T08:28:14Z

✋ 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-08T09:57:40Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.0.5-0 🚀

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

OSBotify · 2024-07-08T10:54:03Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.0.5-2 🚀

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

stitesExpensify · 2024-07-08T22:39:15Z

I think that this is most likely the cause of this deploy blocker #44969

OSBotify · 2024-07-10T10:59:41Z

🚀 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:20:05Z

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

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

ishpaul777 · 2024-08-26T15:17:22Z

src/pages/ReportDetailsPage.tsx

+    const canUnapproveRequest =
+        ReportUtils.isMoneyRequestReport(moneyRequestReport) &&
+        (ReportUtils.isReportManager(moneyRequestReport) || isPolicyAdmin) &&
+        (ReportUtils.isReportApproved(moneyRequestReport) || ReportUtils.isReportManuallyReimbursed(moneyRequestReport));


Coming from #44966, Some cases was missed, we fixed them in #44229

rushatgabhane added 16 commits June 24, 2024 03:38

add manually reimbursed func

227ce21

add canUnapproveRequest

076dba0

add menu item type

0a2f286

add unapprove lang

43564f4

show menu item for unapprove

f212e2d

add func to unapprove request

e8c0adb

fix onyx type for unapprove

c17d876

rm unapprove as olddot action

1754187

add backwards icon

6274247

use backwards icon

b588e81

add optimistic unapproved action

a1cdab6

add unapprove api type

1531248

add unapprove api command call

3213e7e

call api on unapprove click

1b55327

add warning if connected to accounting

bdbe266

add warning if connected to accounting

341244e

rushatgabhane requested review from a team as code owners June 24, 2024 03:32

melvin-bot bot removed the request for review from a team June 24, 2024 03:32

melvin-bot bot requested a review from jayeshmangwani June 24, 2024 03:33

rushatgabhane changed the title ~~[U] Unapprove button~~ [Unapprove] Add unapprove feature to approved reports Jun 24, 2024

rm full

d4a052b

rushatgabhane commented Jun 24, 2024

View reviewed changes

rushatgabhane added 4 commits June 24, 2024 06:36

add spanish

35ef33d

rm optimisticChatReportData

36cc15f

add unapprove to muted actions

cc89578

add bold style to prompt

72013c0

Beamanator self-requested a review June 24, 2024 06:42

Beamanator reviewed Jun 24, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Show resolved Hide resolved

src/libs/ReportUtils.ts Show resolved Hide resolved

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

Beamanator approved these changes Jul 8, 2024

View reviewed changes

Beamanator merged commit a280f82 into Expensify:main Jul 8, 2024
15 of 17 checks passed

Beamanator mentioned this pull request Jul 8, 2024

[HOLD for payment 2024-08-02] [Unapprove in NewDot - Collect] Show warning modal if Report has been exported to connected accounting integration #44884

Closed

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

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

Closed

86 tasks

blimpich mentioned this pull request Jul 8, 2024

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

Closed

6 tasks

thienlnam mentioned this pull request Jul 8, 2024

[HOLD for payment 2024-07-24] Expense - "Unapprove" option exists on Manually reimbursed reports, on Collect policy with Instant Submit, Submit & Close #45009

Closed

6 tasks

stitesExpensify mentioned this pull request Jul 8, 2024

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

Closed

6 tasks

Beamanator mentioned this pull request Jul 9, 2024

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

Merged

50 tasks

ishpaul777 reviewed Aug 26, 2024

View reviewed changes

ishpaul777 mentioned this pull request Aug 26, 2024

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

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Unapprove] Add unapprove feature to approved reports #44229

[Unapprove] Add unapprove feature to approved reports #44229

rushatgabhane commented Jun 24, 2024 •

edited

Loading

melvin-bot bot commented Jun 24, 2024

rushatgabhane Jun 24, 2024 •

edited

Loading

Beamanator left a comment

jayeshmangwani commented Jul 6, 2024 •

edited

Loading

jayeshmangwani commented Jul 6, 2024

jayeshmangwani commented Jul 6, 2024

rushatgabhane commented Jul 6, 2024 •

edited

Loading

rushatgabhane commented Jul 6, 2024

jayeshmangwani commented Jul 7, 2024

rushatgabhane commented Jul 8, 2024

Beamanator commented Jul 8, 2024

Beamanator left a comment

rushatgabhane commented Jul 8, 2024 •

edited

Loading

rushatgabhane commented Jul 8, 2024 •

edited

Loading

Beamanator commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

Beamanator commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

stitesExpensify commented Jul 8, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

ishpaul777 Aug 26, 2024

[Unapprove] Add unapprove feature to approved reports #44229

[Unapprove] Add unapprove feature to approved reports #44229

Conversation

rushatgabhane commented Jun 24, 2024 • edited Loading

Details

Fixed Issues

Tests

Connect to an accounting integration

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

With accounting

Without accounting

melvin-bot bot commented Jun 24, 2024

rushatgabhane Jun 24, 2024 • edited Loading

Choose a reason for hiding this comment

Beamanator left a comment

Choose a reason for hiding this comment

jayeshmangwani commented Jul 6, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

jayeshmangwani commented Jul 6, 2024

jayeshmangwani commented Jul 6, 2024

rushatgabhane commented Jul 6, 2024 • edited Loading

rushatgabhane commented Jul 6, 2024

jayeshmangwani commented Jul 7, 2024

rushatgabhane commented Jul 8, 2024

Beamanator commented Jul 8, 2024

Beamanator left a comment

Choose a reason for hiding this comment

rushatgabhane commented Jul 8, 2024 • edited Loading

rushatgabhane commented Jul 8, 2024 • edited Loading

Beamanator commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

Beamanator commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

stitesExpensify commented Jul 8, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

ishpaul777 Aug 26, 2024

Choose a reason for hiding this comment

rushatgabhane commented Jun 24, 2024 •

edited

Loading

rushatgabhane Jun 24, 2024 •

edited

Loading

jayeshmangwani commented Jul 6, 2024 •

edited

Loading

rushatgabhane commented Jul 6, 2024 •

edited

Loading

rushatgabhane commented Jul 8, 2024 •

edited

Loading

rushatgabhane commented Jul 8, 2024 •

edited

Loading