Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exclude Concierge from IOU flows (2nd attempt) #2841

Merged
merged 1 commit into from
May 14, 2021
Merged

Exclude Concierge from IOU flows (2nd attempt) #2841

merged 1 commit into from
May 14, 2021

Conversation

tugbadogan
Copy link
Contributor

cc @Luke9389 @roryabraham

Details

This is a duplicate of #2740 and I'm using _.contains() to avoid crashing the app if this.props.report.participant is undefined.

Fixed Issues

Fixes #2698

Tests

QA Steps

- Open 1:1 and group chat with Concierge
- Press `+` icon next to chat composer
- Observe that there is no `Request Money` or `Split Bill` option on menu
- Open 1:1 and group chat without Concierge
- Press `+` icon next to chat composer
- Observe that there is a `Request Money` or `Split Bill` option on menu
- Press big green `+` icon on the sidebar
- Select `Request Money` or `Split Bill`
- Enter a random amount and press `Next`
- Search Concierge
- Observe that Concierge doesn't appear among results

Q&A steps for group creation issue #2809

* Launch the app and login
* Create a group with 2 or more users
* Focus on the input field to type

Tested On

  • Web
  • Mobile Web
  • Desktop
  • iOS
  • Android

Screenshots

Web

Screenshot 2021-05-13 at 00 47 33

Screenshot 2021-05-13 at 00 47 18

Screenshot 2021-05-13 at 00 46 59

Screenshot 2021-05-13 at 00 46 48

Screenshot 2021-05-13 at 00 46 37

Screenshot 2021-05-13 at 00 46 24

@tugbadogan tugbadogan requested a review from a team as a code owner May 12, 2021 23:50
@MelvinBot MelvinBot requested review from thienlnam and removed request for a team May 12, 2021 23:50
@tugbadogan tugbadogan changed the title Exclude concierge from IOU flows (2nd attempt) Exclude Concierge from IOU flows (2nd attempt) May 12, 2021
@@ -308,10 +308,10 @@ class ReportActionCompose extends React.Component {
render() {
// eslint-disable-next-line no-unused-vars
const hasMultipleParticipants = lodashGet(this.props.report, 'participants.length') > 1;
const hasConciergeParticipant = _.contains(this.props.report.participants, CONST.EMAIL.CONCIERGE);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only this line has been changed compared to the previous PR #2740

Before:

const hasConciergeParticipant = this.props.report.participants.includes(CONST.EMAIL.CONCIERGE);

Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good, and I appreciate that you added tests! Passing on to @roryabraham or @Luke9389 for final merge. Another note as I review this is that we should eventually update this from excludeConcierge to excludeSupportEmails or something similar and exclude Chronos as well

@trjExpensify
Copy link
Contributor

Merging this. Thanks for the fix here @tugbadogan, and @thienlnam & @Luke9389 for the reviews.

@trjExpensify trjExpensify merged commit caa2778 into Expensify:main May 14, 2021
@OSBotify
Copy link
Contributor

🚀 Deployed to staging in version: 1.0.45-2🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production in version: 1.0.46-0🚀

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

@tugbadogan tugbadogan deleted the tugbadogan-exclude-concierge-iou-2nd-attempt branch July 10, 2021 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[IOU] Users are able to send payment requests and split bills with Concierge
5 participants