feat: [Held requests] option does not show in the preview overflow menu. #42034

Krishna2323 · 2024-05-13T04:32:20Z

Details

Fixed Issues

$ #41440
PROPOSAL: #41440 (comment)

Tests

Create one or two expenses on a Collect policy
Navigate to Workspace Chat > Report
Hover over an expense
Click the three dots in the comment action menu
Verify there is a hold option > click on hold > enter reason > submit
Go to expense report page > verify the report is held > go back
Hover on the same report
Verify unhold option is there > click on unhold
Go to expense report page > verify the report is unheld

Verify that no errors appear in the JS console

Offline tests

Create one or two expenses on a Collect policy
Navigate to Workspace Chat > Report
Hover over an expense
Click the three dots in the comment action menu
Verify there is a hold option > click on hold > enter reason > submit
Go to expense report page > verify the report is held > go back
Hover on the same report
Verify unhold option is there > click on unhold
Go to expense report page > verify the report is unheld

QA Steps

Create one or two expenses on a Collect policy
Navigate to Workspace Chat > Report
Hover over an expense
Click the three dots in the comment action menu
Verify there is a hold option > click on hold > enter reason > submit
Go to expense report page > verify the report is held > go back
Hover on the same report
Verify unhold option is there > click on unhold
Go to expense report page > verify the report is unheld

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

melvin-bot · 2024-05-13T04:32:25Z

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

hungvu193 · 2024-05-15T03:08:27Z

hey @Krishna2323 , it's been a while, do you have any ETA for this?

Krishna2323 · 2024-05-15T06:32:06Z

@hungvu193, I will update this today or tomorrow. Sorry for the delay, I'm not at my workplace.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 · 2024-05-17T11:14:41Z

@hungvu193, can you pls give this PR a quick look, if everything seems fine to you, I will add the screenshot.

hungvu193 · 2024-05-17T11:25:42Z

I'll take a look in a few hours 👀

hungvu193 · 2024-05-19T14:48:03Z

@hungvu193, can you pls give this PR a quick look, if everything seems fine to you, I will add the screenshot.

Please add the screenshots

src/libs/ReportUtils.ts

src/pages/home/report/ContextMenu/ContextMenuActions.tsx

hungvu193 · 2024-05-20T03:21:43Z

src/libs/ReportUtils.ts

+    if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
+        return;
+    }
+    const moneyRequestReportID = reportAction?.originalMessage?.IOUReportID ?? 0;
+
+    const moneyRequestReport = getReport(String(moneyRequestReportID));
+    if (!moneyRequestReportID || !moneyRequestReport) {
+        return;
+    }


Can we merge these 2 conditions?

if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU || !moneyRequestReportID || !moneyRequestReport) { return; }

I think thats fine, reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU check is required before defining moneyRequestReport or moneyRequestReportID.

hungvu193 · 2024-05-21T10:59:56Z

little bump here @Krishna2323

Krishna2323 · 2024-05-21T11:01:06Z

@hungvu193, sorry for delay, I will add the recordings today.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

mallenexpensify · 2024-05-21T18:06:18Z

@Krishna2323 as part of Rule #1, Get Shit Done, please be sure to action upon any existing issues/PRs before submitting new proposals. CONTRIBUTING.md is being updated to specifically mention this too

Contributors should not submit proposals on issues when they have assigned issues or PRs that are awaiting an action from them. If so, they will be in violation of Rule #1 (Get Shit Done) in our Code of Conduct and will receive a warning. Multiple warnings can lead to removal from the program.

We'll be issuing warnings for these infractions in the future. This is not a warning though, since CONTRIBUTING.md isn't updated yet (and I haven't posted in #expensify-open-source about the update either)

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 · 2024-05-21T21:20:57Z

@hungvu193, I have added the recordings, can you pls review once again?

hungvu193 · 2024-05-21T23:18:36Z

@hungvu193, I have added the recordings, can you pls review once again?

Ok. I'll take a look in next few hours

hungvu193 · 2024-05-22T02:19:31Z

src/libs/ReportUtils.ts

@@ -2707,6 +2715,80 @@ function canEditReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
    );
 }

