Clear hold reason of all transactions when the admin approves all requests #39579

nkdengineer · 2024-04-04T07:47:13Z

Details

Clear hold reason of all transactions when the admin approves all requests

Fixed Issues

$ #39342
PROPOSAL: #39342 (comment)

Tests

Precondition: The admin have the collect workspace and invite some users as employee

[Employee] Create two requests in the workspace chat
[Employee] Go to transaction thread report of each request and hold the request
[Employee] Submit the report
[Admin] Go to expense report and click on approve button
[Admin] Approve all requests
[Admin] Verify that Pay with Expensify button appears and it includes the total amount

Verify that no errors appear in the JS console

Offline tests

Precondition: Do step 1-3 online
Do step 4 - 6 offline

QA Steps

Precondition: The admin have the collect workspace and invite some users as employee

[Employee] Create two requests in the workspace chat
[Employee] Go to transaction thread report of each request and hold the request
[Employee] Submit the report
[Admin] Go to expense report and click on approve button
[Admin] Approve all requests
[Admin] Verify that Pay with Expensify button appears and it includes the total amount

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-04-04.at.14.31.10.mov

Android: mWeb Chrome

Screen.Recording.2024-04-04.at.14.23.22.mov

iOS: Native

Screen.Recording.2024-04-04.at.14.32.28.mov

iOS: mWeb Safari

Screen.Recording.2024-04-04.at.14.27.38.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-04.at.13.37.46.mov

MacOS: Desktop

Screen.Recording.2024-04-04.at.14.35.24.mov

…uests

melvin-bot · 2024-04-04T07:48:38Z

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

nkdengineer · 2024-04-04T08:02:02Z

@hoangzinh Actually, after we hold the request, the app crashes the context here. To test locally, we can update these like this

const latestDecision = action.message?.[0]?.moderationDecision?.decision ?? '';

App/src/pages/home/report/ReportActionItem.tsx

Line 280 in ae6cc49

const latestDecision = action.message?.[0].moderationDecision?.decision ?? '';

children = <ReportActionItemBasicMessage message={action.message?.[0]?.text ?? ''} />;

App/src/pages/home/report/ReportActionItem.tsx

Line 535 in ae6cc49

    
           children = <ReportActionItemBasicMessage message={action.message?.[0].text ?? ''} />;

hoangzinh · 2024-04-04T14:38:23Z

src/libs/actions/IOU.ts

