[Wave6] Enable requesting on specific report by mountiny · Pull Request #35246 · Expensify/App

mountiny · 2024-01-26T14:03:44Z

Details

When user requested money from within a specific report, we did not pass the specific reportID to the backend. Instead we always depended on what reportID has been saved in the chatReport.iouReportID key.

This PR fixes it and we pass the correct money request report in the params to the CreateIOUTransaction command and as a result the transaction is added to a correct report.

Fixed Issues

$ #34906

Tests

Have a Collect policy set up to work with NewDot

Invite a member to the policy so they have a workspace chat
As the Employee, go to OldDot and create New Report
Create multiple empty draft/open reports
They should show up in NewDot in your workspace chat
Go to any of those expense reports.
From the Composer + button, request money
Use Manual request
Verify that the request was added to this report
Repeat for Scan and Distance
Now repeat those for the other open reports and always verify the expense was added to correct report
Request money from Global Create or from Workspace chat
Verify you were able to request just fine

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

I have tested on web and mWeb since this change is platform agnostic

Screen.Recording.2024-01-26.at.13.50.49.mp4

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…chat report

melvin-bot · 2024-01-26T14:03:49Z

@eVoloshchak @ One of you needs to 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]

mountiny · 2024-01-26T14:22:22Z

web testing
https://github.com/Expensify/App/assets/36083550/d6133aec-f11b-4301-9bc7-3ebed00d1729

mountiny · 2024-01-26T14:23:30Z

@eVoloshchak Do you have the Collect policy set up? Can you do a checklist on this one?

For now you can confirm the params of the requestMoney call are correct, the backend part of the fix will be deployed on Monday

Beamanator

Looks good (untested) but I have a few NABs just because i like to hear myself ~~talk~~ type

Beamanator · 2024-01-26T14:53:20Z

+    const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID || ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));
+    let iouReport = isNewIOUReport ? null : allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID > 0 ? moneyRequestReportID : chatReport.iouReportID}`];


NAB - This seems a bit cleaner to me, what do you think? It could be too verbose, just thinking out loud :D

Suggested change

const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID || ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));

let iouReport = isNewIOUReport ? null : allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID > 0 ? moneyRequestReportID : chatReport.iouReportID}`];

let iouReport = null;

const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID || ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));

if (moneyRequestReportID > 0) {

iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID}`];

} else if (!isNewIOUReport) {

iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${chatReport.iouReportID}`];

}

@mountiny I'm working on TS migration of IOU file, and after merging the latest main I have a question regarding this part of the code.
Since moneyRequestReportID can be a string, TS complains on this check

