Make the logic for money request options in composer quick actions more robust #28542

mountiny · 2023-09-30T17:11:04Z

Details

The request money option needs to show for all unsettled IOUs, for both participants, no matter who is the owner, payer or payee.

Similarly we want to show the money request option in expense reports which are tied to user's own policy expense chat. We achieve that by checking the parent report of the expense report and then its isOwnPolicyExpenseChat property.

Adding more automated tests for the getMoneyRequestOptions method to cover as many scenarios as possible

Fixed Issues

$ #27075

Tests

Being able to request money in the IOU report

Navigate to a DM with an existing User B
Click the composer + button
Verify you can see the Request Money option and no split
Request money from User B
Navigate to the IOU report which got created
Click the composer + button in the IOU report
Verify you can see the Request money option
Request more money from User B
Log in as User B in incognito window
Go to the DM with User A
Verify you can see the request money option in the composer + actions menu
Navigate to the IOU report where User A requested money from the User B
Verify you can request money from User A in the IOU report composer + actions menu too
As User B, in the IOU report, request more money from the User A than you owe at the moment
Verify the request was successful and the User A now owes money to User B
Verify you can still see the Request Money option as User B
Go back to the User A window and verify you can also still see an option to request money from User B
As User A, pay the money report elsewhere to settle the report
Verify that as User A, you cannot request money in the paid IOU report
Similarly, verify that as User B, you cannot request money in the paid IOU report

Being able to request money in an expense report tied to your own workspace chat

As non-admin workspace Member, request money from a workspace
Navigate to the expense report
Verify you can see the Request money option in the composer + actions menu
In another incognito window, sign in as the admin of the workspace
Navigate to the workspace chat with the Member
Verify you dont see the Request money option in the composer + actions menu
Navigate to the expense report
Verify you can see an option to pay the report
Verify that you don't see the request money option in the composer + actions menu

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

Asked c+ for screenshots

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-09-30T17:11:09Z

@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-10-02T09:32:30Z

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

web1.mp4

web2.mov

Mobile Web - Chrome

android-web.mp4

Mobile Web - Safari

ios-web.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

narefyev91

LGTM! Nice work!
🎀 👀 🎀 C+ reviewed

melvin-bot · 2023-10-02T09:33:26Z

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

deetergp

👍

deetergp · 2023-10-02T18:09:57Z

tests/unit/ReportUtilsTest.js

@@ -434,22 +434,82 @@ describe('ReportUtils', () => {
        afterAll(() => Onyx.clear());

        describe('return empty iou options if', () => {
-            it('participants contains excluded iou emails', () => {
+            it('participants aray contains excluded expensify iou emails', () => {


NAB: typo in the word array

OSBotify · 2023-10-02T18:19:53Z

✋ 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-10-03T16:09:39Z

🚀 Deployed to staging by https://github.com/deetergp in version: 1.3.77-0 🚀

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

OSBotify · 2023-10-05T00:16:29Z

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

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

mountiny added 4 commits September 29, 2023 17:01

Fix the request money option

db0ef88

Merge branch 'main' into vit-fixRequestMoney

a4ac8f9

Add tests to cover the getMoneRequestOptions better

c376fd3

clean up the getMoneyRequestOptions

0d493e3

mountiny requested a review from a team as a code owner September 30, 2023 17:11

mountiny self-assigned this Sep 30, 2023

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

mountiny mentioned this pull request Sep 30, 2023

[HOLD for payment 2023-10-12] [$500] HIGH: Add ability to request money from within IOU and `expense reports #27075

Closed

mountiny added 2 commits October 1, 2023 01:29

Clean up the getMoneyRequestOptions logic

9777a2c

Update tests

d5adca2

narefyev91 approved these changes Oct 2, 2023

View reviewed changes

melvin-bot bot requested a review from deetergp October 2, 2023 09:33

deetergp approved these changes Oct 2, 2023

View reviewed changes

deetergp merged commit 943031a into main Oct 2, 2023

deetergp deleted the vit-fixRequestMoney branch October 2, 2023 18:14

OSBotify mentioned this pull request Oct 3, 2023

Deploy Checklist: New Expensify 2023-10-03 #28727

Closed

lanitochka17 mentioned this pull request Oct 4, 2023

IOU - User B can't request money to user A inside the IOU report user A created #28816

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make the logic for money request options in composer quick actions more robust #28542

Make the logic for money request options in composer quick actions more robust #28542

mountiny commented Sep 30, 2023 •

edited

Loading

melvin-bot bot commented Sep 30, 2023

narefyev91 commented Oct 2, 2023

narefyev91 left a comment

melvin-bot bot commented Oct 2, 2023

deetergp left a comment

deetergp Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 5, 2023

Make the logic for money request options in composer quick actions more robust #28542

Make the logic for money request options in composer quick actions more robust #28542

Conversation

mountiny commented Sep 30, 2023 • edited Loading

Details

Fixed Issues

Tests

Being able to request money in the IOU report

Being able to request money in an expense report tied to your own workspace chat

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 30, 2023

narefyev91 commented Oct 2, 2023

Reviewer Checklist

Screenshots/Videos

narefyev91 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 2, 2023

deetergp left a comment

Choose a reason for hiding this comment

deetergp Oct 2, 2023

Choose a reason for hiding this comment

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 5, 2023

mountiny commented Sep 30, 2023 •

edited

Loading