Add ability to request money from iou and expense report #27133

dukenv0307 · 2023-09-11T08:40:48Z

Details

Fixed Issues

$ #27075
PROPOSAL: #27075 (comment)

Tests

Pre-condition: Already have a report preview that isn't approved or paid

Open the iou or expense report by clicking on the report preview above
Go to FAB > Request money
Create a request money
Verify that after creating the request money we go back to iou or expense report
Click on header to go back the parent report
Verify that the amount and the number of request in report preview is updated correctly
On another device, login with the user that is the payer of the request above and pay the request
Click on FAB and verify that the request money option isn't appear

Verify that no errors appear in the JS console

Offline tests

QA Steps

Pre-condition: Already have a report preview that isn't approved or paid

Open the iou or expense report by clicking on the report preview above
Go to FAB > Request money
Create a request money
Verify that after creating the request money we go back to iou or expense report
Click on header to go back the parent report
Verify that the amount and the number of request in report preview is updated correctly
On another device, login with the user that is the payer of the request above and pay the request
Click on FAB and verify that the request money option isn't appear

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screencast.from.11-09-2023.16.07.01.webm

Mobile Web - Chrome

Record_2023-09-11-16-13-46.mp4

Mobile Web - Safari

Screen.Recording.2023-09-11.at.16.18.02.mp4

Desktop

Screen.Recording.2023-09-11.at.16.29.13.mov

iOS

Screen.Recording.2023-09-11.at.16.16.06.mp4

Android

27075.mp4

melvin-bot · 2023-09-11T09:50:26Z

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

narefyev91 · 2023-09-11T14:05:00Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

web.mov

Mobile Web - Chrome

8mb.video-ryH-w75iY91x.mp4

Mobile Web - Safari

ios-web.mov

Desktop

desktop.mov

iOS

8mb.video-7SV-xlOCc0Cy.mp4

Android

android.mov

narefyev91

Did not see any issues with current implementation
Works well!
If nothing else needed here - LGTM
🎀 👀 🎀 C+ reviewed

src/libs/actions/IOU.js

mountiny · 2023-09-11T15:22:20Z

src/libs/actions/IOU.js

@@ -562,8 +562,11 @@ function createDistanceRequest(report, participant, comment, created, transactio
 * @param {Object} [receipt]
 */
 function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined) {
+    // If the report is iou or expense report, we should get the chat report of this to pass to getMoneyRequestInformation function
+    const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
+    const currentReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;


I think it would be better to call it like this:

Suggested change

const currentReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;

const chatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;

It overlaps with chatReport below.

currentChatReport

Updated with merging the newest main.

Co-authored-by: Vit Horacek <[email protected]>

mountiny

Thanks!

mountiny · 2023-09-11T15:51:57Z

I will wait til next deploy with this one to mitigate huge checklist

mountiny

Thanks!

OSBotify · 2023-09-13T09:30:22Z

✋ 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 · 2023-09-14T10:53:22Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.70-0 🚀

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

OSBotify · 2023-09-18T10:11:21Z

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

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

JmillsExpensify · 2023-09-29T01:48:09Z

Has there be a regression? I'm not able to find the option to add an expense to an expense report.

dukenv0307 · 2023-09-29T02:19:42Z

@JmillsExpensify This because BE return participant as empty array for this report that makes getMoneyRequestOption is wrong.

JmillsExpensify · 2023-09-29T05:04:43Z

Oh interesting. I'm surprised we didn't see that in the PR phase, any insight into why?

JmillsExpensify · 2023-09-29T05:06:16Z

Update: Disregard last comment. Based on internal discussion, it looks like we've since made a change to the backend that has since broken this. I'll work on finding the offending PR so we can figure out what went wrong.

dukenv0307 added 2 commits September 11, 2023 15:36

add ability to request money from iou and expense report

cc7d773

use report instead of reportID

8badad2

dukenv0307 marked this pull request as ready for review September 11, 2023 09:50

dukenv0307 requested a review from a team as a code owner September 11, 2023 09:50

melvin-bot bot requested review from narefyev91 and removed request for a team September 11, 2023 09:50

narefyev91 approved these changes Sep 11, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny September 11, 2023 15:12

mountiny assigned dukenv0307 Sep 11, 2023

mountiny requested changes Sep 11, 2023

View reviewed changes

dukenv0307 and others added 3 commits September 11, 2023 22:25

Update src/libs/actions/IOU.js

a2b9e26

Co-authored-by: Vit Horacek <[email protected]>

rename current report

65ff2fd

Merge branch 'main' into fix/27075

19ac191

mountiny previously approved these changes Sep 11, 2023

View reviewed changes

merge main

ed3215f

dukenv0307 dismissed mountiny’s stale review via ed3215f September 13, 2023 03:22

mountiny approved these changes Sep 13, 2023

View reviewed changes

mountiny merged commit ee4eef8 into Expensify:main Sep 13, 2023

OSBotify mentioned this pull request Sep 14, 2023

Deploy Checklist: New Expensify 2023-09-14 #27425

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ability to request money from iou and expense report #27133

Add ability to request money from iou and expense report #27133

dukenv0307 commented Sep 11, 2023 •

edited

Loading

melvin-bot bot commented Sep 11, 2023

narefyev91 commented Sep 11, 2023 •

edited

Loading

narefyev91 left a comment

mountiny Sep 11, 2023

dukenv0307 Sep 11, 2023

mountiny Sep 11, 2023

dukenv0307 Sep 11, 2023

mountiny left a comment

mountiny commented Sep 11, 2023

mountiny left a comment

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 18, 2023

JmillsExpensify commented Sep 29, 2023

dukenv0307 commented Sep 29, 2023

JmillsExpensify commented Sep 29, 2023

JmillsExpensify commented Sep 29, 2023

	const currentReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
	const chatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;

Add ability to request money from iou and expense report #27133

Add ability to request money from iou and expense report #27133

Conversation

dukenv0307 commented Sep 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 11, 2023

narefyev91 commented Sep 11, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

narefyev91 left a comment

Choose a reason for hiding this comment

mountiny Sep 11, 2023

Choose a reason for hiding this comment

dukenv0307 Sep 11, 2023

Choose a reason for hiding this comment

mountiny Sep 11, 2023

Choose a reason for hiding this comment

dukenv0307 Sep 11, 2023

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Sep 11, 2023

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 18, 2023

JmillsExpensify commented Sep 29, 2023

dukenv0307 commented Sep 29, 2023

JmillsExpensify commented Sep 29, 2023

JmillsExpensify commented Sep 29, 2023

dukenv0307 commented Sep 11, 2023 •

edited

Loading

narefyev91 commented Sep 11, 2023 •

edited

Loading