Update money request options for different room types #31025

puneetlath · 2023-11-07T19:59:29Z

Details

In trying to make https://github.com/Expensify/Expensify/issues/324780 work, I realized that we have special logic that makes it so that you can't request money on Control workspaces (only split bill). I tried to update an simplify the getMoneyRequestOptions logic to be:

split bill
- chat rooms with multiple users
- workspace chats (all, not just control as I wasn't aware of any reason to restrict, but I could be wrong about that cc @youssef-lr)
- group DMs
request money
- workspace chats (all kinds as long as its their own)
- IOU/expense reports
- DMs
send money
- 1:1 DMs

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/324780
PROPOSAL:

Tests

Click the plus button in a chat thread
You should see no money request options (split, request, send)
Click the plus button in a task
You should see no money request options (split, request, send)
Click the plus button in your chat with Concierge
You should see no money request options (split, request, send)
Log into accountA
Locally, set the accountID in one of these constants to be the accountID of accountA
Create a workspace in accountA and invite accountB
Sign into accountB and click the plus button in your workspace chat
You should see the request money and split bill options
Go to a workspace chat in any user's account for a workspace not owned by accountA
You should see the request money and split bill options
Go to chat room with no other users in it
You should see no money request options (split, request, send)
Add another user to the room
You should see the split bill option
Go to a 1:1 DM
You should see request and send, not split
Go to a group DM with 2+ other people
You should see only split
Go to an IOU report that is not paid
You should see only request
Go to an IOU report that is paid
You should see no money request options (split, request, send)
Go to an expense report that is not paid
You should see only request
Go to an expense report that is paid
You should see no money request options (split, request, send)

Verify that no errors appear in the JS console

Offline tests

Same as online tests.

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-11-07T22:02:56Z

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

puneetlath · 2023-11-07T22:19:15Z

@ntdiary trying to get my android emulator working, but in the meantime, mind reviewing? There's no platform logic here.

ntdiary · 2023-11-08T10:46:07Z

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(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 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 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

thread report

task report

concierge report

workspace member

workspace owner

chat room no other users

chat room multi users

1:1 DM

2+ DM

IOU not paid

IOU paid

expense not paid

expense paid

MacOS: Desktop

ntdiary · 2023-11-08T15:00:38Z

@ntdiary trying to get my android emulator working, but in the meantime, mind reviewing? There's no platform logic here.

I put screenshots of these cases in the MacOS: Chrome / Safari section, and also tested on other platforms. Just don't quite understand the meaning of changing the accountID and how to change it 😂:

Locally, set the accountID in one of these constants to be the accountID of accountA

puneetlath · 2023-11-08T15:23:29Z

Ahh @ntdiary basically if you change one of those constants to one of your accounts, then you can "pretend" that one of your accounts is a special expensify account and test accordingly.

ntdiary

Ah, thank you, great explanation! LGTM :)

melvin-bot · 2023-11-08T17:17:43Z

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

melvin-bot · 2023-11-08T17:17:47Z

🎯 @ntdiary, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #31073.

src/libs/ReportUtils.js

youssef-lr

LGTM

OSBotify · 2023-11-08T20:03:49Z

✋ 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-11-10T15:42:39Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.97-7 🚀

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

OSBotify · 2023-11-10T16:00:30Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.98-0 🚀

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

OSBotify · 2023-11-14T21:53:57Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.98-5 🚀

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

Update money request options for different room types

ab16481

puneetlath self-assigned this Nov 7, 2023

puneetlath added 4 commits November 7, 2023 15:00

Rename participants to otherParticipants

16da9a6

prettier

fce7b70

Fix isDM function to only be true for type chat

e883529

Update tests for updated scenarios

f481ca9

puneetlath marked this pull request as ready for review November 7, 2023 22:02

puneetlath requested a review from a team as a code owner November 7, 2023 22:02

melvin-bot bot requested review from ntdiary and removed request for a team November 7, 2023 22:02

puneetlath requested a review from youssef-lr November 7, 2023 22:19

ntdiary approved these changes Nov 8, 2023

View reviewed changes

melvin-bot bot requested a review from pecanoro November 8, 2023 17:17

melvin-bot bot mentioned this pull request Nov 8, 2023

Payment issue for E/App PR#31025 #31073

Closed

pecanoro requested changes Nov 8, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

Add blank line before comment

2300d06

puneetlath requested a review from pecanoro November 8, 2023 18:06

youssef-lr approved these changes Nov 8, 2023

View reviewed changes

pecanoro approved these changes Nov 8, 2023

View reviewed changes

pecanoro merged commit fae9178 into main Nov 8, 2023
15 checks passed

pecanoro deleted the puneet-request-options branch November 8, 2023 19:59

OSBotify mentioned this pull request Nov 8, 2023

Deploy Checklist: New Expensify 2023-11-08 #31077

Closed

kbecciv mentioned this pull request Nov 8, 2023

Workspace - Process is looped when attempting to split Distance request in workspace chat #31086

Closed

6 tasks

OSBotify mentioned this pull request Nov 10, 2023

Deploy Checklist: New Expensify 2023-11-10 #31187

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update money request options for different room types #31025

Update money request options for different room types #31025

puneetlath commented Nov 7, 2023 •

edited

Loading

melvin-bot bot commented Nov 7, 2023

puneetlath commented Nov 7, 2023

ntdiary commented Nov 8, 2023 •

edited

Loading

ntdiary commented Nov 8, 2023

puneetlath commented Nov 8, 2023

ntdiary left a comment

melvin-bot bot commented Nov 8, 2023

melvin-bot bot commented Nov 8, 2023

youssef-lr left a comment

OSBotify commented Nov 8, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

Update money request options for different room types #31025

Update money request options for different room types #31025

Conversation

puneetlath commented Nov 7, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 7, 2023

puneetlath commented Nov 7, 2023

ntdiary commented Nov 8, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

ntdiary commented Nov 8, 2023

puneetlath commented Nov 8, 2023

ntdiary left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Nov 8, 2023

melvin-bot bot commented Nov 8, 2023

youssef-lr left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 8, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

puneetlath commented Nov 7, 2023 •

edited

Loading

ntdiary commented Nov 8, 2023 •

edited

Loading