+                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${heldTransaction.transactionID}`,
+                value: {
+                    comment: {
+                        ...heldTransaction.comment,


I think we don't need to push current value of heldTransaction.comment

hoangzinh · 2024-04-04T14:38:29Z

src/libs/actions/IOU.ts

+                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${heldTransaction.transactionID}`,
+                value: {
+                    comment: {
+                        ...heldTransaction.comment,


@hoangzinh Updated.

hoangzinh · 2024-04-04T14:41:26Z

src/libs/actions/IOU.ts

@@ -4673,7 +4673,10 @@ function hasIOUToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObj
 function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full?: boolean) {
    const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
    let total = expenseReport.total ?? 0;
-    if (ReportUtils.hasHeldExpenses(expenseReport.reportID) && !full && !!expenseReport.unheldTotal) {
+    const transactions = TransactionUtils.getAllReportTransactions(expenseReport.reportID);
+    const hasHeldExpenses = transactions.some((transaction) => TransactionUtils.isOnHold(transaction));


I think it's better if we keep use ReportUtils.hasHeldExpenses util to check report has held expenses. We might need to write a new util to get heldExpenses of a report.

Because ReportUtils.hasHeldExpenses also get all transaction and use it to check the held request and we also use allTransactions here to get the heldTransactions, so I not use ReportUtils.hasHeldExpenses to prevent call getAllReportTransactions two times.

I think it's not worth to duplicate code ReportUtils.hasHeldExpenses here. If we put more logic into ReportUtils.hasHeldExpenses later, those line of codes would be outdated

@hoangzinh I updated.

hoangzinh · 2024-04-06T11:06:46Z

src/libs/actions/IOU.ts

@@ -4729,6 +4729,31 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
        },
    ];

+    // Clear hold reason of all transactions if we approve all requests
+    const heldTransactions = ReportUtils.getAllHeldTransactions(expenseReport.reportID);


@nkdengineer what do you think if we split this into a const and use it to check here? Something like this

App/src/libs/actions/IOU.ts

Line 4637 in eeccc2b

if (ReportUtils.hasHeldExpenses(expenseReport.reportID) && !full && !!expenseReport.unheldTotal) {

const hasHeldExpenses = ReportUtils.hasHeldExpenses(expenseReport.reportID) ... // Clear hold reason of all held transactions if we approve all requests if (full & hasHeldExpenses) { const heldTransactions = ReportUtils.getAllHeldTransactions(expenseReport.reportID); ... }

make sense.

@hoangzinh Updated.

hoangzinh · 2024-04-10T11:55:04Z

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

Screen.Recording.2024-04-11.at.15.46.57.android.mov

Android: mWeb Chrome

Screen.Recording.2024-04-11.at.15.27.32.android.chrome.mov

iOS: Native

Screen.Recording.2024-04-11.at.15.33.22.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-04-11.at.15.36.27.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-10.at.19.55.30.web.mov

MacOS: Desktop

Screen.Recording.2024-04-11.at.09.03.44.desktop.mov

hoangzinh · 2024-04-10T11:55:30Z

@nkdengineer can you try to merge latest main if it fix perf-test?

nkdengineer · 2024-04-10T17:02:04Z

@hoangzinh Fixed now.

hoangzinh

LGTM

robertjchen

Thanks!

OSBotify · 2024-04-12T15:36:08Z

✋ 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-04-18T04:56:14Z

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

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

OSBotify · 2024-04-22T14:57:13Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

Clear hold reason of all transactions when the admin approves all req…

a06fb15

…uests

nkdengineer marked this pull request as ready for review April 4, 2024 07:48

nkdengineer requested a review from a team as a code owner April 4, 2024 07:48

melvin-bot bot requested review from hoangzinh and removed request for a team April 4, 2024 07:48

nkdengineer mentioned this pull request Apr 4, 2024

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

Closed

6 tasks

Merge branch 'main' into fix/39342

7e31e7a

hoangzinh reviewed Apr 4, 2024

View reviewed changes

nkdengineer added 4 commits April 4, 2024 22:05

remove unnecessary code

932937b

Merge branch 'main' into fix/39342

8421c8e

create getAllHeldTransactions

7af6292

remove empty line

eeccc2b

hoangzinh reviewed Apr 6, 2024

View reviewed changes

nkdengineer added 3 commits April 8, 2024 15:49

Merge branch 'main' into fix/39342

75a2fe3

create a const for held request check

d44456c

Merge branch 'main' into fix/39342

fcdbf4a

Merge branch 'main' into fix/39342

addcb9a

hoangzinh approved these changes Apr 11, 2024

View reviewed changes

melvin-bot bot requested a review from robertjchen April 11, 2024 08:52

robertjchen approved these changes Apr 12, 2024

View reviewed changes

robertjchen merged commit 0665fa4 into Expensify:main Apr 12, 2024
16 checks passed

github-actions bot mentioned this pull request Apr 18, 2024

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clear hold reason of all transactions when the admin approves all requests #39579

Clear hold reason of all transactions when the admin approves all requests #39579

nkdengineer commented Apr 4, 2024

melvin-bot bot commented Apr 4, 2024

nkdengineer commented Apr 4, 2024

hoangzinh Apr 4, 2024

hoangzinh Apr 4, 2024

nkdengineer Apr 4, 2024

hoangzinh Apr 4, 2024

nkdengineer Apr 4, 2024

hoangzinh Apr 4, 2024

nkdengineer Apr 5, 2024

hoangzinh Apr 6, 2024

nkdengineer Apr 8, 2024

nkdengineer Apr 8, 2024

hoangzinh commented Apr 10, 2024 •

edited

Loading

hoangzinh commented Apr 10, 2024

nkdengineer commented Apr 10, 2024

hoangzinh left a comment

robertjchen left a comment

OSBotify commented Apr 12, 2024

OSBotify commented Apr 18, 2024

OSBotify commented Apr 22, 2024

Clear hold reason of all transactions when the admin approves all requests #39579

Clear hold reason of all transactions when the admin approves all requests #39579

Conversation

nkdengineer commented Apr 4, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 4, 2024

nkdengineer commented Apr 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hoangzinh commented Apr 10, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

hoangzinh commented Apr 10, 2024

nkdengineer commented Apr 10, 2024

hoangzinh left a comment

Choose a reason for hiding this comment

robertjchen left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 12, 2024

OSBotify commented Apr 18, 2024

OSBotify commented Apr 22, 2024

hoangzinh commented Apr 10, 2024 •

edited

Loading