if (moneyRequestReportID > 0) {

Was there any reason why you decided to have this specific check or may I update it just to be

if (moneyRequestReportID) {

Also for type consistency, I would update moneyRequestReportID default values form 0 to empty string '' here, here and here, what do you think?

@VickyStash Thank I think that makes sense to do now given the reportIDs are typed as string. In backend its integer so might be a bit confusing for internal devs

Beamanator · 2024-01-26T14:59:13Z

 * @param {Object} [policy]
 * @param {Object} [policyTags]
 * @param {Object} [policyCategories]
+ * @param {Number} [moneyRequestReportID]


NAB - would it be helpful to explain the purpose of this new param? I'm not exactly sure how to explain, i tried for like 5 minutes 🤣

Like how can we explain why chatReport.iouReport is useful sometimes but not always, which is why we need this param? Or is that obvious to everyone but me? :D

Yeah I was actually thinking about the same but did not come up with anything short. I am adding something now, let me know how it sounds!

eVoloshchak · 2024-01-29T02:12:06Z

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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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-01-30.at.01.04.14.mov

Android: mWeb Chrome

Screen.Recording.2024-01-30.at.01.09.24.mov

iOS: Native

Screen.Recording.2024-01-30.at.01.14.27.mov

iOS: mWeb Safari

Screen.Recording.2024-01-30.at.01.11.13.mov

MacOS: Chrome / Safari

Screen.Recording.2024-01-30.at.01.00.05.mov

MacOS: Desktop

Screen.Recording.2024-01-30.at.01.15.43.mov

mountiny · 2024-01-29T17:53:22Z

@Beamanator Updated!

mountiny · 2024-01-29T17:54:02Z

@eVoloshchak this should be fine to test now!

eVoloshchak

Looks good and tests well!
There are some conflicts

mountiny · 2024-01-30T12:11:12Z

@eVoloshchak updated!

Beamanator

Looks like lint is failing here

mountiny · 2024-01-30T13:23:42Z

Should be fixed, that was from testing some other branch it it somehow got into the merge commit, sorry

eVoloshchak

Works well

melvin-bot · 2024-01-31T01:09:24Z

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

Beamanator

Looking great! Not merging just b/c of the one outstanding comment about the "Composer" comment

Co-authored-by: Alex Beaman <alexbeaman@expensify.com>

mountiny · 2024-01-31T14:42:01Z

@Beamanator Accepted your suggestion! thanks!

Beamanator

LGTM - thanks @mountiny !

OSBotify · 2024-01-31T16:05:41Z

✋ 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-01-31T23:01:12Z

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

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

OSBotify · 2024-02-02T15:13:45Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.35-7 🚀

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

mountiny added 3 commits January 26, 2024 13:35

Rename report param of the getMoneyRequestInformation to clarify its …

9a629cc

…chat report

Add the new reportID param to createDistanceRequest

4c75f8b

Add the reportID to the requestMoney action

4f6bd80

mountiny requested a review from Beamanator January 26, 2024 14:03

mountiny self-assigned this Jan 26, 2024

mountiny requested a review from a team as a code owner January 26, 2024 14:03

melvin-bot Bot requested review from eVoloshchak and removed request for a team January 26, 2024 14:03

Beamanator reviewed Jan 26, 2024

View reviewed changes

mountiny added 2 commits January 29, 2024 17:40

Merge branch 'main' into vit-passReportID

26ad30d

Address PR feedback

c237445

eVoloshchak reviewed Jan 30, 2024

View reviewed changes

Resolve merge conflicts

6b166e8

Beamanator reviewed Jan 30, 2024

View reviewed changes

Comment thread src/components/MoneyReportHeader.tsx

Revert testing change

76cbb77

Beamanator reviewed Jan 30, 2024

View reviewed changes

Comment thread src/libs/actions/IOU.js Outdated

eVoloshchak approved these changes Jan 31, 2024

View reviewed changes

melvin-bot Bot requested a review from dangrous January 31, 2024 01:09

Beamanator previously approved these changes Jan 31, 2024

View reviewed changes

mountiny dismissed Beamanator’s stale review via 4241883 January 31, 2024 14:41

Update src/libs/actions/IOU.js

4241883

Co-authored-by: Alex Beaman <alexbeaman@expensify.com>

mountiny requested a review from Beamanator January 31, 2024 14:41

Beamanator approved these changes Jan 31, 2024

View reviewed changes

Beamanator merged commit 1c1faaa into main Jan 31, 2024

Beamanator deleted the vit-passReportID branch January 31, 2024 16:01

github-actions Bot mentioned this pull request Jan 31, 2024

Deploy Checklist: New Expensify 2024-01-31 #35524

Closed

37 tasks

lakchote mentioned this pull request Feb 1, 2024

[HOLD for payment 2024-02-09] IOU - Pay elsewhere button does nothing and console error shows up #35561

Closed

6 tasks

melvin-bot Bot mentioned this pull request Feb 2, 2024

[HOLD for payment 2024-02-09] [HIGH] Ensure the expense is added to report from which it was requested from #34906

Closed

		const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID \|\| ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));
		let iouReport = isNewIOUReport ? null : allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID > 0 ? moneyRequestReportID : chatReport.iouReportID}`];

-    const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID || ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));
-    let iouReport = isNewIOUReport ? null : allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID > 0 ? moneyRequestReportID : chatReport.iouReportID}`];
+    let iouReport = null;
+    const isNewIOUReport = !moneyRequestReportID && (!chatReport.iouReportID || ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(chatReport));
+    if (moneyRequestReportID > 0) {
+        iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID}`];
+    } else if (!isNewIOUReport) {
+        iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${chatReport.iouReportID}`];
+    }

Conversation

mountiny commented Jan 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jan 26, 2024

Uh oh!

mountiny commented Jan 26, 2024

Uh oh!

mountiny commented Jan 26, 2024

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Beamanator Jan 26, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny Jan 29, 2024

Choose a reason for hiding this comment

Uh oh!

VickyStash Feb 1, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny Feb 2, 2024

Choose a reason for hiding this comment

Uh oh!

Beamanator Jan 26, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny Jan 29, 2024

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Jan 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny commented Jan 29, 2024

Uh oh!

mountiny commented Jan 29, 2024

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jan 30, 2024

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mountiny commented Jan 30, 2024

Uh oh!

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jan 31, 2024

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jan 31, 2024

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 31, 2024

Uh oh!

OSBotify commented Jan 31, 2024

Uh oh!

OSBotify commented Feb 2, 2024

Uh oh!

Reviewers

Assignees

mountiny commented Jan 26, 2024 •

edited

Loading

eVoloshchak commented Jan 29, 2024 •

edited

Loading