[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

BartoszGrajdek · 2023-12-14T22:04:08Z

Details

This PR adds a possibility to partially or fully pay/approve expense reports that contain requests on hold.

Fixed Issues

$ #31345

Tests

Assumptions:

To check approvals flow you need an appropriate workspace - for more context please take a look here
Whenever all money requests are on hold the total amount on approve/pay button shouldn't be displayed and it should redirect the user to modal with just one confirmation button asking to pay the full amount - since there are no "unheld" requests

Scenarios to test out - test both for approvals & payment flow:

All requests in money report on hold - User should only be able to pay the full amount
All requests should be put off hold, and then everything should be settled/approved like it used to before
Some of requests in money report on hold - User tries paying the full amount
All requests on hold should be put off hold, and then everything should be settled/approved like it used to before
Some of requests in money report on hold - User tries paying the unheld amount
All unheld requests should be paid/approved with appropriate updates in request previews, all requests on hold should be moved to a new money report
No requests held - Same flow as before this PR

Offline tests

Assumptions:

To check approvals flow you need an appropriate workspace - for more context please take a look here
User shouldn't be able to pay/approve a money report that doesn't have the total amount updated. This means that if the user creates a money request with currency different than the workspace currency they shouldn't be able to pay it offline whenever there's a pending update of any kind (this means that if I add new money request while being online and then turn off my internet I should still be able to pay the report, since there are no pending updates). - This is because we need backend to calculate the total amount in the default currency
Whenever all money requests are on hold the total amount on approve/pay button shouldn't be displayed and it should redirect the user to modal with just one confirmation button asking to pay the full amount - since there are no "unheld" requests
We're not going to create any new money reports after approval/payment while the user is offline - that's something that will happen only once we go back online

Scenarios to test out - test both for approvals & payment flow:

Any of the other scenarios + some pending updates
a. If the money report includes requests with different currencies (or just one money request with currency different than your default currency) pay/approve button should be disabled.
b. If the money report includes only one currency pay/approve button should be available
All requests in money report on hold - User should only be able to pay/approve the full amount
All held request previews shouldn't display the "· Hold" instead they should display "· Paid",, green checkmarks should be shown the same way it's currently working on staging the system message should have opacity of 0.5
Some of requests in money report on hold - User pays/approves the full amount
All held request previews shouldn't display the "· Hold" instead they should display "· Paid",, green checkmarks should be shown the same way it's currently working on staging the system message should have opacity of 0.5
Some of requests in money report on hold - User tries pays/approves the unheld amount
All requests will have opacity of 0.5, green checkmarks should be shown the same way it's currently working on staging, but only in the unheld requests preview
No requests held - Same flow as before this PR

Verify that no errors appear in the JS console

QA Steps

Verify that no errors appear in the JS console

Important

There are currently some problems with the backend for this feature, so it may not be fully working while you're online
Nevertheless, all of test scenarios are mentioned in Tests & Offline tests sections

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…equest-page

melvin-bot · 2024-03-28T17:13:18Z

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

BartoszGrajdek · 2024-03-28T17:13:35Z

@allroundexperts FYI - I think @robertjchen will be handling review here

robertjchen · 2024-03-28T17:33:52Z

src/components/ProcessMoneyReportHoldMenu.tsx

+
+    return (
+        <DecisionModal
+            title={translate(isApprove ? 'iou.confirmApprove' : 'iou.confirmPay')}


NAB: just making a note for later cleanup- we can probably move these string constants to https://github.com/Expensify/App/blob/main/src/CONST.ts

robertjchen · 2024-03-28T17:34:58Z

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

MacOS: Desktop

melvin-bot · 2024-03-28T17:54:31Z

@robertjchen looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2024-03-28T18:01:09Z

✋ 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-03-29T02:26:29Z

🚀 Deployed to staging by https://github.com/robertjchen in version: 1.4.58-0 🚀

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

bondydaa · 2024-04-01T16:59:01Z

not an emergency, all jobs were/are passing.

OSBotify · 2024-04-02T11:02:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.58-8 🚀

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

alitoshmatov · 2024-04-29T07:43:56Z

src/components/MoneyReportHeader.tsx

+        if (ReportUtils.hasHeldExpenses(moneyRequestReport.reportID)) {
+            setIsHoldMenuVisible(true);
+        } else if (chatReport) {
+            IOU.payMoneyRequest(type, chatReport, moneyRequestReport, false);


true value should have been passed since this function is handling full payment. ref: #39357

hoangzinh · 2024-05-07T15:48:59Z

src/libs/actions/IOU.ts

+    if (ReportUtils.hasHeldExpenses(expenseReport.reportID) && !full && !!expenseReport.unheldTotal) {
+        total = expenseReport.unheldTotal;
+    }
+    const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(total, expenseReport.currency ?? '', expenseReport.reportID);


Coming from #39342, we need to optimistic clear hold reason as well

paultsimura · 2024-07-22T16:08:28Z

src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx

+    const shouldShowRBR =
+        hasViolations || hasFieldErrors || (!(isSettled && !isSettlementOrApprovalPartial) && !(ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial) && isOnHold);


This eventually caused #45064 – we should optimistically clear the 'hold' violations when unholding a request.

shubham1206agra · 2024-07-25T17:19:20Z

src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx

+            } else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
+                message += ` • ${translate('iou.hold')}`;


This condition was put in wrong place which caused #42138

s77rt · 2024-10-19T01:45:36Z

src/components/MoneyReportHeader.tsx

@@ -78,8 +80,32 @@ function MoneyReportHeader({session, policy, chatReport, nextStep, report: money
    const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep;
    const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
    const formattedAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, moneyRequestReport.currency);
+    const [nonHeldAmount, fullAmount] = ReportUtils.getNonHeldAndFullAmount(moneyRequestReport);
+    const displayedAmount = ReportUtils.hasHeldExpenses(moneyRequestReport.reportID) && canAllowSettlement ? nonHeldAmount : formattedAmount;


@BartoszGrajdek Is there a reason that the canAllowSettlement condition is required here?

BartoszGrajdek added 30 commits November 22, 2023 13:08

Add reason interstatial

3f4df08

Merge remote-tracking branch 'origin/main' into hold-requests/money-r…

faebe01

…equest-page

Hold banner

f4297cd

Add new translations

317f5fc

Change Header styles

da7e0a6

Add full boolean to IOU requests

d38c0f6

Mock Report & Transaction Utils

818a841

Add Offline Support

ed3fe5e

merge main

275e17b

Refactor utility functions

7301183

fix: prettier

f28bd09

Remove redundant import

e237009

Merge remote-tracking branch 'origin/main' into hold-requests/money-r…

4e36be7

…equest-page

fix: resolve merge conflicts

38f28b5

fix: imports

7fefad2

fix: remove merge conflict

aa63896

Resolve merge conflict

cc5b1a0

fix: prettier

adea766

fix: typecheck

7067e21

Refactor Hold Feature

eb74222

Remove comment

19aa76d

imports fixes

32e7c7e

feat: add offline support & system notifications

47c7c8d

Resolve merge conflicts

c56681c

fix: rename API call

2fee6b7

refactor: migrate new files & new functions to TS

7033f38

fix: change names

04636a8

fix: handle a case where every request is on HOLD

b81c5df

fix: order of system messages created date correction

20f568c

fix: remove console logs

34e2d8c

melvin-bot bot requested review from allroundexperts and removed request for a team March 28, 2024 17:13

robertjchen reviewed Mar 28, 2024

View reviewed changes

robertjchen approved these changes Mar 28, 2024

View reviewed changes

robertjchen merged commit ef949e0 into Expensify:main Mar 28, 2024
15 of 28 checks passed

melvin-bot bot added the Emergency label Mar 28, 2024

github-actions bot mentioned this pull request Mar 29, 2024

Deploy Checklist: New Expensify 2024-03-29 #39222

Closed

lanitochka17 mentioned this pull request Mar 31, 2024

[HOLD for payment 2024-06-20] [$500] [Held requests] No confirmation prompt when approving held request via the report preview #39335

Closed

6 tasks

izarutskaya mentioned this pull request Mar 31, 2024

#wave-collect - [Hold on 378314][Held requests] Confirmation to pay is still shown after approving all the requests #39336

Closed

6 tasks

lanitochka17 mentioned this pull request Mar 31, 2024

[HOLD on #378314][$500] [Held requests] Request on hold becomes unheld when approving only unheld request #39338

Closed

6 tasks

m-natarajan mentioned this pull request Mar 31, 2024

[Pay meow][$500] [Held requests] Pay with Expensify button does not include amount after approving held request #39342

Closed

6 tasks

bondydaa removed the Emergency label Apr 1, 2024

chiragsalian mentioned this pull request Apr 1, 2024

[$250] mweb - IOU - Tapping pay elsewhere button in header grey out IOU preview for few seconds #39314

Closed

6 tasks

alitoshmatov reviewed Apr 29, 2024

View reviewed changes

alitoshmatov mentioned this pull request Apr 29, 2024

[HOLD for payment 2024-04-25] [$500] IOU - Missing green checkmark next to Total amount after paying request offline #39357

Closed

6 tasks

hoangzinh reviewed May 7, 2024

View reviewed changes

paultsimura reviewed Jul 22, 2024

View reviewed changes

paultsimura mentioned this pull request Jul 22, 2024

[HOLD for payment 2024-07-26] [$250] Hold - Red dot remains when unhold expense #45064

Closed

6 tasks

shubham1206agra reviewed Jul 25, 2024

View reviewed changes

shubham1206agra mentioned this pull request Jul 25, 2024

[HOLD for payment 2024-07-26] [$250] Hold request - "Missing merchant" appears in the held expense preview #42138

Closed

6 tasks

s77rt reviewed Oct 19, 2024

View reviewed changes

s77rt mentioned this pull request Oct 19, 2024

Fix wrong total amount of hold expenses when approve/pay partially #49971

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

BartoszGrajdek commented Dec 14, 2023 •

edited by robertjchen

Loading

melvin-bot bot commented Mar 28, 2024

BartoszGrajdek commented Mar 28, 2024

robertjchen Mar 28, 2024

robertjchen commented Mar 28, 2024 •

edited

Loading

melvin-bot bot commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

bondydaa commented Apr 1, 2024

OSBotify commented Apr 2, 2024

alitoshmatov Apr 29, 2024 •

edited

Loading

hoangzinh May 7, 2024

paultsimura Jul 22, 2024

shubham1206agra Jul 25, 2024

s77rt Oct 19, 2024

		const shouldShowRBR =
		hasViolations \|\| hasFieldErrors \|\| (!(isSettled && !isSettlementOrApprovalPartial) && !(ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial) && isOnHold);

		} else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
		message += ` • ${translate('iou.hold')}`;

[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

Conversation

BartoszGrajdek commented Dec 14, 2023 • edited by robertjchen Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 28, 2024

BartoszGrajdek commented Mar 28, 2024

robertjchen Mar 28, 2024

Choose a reason for hiding this comment

robertjchen commented Mar 28, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

bondydaa commented Apr 1, 2024

OSBotify commented Apr 2, 2024

alitoshmatov Apr 29, 2024 • edited Loading

Choose a reason for hiding this comment

hoangzinh May 7, 2024

Choose a reason for hiding this comment

paultsimura Jul 22, 2024

Choose a reason for hiding this comment

shubham1206agra Jul 25, 2024

Choose a reason for hiding this comment

s77rt Oct 19, 2024

Choose a reason for hiding this comment

BartoszGrajdek commented Dec 14, 2023 •

edited by robertjchen

Loading

robertjchen commented Mar 28, 2024 •

edited

Loading

alitoshmatov Apr 29, 2024 •

edited

Loading