+function getParentReportAction(parentReportActions: OnyxEntry<ReportActions>, parentReportActionID: string | undefined): OnyxEntry<ReportAction> {


I thought you mentioned you removed this one?

I re-added this as the other function is deprecated and we are using this function in ReportScreen also.

@robertjchen This is my concern, we should use deprecated function or creating a new one here?

Is there a reason why we can't use Use Onyx.connect() or withOnyx() instead as recommended by the deprecation comment? 🤔

@Krishna2323 Bump on the above question.

I checked ReportUtils, I saw that we're still using ReportActionsUtils.getParentReportAction(report); to get parentReportActions.

little bump @Krishna2323 so we can merge this one.

@hungvu193, I think we can leave getParentReportAction as it is for now. It will be removed/replaced in this issue, and we are already using getParentReportAction in multiple places.

App/src/pages/home/ReportScreen.tsx

Lines 105 to 111 in 4e4715f

function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, parentReportActionID: string | undefined): OnyxEntry<OnyxTypes.ReportAction> {

if (!parentReportActions || !parentReportActionID) {

return null;

}

return parentReportActions[parentReportActionID ?? '0'];

}

@tgolen, can you pls confirm if we are going to replace getParentReportAction or not? I don't see any open issue/PR for that.

What are your thoughts on this, @robertjchen? Since we're already using the deprecated getParentReportAction in ReportUtils, I'm okay with using it until we have a plan to remove it all at once.

Sounds good, given the current progress on the migration- we can use the deprecated function for now 👍

Thanks for confirming 😄 .
@Krishna2323 Can you update this please? Thank you 🙇

hungvu193 · 2024-05-22T02:21:06Z

Not sure if this is related but every time I held an expense, I saw a RBR.
Also the number of replies only updated after I clicked that expense and went back.

Screen.Recording.2024-05-22.at.09.17.28.mov

hungvu193 · 2024-05-22T08:34:29Z

Not sure if this is related but every time I held an expense, I saw a RBR. Also the number of replies only updated after I clicked that expense and went back.

Screen.Recording.2024-05-22.at.09.17.28.mov

How about this one? @Krishna2323

Krishna2323 · 2024-05-22T08:36:21Z

@hungvu193, I need to check for that, the reply count update doesn't seem to be related but I will check and RBR is expected behaviour afaik

hungvu193 · 2024-05-22T10:34: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.native.mov

Android: mWeb Chrome

mAndroid.mov

iOS: Native

ios.native.mov

iOS: mWeb Safari

mSafari.mov

MacOS: Chrome / Safari

chrome.mov

MacOS: Desktop

desk.mov

hungvu193 · 2024-05-23T01:33:18Z

I need to check for that, the reply count update doesn't seem to be related but I will check

Let's me know when you finish your investigation so we can merge this one. Thank you 😄

trjExpensify · 2024-05-24T14:30:19Z

@Krishna2323 how did you get on? Will you complete that today?

hungvu193 · 2024-05-27T06:25:17Z

Let's me know if you have any new update @Krishna2323

Krishna2323 · 2024-05-27T15:35:32Z

@hungvu193, still trying to get the solution, it would be great if you can look once.

hungvu193 · 2024-05-28T02:33:47Z

src/libs/ReportUtils.ts

+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`] ?? null;
+
+    if (isOnHold) {
+        IOU.unholdRequest(transactionID, reportAction.childReportID ?? '');


In here, you updated the hold expense with its childReportID, in our BE we didn't send Pusher event to update its parent that's why our replies didn't increase when you held the expense.

This seems that we will need BE changes here cc @robertjchen.

@hungvu193, thanks a lot for looking into this, I agree with you.

Got it, so the backend should also push updates for the parent report here, is that correct?

Could you let me know which particular field changes in the parent report that makes the update from the backend necessary? 👀

childVisibleActionCount is the current field to count the replies.
Since we also added a comment when we held request, I think the pusher event will be exactly the same when we added a new comment inside a thread.

Got it, we can investigate- can this PR go out ahead of the backend changes or is it blocked until that field is available?

I think we can go ahead with this PR first, but let's leave a note for QA team that the issue about counting replies will be fixed once BE PR is deployed.

hungvu193 · 2024-05-29T01:43:35Z

We have conflicts here @Krishna2323

trjExpensify · 2024-05-29T10:32:24Z

Bump on the conflicts, thanks!

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 · 2024-05-29T13:56:21Z

conflicts resolved.

trjExpensify · 2024-06-06T14:24:37Z

I'm unclear what we're waiting on here, @robertjchen? (coming from here)

robertjchen · 2024-06-06T14:29:16Z

@trjExpensify There's ongoing discussion in the comments above, once those are wrapped up we can merge 👍

robertjchen · 2024-06-07T13:09:18Z

@Krishna2323 Just need a final change here and we should be good to go! #42034 (comment)

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

robertjchen · 2024-06-10T06:14:08Z

Looks like a final lint issue and we should be good to merge 👍

hungvu193 · 2024-06-11T02:04:22Z

All yours @robertjchen

robertjchen

Perfect, thank you!

OSBotify · 2024-06-11T05:32:59Z

✋ 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-06-11T22:27:53Z

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

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

OSBotify · 2024-06-13T15:30:29Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.82-4 🚀

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

JmillsExpensify · 2024-06-25T03:41:32Z

Hey ya'll! Any idea why I'm not able to get hold to appear in the overflow menu on a report that's with me for approval?

hungvu193 · 2024-06-25T04:16:18Z

it might relate to #43589
is that non-reimbursable transaction?

feat: [Held requests] option does not show in the preview overflow menu.

be5bcfa

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner May 13, 2024 04:32

melvin-bot bot requested review from hungvu193 and removed request for a team May 13, 2024 04:32

Krishna2323 marked this pull request as draft May 13, 2024 04:32

Krishna2323 added 2 commits May 16, 2024 17:19

Merge branch 'main' into krishna2323/issue/41440

2e36d00

minor fixes.

d8fc20b

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 marked this pull request as ready for review May 17, 2024 09:03

hungvu193 reviewed May 20, 2024

View reviewed changes

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

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

hungvu193 reviewed May 20, 2024

View reviewed changes

canHoldUnholdReportAction util function refactoring.

9f330e4

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

add getParentReportAction in ReportUtils.

0fac245

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

hungvu193 suggested changes May 22, 2024

View reviewed changes

Merge branch 'Expensify:main' into krishna2323/issue/41440

3b2e151

hungvu193 reviewed May 28, 2024

View reviewed changes

hungvu193 approved these changes May 28, 2024

View reviewed changes

melvin-bot bot requested a review from robertjchen May 28, 2024 02:37

Krishna2323 added 2 commits May 29, 2024 19:25

resolve conflicts.

ed98b40

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna2323/issue/41440

051180b

Merge branch 'Expensify:main' into krishna2323/issue/41440

7946f0c

Krishna2323 added 3 commits June 8, 2024 13:13

Merge branch 'Expensify:main' into krishna2323/issue/41440

f33575d

use deprecated ReportActionsUtils.getParentReportAction.

2df4f55

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

fix lint issue.

721e407

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna2323/issue/41440

41276b8

robertjchen approved these changes Jun 11, 2024

View reviewed changes

robertjchen merged commit 65db650 into Expensify:main Jun 11, 2024
15 checks passed

github-actions bot mentioned this pull request Jun 11, 2024

Deploy Checklist: New Expensify 2024-06-11 #43515

Closed

59 tasks

melvin-bot bot mentioned this pull request Jun 13, 2024

[Awaiting checklist] [$250] [Held requests] 'Hold expense` option does not show in the preview overflow menu #41440

Closed

6 tasks

	function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, parentReportActionID: string \| undefined): OnyxEntry<OnyxTypes.ReportAction> {
	if (!parentReportActions \|\| !parentReportActionID) {
	return null;
	}
	return parentReportActions[parentReportActionID ?? '0'];
	}

feat: [Held requests] option does not show in the preview overflow menu. #42034

feat: [Held requests] option does not show in the preview overflow menu. #42034

Conversation

Krishna2323 commented May 13, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 13, 2024

hungvu193 commented May 15, 2024

Krishna2323 commented May 15, 2024

Krishna2323 commented May 17, 2024

hungvu193 commented May 17, 2024

hungvu193 commented May 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hungvu193 commented May 21, 2024

Krishna2323 commented May 21, 2024

mallenexpensify commented May 21, 2024

Krishna2323 commented May 21, 2024 • edited Loading

hungvu193 commented May 21, 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

robertjchen Jun 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hungvu193 commented May 22, 2024 • edited Loading

hungvu193 commented May 22, 2024

Krishna2323 commented May 22, 2024

hungvu193 commented May 22, 2024

Reviewer Checklist

Screenshots/Videos

hungvu193 commented May 23, 2024

trjExpensify commented May 24, 2024

hungvu193 commented May 27, 2024

Krishna2323 commented May 27, 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

hungvu193 commented May 29, 2024

trjExpensify commented May 29, 2024

Krishna2323 commented May 29, 2024

trjExpensify commented Jun 6, 2024

robertjchen commented Jun 6, 2024

robertjchen commented Jun 7, 2024

robertjchen commented Jun 10, 2024

hungvu193 commented Jun 11, 2024

robertjchen left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 11, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

JmillsExpensify commented Jun 25, 2024

hungvu193 commented Jun 25, 2024

Krishna2323 commented May 13, 2024 •

edited

Loading

Krishna2323 commented May 21, 2024 •

edited

Loading

robertjchen Jun 6, 2024 •

edited

Loading

hungvu193 commented May 22, 2024 •

edited

Loading